Changeset 3615 for trunk/LMDZ.COMMON/libf/dyn3d

Timestamp:

Feb 10, 2025, 8:42:03 AM (4 months ago)

Author:

emillour

Message:

Venus PCM: Corrections to enable 1+1=2

• store correctly the time_of_day in restart.nc to enable proper restart
• enforce recomputation of CP in the physics at all time steps (otherwise when without thermosphere the value was only computed at first step and kept unchanged afterwards).

EM

Location:

trunk/LMDZ.COMMON/libf/dyn3d

Files:

• conf_gcm.F90 (modified) (1 diff)
• gcm.F90 (modified) (1 diff)
• leapfrog.F (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F90

@@ -176 +176 @@
 !Config  Help = Heure de depart de la simulation
 !Config         en jour
-  starttime = 0
-  CALL getin('starttime',starttime)
-      
+  if (raz_date/=0) then ! should only be used when manually reseting dates
+    starttime = 0
+    CALL getin('starttime',starttime)
+  endif
+  
   ! Mars: time of start for run in "start.nc" (when there are multiple time
   !       steps stored in the file)

trunk/LMDZ.COMMON/libf/dyn3d/gcm.F90

@@ -315 +315 @@
   IF(dtvr.NE.zdtvr) THEN
      WRITE(lunout,*) &
-          'WARNING!!! changement de pas de temps',dtvr,'>',zdtvr
+          'WARNING!!! time step change: ',dtvr,'>',zdtvr
   ENDIF
   dtvr=zdtvr
 
   !
-  ! on remet le calendrier a zero si demande
-  !
-  IF (start_time /= starttime) then
-     WRITE(lunout,*)' GCM: Attention l''heure de depart lue dans le' &
-     ,' fichier restart ne correspond pas a celle lue dans le run.def'
-     IF (raz_date == 1) then
-        WRITE(lunout,*)'Je prends l''heure lue dans run.def'
-        start_time = starttime
-     ELSE
-        call abort_gcm("gcm", "'Je m''arrete'", 1)
-     ENDIF
+  ! reset calendar if requested
+  !
+  IF (raz_date == 1) then
+    WRITE(lunout,*)'Reinitializing to start time from run.def'
+    start_time = starttime
   ENDIF
+
   IF (raz_date == 1) THEN
      annee_ref = anneeref

trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

@@ -919 +919 @@
                 endif
               else
-                CALL dynredem1("restart.nc",start_time,
+                CALL dynredem1("restart.nc",JH_cur,
      &                         vcov,ucov,teta,q,masse,ps)
               endif
@@ -1072 +1072 @@
                                   endif
                 else
-                  CALL dynredem1("restart.nc",start_time,
+                  CALL dynredem1("restart.nc",JH_cur,
      &                         vcov,ucov,teta,q,masse,ps)
                 endif