Changeset 1300 for trunk/LMDZ.COMMON/makelmdz

Timestamp:

Jun 25, 2014, 1:19:59 PM (11 years ago)

Author:

emillour

Message:

Common dynamics:
Some updates to keep up with LMDZ5 Earth model evolution (up to LMDZ5 rev 1955).
Main change is the introduction of a "dyn3d_common" directory
to store files common to dyn3d and dyn3dpar.
See file "DOC/chantiers/commit_importants.log" for detailed list
of changes. These changes do not change results on test cases.
EM

File:

• trunk/LMDZ.COMMON/makelmdz (modified) (6 diffs)

trunk/LMDZ.COMMON/makelmdz

@@ -25 +25 @@
 fcm_path=none
 cosp=false
+sisvat=false
 bands=""
 scatterers=""
@@ -38 +39 @@
   arch="SX8_BRODIE"
 fi
-if [[ "${machine:0:6}" == "vargas" ]]
-then
-  arch="PW6_VARGAS"
-fi
-if [[ "${machine:0:6}" == "ada338" ]]
-then
-  arch="PW6_VARGAS"
+if [[ "${machine:0:3}" == "ada" ]]
+then
+  arch="X64_ADA"
 fi
 if [[ "${machine:0:6}" == "ciclad" ]]
@@ -90 +87 @@
 
 CPP_KEY="" 
-INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. '
+INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/dyn3d_common -I$(LIBF)/filtrez -I. '
 LIB=""
 adjnt=""
@@ -195 +192 @@
           cosp="$2" ; shift ; shift ;;
       
+      "-sisvat")
+          sisvat="$2" ; shift ; shift ;;
+      
       "-mem")
           paramem="mem" ; shift ;;
@@ -434 +434 @@
    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
 
@@ -444 +450 @@
    lcosp="-l${LIBPREFIX}cosp"
    INCLUDE="$INCLUDE"' -I$(LIBF)/cosp'
+fi
+
+if [[ "$sisvat" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_SISVAT"
 fi