Changeset 1657 for LMDZ5/trunk/libf/dyn3dmem/gcm.F

Timestamp:

Oct 2, 2012, 5:57:45 PM (12 years ago)

Author:

Laurent Fairhead

Message:

Phasage de la dynamique parallèle localisée (petite mémoire) avec la branche LMDZ4V5.0-dev (fin de la branche)
Validation effectuée par comparaison des fichiers de sorties debug (u, v, t, q, masse, etc ...) d'une simulation sans physique
faite avec la version du modèle donnée paY. Meurdesoif et la version phasée avec la r1399 (fin de la branche LMDZ4V5.0-dev)

---

Phasing of the localised (low memory) parallel dynamics package with the LMDZ4V5.0-dev version of LMDZ
Validation consisted in comparing output debug files (u, v, t, q, masse, etc... ) of a no physics simulation
run with the version of the code given by Y. Meurdesoif and this version phased with r1399 (end of the LMDZ4V5.0-dev branch)

File:

• LMDZ5/trunk/libf/dyn3dmem/gcm.F (modified) (7 diffs)

LMDZ5/trunk/libf/dyn3dmem/gcm.F

@@ -1 +1 @@
 !
-! $Id: gcm.F 1316 2010-02-22 14:51:12Z acozic $
+! $Id: gcm.F 1397 2010-06-02 12:57:39Z emillour $
 !
 c
@@ -70 +70 @@
 #include "description.h"
 #include "serre.h"
-#include "com_io_dyn.h"
+!#include "com_io_dyn.h"
 #include "iniprint.h"
 #include "tracstoke.h"
+#ifdef INCA
+! Only INCA needs these informations (from the Earth's physics)
 #include "indicesol.h"
+#endif
 
       INTEGER         longcles
@@ -273 +276 @@
       if (read_start) then
       ! we still need to run iniacademic to initialize some
-      ! constants & fields, if we run the 'newtonian' case:
-        if (iflag_phys.eq.2) then
+      ! constants & fields, if we run the 'newtonian' or 'SW' cases:
+        if (iflag_phys.ne.1) then
           CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
         endif
-!#ifdef CPP_IOIPSL
+
         if (planet_type.eq."earth") then
 #ifdef CPP_EARTH
 ! Load an Earth-format start file
          CALL dynetat0_loc("start.nc",vcov,ucov,
-     .              teta,q,masse,ps,phis, time_0)
+     &              teta,q,masse,ps,phis, time_0)
+#else
+        ! SW model also has Earth-format start files
+        ! (but can be used without the CPP_EARTH directive)
+          if (iflag_phys.eq.0) then
+            CALL dynetat0_loc("start.nc",vcov,ucov,
+     &              teta,q,masse,ps,phis, time_0)
+          endif
 #endif
         endif ! of if (planet_type.eq."earth")
@@ -326 +336 @@
 C on remet le calendrier à zero si demande
 c
-      if (annee_ref .ne. anneeref .or. day_ref .ne. dayref) then
+      IF (raz_date == 1) THEN
+        annee_ref = anneeref
+        day_ref = dayref
+        day_ini = dayref
+        itau_dyn = 0
+        itau_phy = 0
+        time_0 = 0.
+        write(lunout,*)
+     .   'GCM: On reinitialise a la date lue dans gcm.def'
+      ELSE IF (annee_ref .ne. anneeref .or. day_ref .ne. dayref) THEN
         write(lunout,*)
      .  'GCM: Attention les dates initiales lues dans le fichier'
@@ -332 +351 @@
      .  ' restart ne correspondent pas a celles lues dans '
         write(lunout,*)' gcm.def'
-        write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
-        write(lunout,*)' day_ref=',day_ref," dayref=",dayref
-        if (raz_date .ne. 1) then
-          write(lunout,*)
-     .    'GCM: On garde les dates du fichier restart'
-        else
-          annee_ref = anneeref
-          day_ref = dayref
-          day_ini = dayref
-          itau_dyn = 0
-          itau_phy = 0
-          time_0 = 0.
-          write(lunout,*)
-     .   'GCM: On reinitialise a la date lue dans gcm.def'
-        endif
-      ELSE
-        raz_date = 0
-      endif
+        write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
+        write(lunout,*)' day_ref=',day_ref," dayref=",dayref
+        write(lunout,*)' Pas de remise a zero'
+      ENDIF
+c      if (annee_ref .ne. anneeref .or. day_ref .ne. dayref) then
+c        write(lunout,*)
+c     .  'GCM: Attention les dates initiales lues dans le fichier'
+c        write(lunout,*)
+c     .  ' restart ne correspondent pas a celles lues dans '
+c        write(lunout,*)' gcm.def'
+c        write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
+c        write(lunout,*)' day_ref=',day_ref," dayref=",dayref
+c        if (raz_date .ne. 1) then
+c          write(lunout,*)
+c     .    'GCM: On garde les dates du fichier restart'
+c        else
+c          annee_ref = anneeref
+c          day_ref = dayref
+c          day_ini = dayref
+c          itau_dyn = 0
+c          itau_phy = 0
+c          time_0 = 0.
+c          write(lunout,*)
+c     .   'GCM: On reinitialise a la date lue dans gcm.def'
+c        endif
+c      ELSE
+c        raz_date = 0
+c      endif
 
 #ifdef CPP_IOIPSL
@@ -428 +457 @@
          if (planet_type.eq."earth") then
 #ifdef CPP_EARTH
-         CALL iniphysiq(ngridmx,llm,daysec,day_ini,dtphys ,
+         CALL iniphysiq(ngridmx,llm,daysec,day_ini,dtphys/nsplit_phys ,
      ,                latfi,lonfi,airefi,zcufi,zcvfi,rad,g,r,cpp     )
 #endif
@@ -473 +502 @@
 
 #ifdef CPP_IOIPSL
-      if ( 1.eq.1) then
       time_step = zdtvr
-      t_ops = iecri * daysec
-      t_wrt = iecri * daysec
-!      CALL inithist_p(dynhist_file,day_ref,annee_ref,time_step,
-!     .              t_ops, t_wrt, histid, histvid)
+      IF (mpi_rank==0) then
+        if (ok_dyn_ins) then
+          ! initialize output file for instantaneous outputs
+          ! t_ops = iecri * daysec ! do operations every t_ops
+          t_ops =((1.0*iecri)/day_step) * daysec  
+          t_wrt = daysec ! iecri * daysec ! write output every t_wrt
+          t_wrt = daysec ! iecri * daysec ! write output every t_wrt
+          CALL inithist(day_ref,annee_ref,time_step,
+     &                  t_ops,t_wrt)
+        endif
 
       IF (ok_dyn_ave) THEN 
-         t_ops = iperiod * time_step
-         t_wrt = periodav * daysec
+         ! initialize output file for averaged outputs
+         t_ops = iperiod * time_step ! do operations every t_ops
+         t_wrt = periodav * daysec   ! write output every t_wrt
          CALL initdynav_loc(day_ref,annee_ref,time_step,t_ops,t_wrt)
-      END IF
+        END IF
+      ENDIF
       dtav = iperiod*dtvr/daysec
-      endif
-
-
 #endif
 ! #endif of #ifdef CPP_IOIPSL