Changeset 2056 for LMDZ5/branches/testing/makelmdz

Timestamp:

Jun 11, 2014, 3:46:46 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• makelmdz (modified) (5 diffs)

LMDZ5/branches/testing/makelmdz

@@ -32 +32 @@
 ## try to recognise machine and infer arch from it
 machine=`hostname`
-if [[ "$machine" == "brodie" ]]
-then
-  arch="SX8_BRODIE"
-fi
 if [[ "${machine:0:3}" == "ada" ]]
 then
   arch="X64_ADA"
-fi
-if [[ "${machine:0:6}" == "ciclad" ]]
-then
-  arch="AMD64_CICLAD"
 fi
 if [[ "${machine:0:7}" == "platine" ]]
@@ -84 +76 @@
 
 CPP_KEY="" 
-INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/dyn3d_common -I$(LIBF)/filtrez -I. '
+INCLUDE='-I$(LIBF)/grid -I$(LIBF)/bibio -I$(LIBF)/filtrez -I. '
 LIB=""
 adjnt=""
@@ -167 +159 @@
           CPP_KEY="$CPP_KEY $2" ; shift ; shift ;;
 
-      "-adjnt")
-          echo "not operational ... work to be done here ";exit
-          opt_dep="$opt_dep adjnt" ; adjnt="-ladjnt -ldyn3d "
-          optim="$optim -Dadj" ; shift ;;
-
       "-cosp")
           cosp="$2" ; shift ; shift ;;
@@ -487 +474 @@
    cp -p fxy_${grille}.h fxyprim.h
    filtre="FILTRE=$filtre"
-   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} '
+   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} -I$(LIBF)/dyn3d_common '
 elif (( $dimc == 2 )) ; then
    filtre="FILTRE= L_FILTRE= "
    INCLUDE="$INCLUDE "'-I$(LIBF)/dyn2d'
 elif (( $dimc == 1 )) ; then
+   CPP_KEY="$CPP_KEY CPP_1D"
    filtre="L_DYN= DYN= FILTRE= L_FILTRE= DIRMAIN=phy$physique "
-   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d' # Pas tres propre
+   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d -I$(LIBF)/dyn3d_common ' # Pas tres propre
 else
    echo Dimension dimc=$dimc pas prevu ; exit
 fi
 
-######################################################################
-# Creation du suffixe de la configuration
-######################################################################
-
-SUFF_NAME=_${dim_full}
-SUFF_NAME=${SUFF_NAME}_phy${physique}
-
-if [[ "$parallel" != "none" ]]
-then
-  SUFF_NAME=${SUFF_NAME}_para
-  DYN=dyn${dimc}d${paramem}
-  if [[ "$paramem" == "mem" ]]
-  then
-   SUFF_NAME=${SUFF_NAME}_${paramem}
-  fi
-else
-  SUFF_NAME=${SUFF_NAME}_seq
-  DYN=dyn${dimc}d
-fi
-
-if [[ $veget != "false" ]]
-then
-  SUFF_NAME=${SUFF_NAME}_orch
-fi
-
-if [[ $couple != "false" ]]
-then
-  SUFF_NAME=${SUFF_NAME}_couple
-fi
-
-if [[ $chimie == "INCA" ]]
-then
-  SUFF_NAME=${SUFF_NAME}_inca
-fi
 
 cd $LMDGCM
@@ -574 +528 @@
 if [[ -r $LMDGCM/libf/dyn${dimc}d${FLAG_PARA}/${code}.F90 ]]
 then
+  source_code=${code}.F90
+elif [[ -r $LMDGCM/libf/phy$physique/${code}.F90 ]] ; then
   source_code=${code}.F90
 fi