Changeset 1910 for LMDZ5/branches/testing/makelmdz

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (2 props)
• makelmdz (modified) (6 diffs, 1 prop)

LMDZ5/branches/testing/makelmdz

@@ -25 +25 @@
 fcm_path=none
 cosp=false
+sisvat=false
 
 # guess a default 'arch'
@@ -34 +35 @@
   arch="SX8_BRODIE"
 fi
-if [[ "${machine:0:6}" == "vargas" ]]
-then
-  arch="PW6_VARGAS"
+if [[ "${machine:0:3}" == "ada" ]]
+then
+  arch="X64_ADA"
 fi
 if [[ "${machine:0:6}" == "ciclad" ]]
@@ -173 +174 @@
           cosp="$2" ; shift ; shift ;;
       
+      "-sisvat")
+          sisvat="$2" ; shift ; shift ;;
+      
       "-mem")
           paramem="mem" ; shift ;;
@@ -275 +279 @@
 archfileopt=$( echo ${archfileline##%BASE_LD} )
 LIB="$LIB  ${archfileopt}"
+
+# add Include files defined in arch.fcm file for pre-processing
+archfileline=$( grep -i '^%FPP_FLAGS' arch.fcm )
+for inc in $archfileline ; do INCLUDE="$INCLUDE `echo $inc | grep '\-I'`" ; done
 
 if [[ "$physique" != "nophys" ]]
@@ -385 +393 @@
    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
+elif [[ $io == xios ]]
+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"
 fi
 
@@ -396 +410 @@
    INCLUDE="$INCLUDE"' -I$(LIBF)/cosp'
 fi
+
+if [[ "$sisvat" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_SISVAT"
+fi
+
 
 INCLUDE="$INCLUDE ${NETCDF_INCDIR}"