Changeset 3605 for LMDZ6/branches/Ocean_skin/makelmdz_fcm

Timestamp:

Nov 21, 2019, 4:43:45 PM (4 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

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

LMDZ6/branches/Ocean_skin/makelmdz_fcm

@@ -35 +35 @@
 cosp=false
 cosp2=false
+cospv2=false
 job=1
 full=''
@@ -44 +45 @@
 
 LMDGCM=`/bin/pwd`
-LIBOGCM=$LMDGCM/libo
+LIBOGCM=$WORK/build/LMDZ_ocean_skin
 LIBFGCM=$LMDGCM/libf
 DYN_COMMON_PATH=$LIBFGCM/dyn3d_common
@@ -57 +58 @@
 SISVAT_PATH=$LMDGCM/.void_dir
 COSP_PATH=$LMDGCM/.void_dir
-COSP2_PATH=$LMDGCM/.void_dir
 fcm_path=$LMDGCM/tools/fcm/bin
 
@@ -90 +90 @@
 [-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
           false       : no vegetation model
-          orchidee2.0 : compile using ORCHIDEE 2.0 (or more recent version)
+          orchidee2.1 : compile using ORCHIDEE 2.1 (or more recent version)
+          orchidee2.0 : compile using ORCHIDEE 2.0
           orchidee1.9 : compile using ORCHIDEE up to the version including OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
           true        : (obsolete; for backward compatibility) use ORCHIDEE tag 1.9-1.9.6
@@ -96 +97 @@
 [-cosp true/false]    : compile with/without cosp package (default: false)
 [-cosp2 true/false]    : compile with/without cosp2 package (default: false)
+[-cospv2 true/false]    : compile with/without cospv2 package (default: false)
 [-sisvat true/false]  : compile with/without sisvat package (default: false)
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
@@ -181 +183 @@
       "-cosp2")
           cosp2="$2" ; shift ; shift ;;
+
+      "-cospv2")
+          cospv2="$2" ; shift ; shift ;;
       
       "-mem")
@@ -373 +378 @@
 fi
 
-if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" ]
+if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" ]
 then
 #NB: option 'true': for backward compatibility. To be used with ORCHIDEE tag 1.9-1.9.6
@@ -385 +390 @@
    fi
    if [[ "$veget" == "orchidee2.0" ]] ; then
+      orch_libs="sechiba parameters stomate parallel orglob orchidee"
+      CPP_KEY="$CPP_KEY ORCHIDEE_NOUNSTRUCT"
+   elif [[ "$veget" == "orchidee2.1" ]] ; then
       orch_libs="sechiba parameters stomate parallel orglob orchidee"
    else
@@ -457 +465 @@
 #   LIB="${LIB} -l${LIBPREFIX}cosp2"
 fi
+
+if [[ "$cospv2" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_COSPV2"
+   COSP_PATH="$LIBFGCM/phylmd/cospv2"
+#   LIB="${LIB} -l${LIBPREFIX}cosp2"
+fi
+
 
 
@@ -666 +682 @@
 echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
 echo "%COSP          $COSP_PATH"     >> $config_fcm
-echo "%COSP2          $COSP2_PATH"     >> $config_fcm
 echo "%CPP_KEY       $CPP_KEY"       >> $config_fcm
 echo "%EXEC          $code"          >> $config_fcm