Changeset 5864 for CONFIG_DEVT

Timestamp:

06/24/21 14:29:03 (3 years ago)

Author:

ymipsl

Message:

Update LMDZ environnement for ensemble
YM

Location:

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/LMDZ

Files:

• arch/arch-X64_IRENE-AMD.path (modified) (1 diff)
• makelmdz_fcm (modified) (2 diffs)

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/LMDZ/arch/arch-X64_IRENE-AMD.path

@@ -5 +5 @@
 ORCH_INCDIR=$LMDGCM/../../lib
 ORCH_LIBDIR=$LMDGCM/../../lib
-OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
+OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/include
 OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
 INCA_LIBDIR=$LMDGCM/../INCA/build/lib

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/LMDZ/makelmdz_fcm

@@ -338 +338 @@
 fi
 
-if [[ "$couple" != "false" ]]
-then
-    if [[ "$couple" == "MPI1" ]]
-    then
-        CPP_KEY="$CPP_KEY CPP_COUPLE"
-        export OASIS_INCDIR=$LMDGCM/../../prism/X64/build/lib/psmile.MPI1
-        export OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
-        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
-        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lmpp_io"
-    else
-        CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
-        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
-        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
-    fi
-fi
-
 if [[ "$parallel" == "mpi" ]]
 then
@@ -452 +436 @@
 fi
 
+if [[ "$couple" != "false" ]]
+then
+    if [[ "$couple" == "MPI1" ]]
+    then
+        CPP_KEY="$CPP_KEY CPP_COUPLE"
+        export OASIS_INCDIR=$LMDGCM/../../prism/X64/build/lib/psmile.MPI1
+        export OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
+        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
+        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lmpp_io"
+    else
+        CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
+        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
+        LIB="$LIB -L${OASIS_LIBDIR} -loasis.cbind -lpsmile.MPI1 -lscrip -lmct -lmpeu"
+    fi
+fi
+
 if [[ "$cosp" == "true" ]]
 then