Changeset 4921

Timestamp:

Apr 25, 2024, 4:23:42 PM (11 days ago)

Author:

abarral

Message:

add adastra gnu arch
fix netcdf mpif90 detection
fix gfortran detection on adastra
fix check for lmdz version and orchidee seq

Location:

BOL/script_install_amaury

Files:

• arch_local/arch_adastra.env (added)
• arch_local/arch_adastra.fcm (added)
• arch_local/arch_adastra.path (added)
• install_lmdz.sh (modified) (3 diffs)

BOL/script_install_amaury/install_lmdz.sh

@@ -356 +356 @@
         # Convert non-basic compiler
         case $compiler in
-            mpif90) ncdf_compiler=$($compiler 2>&1 >/dev/null | head -n 1 | cut -f 1 -d ":")
+            mpif90) ncdf_compiler=$($compiler --version | head -n 1 | cut -d " " -f -1)
         esac
 
         case $ncdf_compiler in
-            gfortran) opt1="-compiler gnu"; opt2="-CC gcc -FC gfortran -CXX g++";;
+            gfortran | GNU) ncdf_compiler="gfortran"; opt1="-compiler gnu"; opt2="-CC gcc -FC gfortran -CXX g++";;
             *)      echo "unexpected compiler $ncdf_compiler for netcdf"; exit 1
         esac
@@ -474 +474 @@
             "2.6")
             xios_http="http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS2/branches/xios-2.6";;
-            *) echo "XIOS: Error, bad argument for -branch ! Did not expect $xios_branch"; exit;;
+            *) echo "XIOS: Error, bad argument for -branch ! Did not expect $xios_branch"; exit 1;;
         esac
         
@@ -522 +522 @@
 
     # Check parallel LMDZ+ORCH
-    if [[ (! $veget = "none") && (! $parallel = "none") && ($used_lmdz_rev -lt 4894) ]]; then
-        echo "LMDZ revision must be >=4894 for orchidee with parallel support"; exit 1
+    if [[ (! $veget = "none") && $parallel = "none" && ($used_lmdz_rev -lt 4894) ]]; then
+        echo "LMDZ revision must be >=4894 for orchidee without parallel support. Upgrade lmdz or use -parallel mpi_omp."; exit 1
     fi
 }