Changeset 2631 for LMDZ5/trunk

Timestamp:

Sep 22, 2016, 6:34:57 PM (8 years ago)

Author:

fhourdin

Message:

Modification de makelmdz et makelmdz_fcm pour les aerosols

Location:

LMDZ5/trunk

Files:

• makelmdz (modified) (4 diffs)
• makelmdz_fcm (modified) (6 diffs)

LMDZ5/trunk/makelmdz

@@ -27 +27 @@
 sisvat=false
 rrtm=false
+rrtm=false
+dust=false
 full=""
 
@@ -110 +112 @@
 [-sisvat true/false]  : compile with/without sisvat package (default: false)
 [-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)
 [-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)
@@ -173 +176 @@
       "-rrtm")
           rrtm="$2" ; shift ; shift ;;
+
+      "-dust")
+          dust="$2" ; shift ; shift ;;
       
       "-mem")
@@ -447 +453 @@
    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
 

LMDZ5/trunk/makelmdz_fcm

@@ -25 +25 @@
 sisvat=false
 rrtm=false
+dust=false
 chimie=false
 parallel=none
@@ -46 +47 @@
 PHY_COMMON_PATH=$LMDGCM/.void_dir
 RRTM_PATH=$LMDGCM/.void_dir
+DUST_PATH=$LMDGCM/.void_dir
 SISVAT_PATH=$LMDGCM/.void_dir
 COSP_PATH=$LMDGCM/.void_dir
@@ -87 +89 @@
 [-sisvat true/false]  : compile with/without sisvat package (default: false)
 [-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)
 [-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)
@@ -138 +141 @@
       "-rrtm")
           rrtm="$2" ; shift ; shift ;;
+
+      "-dust")
+          dust="$2" ; shift ; shift ;;
 
       "-chimie")
@@ -351 +357 @@
 fi
 
+if [[ "$dust" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_Dust"
+   DUST_PATH="$LIBFGCM/%PHYS/Dust"
+fi
+
 if [[ $io == ioipsl ]]
 then
@@ -580 +592 @@
 echo "%DYN_PHYS_SUB  $DYN_PHYS_SUB_PATH" >> $config_fcm
 echo "%RRTM          $RRTM_PATH"     >> $config_fcm
+echo "%DUST          $DUST_PATH"     >> $config_fcm
 echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
 echo "%COSP          $COSP_PATH"     >> $config_fcm