Changeset 2720 for LMDZ5/branches/testing/makelmdz_fcm

Timestamp:

Nov 30, 2016, 1:28:41 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2664:2719 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/makelmdz_fcm

@@ -26 +26 @@
 rrtm=false
 dust=false
+strataer=false
 chimie=false
 parallel=none
@@ -48 +49 @@
 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
@@ -90 +92 @@
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
 [-dust true/false]    : compile with/without the dust package by Boucher and co (default: false)
+[-strataer true/false]    : 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)
@@ -144 +147 @@
       "-dust")
           dust="$2" ; shift ; shift ;;
+
+      "-strataer")
+          strataer="$2" ; shift ; shift ;;
 
       "-chimie")
@@ -363 +369 @@
 fi
 
+if [[ "$strataer" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_StratAer"
+   STRATAER_PATH="$LIBFGCM/%PHYS/StratAer"
+fi
+
 if [[ $io == ioipsl ]]
 then
@@ -593 +605 @@
 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