Skip to content
Snippets Groups Projects
Commit 92ab08e4 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 27/04/2022: rename modules common to stations and profilers

parent 508731de
No related branches found
No related tags found
No related merge requests found
...@@ -66,13 +66,13 @@ USE MODD_DYN_n, ONLY: DYN_MODEL, XTSTEP ...@@ -66,13 +66,13 @@ USE MODD_DYN_n, ONLY: DYN_MODEL, XTSTEP
USE MODD_GRID_n, ONLY: XXHAT, XYHAT USE MODD_GRID_n, ONLY: XXHAT, XYHAT
USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT
USE MODD_STATION_n USE MODD_STATION_n
USE MODD_TYPE_STATION USE MODD_TYPE_STATPROF
! !
USE MODE_MSG USE MODE_MSG
USE MODE_STATION_READER USE MODE_STATPROF_READER
USE MODE_STATION_TOOLS, ONLY: STATION_ADD, STATION_ALLOCATE, STATION_INI_INTERP, STATION_POSITION USE MODE_STATPROF_TOOLS, ONLY: STATION_ADD, STATION_ALLOCATE, STATION_INI_INTERP, STATION_POSITION
USE MODE_ALLOCBUFFER_ll, ONLY: ALLOCBUFFER_ll USE MODE_ALLOCBUFFER_ll, ONLY: ALLOCBUFFER_ll
USE MODE_GATHER_ll, ONLY: GATHERALL_FIELD_ll USE MODE_GATHER_ll, ONLY: GATHERALL_FIELD_ll
! !
IMPLICIT NONE IMPLICIT NONE
! !
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
! ------------ ! ------------
! !
! !
USE MODD_PARAMETERS, ONLY: JPMODELMAX USE MODD_PARAMETERS, ONLY: JPMODELMAX
USE MODD_TYPE_STATION, ONLY: TSTATIONDATA, TSTATPROFTIME USE MODD_TYPE_STATPROF, ONLY: TSTATIONDATA, TSTATPROFTIME
IMPLICIT NONE IMPLICIT NONE
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
!MNH_LIC for details. version 1. !MNH_LIC for details. version 1.
!----------------------------------------------------------------- !-----------------------------------------------------------------
! ############################ ! ############################
MODULE MODD_TYPE_STATION MODULE MODD_TYPE_STATPROF
! ############################ ! ############################
! !
!!**** *MODD_STATION* - declaration of stations !!**** *MODD_STATION* - declaration of stations
...@@ -111,4 +111,4 @@ REAL, DIMENSION(:), ALLOCATABLE :: XSFCO2 ! CO2 surface flux ...@@ -111,4 +111,4 @@ REAL, DIMENSION(:), ALLOCATABLE :: XSFCO2 ! CO2 surface flux
END TYPE TSTATIONDATA END TYPE TSTATIONDATA
END MODULE MODD_TYPE_STATION END MODULE MODD_TYPE_STATPROF
...@@ -97,7 +97,7 @@ USE MODD_STATION_n ...@@ -97,7 +97,7 @@ USE MODD_STATION_n
USE MODD_ALLSTATION_n, ONLY: LDIAG_SURFRAD USE MODD_ALLSTATION_n, ONLY: LDIAG_SURFRAD
USE MODD_TIME_n, ONLY: tdtcur USE MODD_TIME_n, ONLY: tdtcur
! !
USE MODE_STATION_TOOLS, ONLY: STATION_INTERP_2D, STATION_INTERP_2D_U, STATION_INTERP_2D_V USE MODE_STATPROF_TOOLS, ONLY: STATION_INTERP_2D, STATION_INTERP_2D_U, STATION_INTERP_2D_V
! !
! !
IMPLICIT NONE IMPLICIT NONE
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1. !MNH_LIC for details. version 1.
!----------------------------------------------------------------- !-----------------------------------------------------------------
! ####################### ! ############################
MODULE MODE_STATION_READER MODULE MODE_STATPROF_READER
! ####################### ! ############################
IMPLICIT NONE IMPLICIT NONE
...@@ -41,10 +41,10 @@ SUBROUTINE READ_CSV_STATION( HFILE, PXHAT_GLOB, PYHAT_GLOB, PXHATM, PYHATM, ...@@ -41,10 +41,10 @@ SUBROUTINE READ_CSV_STATION( HFILE, PXHAT_GLOB, PYHAT_GLOB, PXHATM, PYHATM,
USE MODD_CONF, ONLY: LCARTESIAN USE MODD_CONF, ONLY: LCARTESIAN
USE MODD_STATION_n, ONLY: NUMBSTAT USE MODD_STATION_n, ONLY: NUMBSTAT
USE MODD_TYPE_STATION, ONLY: TSTATIONDATA USE MODD_TYPE_STATPROF, ONLY: TSTATIONDATA
USE MODE_MSG USE MODE_MSG
USE MODE_STATION_TOOLS, ONLY: STATION_ADD, STATION_INI_INTERP, STATION_POSITION USE MODE_STATPROF_TOOLS, ONLY: STATION_ADD, STATION_INI_INTERP, STATION_POSITION
CHARACTER(LEN=*), INTENT(IN) :: HFILE ! file to read CHARACTER(LEN=*), INTENT(IN) :: HFILE ! file to read
REAL, DIMENSION(:), INTENT(IN) :: PXHAT_GLOB REAL, DIMENSION(:), INTENT(IN) :: PXHAT_GLOB
...@@ -131,4 +131,4 @@ END IF ...@@ -131,4 +131,4 @@ END IF
! !
END SUBROUTINE FRENCH_TO_ENGLISH END SUBROUTINE FRENCH_TO_ENGLISH
END MODULE MODE_STATION_READER END MODULE MODE_STATPROF_READER
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
!----------------------------------------------------------------- !-----------------------------------------------------------------
! Modifications: ! Modifications:
!----------------------------------------------------------------- !-----------------------------------------------------------------
! ################## ! ###################
MODULE MODE_STATION_TOOLS MODULE MODE_STATPROF_TOOLS
! ################## ! ###################
USE MODD_TYPE_STATION, ONLY: TSTATIONDATA USE MODD_TYPE_STATPROF, ONLY: TSTATIONDATA
IMPLICIT NONE IMPLICIT NONE
...@@ -390,4 +390,4 @@ FUNCTION STATION_INTERP_2D_V( TPSTATION, PA ) RESULT( PB ) ...@@ -390,4 +390,4 @@ FUNCTION STATION_INTERP_2D_V( TPSTATION, PA ) RESULT( PB )
END FUNCTION STATION_INTERP_2D_V END FUNCTION STATION_INTERP_2D_V
END MODULE MODE_STATION_TOOLS END MODULE MODE_STATPROF_TOOLS
...@@ -77,9 +77,9 @@ USE MODD_NSV, ONLY: nsv ...@@ -77,9 +77,9 @@ USE MODD_NSV, ONLY: nsv
USE MODD_PARAM_n, ONLY: CRAD, CSURF, CTURB USE MODD_PARAM_n, ONLY: CRAD, CSURF, CTURB
USE MODD_PRECISION, ONLY: MNHINT_MPI, MNHREAL_MPI USE MODD_PRECISION, ONLY: MNHINT_MPI, MNHREAL_MPI
USE MODD_STATION_n, only: NUMBSTAT_LOC, TSTATIONS, tstations_time USE MODD_STATION_n, only: NUMBSTAT_LOC, TSTATIONS, tstations_time
USE MODD_TYPE_STATION, ONLY: TSTATIONDATA USE MODD_TYPE_STATPROF, ONLY: TSTATIONDATA
! !
USE MODE_STATION_TOOLS, ONLY: STATION_ALLOCATE USE MODE_STATPROF_TOOLS, ONLY: STATION_ALLOCATE
! !
IMPLICIT NONE IMPLICIT NONE
! !
...@@ -292,25 +292,25 @@ END SUBROUTINE WRITE_STATION_n ...@@ -292,25 +292,25 @@ END SUBROUTINE WRITE_STATION_n
SUBROUTINE STATION_DIACHRO_n( TPDIAFILE, TPSTATION ) SUBROUTINE STATION_DIACHRO_n( TPDIAFILE, TPSTATION )
! ################################################## ! ##################################################
USE MODD_ALLSTATION_n, ONLY: LDIAG_SURFRAD USE MODD_ALLSTATION_n, ONLY: LDIAG_SURFRAD
use modd_budget, only: NLVL_CATEGORY, NLVL_SUBCATEGORY, NLVL_GROUP, NLVL_SHAPE, NLVL_TIMEAVG, NLVL_NORM, NLVL_MASK, & use modd_budget, only: NLVL_CATEGORY, NLVL_SUBCATEGORY, NLVL_GROUP, NLVL_SHAPE, NLVL_TIMEAVG, NLVL_NORM, NLVL_MASK, &
tbudiachrometadata tbudiachrometadata
USE MODD_CONF, ONLY: LCARTESIAN USE MODD_CONF, ONLY: LCARTESIAN
USE MODD_CST, ONLY: XRV USE MODD_CST, ONLY: XRV
use modd_field, only: NMNHDIM_STATION_TIME, NMNHDIM_STATION_PROC, NMNHDIM_UNUSED, & use modd_field, only: NMNHDIM_STATION_TIME, NMNHDIM_STATION_PROC, NMNHDIM_UNUSED, &
tfieldmetadata_base, TYPEREAL tfieldmetadata_base, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA USE MODD_IO, ONLY: TFILEDATA
USE MODD_NSV, ONLY: nsv, nsv_aer, nsv_aerbeg, nsv_aerend, & USE MODD_NSV, ONLY: nsv, nsv_aer, nsv_aerbeg, nsv_aerend, &
nsv_dst, nsv_dstbeg, nsv_dstend, nsv_slt, nsv_sltbeg, nsv_sltend, & nsv_dst, nsv_dstbeg, nsv_dstend, nsv_slt, nsv_sltbeg, nsv_sltend, &
tsvlist tsvlist
USE MODD_PARAM_n, ONLY: CRAD, CSURF, CTURB USE MODD_PARAM_n, ONLY: CRAD, CSURF, CTURB
use modd_station_n, only: tstations_time use modd_station_n, only: tstations_time
use modd_type_station, only: tstationdata use modd_type_statprof, only: tstationdata
USE MODE_AERO_PSD USE MODE_AERO_PSD
USE MODE_DUST_PSD USE MODE_DUST_PSD
USE MODE_SALT_PSD USE MODE_SALT_PSD
use MODE_WRITE_DIACHRO, ONLY: Write_diachro use MODE_WRITE_DIACHRO, ONLY: Write_diachro
TYPE(TFILEDATA), INTENT(IN) :: TPDIAFILE ! diachronic file to write TYPE(TFILEDATA), INTENT(IN) :: TPDIAFILE ! diachronic file to write
TYPE(TSTATIONDATA), INTENT(IN) :: TPSTATION TYPE(TSTATIONDATA), INTENT(IN) :: TPSTATION
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment