From c4f1f408f79bbff75fb65e6903682ff359c680ae Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Fri, 16 Jul 2021 17:11:07 +0200 Subject: [PATCH] Quentin 16/07/2021: station change default time step to 60s and remove TYPE variable of csv reading. TODO: remove the STATION%TYPE which is not used --- src/MNH/default_desfmn.f90 | 2 +- src/MNH/station_reader.f90 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90 index cba461359..27b2ba813 100644 --- a/src/MNH/default_desfmn.f90 +++ b/src/MNH/default_desfmn.f90 @@ -596,7 +596,7 @@ LTECOUTPTS = .FALSE. ! ---------------------------------- ! NNUMB_STAT = 0 -XSTEP_STAT = 1.0 +XSTEP_STAT = 60.0 XX_STAT(:) = XUNDEF XY_STAT(:) = XUNDEF XZ_STAT(:) = XUNDEF diff --git a/src/MNH/station_reader.f90 b/src/MNH/station_reader.f90 index e6f9647bc..0f6b74663 100644 --- a/src/MNH/station_reader.f90 +++ b/src/MNH/station_reader.f90 @@ -88,7 +88,7 @@ END DO ALLOCATE(TPSTATION%K(NUMBSTAT)) !ALLOCATE(TPSTATION%STEP(NUMBSTAT)) ALLOCATE(TPSTATION%NAME(NUMBSTAT)) - ALLOCATE(TPSTATION%TYPE(NUMBSTAT)) +! ALLOCATE(TPSTATION%TYPE(NUMBSTAT)) TPSTATION%LON = XUNDEF TPSTATION%LAT = XUNDEF @@ -97,7 +97,7 @@ END DO TPSTATION%X = XUNDEF TPSTATION%Y = XUNDEF TPSTATION%NAME = " " - TPSTATION%TYPE = " " +! TPSTATION%TYPE = " " ! Nouvelle lecture REWIND(ILU) READ(ILU,FMT='(A400)') YSTRING ! Lecture du header @@ -107,7 +107,7 @@ END DO INBLINE = 1 DO INBLINE=1, NUMBSTAT READ(ILU,FMT='(A400)') YSTRING - READ(YSTRING,*) TPSTATION%NAME(INBLINE),TPSTATION%TYPE(INBLINE),& + READ(YSTRING,*) TPSTATION%NAME(INBLINE), & !TPSTATION%TYPE(INBLINE),& TPSTATION%X(INBLINE), TPSTATION%Y(INBLINE), TPSTATION%Z(INBLINE)!,& END DO REWIND(ILU) @@ -117,7 +117,7 @@ END DO INBLINE = 1 DO INBLINE=1, NUMBSTAT READ(ILU,FMT='(A400)') YSTRING - READ(YSTRING,*) TPSTATION%NAME(INBLINE), TPSTATION%TYPE(INBLINE),& + READ(YSTRING,*) TPSTATION%NAME(INBLINE), & !TPSTATION%TYPE(INBLINE),& TPSTATION%LAT(INBLINE), TPSTATION%LON(INBLINE), TPSTATION%Z(INBLINE)!,& END DO REWIND(ILU) -- GitLab