Changeset 1650 for trunk/LMDZ.COMMON/makelmdz_fcm

Timestamp:

Jan 25, 2017, 4:02:54 PM (8 years ago)

Author:

emillour

Message:

Dynamical core: Further adaptations to stick with LMDZ5 (up to rev r2750)

• libf
• makelmdz[_fcm] : added Earth-specific "dust" and "strataer" cases and

-arch_path option

• bld.cfg : added dust and strataer cases

• dyn3d[par]
• conf_gcm.F90 : added read_orop parameter (Earth-related) for

loading subgrid orography parameters.

• guide[_p]_mod.F90: added output of nudging coefficients for winds

and temperature

• temps_mod.F90 : cosmetics/comments
• logic_mod.F90 : cosmetics/comments

• dyn3d_common
• comconst_mod.F90 : cosmetics/comments + added year_day module variable
• conf_planete.F90 : added year_day from comconst_mod as done in LMDZ5
• comvert_mod.F90 : cosmetics/comments
• infotrac.F90 : added "startAer" case to follow up with LMDZ5

• misc
• wxios.F90 : follow up on changes in LMDZ5

EM

File:

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

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -24 +24 @@
 sisvat=false
 rrtm=false
+dust=false
+strataer=false
 chimie=false
 chemistry=false
@@ -38 +40 @@
 libphy=false
 
+arch_defined="FALSE"
+arch_path="arch"
+arch_default_path="arch"
+
 LMDGCM=`/bin/pwd`
 LIBOGCM=$LMDGCM/libo
@@ -48 +54 @@
 PHY_COMMON_PATH=$LMDGCM/.void_dir
 RRTM_PATH=$LMDGCM/.void_dir
+DUST_PATH=$LMDGCM/.void_dir
+STRATAER_PATH=$LMDGCM/.void_dir
 SISVAT_PATH=$LMDGCM/.void_dir
 COSP_PATH=$LMDGCM/.void_dir
@@ -85 +93 @@
 [-p PHYS]                  : set of physical parametrizations (in libf/phyPHYS), (default: lmd)
 [-prod / -dev / -debug]    : compilation mode production (default) / developement / debug .
-[-c false/MPI1/OMCT]       : coupling with ocean model : MPI1/OMCT/false (default: false)
-[-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
+[-c false/MPI1/OMCT]       : (Earth) coupling with ocean model : MPI1/OMCT/false (default: false)
+[-v false/orchidee2.0/orchidee1.9/true] : (Earth) version of the vegetation model to include (default: false)
           false       : no vegetation model
           orchidee2.0 : compile using ORCHIDEE 2.0 (or more recent version)
@@ -95 +103 @@
 [-sisvat true/false]  : (Earth) compile with/without sisvat package (default: false)
 [-rrtm true/false]    : (Earth) compile with/without rrtm package (default: false)
+[-dust true/false]    : (Earth) compile with/without the dust package by Boucher and co (default: false)
+[-strataer true/false]    : (Earth) compile with/without the strat aer package by Boucher and co (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)
@@ -108 +118 @@
 [-fcm_path path]           : path to the fcm tool (default: tools/fcm/bin)
 [-ext_src path]            : path to an additional set of routines to compile with the model
+[-arch_path path]          : path to architecture files (default: $arch_default_path)
  -arch arch                : target architecture 
  exec                      : executable to build
@@ -152 +163 @@
           rrtm="$2" ; shift ; shift ;;
 
+      "-dust")
+          dust="$2" ; shift ; shift ;;
+
+      "-strataer")
+          strataer="$2" ; shift ; shift ;;
+
       "-chimie")
           chimie="$2" ; shift ; shift ;;
@@ -197 +214 @@
 
       "-arch")
-          arch=$2 ; shift ; shift ;;
+          arch=$2 ; arch_defined="TRUE" ; shift ; shift ;;
+
+      "-arch_path")
+          arch_path=$2 ; arch_path_defined="TRUE"; shift ; shift ;;
 
       *)
@@ -227 +247 @@
 rm -rf .void_dir
 mkdir .void_dir
-rm -f arch.path
-ln -s arch/arch-${arch}.path ./arch.path
-source arch.path
+
+if [[ "$arch_defined" == "TRUE" ]]
+then
+  rm -f arch.path
+  rm -f arch.fcm
+  rm -f arch.env
+
+  if test -f $arch_path/arch-${arch}.path
+  then
+    ln -s $arch_path/arch-${arch}.path arch.path
+  elif test -f $arch_default_path/arch-${arch}.path
+  then
+    ln -s $arch_default_path/arch-${arch}.path arch.path
+  fi
+        
+  if test -f $arch_path/arch-${arch}.fcm
+  then
+    ln -s $arch_path/arch-${arch}.fcm arch.fcm
+  elif test -f $arch_default_path/arch-${arch}.fcm
+  then
+    ln -s $arch_default_path/arch-${arch}.fcm arch.fcm
+  fi
+
+  if test -f $arch_path/arch-${arch}.env
+  then
+    ln -s $arch_path/arch-${arch}.env arch.env
+  elif test -f $arch_default_path/arch-${arch}.env
+  then
+    ln -s $arch_default_path/arch-${arch}.env arch.env
+  else
+    ln -s .void_file arch.env
+  fi
+  # source architecture PATH and ENV files
+  source arch.env
+  source arch.path
+else
+  echo "You must define a target architecture"
+  exit 1
+fi
 
 ########################################################################
@@ -372 +428 @@
 fi
 
+if [[ "$dust" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_Dust"
+   DUST_PATH="$LIBFGCM/%PHYS/Dust"
+fi
+
+if [[ "$strataer" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_StratAer"
+   STRATAER_PATH="$LIBFGCM/%PHYS/StratAer"
+fi
+
 if [[ $io == ioipsl ]]
 then
@@ -642 +710 @@
 echo "%DYN_PHYS_SUB  $DYN_PHYS_SUB_PATH" >> $config_fcm
 echo "%RRTM          $RRTM_PATH"     >> $config_fcm
+echo "%DUST          $DUST_PATH"     >> $config_fcm
+echo "%STRATAER      $STRATAER_PATH" >> $config_fcm
 echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
 echo "%COSP          $COSP_PATH"     >> $config_fcm