Changeset 2298 for LMDZ5/branches/testing/makelmdz_fcm

Timestamp:

Jun 14, 2015, 9:13:32 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• makelmdz_fcm (modified) (9 diffs)

LMDZ5/branches/testing/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
+DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
 RRTM_PATH=$LMDGCM/.void_dir
 SISVAT_PATH=$LMDGCM/.void_dir
@@ -78 +82 @@
           true        : (obsolete; for backward compatibility) use ORCHIDEE tag 1.9-1.9.6
 [-chimie INCA/false]       : with INCA chemistry model or without (default: false)
+[-cosp true/false]    : compile with/without cosp package (default: false)
+[-sisvat true/false]  : compile with/without sisvat package (default: false)
+[-rrtm true/false]    : compile with/without rrtm package (default: false)
 [-parallel none/mpi/omp/mpi_omp] : parallelism (default: none) : mpi, openmp or mixted mpi_openmp
 [-g GRI]                   : grid configuration in dyn3d/GRI_xy.h  (default: reg, inclues a zoom)
@@ -176 +183 @@
 done
 
+if [[ $code = ce0l && $paramem = mem ]]
+then
+    echo "There is no parallel version of ce0l at the moment."
+    echo "Please compile the sequential version of the code to produce the" \
+        "executable ce0l."
+    exit 1
+fi
+
 ###############################################################
 # path to fcm 
@@ -219 +234 @@
 fi
 
+phys_root=$physique
+if [[ "${physique:0:3}" == "lmd" ]] ; then phys_root=lmd ; fi
+if [[ "${physique:0:4}" == "mars" ]] ; then phys_root=mars ; fi
+if [[ "${physique:0:3}" == "std" ]] ; then phys_root=std ; fi
+if [[ "${physique:0:5}" == "venus" ]] ; then phys_root=venus ; fi
+if [[ "${physique:0:5}" == "titan" ]] ; then phys_root=titan ; fi
+if [[ "${physique:0:3}" == "mar" ]] ; then phys_root=mar ; fi
+if [[ "${physique:0:3}" == "dev" ]] ; then phys_root=dev ; fi
+
 if [[ "$physique" != "nophys" ]]
 then
    #We'll use some physics
    CPP_KEY="$CPP_KEY CPP_PHYS"
-   if [[ "${physique:0:3}" == "lmd" ]]
+   if [[ "${phys_root}" == "lmd" ]]
    then
    #For lmd physics, default planet type is Earth
    CPP_KEY="$CPP_KEY CPP_EARTH"
    fi
+   # set the dyn/phys interface path
+   DYN_PHYS_PATH="${LIBFGCM}/dynlonlat_phylonlat"
+   DYN_PHYS_SUB_PATH="${LIBFGCM}/dynlonlat_phylonlat/phy${phys_root}"
+fi
+
+if [[ "$filtre" == "filtrez" ]]
+then
+   FILTRE_PATH=${LIBFGCM}/$filtre
 fi
 
@@ -339 +371 @@
 then
    CPP_KEY="$CPP_KEY CPP_COSP"
-   COSP_PATH="$LIBFGCM/cosp"
+   COSP_PATH="$LIBFGCM/phylmd/cosp"
 #   LIB="${LIB} -l${LIBPREFIX}cosp"
 fi
@@ -407 +439 @@
   \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
+  DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
 fi
 
@@ -470 +517 @@
 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
 
@@ -503 +556 @@
 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 "%DYN_PHYS_SUB  $DYN_PHYS_SUB_PATH" >> $config_fcm
 echo "%RRTM          $RRTM_PATH"     >> $config_fcm
 echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
@@ -525 +582 @@
 fi
 
-
 rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
 ./build_gcm ${fcm_path} -j $job $full