Changeset 1923 for trunk/ICOSA_LMDZ

Timestamp:

May 2, 2018, 11:12:43 AM (7 years ago)

Author:

emillour

Message:

Dynamico-Venus interface:
Fix initialization date for time series outputs.
EM

File:

• trunk/ICOSA_LMDZ/src/phyvenus/interface_icosa_lmdz.f90 (modified) (6 diffs)

trunk/ICOSA_LMDZ/src/phyvenus/interface_icosa_lmdz.f90

@@ -75 +75 @@
   REAL(rstd) :: pseudoalt(llm)
 
-  INTEGER :: run_length  
-  INTEGER :: annee_ref  
-  INTEGER :: day_ref    
-  INTEGER :: day_ini    
-  REAL    :: start_time 
-  REAL    :: physics_timestep    
-
-
-  INTEGER                       :: nqo, nbtr
-  CHARACTER(len=4)              :: type_trac
-  CHARACTER(len=20),ALLOCATABLE :: tname(:)    ! tracer short name for restart and diagnostics
-  CHARACTER(len=23),ALLOCATABLE :: ttext(:)     ! tracer long name for diagnostics
-  INTEGER,ALLOCATABLE           :: niadv(:)    ! equivalent dyn / physique
-  INTEGER,ALLOCATABLE           :: conv_flg(:) ! conv_flg(it)=0 : convection desactivated for tracer number it 
-  INTEGER,ALLOCATABLE           :: pbl_flg(:)  ! pbl_flg(it)=0  : boundary layer diffusion desactivaded for tracer number it 
-  CHARACTER(len=8),ALLOCATABLE :: solsym(:)  ! tracer name from inca
-
-  INTEGER :: iflag_phys    
+!  INTEGER :: run_length  
+!  INTEGER :: annee_ref  
+!  INTEGER :: day_ref    
+!  INTEGER :: day_ini    
+!  REAL    :: start_time 
+!  REAL    :: physics_timestep    
+
+
+!  INTEGER                       :: nqo, nbtr
+!  CHARACTER(len=4)              :: type_trac
+!  CHARACTER(len=20),ALLOCATABLE :: tname(:)    ! tracer short name for restart and diagnostics
+!  CHARACTER(len=23),ALLOCATABLE :: ttext(:)     ! tracer long name for diagnostics
+!  INTEGER,ALLOCATABLE           :: niadv(:)    ! equivalent dyn / physique
+!  INTEGER,ALLOCATABLE           :: conv_flg(:) ! conv_flg(it)=0 : convection desactivated for tracer number it 
+!  INTEGER,ALLOCATABLE           :: pbl_flg(:)  ! pbl_flg(it)=0  : boundary layer diffusion desactivaded for tracer number it 
+!  CHARACTER(len=8),ALLOCATABLE :: solsym(:)  ! tracer name from inca
+
+!  INTEGER :: iflag_phys    
   INTEGER :: nbp_phys, nbp_phys_glo
   
@@ -221 +221 @@
   ! Calendar related stuff
   REAL(rstd) :: ptimestep
-  INTEGER :: run_length  
+  REAL(rstd) :: run_length  
   INTEGER :: annee_ref  
   INTEGER :: day_ref    
@@ -332 +332 @@
     CALL getin('startphy_file',startphy_file)
 
+    day_length=10087000
+    CALL getin('day_length',day_length)
+    
+    run_length=day_length ! default
+    CALL getin('run_length',run_length)
+
     IF (startphy_file) THEN
       ! Read in some information from the startphy.nc file
@@ -351 +357 @@
       status=nf90_get_var(ncid,varid,tab_cntrl)
       ! extract needed variables from tab_cntrl 
-      day_end=tab_cntrl(13)
+      day_ini=tab_cntrl(13)
       annee_ref=tab_cntrl(14)
+      ptime=modulo((tab_cntrl(15)*tab_cntrl(1))/day_length,1.0)
 
       status=nf90_close(ncid)
@@ -359 +366 @@
       ! required information that is not in tab_cntrl
       ! has to be default or read from def files
-      day_end=0
-      CALL getin('day_end',day_end)
-      annee_ref=0
+      day_ini=0
+      annee_ref=1
       CALL getin('annee_ref',annee_ref)
+      ptime=0.
     ENDIF
 
+    day_end=day_ini+nint(run_length/day_length)
+
     ! Other required values which have to be read from def files
-    day_ref=0
+    day_ref=1
     CALL getin('day_ref',day_ref)
-    day_ini=0
-    CALL getin('day_ini',day_ini)
-    day_length=0
-    CALL getin('day_length',day_length)
     iflag_trac=0
     CALL getin('iflag_trac',iflag_trac)
@@ -397 +402 @@
     
 !$OMP MASTER
-    ! initialize pday and ptime
+    ! initialize pday
     pday = day_ini
-    ptime = 0 ! assume we start at midnight ...
 !$OMP END MASTER
 !$OMP BARRIER