Changeset 3851 for LMDZ6/branches/LMDZ-tracers/makelmdz_fcm

Timestamp:

Feb 22, 2021, 12:44:07 PM (4 years ago)

Author:

dcugnet

Message:

Update the branch to the current trunk.

Location:

LMDZ6/branches/LMDZ-tracers

Files:

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

LMDZ6/branches/LMDZ-tracers/makelmdz_fcm

@@ -24 +24 @@
 veget=false
 sisvat=false
+inlandsis=false
 rrtm=false
 dust=false
@@ -64 +65 @@
 ########################################################################
 
-CPP_KEY="" 
+CPP_KEY="IN_LMDZ" 
 INCLUDE=""
 LIB=""
@@ -99 +100 @@
 [-cospv2 true/false]    : compile with/without cospv2 package (default: false)
 [-sisvat true/false]  : compile with/without sisvat package (default: false)
+[-inlandsis true/false]  : compile with/without inlandsis 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)
@@ -151 +153 @@
       "-sisvat")
           sisvat="$2" ; shift ; shift ;;
+
+      "-inlandsis")
+    inlandsis="$2" ; shift ; shift ;;
 
       "-rrtm")
@@ -415 +420 @@
 fi
 
+if [[ "$inlandsis" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_INLANDSIS"
+   INLANDSIS_PATH="$LIBFGCM/%PHYS/inlandsis"
+fi
+
+
 if [[ "$rrtm" == "true" ]]
 then
@@ -629 +641 @@
 then
   SUFF_NAME=${SUFF_NAME}_orch
+fi
+
+if [[ $dust == "true" ]]
+then
+  SUFF_NAME=${SUFF_NAME}_spla
 fi
 
@@ -681 +698 @@
 echo "%STRATAER      $STRATAER_PATH" >> $config_fcm
 echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
+echo "%INLANDSIS     $INLANDSIS_PATH" >> $config_fcm
 echo "%COSP          $COSP_PATH"     >> $config_fcm
 echo "%CPP_KEY       $CPP_KEY"       >> $config_fcm