Changeset 849 for trunk/LMDZ.COMMON/makelmdz

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

File:

• trunk/LMDZ.COMMON/makelmdz (modified) (3 diffs)

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