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

Timestamp:

Apr 28, 2021, 1:00:13 PM (4 years ago)

Author:

romain.vande

Message:

For LMDZ MARS: Update of day_ini, time and hour_ini in restart and retstartfi.
Hour_ini is obsolete. If we write one restart file: day_ini is the last day
of the simulation and the remaining time is in Time (often=0), if we write
multiple restart nothing changes

Location:

trunk/LMDZ.COMMON/libf/dyn3dpar

Files:

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

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

@@ -147 +147 @@
 
   if (planet_type=="mars") then ! For Mars only
-    tab_cntrl(29)=hour_ini
+!    tab_cntrl(29)=hour_ini
+    tab_cntrl(29)=0
   endif
 

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

@@ -24 +24 @@
      &                       raz_date,anneeref,starttime,dayref,
      &                       ok_dyn_ins,ok_dyn_ave,iecri,periodav,
-     &                       less1day,fractday,ndynstep,nsplit_phys
+     &                       less1day,fractday,ndynstep,nsplit_phys,
+     &                       ecritstart
       use cpdet_mod, only: ini_cpdet
 
@@ -322 +323 @@
 
 C
-C on remet le calendrier à zero si demande
+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 à celle lue dans le run.def'
+     &,' 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'
@@ -496 +497 @@
       if (planet_type=="mars") then
          ! For Mars we transmit day_ini
-        CALL dynredem0_p("restart.nc", day_ini, phis)
+        !CALL dynredem0_p("restart.nc", day_ini, phis)
+        if (ecritstart.GT.0) then
+         CALL dynredem0_p("restart.nc", day_ini, phis)
+        else
+         CALL dynredem0_p("restart.nc", day_end, phis)
+        endif
       else
         CALL dynredem0_p("restart.nc", day_end, phis)

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

@@ -39 +39 @@
      .                  statcl,conser,apdiss,purmats,tidal,ok_strato
        USE temps_mod, ONLY: itaufin,jD_ref,jH_ref,day_ini,
-     .                  day_ref,start_time,dt,hour_ini
+     .                  day_ref,start_time,dt,hour_ini,day_end
 
 
@@ -1813 +1813 @@
 c$OMP MASTER
               if (planet_type=="mars") then
-                CALL dynredem1_p("restart.nc",REAL(itau)/REAL(day_step),
-     &                           vcov,ucov,teta,q,masse,ps)
+!                CALL dynredem1_p("restart.nc",REAL(itau)/REAL(day_step),
+!     &                           vcov,ucov,teta,q,masse,ps)
+                if(ecritstart.GT.0) then
+                 CALL dynredem1_p("restart.nc",
+     &                        REAL(itau)/REAL(day_step),
+     &                        vcov,ucov,teta,q,masse,ps)
+                else
+                 CALL dynredem1_p("restart.nc",
+     &             REAL(itau)/REAL(day_step)-(day_end-day_ini),
+     &                        vcov,ucov,teta,q,masse,ps)
+                endif
               else
                 CALL dynredem1_p("restart.nc",start_time,
@@ -2026 +2035 @@
 c$OMP MASTER
                 if (planet_type=="mars") then
-                  CALL dynredem1_p("restart.nc",
-     &                              REAL(itau)/REAL(day_step),
-     &                               vcov,ucov,teta,q,masse,ps)
+!                  CALL dynredem1_p("restart.nc",
+!     &                              REAL(itau)/REAL(day_step),
+!     &                               vcov,ucov,teta,q,masse,ps)
+                if(ecritstart.GT.0) then
+                 CALL dynredem1_p("restart.nc",
+     &                        REAL(itau)/REAL(day_step),
+     &                        vcov,ucov,teta,q,masse,ps)
+                else
+                 CALL dynredem1_p("restart.nc",
+     &             REAL(itau)/REAL(day_step)-(day_end-day_ini),
+     &                        vcov,ucov,teta,q,masse,ps)
+                endif
                 else
                   CALL dynredem1_p("restart.nc",start_time,