diff --git a/src/MNH/modd_stationn.f90 b/src/MNH/modd_stationn.f90 index 6017c0f981549d27048699cbc669c65894792749..f86692bf4454c75969971ef6ea3225b5202d982c 100644 --- a/src/MNH/modd_stationn.f90 +++ b/src/MNH/modd_stationn.f90 @@ -37,7 +37,7 @@ ! ! USE MODD_PARAMETERS, ONLY: JPMODELMAX -USE MODD_TYPE_STATION, ONLY: TSTATIONDATA, TSTATIONTIME +USE MODD_TYPE_STATION, ONLY: TSTATIONDATA, TSTATPROFTIME IMPLICIT NONE @@ -55,7 +55,7 @@ TYPE STATION_t INTEGER :: NUMBSTAT ! number of stations INTEGER :: NUMBSTAT_LOC = 0 ! number of stations on this process ! - TYPE(TSTATIONTIME) :: TSTATIONS_TIME + TYPE(TSTATPROFTIME) :: TSTATIONS_TIME TYPE(TSTATIONDATA), DIMENSION(:), POINTER :: TSTATIONS ! characteristics and records of the stations ! END TYPE STATION_t @@ -65,7 +65,7 @@ TYPE(STATION_t), DIMENSION(JPMODELMAX), TARGET, SAVE :: STATION_MODEL LOGICAL, POINTER :: LSTATION=>NULL() INTEGER, POINTER :: NUMBSTAT=>NULL() INTEGER, POINTER :: NUMBSTAT_LOC=>NULL() -TYPE(TSTATIONTIME), POINTER :: TSTATIONS_TIME => NULL() +TYPE(TSTATPROFTIME), POINTER :: TSTATIONS_TIME => NULL() TYPE(TSTATIONDATA), DIMENSION(:), POINTER :: TSTATIONS => NULL() CONTAINS diff --git a/src/MNH/modd_type_station.f90 b/src/MNH/modd_type_station.f90 index d8d58820a3751ffd3c3e2c3d5f7af31cdc04aed6..ed408c9affba4b01b7ec8a01ff4f6080a1ca8469 100644 --- a/src/MNH/modd_type_station.f90 +++ b/src/MNH/modd_type_station.f90 @@ -43,14 +43,14 @@ implicit none private -public :: TSTATIONTIME, TSTATIONDATA +public :: TSTATPROFTIME, TSTATIONDATA -TYPE TSTATIONTIME +TYPE :: TSTATPROFTIME REAL :: XTIME_CUR = XUNDEF ! current time since last storage INTEGER :: N_CUR = 0 ! current step of storage REAL :: XTSTEP = 60. ! storage time step (default reset later by INI_STATION_n) type(date_time), dimension(:), ALLOCATABLE :: tpdates ! dates(n) (n: recording instants) -END TYPE TSTATIONTIME +END TYPE TSTATPROFTIME TYPE TSTATIONDATA ! Type to store all the data of 1 station