Changeset 1650 for trunk/LMDZ.COMMON/makelmdz

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 (modified) (7 diffs)

trunk/LMDZ.COMMON/makelmdz

@@ -27 +27 @@
 sisvat=false
 rrtm=false
+dust=false
+strataer=false
 bands=""
 scatterers=""
 full=''
 
+arch_defined="FALSE"
+arch_path="arch"
+arch_default_path="arch"
+
 # guess a default 'arch'
 arch="local" # start with assuming we're on a local machine with local arch file
+arch_defined="TRUE" # and thus also set arch_defined to true 
 ## try to recognise machine and infer arch from it
 machine=`hostname`
@@ -120 +127 @@
 [-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 from Boucher et al. (default: false)
+[-strataer true/false]    : (Earth) compile with/without the strat aer package from Boucher et al. (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)
@@ -131 +140 @@
 [-full]                    : full (re-)compilation (from scratch)
 [-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
@@ -189 +199 @@
           rrtm="$2" ; shift ; shift ;;
       
+      "-dust")
+          dust="$2" ; shift ; shift ;;
+      
+      "-strataer")
+          strataer="$2" ; shift ; shift ;;
+      
       "-mem")
           paramem="mem" ; shift ;;
@@ -205 +221 @@
 
       "-arch")
-          arch=$2 ; shift ; shift ;;
+          arch=$2 ; arch_defined="TRUE" ; shift ; shift ;;
+
+      "-arch_path")
+          arch_path=$2 ; arch_path_defined="TRUE"; shift ; shift ;;
 
       *)
@@ -219 +238 @@
 rm -rf .void_dir
 mkdir .void_dir
-rm -f arch.path
-if [[ -r arch/arch-${arch}.path ]]
-then
-  ln -s arch/arch-${arch}.path ./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 "Error: missing arch/arch-${arch}.path file !"
-  exit
-fi
-rm -f arch.fcm
-if [[ -r arch/arch-${arch}.fcm ]]
-then
-  ln -s arch/arch-${arch}.fcm arch.fcm
-else
-  echo "Error: missing arch/arch-${arch}.fcm file !"
-  exit
-fi
+  echo "You must define a target architecture"
+  exit 1
+fi
+
 ########################################################################
 # Definition des clefs CPP, des chemins des includes et modules
@@ -486 +528 @@
    CPP_KEY="$CPP_KEY CPP_RRTM"
    src_dirs="$src_dirs phy${physique}/rrtm"
+fi
+
+if [[ "$dust" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_Dust"
+   src_dirs="$src_dirs phy${physique}/Dust"
+fi
+
+if [[ "$strataer" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_StratAer"
+   src_dirs="$src_dirs phy${physique}/StratAer"
 fi