Changeset 2239 for LMDZ5/trunk/makelmdz_fcm

Timestamp:

Mar 23, 2015, 8:27:30 AM (10 years ago)

Author:

Ehouarn Millour

Message:

Reorganizing physics/dynamics interface:

• what is related to dynamics-physics interface is now in a seperate directory: dynlmdz_phy* for physics in phy*
• 1d model and related dependencies (including a couple from "dynamics", set up as symbolic links) is now in subdirectory "dyn1d" of phy*.
• "bibio" directory is now "misc" and should only contain autonomous utilities.
• "cosp" is now a subdirectory of phylmd.

EM

File:

• LMDZ5/trunk/makelmdz_fcm (modified) (6 diffs)

LMDZ5/trunk/makelmdz_fcm

@@ -38 +38 @@
 LIBOGCM=$LMDGCM/libo
 LIBFGCM=$LMDGCM/libf
+DYN_COMMON_PATH=$LIBFGCM/dyn3d_common
 # path for optional packages, but default set to ".void_dir"
+FILTRE_PATH=$LMDGCM/.void_dir
+DYN_PHYS_PATH=$LMDGCM/.void_dir
 RRTM_PATH=$LMDGCM/.void_dir
 SISVAT_PATH=$LMDGCM/.void_dir
@@ -231 +234 @@
    CPP_KEY="$CPP_KEY CPP_EARTH"
    fi
+   # set the dyn/phys interface path
+   DYN_PHYS_PATH="${LIBFGCM}/dynlmdz_phy${physique}"
+fi
+
+if [[ "$filtre" == "filtrez" ]]
+then
+   FILTRE_PATH=${LIBFGCM}/$filtre
 fi
 
@@ -342 +352 @@
 then
    CPP_KEY="$CPP_KEY CPP_COSP"
-   COSP_PATH="$LIBFGCM/cosp"
+   COSP_PATH="$LIBFGCM/phylmd/cosp"
 #   LIB="${LIB} -l${LIBPREFIX}cosp"
 fi
@@ -410 +420 @@
   \rm fxyprim.h
   cp -p fxy_${grille}.h fxyprim.h
-else
-  echo "Probleme dans les dimensions de la dynamique !!"
-  echo "Non reactive pour l'instant !!!"
+#else
+#  echo "Probleme dans les dimensions de la dynamique !!"
+#  echo "Non reactive pour l'instant !!!"
+fi
+
+if (( $dimension == 1 ))
+then
+  CPP_KEY="$CPP_KEY CPP_1D"
+##in 1D, add dyn3d to include path (because main prog is in physics)
+  INCLUDE="$INCLUDE -Ilibf/dyn3d -Ilibf/dyn3d_common"
+## no filtre in 1d:
+  FILTRE_PATH=$LMDGCM/.void_dir
+## no need to compile all routines in dyn3d_common either:
+  DYN_COMMON_PATH=$LMDGCM/.void_dir
+## no need to compile all routines in dynlmdz_phy... ;
+## (because key ones are included in 1D main program)
+  DYN_PHYS_PATH=$LMDGCM/.void_dir
 fi
 
@@ -473 +497 @@
 else
   SUFF_NAME=${SUFF_NAME}_seq
-  DYN=dyn${dimc}d
+  if (( $dimension == 1 ))
+  then
+    # dynamics-related routines in"dyn1d" subdirectory of phy${physique} 
+    DYN=phy${physique}/dyn1d
+  else
+    DYN=dyn${dimc}d
+  fi
 fi
 
@@ -506 +536 @@
 echo "%LIBO          $LIBOGCM"       >> $config_fcm
 echo "%DYN           $DYN"           >> $config_fcm
+echo "%DYN_COMMON    $DYN_COMMON_PATH" >> $config_fcm
+echo "%FILTRE        $FILTRE_PATH"   >> $config_fcm
 echo "%PHYS          phy${physique}" >> $config_fcm
+echo "%DYN_PHYS      $DYN_PHYS_PATH" >> $config_fcm
 echo "%RRTM          $RRTM_PATH"     >> $config_fcm
 echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm