Changeset 3605 for LMDZ6/branches/Ocean_skin/makelmdz

Timestamp:

Nov 21, 2019, 4:43:45 PM (5 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 (modified) (10 diffs)

LMDZ6/branches/Ocean_skin/makelmdz

@@ -26 +26 @@
 cosp=false
 cosp2=false
+cospv2=false
 sisvat=false
 rrtm=false
@@ -42 +43 @@
 ## try to recognise machine and infer arch from it
 machine=`hostname`
-if [[ "${machine:0:3}" == "ada" ]]
-then
-  arch="X64_ADA"
+if [[ "${machine:0:4}" == "jean" ]]
+then
+  arch="X64_JEANZAY"
 fi
 if [[ "${machine:0:7}" == "platine" ]]
@@ -112 +113 @@
 [-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
           false       : no vegetation model
+          orchidee2.1 : compile using ORCHIDEE 2.1 (or more recent version)
           orchidee2.0 : compile using ORCHIDEE 2.0 (or more recent version)
           orchidee1.9 : compile using ORCHIDEE up to the version including OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
@@ -118 +120 @@
 [-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)
@@ -183 +186 @@
       "-cosp2")
           cosp2="$2" ; shift ; shift ;;
+
+      "-cosp2")
+          cospv2="$2" ; shift ; shift ;;
       
       "-sisvat")
@@ -432 +438 @@
 
 #==============================================================================
-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
 
@@ -442 +448 @@
    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
@@ -494 +503 @@
    src_dirs="$src_dirs phy${physique}/cosp2"
    INCLUDE="$INCLUDE"' -I$(LIBF)/'phy${physique}'/cosp2'
+fi
+
+if [[ "$cospv2" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_COSPV2"
+   src_dirs="$src_dirs phy${physique}/cospv2"
+   INCLUDE="$INCLUDE"' -I$(LIBF)/'phy${physique}'/cospv2'
 fi
 
@@ -772 +788 @@
 L_COSP="$lcosp" \
 L_COSP2="$lcosp2" \
+L_COSPV2="$lcospv2" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \
@@ -806 +823 @@
 L_COSP="$lcosp" \
 L_COSP2="$lcosp2" \
+L_COSPV2="$lcospv2" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \