Changeset 2202 for LMDZ5/trunk

Timestamp:

Feb 10, 2015, 4:21:39 PM (10 years ago)

Author:

lguez

Message:

Added tests in the compilation scripts: iim should be a multiple of 8 and dyn3dpar should not be used.

Location:

LMDZ5/trunk

Files:

• libf/grid/dimension/makdim (modified) (5 diffs)
• makelmdz (modified) (2 diffs)
• makelmdz_fcm (modified) (2 diffs)

LMDZ5/trunk/libf/grid/dimension/makdim

@@ -5 +5 @@
 if (( $# < 1 )) || (( $# > 3 ))
 then
- echo "Wrong number of parameters in $0 !!!"
- echo " Usage:"
- echo "  $0 [im] [jm] lm"
- echo " where im, jm and lm are the dimensions"
- exit
+    echo "Wrong number of parameters in $0 !!!"
+    echo " Usage:"
+    echo "  $0 [im] [jm] lm"
+    echo " where im, jm and lm are the dimensions"
+    exit 1
+fi
+
+if (($1 % 8 != 0))
+then
+    echo "The number of longitudes must be a multiple of 8."
+    echo "See the files dyn3d/groupe.F and dyn3dmem/groupe_loc.F."
+    exit 1
 fi
 
 # build "fichnom", the relevant 'dimensions.im.jm.lm' file name
 for i in $*
-  do
-  list=$list.$i
+do
+    list=$list.$i
 done
 fichdim=dimensions${list}
 
 if [ ! -f $fichdim ]
-    then
+then
 #    echo "$fichdim does not exist"
 
     # assign values of im, jm and lm
     if [ $# -ge 3 ]
-        then
+    then
         im=$1
         jm=$2
@@ -31 +38 @@
         ndm=1
     elif [ $# -ge 2 ]
-        then
+    then
         im=1
         jm=$1
@@ -37 +44 @@
         ndm=1
     elif [ $# -ge 1 ]
-        then
+    then
         im=1
         jm=1
@@ -45 +52 @@
 
 # since the file doesn't exist, we create it
-cat << EOF > $fichdim
+    cat << EOF > $fichdim
 !-----------------------------------------------------------------------
 !   INCLUDE 'dimensions.h'
@@ -64 +71 @@
 # remove 'old' dimensions.h file (if any) and replace it with new one
 if [ -f ../dimensions.h ] ; then
-\rm ../dimensions.h
+    \rm ../dimensions.h
 fi
 tar cf - $fichdim | ( cd .. ; tar xf - ; mv $fichdim dimensions.h )

LMDZ5/trunk/makelmdz

@@ -311 +311 @@
 else
   FLAG_PARA="$paramem"
+  if [[ $paramem == par ]]
+  then
+      echo "The version of the dynamics in dyn3dpar is no longer updated."
+      echo "You should use option \"-mem\"."
+      exit 1
+  fi     
 fi
 
@@ -470 +476 @@
 cd $LIBFGCM/grid/dimension
 ./makdim $dim
+if (($? != 0))
+then
+    exit 1
+fi
+
 cat $LIBFGCM/grid/dimensions.h
 cd $LMDGCM

LMDZ5/trunk/makelmdz_fcm

@@ -12 +12 @@
 #
 ##set -x
+set -e
 ########################################################################
 # options par defaut pour la commande make
@@ -461 +462 @@
   if [[ "$paramem" == "mem" ]]
   then
-   SUFF_NAME=${SUFF_NAME}_${paramem}
+      SUFF_NAME=${SUFF_NAME}_${paramem}
+  else
+      echo "The version of the dynamics in dyn3dpar is no longer updated."
+      echo "You should use option \"-mem\"."
+      exit 1
   fi
 else