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

Timestamp:

Nov 21, 2017, 4:03:44 PM (7 years ago)

Author:

emillour

Message:

Common dynamics:

• enable possiblity to store multiple time steps in the restart.nc file (flag "ecritstart" gives the frequency, in dynamical steps).
• fixed dynredem_mod.F90 to correctly write multiple time steps.
• fixed computation of JH_cur in the mars case where "hour_ini" contains the initial time of day read from the start.nc file
• minor fix in dynetat0.F90

RY

Location:

trunk/LMDZ.COMMON/libf/dyn3dpar

Files:

• conf_gcm.F90 (modified) (1 diff)
• leapfrog_p.F (modified) (11 diffs)

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

@@ -205 +205 @@
   timestart=-9999 ! default value; if <0, use last stored time
   call getin("timestart",timestart)
-      
+
+!Config  Key  = ecritstart
+!Config  Desc = Mars - frequency of restart.nc output (dyn timesteps)
+!Config  Def  = 0
+!Config  Help = Mars - frequency of restart.nc output (dyn timesteps)
+  ecritstart = 0
+  CALL getin('ecritstart',ecritstart)
+
 !Config  Key  = less1day
 !Config  Desc = Possibilite d'integrer moins d'un jour

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

@@ -29 +29 @@
      &                       ok_dynzon,periodav,ok_dyn_ave,iecri,
      &                       ok_dyn_ins,output_grads_dyn,
-     &                       iapp_tracvl
+     &                       iapp_tracvl,ecritstart
        use cpdet_mod, only: cpdet,tpot2t_glo_p,t2tpot_glo_p
        use sponge_mod_p, only: callsponge,mode_sponge,sponge_p
@@ -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
+     .                  day_ref,start_time,dt,hour_ini
 
 
@@ -141 +141 @@
 c   variables pour le fichier histoire
       REAL dtav      ! intervalle de temps elementaire
+      LOGICAL lrestart
 
       REAL tppn(iim),tpps(iim),tpn,tps
@@ -304 +305 @@
 c et du parallelisme !!
 
+c     RMBY: check that hour_ini and start_time are not both non-zero
+      if ((hour_ini.ne.0.0).and.(start_time.ne.0.0)) then
+        write(*,*) "ERROR: hour_ini = ", hour_ini, 
+     &             "start_time = ", start_time
+        abort_message = 'hour_ini and start_time both nonzero'
+        call abort_gcm(modname,abort_message,1)
+      endif
+
    1  CONTINUE ! Matsuno Forward step begins here
 
@@ -311 +320 @@
       jD_cur = jD_ref + day_ini - day_ref +                             &
      &          (itau+1)/day_step
-      jH_cur = jH_ref + start_time +                                    &
-     &         mod(itau+1,day_step)/float(day_step) 
+      IF (planet_type .eq. "mars") THEN
+        jH_cur = jH_ref + hour_ini +                                    &
+     &           mod(itau+1,day_step)/float(day_step) 
+      ELSE
+        jH_cur = jH_ref + start_time +                                  &
+     &           mod(itau+1,day_step)/float(day_step)
+      ENDIF
       if (jH_cur > 1.0 ) then
         jD_cur = jD_cur +1.
@@ -416 +430 @@
         jD_cur = jD_ref + day_ini - day_ref +
      &            (itau+1)/day_step
-        jH_cur = jH_ref + start_time +
-     &           mod(itau+1,day_step)/float(day_step) 
+        IF (planet_type .eq. "mars") THEN
+          jH_cur = jH_ref + hour_ini +
+     &             mod(itau+1,day_step)/float(day_step) 
+        ELSE
+          jH_cur = jH_ref + start_time +
+     &             mod(itau+1,day_step)/float(day_step)
+        ENDIF
         if (jH_cur > 1.0 ) then
           jD_cur = jD_cur +1.
@@ -873 +892 @@
            ENDIF
 
-           jH_cur = jH_ref + start_time +                                &
-     &              mod(itau+1,day_step)/float(day_step) 
-           IF ((planet_type .eq."generic").or.
-     &         (planet_type .eq."mars")) THEN
-             jH_cur = jH_ref + start_time +                               &
-     &          mod(itau,day_step)/float(day_step)
+           IF (planet_type .eq. "mars") THEN
+             jH_cur = jH_ref + hour_ini +                               &
+     &                mod(itau,day_step)/float(day_step)
+           ELSE IF (planet_type .eq. "generic") THEN
+             jH_cur = jH_ref + start_time +                             &
+     &                mod(itau,day_step)/float(day_step)
+           ELSE
+             jH_cur = jH_ref + start_time +                             &
+     &                mod(itau+1,day_step)/float(day_step)
            ENDIF
            if (jH_cur > 1.0 ) then
@@ -1756 +1778 @@
             ENDIF ! of IF(MOD(itau,iecri).EQ.0)
 
-            IF(itau.EQ.itaufin) THEN
-
-c$OMP BARRIER
-c$OMP MASTER
-
+c           Determine whether to write to the restart.nc file
+c           Decision can't be made in one IF statement as if
+c           ecritstart==0 there will be a divide-by-zero error
+            lrestart = .false.
+            IF (itau.EQ.itaufin) THEN
+              lrestart = .true.
+            ELSE IF (ecritstart.GT.0) THEN
+              IF (MOD(itau,ecritstart).EQ.0) lrestart  = .true.
+            ENDIF
+
+c           Write to restart.nc if required
+            IF (lrestart) THEN
+c$OMP BARRIER
+c$OMP MASTER
               if (planet_type=="mars") then
                 CALL dynredem1_p("restart.nc",REAL(itau)/REAL(day_step),
@@ -1770 +1801 @@
 !              CLOSE(99)
 c$OMP END MASTER
-            ENDIF ! of IF (itau.EQ.itaufin)
+            ENDIF ! of IF (lrestart)
 
 c-----------------------------------------------------------------------
@@ -1961 +1992 @@
               ENDIF ! of IF(MOD(itau,iecri).EQ.0)
 
-              IF(itau.EQ.itaufin) THEN
+c             Determine whether to write to the restart.nc file
+c             Decision can't be made in one IF statement as if
+c             ecritstart==0 there will be a divide-by-zero error
+              lrestart = .false.
+              IF (itau.EQ.itaufin) THEN
+                lrestart = .true.
+              ELSE IF (ecritstart.GT.0) THEN
+                IF (MOD(itau,ecritstart).EQ.0) lrestart  = .true.
+              ENDIF
+
+c             Write to restart.nc if required
+              IF (lrestart) THEN
 c$OMP MASTER
                 if (planet_type=="mars") then
@@ -1970 +2012 @@
                   CALL dynredem1_p("restart.nc",start_time,
      &                               vcov,ucov,teta,q,masse,ps)
-                
                 endif
 c$OMP END MASTER
-              ENDIF ! of IF(itau.EQ.itaufin)
+              ENDIF ! of IF (lrestart)
 
               forward = .TRUE.