Changeset 849

Timestamp:

Nov 22, 2012, 9:10:25 AM (12 years ago)

Author:

emillour

Message:

Work on common dynamics and interfacing with different physics:

• Put calls to PVtheta in dynamics between CPP_EARTH flags (because it calls tetalevel, which is supposed to be in the physics; only OK for Earth...).
• Adapted makelmdz script so that one can compile main programs in dyn* or phy* (makelmdz_fcm already capable of doing that).
• Moved start2archive-VT.F and start2archive-VT.F to phyvenus (as start2archive.F and newstart.F); leave adapting them to Titan for later.
• Small correction to phyvenus/testphys1d.F (use module control_mod instead of control.h and call disvert_noterre).
• removed "use histcom" in phyvenus/physiq.F and phytitan/physiq.F ; it is not needed since there is already a "use ioipsl" (and it moreover confused makelmdz_fcm...)
• Had to add declaration of variable "zlsm1" in phytitan/physiq.F because it is used in "write_hist.h"; but note that it is used while not initialized (but what should it be initialized to?).

EM

Location:

trunk

Files:

• DOC/chantiers/compilation.txt (modified) (1 diff)
• DOC/chantiers/meschantiers-Ehouarn.txt (modified) (1 diff)
• LMDZ.COMMON/libf/dyn3d/calfis.F (modified) (1 diff)
• LMDZ.COMMON/libf/dyn3dpar/calfis_p.F (modified) (1 diff)
• LMDZ.COMMON/makelmdz (modified) (3 diffs)
• LMDZ.TITAN/libf/phytitan/physiq.F (modified) (2 diffs)
• LMDZ.VENUS/libf/phyvenus/newstart.F (moved) (moved from trunk/LMDZ.COMMON/libf/dyn3d/newstart-VT.F)
• LMDZ.VENUS/libf/phyvenus/physiq.F (modified) (1 diff)
• LMDZ.VENUS/libf/phyvenus/start2archive.F (moved) (moved from trunk/LMDZ.COMMON/libf/dyn3d/start2archive-VT.F)
• LMDZ.VENUS/libf/phyvenus/testphys1d.F (modified) (4 diffs)

trunk/DOC/chantiers/compilation.txt

@@ -21 +21 @@
 Compils ok.
 
+Ehouarn (22/11/2012):
+- OK pour faire qu'on puisse compiler des exécutables situés dans phy*
+- On est d'accord pour n'utiliser plus que "makelmdz" et "makelmdz_fcm"
+- reste à faire que makelmdz_fcm soit capable de compiler des sources
+  Fortran et C (pour Titan)

trunk/DOC/chantiers/meschantiers-Ehouarn.txt

@@ -16 +16 @@
   "Terrestre" rev. 1678) avec la rev 841.
   Reste à faire l'exercice de validation des modifs en //...
+  Avec rev 841 et 843 Cp(T) en // OK
+  Reste toutefois à paufiner les choses au niveau de calfis_p et des
+  domaines d'utilisation de tpot2t_p et t2tpot_p (toutes les taches MPI
+  font l'intégralité du travail!)
 
 - Faire qu'on puisse compiler un exécutable qui serait dans la physique
-  avec makelmdz & makelmdz_fcm.
+  avec makelmdz & makelmdz_fcm. OK avec la rev 849.
+  Manque encore la possibilité de compiler des sources en C avec makelmdz_fcm

trunk/LMDZ.COMMON/libf/dyn3d/calfis.F

@@ -462 +462 @@
 c
       if (planet_type=="earth") then
-#ifdef CPP_PHYS
+#ifdef CPP_EARTH
 ! PVtheta calls tetalevel, which is in the (Earth) physics
 cIM calcul PV a teta=350, 380, 405K

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

@@ -512 +512 @@
 
       IF (is_sequential.and.(planet_type=="earth")) THEN
-#ifdef CPP_PHYS
+#ifdef CPP_EARTH
 ! PVtheta calls tetalevel, which is in the physics
 cIM calcul PV a teta=350, 380, 405K

trunk/LMDZ.COMMON/makelmdz

@@ -544 +544 @@
 #################################################################
 
-source_code=${code}.F
-if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]]
-then
-  source_code=${code}.F90
+# find code suffix and directory where code is located
+if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F ]]
+then
+  source_code=${code}.F
+  code_dir=dyn${dimc}d${FLAG_PARA}
+else
+  if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]]
+  then
+    source_code=${code}.F90
+    code_dir=dyn${dimc}d${FLAG_PARA}
+  else
+    if [[ -r $LMDGCM/libf/phy${physique}/${code}.F ]]
+    then
+      source_code=${code}.F
+      code_dir=phy${physique}
+    else
+      # last possibility:
+      if [[ -r $LMDGCM/libf/phy${physique}/${code}.F ]]
+      then
+        source_code=${code}.F90
+        code_dir=phy${physique}
+      else
+        echo "Error: cannot find ${code}.F[90]"
+        echo " neither in dyn${dimc}d${FLAG_PARA} nor in phy${physique}"
+        exit
+      fi
+    fi
+  fi
 fi
 
@@ -625 +649 @@
 MOD_SUFFIX="mod" \
 AR=$arcommand \
+DIRMAIN=$code_dir \
 SOURCE=$source_code \
 PROG=$code
@@ -654 +679 @@
 MOD_SUFFIX="mod" \
 AR=$arcommand \
+DIRMAIN=$code_dir \
 SOURCE=$source_code \
 PROG=$code

trunk/LMDZ.TITAN/libf/phytitan/physiq.F

@@ -56 +56 @@
 c======================================================================
       USE ioipsl
-      USE histcom
+!      USE histcom ! not needed; histcom is included in ioipsl
       USE infotrac
       USE control_mod
@@ -279 +279 @@
       REAL zday
       REAL zls,zlsdeg
+      REAL zlsm1 ! for write_hist* (NB: it is not properly initialized!!)
 c
       INTEGER i, k, iq, ig, j, ll, l

trunk/LMDZ.VENUS/libf/phyvenus/physiq.F

@@ -55 +55 @@
 c======================================================================
       USE ioipsl
-      USE histcom
+!      USE histcom ! not needed; histcom is included in ioipsl
       USE infotrac
       USE control_mod

trunk/LMDZ.VENUS/libf/phyvenus/testphys1d.F

@@ -1 +1 @@
 
       PROGRAM testphys1d
+      
+      use control_mod
       IMPLICIT NONE
 
@@ -27 +29 @@
 #include "dimsoil.h"
 #include "comcstfi.h"
-#include "control.h"
+!#include "control.h"
 #include "comvert.h"
 #include "netcdf.inc"
@@ -226 +228 @@
 c    Vertical Coordinates  (hybrids)
 c    """"""""""""""""""""
-      CALL  disvert
+      CALL  disvert_noterre
       
 c     Calcul au milieu des couches : Vient de la version Mars
@@ -474 +476 @@
 c***********************************************************************
 
-#include "../dyn3d/disvert.F"
+#include "../dyn3d/disvert_noterre.F"
 #include "../dyn3d/abort_gcm.F"
 #include "../dyn3d/dump2d.F"