From 2b51c5557df775e059bae6ed1b81a33e295e2cae Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Fri, 22 Apr 2022 15:12:44 +0200 Subject: [PATCH] Philippe 22/04/2022: rename NSTATIONNAMELGTMAX to NSTATPROFNAMELGTMAX --- src/MNH/modd_allstationn.f90 | 6 +++--- src/MNH/modd_parameters.f90 | 4 ++-- src/MNH/modd_type_station.f90 | 4 ++-- src/MNH/modn_stationn.f90 | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/MNH/modd_allstationn.f90 b/src/MNH/modd_allstationn.f90 index 809e28845..4fe0a7be7 100644 --- a/src/MNH/modd_allstationn.f90 +++ b/src/MNH/modd_allstationn.f90 @@ -36,7 +36,7 @@ ! ------------ ! ! -USE MODD_PARAMETERS, ONLY: JPMODELMAX, NFILENAMELGTMAX, NSTATIONNAMELGTMAX +USE MODD_PARAMETERS, ONLY: JPMODELMAX, NFILENAMELGTMAX, NSTATPROFNAMELGTMAX IMPLICIT NONE @@ -54,7 +54,7 @@ TYPE ALLSTATION_t ! INTEGER :: NNUMB_STAT !Number of stations as defined in namelist REAL, DIMENSION(100) :: XX_STAT, XY_STAT, XZ_STAT, XLAT_STAT, XLON_STAT - CHARACTER(LEN=NSTATIONNAMELGTMAX), DIMENSION(100) :: CNAME_STAT + CHARACTER(LEN=NSTATPROFNAMELGTMAX), DIMENSION(100) :: CNAME_STAT CHARACTER(LEN=NFILENAMELGTMAX) :: CFILE_STAT REAL :: XSTEP_STAT LOGICAL :: LDIAG_SURFRAD @@ -71,7 +71,7 @@ REAL, DIMENSION(:), POINTER :: XY_STAT=>NULL() REAL, DIMENSION(:), POINTER :: XLAT_STAT=>NULL() REAL, DIMENSION(:), POINTER :: XLON_STAT=>NULL() REAL, DIMENSION(:), POINTER :: XZ_STAT=>NULL() -CHARACTER (LEN=NSTATIONNAMELGTMAX),DIMENSION(:), POINTER :: CNAME_STAT=>NULL() +CHARACTER (LEN=NSTATPROFNAMELGTMAX),DIMENSION(:), POINTER :: CNAME_STAT=>NULL() CHARACTER (LEN=NFILENAMELGTMAX),POINTER :: CFILE_STAT=>NULL() LOGICAL, POINTER :: LDIAG_SURFRAD=>NULL() CONTAINS diff --git a/src/MNH/modd_parameters.f90 b/src/MNH/modd_parameters.f90 index 929cec5b6..c848073f9 100644 --- a/src/MNH/modd_parameters.f90 +++ b/src/MNH/modd_parameters.f90 @@ -44,7 +44,7 @@ ! P. Wautelet 17/01/2020: add NBUNAMELGTMAX and NCOMMENTLGTMAX parameters ! P. Wautelet 13/03/2020: remove JPBUMAX and JPBUPROMAX ! P. Wautelet 24/09/2021: add NLONGNAMELGTMAX and NUNITLGTMAX parameters -! P. Wautelet 20/04/2022: add NSTATIONNAMELGTMAX parameter +! P. Wautelet 20/04/2022: add NSTATPROFNAMELGTMAX parameter !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -87,7 +87,7 @@ INTEGER, PARAMETER :: NSTDNAMELGTMAX = 64 ! Maximum length of the standard nam INTEGER, PARAMETER :: NLONGNAMELGTMAX = 32 ! Maximum length of the long name of a variable (CF convention) INTEGER, PARAMETER :: NUNITLGTMAX = 40 ! Maximum length of the canonical units of a variable (CF convention) ! -INTEGER, PARAMETER :: NSTATIONNAMELGTMAX = 8 ! Maximum length for the name of a station +INTEGER, PARAMETER :: NSTATPROFNAMELGTMAX = 8 ! Maximum length for the name of a station or profiler INTEGER, PARAMETER :: NDIRNAMELGTMAX = 512 ! Maximum length of a directory name INTEGER, PARAMETER :: NFILENAMELGTMAX = 32 ! Maximum length of a file name (must be at least NFILENAMELGTMAXLFI) diff --git a/src/MNH/modd_type_station.f90 b/src/MNH/modd_type_station.f90 index 55c63959c..d8d58820a 100644 --- a/src/MNH/modd_type_station.f90 +++ b/src/MNH/modd_type_station.f90 @@ -37,7 +37,7 @@ ! ------------ ! use modd_type_date, only: date_time -use modd_parameters, only: NNEGUNDEF, NSTATIONNAMELGTMAX, XUNDEF +use modd_parameters, only: NNEGUNDEF, NSTATPROFNAMELGTMAX, XUNDEF implicit none @@ -54,8 +54,8 @@ END TYPE TSTATIONTIME TYPE TSTATIONDATA ! Type to store all the data of 1 station +CHARACTER(LEN=NSTATPROFNAMELGTMAX) :: CNAME = '' ! station name -CHARACTER(LEN=NSTATIONNAMELGTMAX) :: CNAME = '' ! station name INTEGER :: NID = 0 ! Global identification number of the station (from 1 to total number of stations of the model) diff --git a/src/MNH/modn_stationn.f90 b/src/MNH/modn_stationn.f90 index 0bc56e63f..9b8737c03 100644 --- a/src/MNH/modn_stationn.f90 +++ b/src/MNH/modn_stationn.f90 @@ -36,7 +36,7 @@ USE MODD_ALLSTATION_n, ONLY:& CNAME_STAT_n =>CNAME_STAT ,& CFILE_STAT_n =>CFILE_STAT ,& LDIAG_SURFRAD_n =>LDIAG_SURFRAD -USE MODD_PARAMETERS, ONLY: NFILENAMELGTMAX, NSTATIONNAMELGTMAX +USE MODD_PARAMETERS, ONLY: NFILENAMELGTMAX, NSTATPROFNAMELGTMAX USE MODD_STATION_n ! !----------------------------------------------------------------------------- @@ -49,7 +49,7 @@ IMPLICIT NONE INTEGER ,SAVE:: NNUMB_STAT REAL ,SAVE:: XSTEP_STAT REAL, DIMENSION(100) ,SAVE:: XX_STAT, XY_STAT, XZ_STAT, XLAT_STAT, XLON_STAT -CHARACTER (LEN=NSTATIONNAMELGTMAX), DIMENSION(100),SAVE:: CNAME_STAT +CHARACTER (LEN=NSTATPROFNAMELGTMAX), DIMENSION(100),SAVE:: CNAME_STAT CHARACTER (LEN=NFILENAMELGTMAX), SAVE:: CFILE_STAT !filename LOGICAL ,SAVE:: LDIAG_SURFRAD -- GitLab