Changeset 1403 for trunk/LMDZ.COMMON/makelmdz_fcm

Timestamp:

Mar 31, 2015, 3:49:07 PM (10 years ago)

Author:

emillour

Message:

All models: Reorganizing the physics/dynamics interface.

• makelmdz and makelmdz_fcm scripts adapted to handle the new directory settings

• misc: (replaces what was the "bibio" directory)
• Should only contain extremely generic (and non physics or dynamics-specific) routines
• Therefore moved initdynav.F90, initfluxsto.F, inithist.F, writedynav.F90, write_field.F90, writehist.F to "dyn3d_common"

• dynlonlat_phylonlat: (new interface directory)
• This directory contains routines relevent to physics/dynamics grid interactions, e.g. routines gr_dyn_fi or gr_fi_dyn and calfis
• Moreover the dynlonlat_phylonlat contains directories "phy*" corresponding to each physics package "phy*" to be used. These subdirectories should only contain specific interfaces (e.g. iniphysiq) or main programs (e.g. newstart)

• phy*/dyn1d: this subdirectory contains the 1D model using physics from phy*

EM

File:

• trunk/LMDZ.COMMON/makelmdz_fcm (modified) (8 diffs)

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -40 +40 @@
 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
@@ -87 +91 @@
 [-chimie INCA/false]       : (Earth) with INCA chemistry model or without (default: false)
 [-cosp cosp/false]         : (Earth) add the cosp model (default: false)
+[-sisvat true/false]  : (Earth) compile with/without sisvat package (default: false)
+[-rrtm true/false]    : (Earth) 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)
@@ -236 +242 @@
 fi
 
+phys_root=$physique
+if [[ "${physique:0:3}" == "lmd" ]] ; then phys_root=lmd ; fi
+if [[ "${physique:0:3}" == "mar" ]] ; then phys_root=mar ; 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}" == "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
 
@@ -360 +383 @@
 fi
 
-if [[ "$physique" == "titan" ]]
+# for Titan (but could be used by others as well), there is also "chimtitan"
+if [[ -d ${LIBFGCM}/chim${physique} ]]
 then
    CHEM_PATH="${LIBFGCM}/chim${physique}"
@@ -463 +487 @@
 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"
-#  echo pas de dynamique
-#  dyn="DYN= L_DYN=-ldyn3d "
+  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
 
@@ -523 +554 @@
 else
   SUFF_NAME=${SUFF_NAME}_seq
-  DYN=dyn${dimc}d
-  ## specific stuff for 1D model (needs includes which are in dyn3d)
-  if (( $dimension == 1 )) ; then
-    SUFF_NAME=${SUFF_NAME}
-    DYN=dyn3d
+  if (( $dimension == 1 ))
+  then
+    # dynamics-related routines in"dyn1d" subdirectory of phy${physique} 
+    DYN=phy${physique}/dyn1d
+  else
+    DYN=dyn${dimc}d
   fi
 fi
@@ -561 +593 @@
 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
@@ -594 +630 @@
 ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/tmp tmp_src
 
-#eventual cleanup for SISVAT
-#sed -e 's/^src::sisvat/#src::sisvat/' bld.cfg > bld.tmp
-#mv bld.tmp bld.cfg
-
-#eventual cleanup for RRTM
-#sed -e 's/^src::rrtm/#src::rrtm/' bld.cfg > bld.tmp
-#mv bld.tmp bld.cfg
-
 
 if [[ -r $LIBFGCM/grid/dimensions.h ]]