Changeset 5180

Timestamp:

Sep 10, 2024, 1:43:56 PM (4 months ago)

Author:

abarral

Message:

Improve messages clarity

Location:

BOL/script_install_amaury

Files:

• install_lmdz.sh (modified) (7 diffs)
• test_convergence.sh (modified) (4 diffs)

BOL/script_install_amaury/install_lmdz.sh

@@ -318 +318 @@
 
 function check_available_software {
-    echo "################################################################"
-    echo "Check if required software is available"
-    echo "################################################################"
-    for logiciel in wget tar gzip make gcc cmake m4 c++; do
+    local required_soft=("wget" "tar" "gzip" "make" "gcc" "cmake" "m4" "c++")
+    echo "Checking if required software is available (${required_soft[*]})"
+    for logiciel in "${required_soft[@]}"; do
         if [[ $(which "$logiciel") = "" ]]; then
             echo "You must first install $logiciel on your system"; exit 1
@@ -345 +344 @@
     MODEL=$(readlink -e -f "$MODEL"); echo "MODEL: $MODEL"  # absolute path
     if [[ ! -d "$MODEL/modipsl" ]]; then
-        echo "##########################################################"
         echo "Downloading a slightly modified version of modipsl+LMDZ"
-        echo "##########################################################"
         cd "$MODEL"
         getlog="$(pwd)/get.log"
@@ -353 +350 @@
         myget "src_archives/$trusting/modipsl.$version.tar.gz" &>> get.log
         echo "install_lmdz.sh wget_OK $(date)"
+
         gunzip "modipsl.$version.tar.gz" &>> get.log
         tar xf "modipsl.$version.tar" &>> get.log
         rm "modipsl.$version.tar"
+
         cd - &> /dev/null
     fi
@@ -563 +562 @@
 
 function get_orchidee_version {  # Set / Check ORCHIDEE version
+    echo "Checking Orchidee source version"
     local fetch_rev=""
     orcbranch=""
@@ -577 +577 @@
 
     if [[ -n $fetch_rev ]]; then
+        echo "IF YOU INSTALL ORCHIDEE THE VERY FIRST TIME, ASK for PASSWORD at orchidee-help@listes.ipsl.fr"
         local curr_rev
         curr_rev=$(svn info "$MODEL/modipsl/modeles/ORCHIDEE" | grep Revision: | cut -d ":" -f 2 | cut -c 2-)
@@ -584 +585 @@
             echo "branch is $orcbranch"
             if [[ $fetch_rev -lt 4465 ]]; then echo 'ORCHIDEE version must be >=4465, exiting'; exit 1; fi
-            echo "IF YOU INSTALL ORCHIDEE THE VERY FIRST TIME, ASK for PASSWORD at orchidee-help@listes.ipsl.fr"
             cd "$MODEL/modipsl/modeles"
             rm -rf ORCHIDEE
@@ -628 +628 @@
 
 function get_lmdz_version {
+    echo "Checking LMDZ source version"
     LMDZPATH=$(readlink -e -f "$MODEL/modipsl/modeles/LMD"*)
     cd "$LMDZPATH"

BOL/script_install_amaury/test_convergence.sh

@@ -55 +55 @@
 
   # Check some additional params on sparse configs
-  comp_bench "$rev1" "$rev2" "-xios -rad oldrad -parallel $para -veget none -compilephysiq lmd"  # xios
+#  comp_bench "$rev1" "$rev2" "-xios -rad oldrad -parallel $para -veget none -compilephysiq lmd"  # xios broken for 5017
   for para in "none" "mpi_omp"; do
     comp_bench "$rev1" "$rev2" "-cosp v1 -rad oldrad -parallel $para -veget none -compilephysiq lmd"  # cosp v1 (no v2 because broken atm)
@@ -61 +61 @@
   done
 
+  local origdim="$dim"
   # 1D
   dim="79"
@@ -69 +70 @@
   dim="48x36x39"
   file_to_check="LMDZ/modipsl/modeles/LMDZ/BENCH$dim/restart.nc"
-  for para in "none" "mpi_omp"; do
-    comp_bench "$rev1" "$rev2" "-rad oldrad -parallel $para -veget none -compilephysiq lmdiso -d $dim"
-  done
+  comp_bench "$rev1" "$rev2" "-rad oldrad -parallel none -veget none -compilephysiq lmdiso -d $dim"
+
+  dim="$origdim"
+  file_to_check="LMDZ/modipsl/modeles/LMDZ/BENCH$dim/restart.nc"
 }
 
-#comp_bench 4938 4946 "-rad oldrad -parallel mpi_omp -veget none -compilephysiq lmd"
-#comp_bench 4938 4946 "-rad ecrad -parallel mpi_omp -veget none -compilephysiq lmd"
-#comp_bench 4938 4946 "-rad ecrad -parallel none -veget none -compilephysiq lmd"
-#comp_bench 4950 4946 "-rad oldrad -parallel none -veget none -compilephysiq lmd"
-
-comp_full 5017 5155
+comp_full 5159 5017
+comp_bench 5159 5150 "-xios -rad oldrad -parallel mpi_omp -veget none -compilephysiq lmd"  # xios broken for 5017
 
 
@@ -85 +83 @@
 
 
-