Changeset 1222 for LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/gcm.F

Timestamp:

Aug 7, 2009, 1:48:33 PM (16 years ago)

Author:

Ehouarn Millour

Message:

Changes and cleanups to enable compiling without physics
and without ioipsl.

IOIPSL related cleanups:

• bibio/writehist.F encapsulate the routine (which needs IOIPSL to function)

with #ifdef IOIPSL flag.

• dyn3d/abort_gcm.F, dyn3dpar/abort_gcm.F and dyn3dpar/getparam.F90: use ioipsl_getincom module when not compiling with IOIPSL library, in order to always be able to use getin() routine.
• removed unused "use IOIPSL" in dyn3dpar/guide_p_mod.F90
• calendar related issue: Initialize day_ref and annee_ref in iniacademic.F (i.e. when they are not read from start.nc file)

Earth-specific programs/routines/modules:
create_etat0.F, fluxstokenc.F, limit_netcdf.F, startvar.F
(versions in dyn3d and dyn3dpar)
These routines and modules, which by design and porpose are made to function with
Earth physics are encapsulated with #CPP_EARTH cpp flag.

Earth-specific instructions:

• calls to qminimum (specific treatment of first 2 tracers, i.e. water) in dyn3d/caladvtrac.F, dyn3d/integrd.F, dyn3dpar/caladvtrac_p.F, dyn3dpar/integrd_p.F only if (planet_type == 'earth')

Interaction with parallel physics:

• routine dyn3dpar/parallel.F90 uses "surface_data" module (which is in the physics ...) to know value of "type_ocean" . Encapsulated that with #ifdef CPP_EARTH and set to a default type_ocean="dummy" otherwise.
• So far, only Earth physics are parallelized, so all the interaction between parallel dynamics and parallel physics are encapsulated with #ifdef CCP_EARTH (this way we can run parallel without any physics). The (dyn3dpar) routines which contains such interaction are: bands.F90, gr_dyn_fi_p.F, gr_fi_dyn_p.F, mod_interface_dyn_phys.F90 This should later (when improving dyn/phys interface) be encapsulated with a more general and appropriate #ifdef CPP_PHYS cpp flag.

I checked that these changes do not alter results (on the simple
32x24x11 bench) on Ciclad (seq & mpi), Brodie (seq, mpi & omp) and
Vargas (seq, mpi & omp).

EM

File:

• LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/gcm.F (modified) (9 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/gcm.F

@@ -12 +12 @@
       USE mod_const_mpi, ONLY: init_const_mpi
       USE parallel
-      USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
       USE infotrac
       USE mod_interface_dyn_phys
@@ -23 +22 @@
 #ifdef CPP_EARTH
       USE mod_grid_phy_lmdz
+      USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
       USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
       USE dimphy
@@ -191 +191 @@
       endif ! of if (planet_type.eq."earth")
       CALL set_bands
+#ifdef CPP_EARTH
+! Ehouarn: For now only Earth physics is parallel
       CALL Init_interface_dyn_phys
+#endif
       CALL barrier
 
@@ -320 +323 @@
      .  ' 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,*)
@@ -337 +342 @@
       endif
 
+#ifdef CPP_IOIPSL
       mois = 1
       heure = 0.
@@ -343 +349 @@
       jD_ref = int(jD_ref)
 
-#ifdef CPP_IOIPSL
       call ioconf_startdate(annee_ref,1,day_ref, 0.)
-#endif
 
       write(lunout,*)'DEBUG'
@@ -353 +357 @@
       write(lunout,*)'jD_ref+jH_ref,an, mois, jour, heure'
       write(lunout,*)jD_ref+jH_ref,an, mois, jour, heure
+#else
+! Ehouarn: we still need to define JD_ref and JH_ref
+! and since we don't know how many days there are in a year
+! we set JD_ref to 0 (this should be improved ...)
+      jD_ref=0
+      jH_ref=0
+#endif
 
 c  nombre d'etats dans les fichiers demarrage et histoire
@@ -436 +447 @@
       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
@@ -442 +455 @@
  301  FORMAT('1'/,15x,'run du ', i2,'/',i2,'/',i4)
  302  FORMAT('1'/,15x,'    au ', i2,'/',i2,'/',i4)
-
-!#ifdef CPP_IOIPSL
+#endif
+
       if (planet_type.eq."earth") then
-#ifdef CPP_EARTH
-      CALL dynredem0_p("restart.nc", day_end, phis)
-#endif
+        CALL dynredem0_p("restart.nc", day_end, phis)
       endif