Changeset 3484

Timestamp:

Oct 24, 2024, 1:10:52 PM (2 months ago)

Author:

afalco

Message:

ICOSA_LMDZ: overall compilation stops when compilation of a module fails.
Errors from internal calls in compilation scripts are transferred to the scripts above.
AF

Location:

trunk

Files:

• ICOSA_LMDZ/make_icosa_lmdz (modified) (1 diff)
• LMDZ.COMMON/build_gcm (modified) (3 diffs)
• LMDZ.COMMON/makelmdz_fcm (modified) (8 diffs)

trunk/ICOSA_LMDZ/make_icosa_lmdz

@@ -200 +200 @@
 echo "%LIB $ICOSA_LIB">> config.fcm
 
-if [[ "$build_deps" == "TRUE" ]]
-then
-
-  if [[ -d ../IOIPSL ]] ; then
-    cd ../IOIPSL
-    ./makeioipsl_fcm -parallel -arch $arch -arch_path $arch_path -j $job $full_flag  || exit 1
+function compile_module {
+  ## function to compile each module.
+  dir=$1 # module folder
+  shift
+  cmd=$@ # command line to compile
+  if [[ -d ../$dir ]] ; then
+    cd ../$dir
+    echo "-- Compiling $dir with:"
+    echo $cmd
+    $cmd
+    if [ $? != 0 ]; then # check if fcm command worked
+      echo "In ../$dir, the following command failed:"
+      echo "$cmd"
+      exit 1
+    fi
+
     cd -
   else
-    echo "Error: cannot find ../IOIPSL directory"
-    exit
-  fi
-
-  if [[ -d ../XIOS ]] ; then
-    cd ../XIOS
-    ./make_xios --arch $arch --arch_path $arch_path --job $job $full_flag2 || exit 1
-    cd -
-  else
-    echo "Error: cannot find ../XIOS directory"
-    exit
-  fi
-
+    echo "Error: cannot find ../$dir directory"
+    exit 1
+  fi
+}
+
+if [[ "$build_deps" == "TRUE" ]]
+then
+  compile_module IOIPSL ./makeioipsl_fcm -parallel -arch $arch -arch_path $arch_path -j $job $full_flag
+  compile_module XIOS ./make_xios --arch $arch --arch_path $arch_path --job $job $full_flag2
 fi # of if [[ "$build_deps" == "TRUE" ]]
 
-if [[ -d ../LMDZ.COMMON ]] ; then
-    cd ../LMDZ.COMMON
-    echo "Compiling LMDZ.COMMON with:"
-    cmd="./makelmdz_fcm -p $phys $phys_opt -$compil_mode -parallel $parallel -libphy -io xios -arch $arch -arch_path $arch_path -j $job $full_flag"
-    echo $cmd
-    $cmd || (echo "Failed compilation of LMDZ.COMMON. Command line was:" && echo $cmd && exit 1)
-    cd -
-else
-    echo "Error: cannot find ../LMDZ.COMMON directory"
-    exit
-fi
-
-if [[ -d ../ICOSAGCM ]] ; then
-    cd ../ICOSAGCM
-    # from now on, compile using fcm2
-    echo "Compiling ICOSAGCM with:"
-    cmd="./make_icosa -$compil_mode -parallel $parallel -external_ioipsl -with_xios -arch $arch -arch_path $arch_path -job $job $full_flag"
-    echo "$cmd"
-    $cmd || (echo "Failed compilation of ICOSAGCM. Command line was:" && echo $cmd && exit 1)
-    cd -
-else
-    echo "Error: cannot find ../ICOSAGCM directory"
-    exit
-fi
+compile_module LMDZ.COMMON ./makelmdz_fcm -p $phys $phys_opt -$compil_mode -parallel $parallel -libphy -io xios -arch $arch -arch_path $arch_path -j $job $full_flag
+
+compile_module ICOSAGCM ./make_icosa -$compil_mode -parallel $parallel -external_ioipsl -with_xios -arch $arch -arch_path $arch_path -job $job $full_flag
 
 # compile interface and link

trunk/LMDZ.COMMON/build_gcm

@@ -5 +5 @@
 # the full path to where the 'fcm' command is to be found
 
-if test -f '.lock' 
+if test -f '.lock'
   then
     echo 'ATTENTION: vous etes sans doute en train de compiler le modele par ailleurs'
@@ -19 +19 @@
     echo "Do you wish to continue?"
     read ouinon
-    if [[ $ouinon == "oui" || $ouinon == "yes" ]] 
+    if [[ $ouinon == "oui" || $ouinon == "yes" ]]
         then
-        echo OK 
+        echo OK
     else
         exit
@@ -45 +45 @@
 # run "fcm build" command
 ${dirname}fcm build $*
+if [ $? != 0 ]; then # check if fcm command worked
+    exit 1
+fi
+
 
 # cleanup
-\rm -f '.lock' 
+\rm -f '.lock'
 

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -180 +180 @@
 
       "-adjnt")
-          echo "not operational ... work to be done here ";exit
+          echo "not operational ... work to be done here ";exit 1
           opt_dep="$opt_dep adjnt" ; adjnt="-ladjnt -ldyn3d "
           optim="$optim -Dadj" ; shift ;;
@@ -350 +350 @@
     echo "newstart or start2archive utilities should be run in serial!"
     echo " Compile without -parallel [mpi|omp|mpi_omp] option!"
-    exit
+    exit 1
 fi
 
@@ -397 +397 @@
    echo "Option -v $veget does not exist"
    echo "Use ./makelmdz_fcm -h for more information"
-   exit
+   exit 1
 fi
 
@@ -549 +549 @@
     \rm -f $LIBFGCM/grid/dimensions.h
   else
-    exit
+    exit 1
   fi
 fi
@@ -585 +585 @@
   else
     echo "Error: you should not use the -s # option with -p $physique"
-    exit
+    exit 1
   fi
 fi
@@ -618 +618 @@
     echo "Error: a 1D model compiled with xios should also be compiled with "
     echo "       -parallel mpi option!"
-    exit
+    exit 1
    fi
   else
@@ -626 +626 @@
     echo "Error: a 1D model should not be compiled with "
     echo "       -parallel [mpi|omp|mpi_omp] option!"
-    exit
+    exit 1
    fi
   fi # of if [[ $io == "xios" ]]
@@ -807 +807 @@
 rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
 ./build_gcm ${fcm_path} -j $job $full
+if [ $? != 0 ]; then # check if fcm command worked
+    exit 1
+fi
 
 rm -rf tmp_src