Changeset 2646 for trunk/LMDZ.MARS

Timestamp:

Mar 24, 2022, 9:53:13 AM (3 years ago)

Author:

emillour

Message:

Mars GCM:
Small update of the handling writing fields in the restartfi.nc; use a
dedicated flag to avoid calls to mod() with a zero argument which causes
recent gfortran (9+) to complain about a division by zero when in debug mode.
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/physiq_mod.F (modified) (5 diffs)

trunk/LMDZ.MARS/README

@@ -3671 +3671 @@
 == 21/03/2022 == RV
 OMP : update the batch example for Occigen and the README associated
+
+== 24/03/2022 == EM
+Small update of the handling writing fields in the restartfi.nc; use a
+dedicated flag to avoid calls to mod() with a zero argument which causes
+recent gfortran (9+) to complain about a division by zero when in debug mode.

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -523 +523 @@
 !$OMP THREADPRIVATE(check_physics_inputs,check_physics_outputs)      
 
+      logical :: write_restart
 
 c=======================================================================
@@ -2386 +2387 @@
 c              thus we store for time=time+dtvr
 
-         IF(   ((ecritstart.GT.0) .and. 
-     .          (MOD(icount*iphysiq,ecritstart).EQ.0)) 
-     .    .or. lastcall  ) THEN
+         ! default: not writing a restart file at this time step
+         write_restart=.false. 
+         IF (ecritstart.GT.0) THEN
+           ! For when we store multiple time steps in the restart file
+           IF (MODULO(icount*iphysiq,ecritstart).EQ.0) THEN
+             write_restart=.true.
+           ENDIF
+         ENDIF
+         IF (lastcall) THEN
+           ! Always write a restart at the end of the simulation
+           write_restart=.true.
+         ENDIF
          
-          IF (grid_type==unstructured) THEN !IF DYNAMICO
+          IF (write_restart) THEN
+           IF (grid_type==unstructured) THEN !IF DYNAMICO
 
              ! When running Dynamico, no need to add a dynamics time step to ztime_fin
@@ -2405 +2416 @@
              endif
 
-          ELSE ! IF LMDZ
+           ELSE ! IF LMDZ
 
           if (ecritstart.GT.0) then !IF MULTIPLE RESTARTS nothing change
@@ -2415 +2426 @@
           endif
 
-          ENDIF
+           ENDIF ! of IF (grid_type==unstructured)
           write(*,'(A,I7,A,F12.5)') 
-     .         'PHYSIQ: Ecriture du fichier restartfi ; icount=',
+     .         'PHYSIQ: writing in restartfi ; icount=',
      .          icount,' date=',ztime_fin
             
@@ -2426 +2437 @@
      .                watercap)
           
-         ENDIF
+         ENDIF ! of IF (write_restart)
 #endif