Changeset 5375 for BOL/script_install

Timestamp:

Dec 4, 2024, 2:39:14 PM (12 days ago)

Author:

abarral

Message:

Fetch compiler from arch after lmdz update rather than from the modipsl tar

File:

• BOL/script_install/install_lmdz.sh (modified) (3 diffs)

BOL/script_install/install_lmdz.sh

@@ -357 +357 @@
         fi
     done
-
-    cat <<eod > tt.f90
-print*,'coucou'
-end
-eod
-    $compiler tt.f90 || a.out
-    ./a.out >| tt
-    if [[ $(< tt sed -e 's/ //g' ) != "coucou" ]]; then
-        echo "problem installing with compiler $compiler"; exit 1
-    fi
-    rm tt a.out tt.f90
 }
 
@@ -424 +413 @@
     path_mpi=$(dirname "$mpi_file")
     root_mpi=$(dirname "$path_mpi")
+}
+
+function check_compiler {
+  # Must be called after init_arch to know which compiler to use
+    cat <<eod > tt.f90
+print*,'coucou'
+end
+eod
+    $compiler tt.f90 || a.out
+    ./a.out >| tt
+    if [[ $(< tt sed -e 's/ //g' ) != "coucou" ]]; then
+        echo "problem installing with compiler $compiler"; exit 1
+    fi
+    rm tt a.out tt.f90
 }
 
@@ -1048 +1051 @@
 ensure_correct_option_combinations
 download_modipsl_tar
-init_arch
 check_available_software
 get_lmdz_version
 get_dynamico_icosa_version
 get_orchidee_version
+init_arch
+check_compiler
 install_netcdf
 install_IOIPSL