Changeset 1302 for trunk/LMDZ.COMMON/makelmdz

Timestamp:

Jun 26, 2014, 6:07:05 PM (11 years ago)

Author:

emillour

Message:

Common dynamics:
Some updates to keep up with LMDZ5 Earth model evolution
(up to LMDZ5 rev 2070). See file "DOC/chantiers/commit_importants.log"
for detailed list of changes.
Note that the updates of exner* routines change (as expected) results
at numerical roundoff level.
EM

File:

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

trunk/LMDZ.COMMON/makelmdz

@@ -26 +26 @@
 cosp=false
 sisvat=false
+rrtm=false
 bands=""
 scatterers=""
-dyn=""
 full=''
 
@@ -35 +35 @@
 ## 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" ]]
@@ -87 +79 @@
 
 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=""
@@ -184 +176 @@
           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 ;;
@@ -194 +181 @@
       "-sisvat")
           sisvat="$2" ; shift ; shift ;;
+      
+      "-rrtm")
+          rrtm="$2" ; shift ; shift ;;
       
       "-mem")
@@ -457 +447 @@
 fi
 
+if [[ "$rrtm" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_RRTM"
+fi
+
 
 INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
@@ -536 +531 @@
 echo dimension $dimension
 
-if (( $dimension == 3 ))
-then
+if (( $dimension == 3 )) ; then
   cd $LIBFGCM/grid
   \rm fxyprim.h
   cp -p fxy_${grille}.h fxyprim.h
-#else
-#  echo "Probleme dans les dimensions de la dynamique !!"
-#  echo "Non reactive pour l'instant !!!"
-fi
-if (( $dimension == 1 ))
-then
-  echo pas de dynamique
-  dyn="DYN= L_DYN=-ldyn3d "
-fi
-
-######################################################################
-# Gestion du filtre qui n'existe qu'en 3d.
-######################################################################
-
-if (( `expr $dimc \> 2` == 1 ))
-then
-   filtre="FILTRE=$filtre"
+  filtre="FILTRE=$filtre"
+  INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d${FLAG_PARA} -I$(LIBF)/dyn3d_common '
+elif (( $dimension == 2 )) ; then
+   filtre="FILTRE= L_FILTRE= "
+   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn2d'
+elif (( $dimension == 1 )) ; then
+   echo pas de dynamique
+   CPP_KEY="$CPP_KEY CPP_1D"
+   filtre="L_DYN= DYN= FILTRE= L_FILTRE= DIRMAIN=phy$physique "
+   INCLUDE="$INCLUDE "'-I$(LIBF)/dyn3d -I$(LIBF)/dyn3d_common ' # Pas tres propre
 else
-   filtre="FILTRE= L_FILTRE= "
-fi
-echo MACRO FILTRE $filtre
-
-echo $dimc
-
-######################################################################
-# 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
+   echo Dimension dimc=$dimc pas prevu ; exit
 fi
 
@@ -626 +574 @@
 find libf -name '*.[Fh]' -print | sort > tmp77
 find libf -name '*.[Fh]' -exec egrep -i " *use *ioipsl" {} \; -print | sort > tmp90
-find libf -name '*.[Fh90]' -print | sort >> tmp90
+find libf -name '*.F90' -print | sort >> tmp90
 ######### CAS PARTICULIER CHIMIE TITAN
 if [[ "$physique" == "titan" ]]
@@ -766 +714 @@
 INCLUDEC="$includec" \
 $filtre \
-$dyn \
 LIBO=${LIBOGCM}/${nomlib} \
 $phys \
@@ -798 +745 @@
 INCLUDEC="$includec" \
 $filtre \
-$dyn \
 LIBO=${LIBOGCM}/${nomlib} \
 $phys \