Changeset 3798 for LMDZ6/branches/Ocean_skin/makelmdz_fcm

Timestamp:

Jan 11, 2021, 11:24:08 PM (4 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

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

LMDZ6/branches/Ocean_skin/makelmdz_fcm

@@ -24 +24 @@
 veget=false
 sisvat=false
+inlandsis=false
 rrtm=false
 dust=false
@@ -45 +46 @@
 
 LMDGCM=`/bin/pwd`
-LIBOGCM=$LMDGCM/libo
+LIBOGCM=$WORK/build/LMDZ_ocean_skin
 LIBFGCM=$LMDGCM/libf
 DYN_COMMON_PATH=$LIBFGCM/dyn3d_common
@@ -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
@@ -681 +693 @@
 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
@@ -703 +716 @@
 ./build_gcm ${fcm_path} -j $job $full
 
+err=$?
+# Check error message from fcm build
+if [ $err != 0 ] ; then
+  exit 1
+fi
+
 rm -rf tmp_src
 rm -rf config