Changeset 2795

Timestamp:

Feb 22, 2017, 9:29:30 AM (7 years ago)

Author:

Laurent Fairhead

Message:

Upgrading time counter in the physics to a count of seconds from the start of the run.
The old counter made the model diverge when runs made in 4 months chunks were compared
to runs made in 1 month chunks

Location:

LMDZ5/trunk/libf/phylmd

Files:

• physiq_mod.F90 (modified) (1 diff)
• time_phylmdz_mod.F90 (modified) (4 diffs, 1 prop)

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -1735 +1735 @@
     !
     itap   = itap + 1
-    IF (is_mpi_root .AND. is_omp_root) THEN
+    IF (is_master .OR. prt_level > 9) THEN
       IF (prt_level > 5 .or. MOD(itap,5) == 0) THEN
-         WRITE(LUNOUT,*)'Entering physics current time = ', current_time
-         WRITE(LUNOUT,*)'Date = ',year_cur,'/',mth_cur,'/',day_cur,':',hour/3600
+         WRITE(LUNOUT,*)'Entering physics elapsed seconds since start ', current_time
+         WRITE(LUNOUT,100)year_cur,mth_cur,day_cur,hour/3600.
+ 100     FORMAT('Date = ',i4.4,' / ',i2.2, ' / ',i2.2,' : ',f20.17)
       ENDIF
     ENDIF

LMDZ5/trunk/libf/phylmd/time_phylmdz_mod.F90

@@ -1 +1 @@
 !
-! $Id: $
+! $Id$
 !
 MODULE time_phylmdz_mod
@@ -28 +28 @@
     INTEGER,SAVE :: itaufin_phy      ! final iteration (in itau_phy steps)
 !$OMP THREADPRIVATE(itaufin_phy)
-    REAL,SAVE    :: current_time ! current elapsed time (fraction of day) from the begining of the run
+    REAL,SAVE    :: current_time ! current elapsed time in seconds from the begining of the run
 !$OMP THREADPRIVATE(current_time)
     
@@ -84 +84 @@
   IMPLICIT NONE
   INCLUDE 'YOMCST.h'
-    REAL,INTENT(IN) :: pdtphys_
-    REAL            :: julian_date
-    
+  REAL,INTENT(IN) :: pdtphys_
+  REAL            :: julian_date
+  INTEGER         :: cur_day
+  REAL            :: cur_sec
+
     ! Check if the physics timestep has changed
     IF ( ABS( (pdtphys-pdtphys_) / ((pdtphys+pdtphys_)/2))> 10.*EPSILON(pdtphys_)) THEN
@@ -95 +97 @@
     
     ! Update elapsed time since begining of run:
-    current_time=current_time+pdtphys/rday
+    current_time = current_time + pdtphys
+    cur_day = int(current_time/rday) + day_ini
+    cur_sec = current_time - (cur_day * rday) + (start_time * rday) 
 
     ! Compute corresponding Julian date and update calendar
-    CALL ymds2ju(annee_ref,1,day_ini,(start_time+current_time)*rday,julian_date)
+    CALL ymds2ju(annee_ref,1, cur_day, cur_sec, julian_date)
     CALL phys_cal_update(julian_date)