From 92ab08e46b150a9c9c7fabe3014babefa798f509 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Wed, 27 Apr 2022 10:16:45 +0200 Subject: [PATCH] Philippe 27/04/2022: rename modules common to stations and profilers --- src/MNH/ini_surfstationn.f90 | 10 +++++----- src/MNH/modd_stationn.f90 | 4 ++-- src/MNH/modd_type_statprof.f90 | 4 ++-- src/MNH/stationn.f90 | 2 +- src/MNH/statprof_reader.f90 | 12 ++++++------ src/MNH/statprof_tools.f90 | 10 +++++----- src/MNH/write_stationn.f90 | 34 +++++++++++++++++----------------- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/MNH/ini_surfstationn.f90 b/src/MNH/ini_surfstationn.f90 index ebd004817..8811fa566 100644 --- a/src/MNH/ini_surfstationn.f90 +++ b/src/MNH/ini_surfstationn.f90 @@ -66,13 +66,13 @@ USE MODD_DYN_n, ONLY: DYN_MODEL, XTSTEP USE MODD_GRID_n, ONLY: XXHAT, XYHAT USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT USE MODD_STATION_n -USE MODD_TYPE_STATION +USE MODD_TYPE_STATPROF ! USE MODE_MSG -USE MODE_STATION_READER -USE MODE_STATION_TOOLS, ONLY: STATION_ADD, STATION_ALLOCATE, STATION_INI_INTERP, STATION_POSITION -USE MODE_ALLOCBUFFER_ll, ONLY: ALLOCBUFFER_ll -USE MODE_GATHER_ll, ONLY: GATHERALL_FIELD_ll +USE MODE_STATPROF_READER +USE MODE_STATPROF_TOOLS, ONLY: STATION_ADD, STATION_ALLOCATE, STATION_INI_INTERP, STATION_POSITION +USE MODE_ALLOCBUFFER_ll, ONLY: ALLOCBUFFER_ll +USE MODE_GATHER_ll, ONLY: GATHERALL_FIELD_ll ! IMPLICIT NONE ! diff --git a/src/MNH/modd_stationn.f90 b/src/MNH/modd_stationn.f90 index f86692bf4..bd86a1595 100644 --- a/src/MNH/modd_stationn.f90 +++ b/src/MNH/modd_stationn.f90 @@ -36,8 +36,8 @@ ! ------------ ! ! -USE MODD_PARAMETERS, ONLY: JPMODELMAX -USE MODD_TYPE_STATION, ONLY: TSTATIONDATA, TSTATPROFTIME +USE MODD_PARAMETERS, ONLY: JPMODELMAX +USE MODD_TYPE_STATPROF, ONLY: TSTATIONDATA, TSTATPROFTIME IMPLICIT NONE diff --git a/src/MNH/modd_type_statprof.f90 b/src/MNH/modd_type_statprof.f90 index ed408c9af..12150549a 100644 --- a/src/MNH/modd_type_statprof.f90 +++ b/src/MNH/modd_type_statprof.f90 @@ -4,7 +4,7 @@ !MNH_LIC for details. version 1. !----------------------------------------------------------------- ! ############################ - MODULE MODD_TYPE_STATION + MODULE MODD_TYPE_STATPROF ! ############################ ! !!**** *MODD_STATION* - declaration of stations @@ -111,4 +111,4 @@ REAL, DIMENSION(:), ALLOCATABLE :: XSFCO2 ! CO2 surface flux END TYPE TSTATIONDATA -END MODULE MODD_TYPE_STATION +END MODULE MODD_TYPE_STATPROF diff --git a/src/MNH/stationn.f90 b/src/MNH/stationn.f90 index 0343d9da3..41e95dc53 100644 --- a/src/MNH/stationn.f90 +++ b/src/MNH/stationn.f90 @@ -97,7 +97,7 @@ USE MODD_STATION_n USE MODD_ALLSTATION_n, ONLY: LDIAG_SURFRAD 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 diff --git a/src/MNH/statprof_reader.f90 b/src/MNH/statprof_reader.f90 index 1a72bfe1a..ed645d7ab 100644 --- a/src/MNH/statprof_reader.f90 +++ b/src/MNH/statprof_reader.f90 @@ -3,9 +3,9 @@ !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- -! ####################### - MODULE MODE_STATION_READER -! ####################### +! ############################ + MODULE MODE_STATPROF_READER +! ############################ IMPLICIT NONE @@ -41,10 +41,10 @@ SUBROUTINE READ_CSV_STATION( HFILE, PXHAT_GLOB, PYHAT_GLOB, PXHATM, PYHATM, USE MODD_CONF, ONLY: LCARTESIAN USE MODD_STATION_n, ONLY: NUMBSTAT -USE MODD_TYPE_STATION, ONLY: TSTATIONDATA +USE MODD_TYPE_STATPROF, ONLY: TSTATIONDATA 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 REAL, DIMENSION(:), INTENT(IN) :: PXHAT_GLOB @@ -131,4 +131,4 @@ END IF ! END SUBROUTINE FRENCH_TO_ENGLISH -END MODULE MODE_STATION_READER +END MODULE MODE_STATPROF_READER diff --git a/src/MNH/statprof_tools.f90 b/src/MNH/statprof_tools.f90 index 10b3c1ee3..0a5e466c3 100644 --- a/src/MNH/statprof_tools.f90 +++ b/src/MNH/statprof_tools.f90 @@ -9,11 +9,11 @@ !----------------------------------------------------------------- ! Modifications: !----------------------------------------------------------------- -! ################## -MODULE MODE_STATION_TOOLS -! ################## +! ################### +MODULE MODE_STATPROF_TOOLS +! ################### -USE MODD_TYPE_STATION, ONLY: TSTATIONDATA +USE MODD_TYPE_STATPROF, ONLY: TSTATIONDATA IMPLICIT NONE @@ -390,4 +390,4 @@ FUNCTION STATION_INTERP_2D_V( TPSTATION, PA ) RESULT( PB ) END FUNCTION STATION_INTERP_2D_V -END MODULE MODE_STATION_TOOLS +END MODULE MODE_STATPROF_TOOLS diff --git a/src/MNH/write_stationn.f90 b/src/MNH/write_stationn.f90 index 23d6b40e7..7b35ea4c8 100644 --- a/src/MNH/write_stationn.f90 +++ b/src/MNH/write_stationn.f90 @@ -77,9 +77,9 @@ USE MODD_NSV, ONLY: nsv USE MODD_PARAM_n, ONLY: CRAD, CSURF, CTURB USE MODD_PRECISION, ONLY: MNHINT_MPI, MNHREAL_MPI 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 ! @@ -292,25 +292,25 @@ END SUBROUTINE WRITE_STATION_n SUBROUTINE STATION_DIACHRO_n( TPDIAFILE, TPSTATION ) ! ################################################## -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, & - tbudiachrometadata -USE MODD_CONF, ONLY: LCARTESIAN -USE MODD_CST, ONLY: XRV -use modd_field, only: NMNHDIM_STATION_TIME, NMNHDIM_STATION_PROC, NMNHDIM_UNUSED, & - tfieldmetadata_base, TYPEREAL -USE MODD_IO, ONLY: TFILEDATA -USE MODD_NSV, ONLY: nsv, nsv_aer, nsv_aerbeg, nsv_aerend, & - nsv_dst, nsv_dstbeg, nsv_dstend, nsv_slt, nsv_sltbeg, nsv_sltend, & - tsvlist -USE MODD_PARAM_n, ONLY: CRAD, CSURF, CTURB -use modd_station_n, only: tstations_time -use modd_type_station, only: tstationdata +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, & + tbudiachrometadata +USE MODD_CONF, ONLY: LCARTESIAN +USE MODD_CST, ONLY: XRV +use modd_field, only: NMNHDIM_STATION_TIME, NMNHDIM_STATION_PROC, NMNHDIM_UNUSED, & + tfieldmetadata_base, TYPEREAL +USE MODD_IO, ONLY: TFILEDATA +USE MODD_NSV, ONLY: nsv, nsv_aer, nsv_aerbeg, nsv_aerend, & + nsv_dst, nsv_dstbeg, nsv_dstend, nsv_slt, nsv_sltbeg, nsv_sltend, & + tsvlist +USE MODD_PARAM_n, ONLY: CRAD, CSURF, CTURB +use modd_station_n, only: tstations_time +use modd_type_statprof, only: tstationdata USE MODE_AERO_PSD USE MODE_DUST_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(TSTATIONDATA), INTENT(IN) :: TPSTATION -- GitLab