Changeset 2720 for LMDZ5/branches/testing/makelmdz

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

LMDZ5/branches/testing/makelmdz

@@ -29 +29 @@
 rrtm=false
 dust=false
+strataer=false
 full=""
 
@@ -113 +114 @@
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
 [-dust true/false]    : compile with/without the dust package from Boucher et al. (default: false)
+[-strataer true/false]    : 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)
@@ -180 +182 @@
           dust="$2" ; shift ; shift ;;
       
+      "-strataer")
+          strataer="$2" ; shift ; shift ;;
+      
       "-mem")
           paramem="mem" ; shift ;;
@@ -459 +464 @@
    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