Changeset 3822 for dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dpar/gcm.F

Timestamp:

Apr 30, 2015, 3:22:39 PM (10 years ago)

Author:

millour

Message:

A couple of bug fixes.
Now the bench (in debug mode) yields identical results in seq/mpi/omp/mpi_omp, and also identical restart files to rev 5 (ie before any modifications to LMDZ5 source files).
EM

File:

• dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dpar/gcm.F (modified) (2 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dpar/gcm.F

@@ -402 +402 @@
 
 c-----------------------------------------------------------------------
+c   Initialisation des I/O :
+c   ------------------------
+
+
+      if (nday>=0) then
+         day_end = day_ini + nday
+      else
+         day_end = day_ini - nday/day_step
+      endif
+
+      WRITE(lunout,300)day_ini,day_end
+ 300  FORMAT('1'/,15x,'run du jour',i7,2x,'au jour',i7//)
+
+#ifdef CPP_IOIPSL
+      call ju2ymds(jD_ref + day_ini - day_ref, an, mois, jour, heure)
+      write (lunout,301)jour, mois, an
+      call ju2ymds(jD_ref + day_end - day_ref, an, mois, jour, heure)
+      write (lunout,302)jour, mois, an
+ 301  FORMAT('1'/,15x,'run du ', i2,'/',i2,'/',i4)
+ 302  FORMAT('1'/,15x,'    au ', i2,'/',i2,'/',i4)
+#endif
+
+c-----------------------------------------------------------------------
 c   Initialisation de la physique :
 c   -------------------------------
@@ -425 +448 @@
 !$OMP END PARALLEL
       END IF
-
-c-----------------------------------------------------------------------
-c   Initialisation des I/O :
-c   ------------------------
-
-
-      if (nday>=0) then
-         day_end = day_ini + nday
-      else
-         day_end = day_ini - nday/day_step
-      endif
-
-      WRITE(lunout,300)day_ini,day_end
- 300  FORMAT('1'/,15x,'run du jour',i7,2x,'au jour',i7//)
-
-#ifdef CPP_IOIPSL
-      call ju2ymds(jD_ref + day_ini - day_ref, an, mois, jour, heure)
-      write (lunout,301)jour, mois, an
-      call ju2ymds(jD_ref + day_end - day_ref, an, mois, jour, heure)
-      write (lunout,302)jour, mois, an
- 301  FORMAT('1'/,15x,'run du ', i2,'/',i2,'/',i4)
- 302  FORMAT('1'/,15x,'    au ', i2,'/',i2,'/',i4)
-#endif
 
 !      if (planet_type.eq."earth") then