Changeset 4446 for LMDZ6/branches/Portage_acc/makelmdz_fcm

Timestamp:

Mar 1, 2023, 6:22:39 PM (16 months ago)

Author:

Laurent Fairhead

Message:

Merged trunk revisions from 4127 to 4443 (HEAD) into branch

File:

• LMDZ6/branches/Portage_acc/makelmdz_fcm (modified) (14 diffs)

LMDZ6/branches/Portage_acc/makelmdz_fcm

@@ -25 +25 @@
 inlandsis=false
 rrtm=false
-rad="old"
+rad="oldrad"
 dust=false
 strataer=false
@@ -45 +45 @@
 isotrac=false
 force_compile=false
+cplocninca=false
 
 arch_defined="FALSE"
@@ -94 +95 @@
 [-prod / -dev / -debug]    : compilation mode production (default) / developement / debug
 [-c false/MPI1/OMCT]       : coupling with ocean model : MPI1/OMCT/false (default: false)
-[-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
+[-v false/orchideetrunk/orchidee2.1/orchidee2.0/orchidee1.9] : version of the vegetation model to include (default: false)
           false       : no vegetation model
-          orchidee2.1 : compile using ORCHIDEE 2.1 (or more recent version)
+          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.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
 [-chimie INCA/false]       : with INCA chemistry model or without (default: false)
+[-cplocninca ]        : allow transfer of species from PISCES to INCA (default: false)
 [-cosp true/false]    : compile with/without cosp package (default: false)
 [-cosp2 true/false]    : compile with/without cosp2 package (default: false)
@@ -106 +109 @@
 [-inlandsis true/false]  : compile with/without inlandsis package (default: false)
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
-[-rad old/rrtm/ecrad]    : compile with old/rrtm/ecrad radiatif code (default: old)
+[-rad oldrad/rrtm/ecrad]    : compile with oldrad/rrtm/ecrad radiatif code (default: oldrad)
 [-dust true/false]    : compile with/without the dust package by Boucher and co (default: false)
 [-strataer true/false]    : compile with/without the strat aer package by Boucher and co (default: false)
@@ -165 +168 @@
 
       "-rrtm")
-          rrtm="$2" ; if [ "$2" = "false" ] ; then rad="old" ; else rad="rrtm" ; fi ; shift ; shift ;;
+          rrtm="$2" ; if [ "$2" = "false" ] ; then rad="oldrad" ; else rad="rrtm" ; fi ; shift ; shift ;;
 
       "-rad")
@@ -178 +181 @@
       "-chimie")
           chimie="$2" ; shift ; shift ;;
+
+     "-cplocninca")
+          cplocninca=TRUE ; shift ;;
 
       "-isotopes")
@@ -364 +370 @@
 then
    CPP_KEY="$CPP_KEY INCA"
-   INCLUDE="$INCLUDE -I${INCA_INCDIR}"
-   LIB="$LIB -L${INCA_LIBDIR} -lchimie"
+   INCLUDE="$INCLUDE ${INCA_INCDIR}"
+   LIB="$LIB ${INCA_LIBDIR} ${INCA_LIB}"
 fi
 
@@ -399 +405 @@
     else
         CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
-        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
-        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
+        INCLUDE="$INCLUDE ${OASIS_INCDIR}"
+        LIB="$LIB ${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
     fi
 fi
@@ -428 +434 @@
 fi
 
-if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" ]
-then
+if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" -o "$veget" = "orchidee2.1" -o "$veget" = "orchideetrunk" ]
+then
+        echo "doing orchidee"
 #NB: option 'true': for backward compatibility. To be used with ORCHIDEE tag 1.9-1.9.6
 #    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
-   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
+   INCLUDE="${INCLUDE} ${ORCH_INCDIR}"
    CPP_KEY="$CPP_KEY CPP_VEGET"
 # temporary, for Orchidee versions 1.9.* (before openmp activation)
@@ -440 +447 @@
    fi
    if [[ "$veget" == "orchidee2.0" ]] ; then
-      orch_libs="sechiba parameters stomate parallel orglob orchidee"
+      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
       CPP_KEY="$CPP_KEY ORCHIDEE_NOUNSTRUCT"
    elif [[ "$veget" == "orchidee2.1" ]] ; then
-      orch_libs="sechiba parameters stomate parallel orglob orchidee"
+      CPP_KEY="$CPP_KEY ORCHIDEE_NOLIC"
+      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob -lorchidee"
+   elif [[ "$veget" == "orchideetrunk" ]] ; then
+      orch_libs="-lorchidee"
    else
-      orch_libs="sechiba parameters stomate parallel orglob"
+      orch_libs="-lsechiba -lparameters -lstomate -lparallel -lorglob"
    fi
-   LIB="${LIB} -L${ORCH_LIBDIR}"
-   for lib in ${orch_libs} ; do
-      if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
-         LIB="${LIB} -l${LIBPREFIX}$lib "
-      fi
-   done
+   LIB="${LIB} ${ORCH_LIBDIR} ${orch_libs}"
+#   for lib in ${orch_libs} ; do
+#      if [ -f ${ORCH_LIBDIR#-L}/lib${LIBPREFIX}$lib.a ] ; then
+#         LIB="${LIB} -l${LIBPREFIX}$lib "
+#      fi
+#   done
+   echo "orchidee lib" 
+   echo ${LIB}
 elif [[ "$veget" != "false" ]] ; then
    echo "Option -v $veget does not exist"
@@ -492 +504 @@
 then
    CPP_KEY="$CPP_KEY CPP_IOIPSL"
-   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
+   INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
+   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
 elif [[ $io == mix ]]
 then
    # For now, xios implies also using ioipsl
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
-   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
+   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
+   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
 elif [[ $io == xios ]]
 then
    # For now, xios implies also using ioipsl
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
-   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios -l${LIBPREFIX}stdc++"
+   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
+   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
 fi
 
@@ -529 +541 @@
 fi
 
+if [[ "$cplocninca" == "TRUE" ]]
+then
+    CPP_KEY="${CPP_KEY} CPP_CPLOCNINCA"
+fi
 
 
 INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
-LIB="$LIB ${NETCDF_LIBDIR}"
+LIB="$LIB ${NETCDF_LIBDIR} ${NETCDF_LIB}"
 
 ########################################################################
@@ -595 +611 @@
 then
   CPP_KEY="$CPP_KEY CPP_1D"
-##in 1D, add dyn3d to include path (because main prog is in physics)
-  INCLUDE="$INCLUDE -Ilibf/dyn3d -Ilibf/dyn3d_common"
 ## no filtre in 1d:
   FILTRE_PATH=$LMDGCM/.void_dir
@@ -649 +663 @@
 
 SUFF_NAME=_${dim_full}
-SUFF_NAME=${SUFF_NAME}_phy${physique}
+SUFF_NAME=${SUFF_NAME}_phy${physique}_${rad}
 
 if [[ "$parallel" != "none" ]]