Changeset 9371 for branches

Timestamp:

2018-03-05T14:40:16+01:00 (6 years ago)

Author:

andmirek

Message:

#2062 Changes allowing use XIOS compiled with oasis

Location:

branches/2018/dev_r9368_fcheck/NEMOGCM

Files:

• ARCH/arch-XC40_METO.fcm (modified) (1 diff)
• TOOLS/COMPILE/Fcheck_archfile.sh (modified) (1 diff)

branches/2018/dev_r9368_fcheck/NEMOGCM/ARCH/arch-XC40_METO.fcm

@@ -45 +45 @@
 
 %OASIS_INC           -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1
-%OASIS_LIBDIR        -L%OASIS_HOME/lib
-%OASIS_LIB           -lpsmile.MPI1 -lmct -lmpeu -lscrip
+%OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
 %CPP                 cpp

branches/2018/dev_r9368_fcheck/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh

@@ -200 +200 @@
     use_oasis=0
 fi
+
+#ignore use_oasis if XIOS_OASIS is set  (doesn't matter to what value)
+if [[ ! -z "$XIOS_OASIS" ]]; then
+use_oasis=1
+fi
+
 for liboa in psmile.MPI1 mct mpeu scrip mpp_io
 do