Changeset 8387

Timestamp:

2024-01-18T14:16:15+01:00 (5 months ago)

Author:

josefine.ghattas

Message:

Added new argument -linkwithoasis needed to compile offline drivers in the fully coupled configuration IPSLCM7 (when OASIS is included). See ticket #968

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• arch/arch-X64_IRENE-AMD.path (modified) (1 diff)
• arch/arch-X64_IRENE.path (modified) (1 diff)
• arch/arch-X64_JEANZAY.path (modified) (1 diff)
• arch/arch-X64_JEANZAY_OPENMPI.path (modified) (1 diff)
• arch/arch-ifort_LSCE.path (modified) (1 diff)
• arch/arch-ifort_LSCE_2023.path (modified) (1 diff)
• arch/arch-ifort_MESOIPSL.path (modified) (1 diff)
• makeorchidee_fcm (modified) (3 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_IRENE-AMD.path

@@ -11 +11 @@
 XIOS_LIB="-lxios"
 
+OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct"
+OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_IRENE.path

@@ -11 +11 @@
 XIOS_LIB="-lxios"
 
+OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct"
+OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_JEANZAY.path

@@ -11 +11 @@
 XIOS_LIB="-lxios"
 
-OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib"
+OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct"
 OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib"
-OASIS_LIB=""
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_JEANZAY_OPENMPI.path

@@ -11 +11 @@
 XIOS_LIB="-lxios"
 
-OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib"
+OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct"
 OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib"
-OASIS_LIB=""
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-ifort_LSCE.path

@@ -11 +11 @@
 XIOS_LIB="-lxios"
 
+OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct"
+OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-ifort_LSCE_2023.path

@@ -11 +11 @@
 XIOS_LIB="-lxios"
 
+OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct"
+OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-ifort_MESOIPSL.path

@@ -11 +11 @@
 XIOS_LIB="-lxios"
 
-OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib"
+OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct"
 OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib"
-OASIS_LIB=""
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+

branches/ORCHIDEE_2_2/ORCHIDEE/makeorchidee_fcm

@@ -58 +58 @@
 arch_path="arch"
 
+# Option linkwithoasis is used when XIOS is compiled with OASIS. This is the case in IPSLCM7 configuration 
+# where the OASIS libraries needs to be included in the creation of the executables. 
+linkwithoasis=FALSE
+
 # Path to store files produced during compilation
 # Note: config_path was previously named .config
@@ -105 +109 @@
         is_other_opt=TRUE
         is_driver_opt=TRUE ; shift ;;
+    
+    "-linkwithoasis")
+        linkwithoasis=TRUE ; shift ;;
 
     "-arch")
@@ -492 +499 @@
 echo "XXXXXX $is_oasisdriver_opt"
 
+
 if [[ "$is_oasisdriver_opt" == "TRUE" ]] ; then
     CPP_KEY="OASIS ${CPP_KEY}"
     TARGET="${TARGET} driver2oasis.exe orchideeoasis.exe"
-    INCDIR="${INCDIR} ${OASIS_INCDIR}/psmile.MPI1 ${OASIS_INCDIR}/scrip  ${OASIS_INCDIR}/mct"
-    LIBDIR="${LIBDIR} ${OASIS_LIBDIR} -lpsmile.MPI1 -lmct -lmpeu -lscrip"
+    INCDIR="${INCDIR} ${OASIS_INCDIR}"
+    LIBDIR="${LIBDIR} ${OASIS_LIBDIR} ${OASIS_LIB}"
     echo "OASIS : ${INCDIR}"
+fi
+
+
+if [[ "$linkwithoasis" == "TRUE" ]] ; then 
+    LIBDIR="${LIBDIR} ${OASIS_LIBDIR} ${OASIS_LIB}"
 fi