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

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/dyn3dpar

Files:

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

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

@@ -198 +198 @@
 !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

trunk/LMDZ.COMMON/libf/dyn3dpar/dynredem_p.F90

@@ -427 +427 @@
   if (start_file_type=="earth") then
     tab_cntrl(31) = REAL(itau_dyn + itaufin)
+    tab_cntrl(32) = time
   else
     tab_cntrl(31) = 0

trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F

@@ -334 +334 @@
         IF(dtvr.NE.zdtvr) THEN
          WRITE(lunout,*)
-     .    'WARNING!!! changement de pas de temps',dtvr,'>',zdtvr
+     .    'WARNING!!! time step change: ',dtvr,'>',zdtvr
         ENDIF
       dtvr=zdtvr
 
 C
-C on remet le calendrier a zero si demande
-c
-      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
+C reset calendar if requested
+c
+      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/dyn3dpar/leapfrog_p.F

@@ -1831 +1831 @@
                 endif
               else
-                CALL dynredem1_p("restart.nc",start_time,
+                CALL dynredem1_p("restart.nc",JH_cur,
      &                           vcov,ucov,teta,q,masse,ps)
               endif
@@ -2054 +2054 @@
                 endif
                 else
-                  CALL dynredem1_p("restart.nc",start_time,
+                  CALL dynredem1_p("restart.nc",JH_cur,
      &                               vcov,ucov,teta,q,masse,ps)
                 endif