Changeset 5925

Timestamp:

Dec 11, 2025, 4:00:46 PM (5 weeks ago)

Author:

evignon

Message:

petite modif de makelmdz_fcm pour compiler le 1D avec orchidee

File:

• LMDZ6/trunk/makelmdz_fcm (modified) (5 diffs)

LMDZ6/trunk/makelmdz_fcm

@@ -99 +99 @@
           orchideetrunk : compile using ORCHIDEE trunk from revision 7757 or higher
           orchidee2.1 : compile using ORCHIDEE 2.1 until 4.1 included or until revision 7757 on the trunk
+          orchidee2.2 : compile using ORCHIDEE 2.2
           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
@@ -430 +431 @@
 fi
 
-if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" -o "$veget" = "orchideetrunk" ]
+if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" -o "$veget" = "orchidee2.2" -o "$veget" = "orchideetrunk" ]
 then
         echo "doing orchidee"
@@ -436 +437 @@
 #    For this case, cpp flag ORCHIDEE_NOOPENMP must be added to the makelmdz_fcm arguments
 #    option orchidee1.9 : Compile with ORCHIDEE version up to the inclusion of OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
+#    FC orchidee 2.2 pour le 1D uniquement a ce stade suppose que l on a mis un numero de revision au moment de l install 
    INCLUDE="${INCLUDE} ${ORCH_INCDIR}"
    CPP_KEY="$CPP_KEY CPP_VEGET"
@@ -445 +447 @@
       orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
       CPP_KEY="$CPP_KEY ORCHIDEE_NOUNSTRUCT"
-   elif [[ "$veget" == "orchidee2.1" ]] ; then
+   elif [[ "$veget" == "orchidee2.1" || "orchidee2.2" ]] ; then
       CPP_KEY="$CPP_KEY ORCHIDEE_NOLIC"
       orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
@@ -677 +679 @@
 fi
 
-if [[ $veget != "false" ]]
-then
-  SUFF_NAME=${SUFF_NAME}_orch
+if [[ $veget = "false" ]]
+then
+  SUFF_NAME=${SUFF_NAME}
+else
+  SUFF_NAME=${SUFF_NAME}_${veget}
 fi