Changeset 5331 for BOL

Timestamp:

Nov 15, 2024, 5:34:32 PM (2 months ago)

Author:

abarral

Message:

Add strataer option to install_lmdz.sh
Improve test_convergence.sh

Location:

BOL/script_install_amaury

Files:

• install_lmdz.sh (modified) (5 diffs)
• test_convergence.sh (modified) (3 diffs)

BOL/script_install_amaury/install_lmdz.sh

@@ -96 +96 @@
     cosp="none"
     aerosols=0
+    strataer=0
     inlandsis=0
 
@@ -207 +208 @@
             "-veget") veget=$2; shift; shift;;
             "-spla") aerosols=1; shift;;
+            "-strataer") strataer=1; shift;;
             "-inlandsis") inlandsis=1; shift;;
             "-make_j") make_j=$2; shift; shift;;
@@ -246 +248 @@
     else
       opt_aer=""; suff_aer=""
+    fi
+
+    if [[ $strataer = 1 ]]; then
+      opt_strataer="-strataer true"
+    else
+      opt_strataer=""
     fi
 
@@ -415 +423 @@
     cp -f "$default_env_path" "$MODEL/modipsl/modeles/$component/arch" &> /dev/null || true  # allow failure if we're copying the file to itself
 
-    # Use local .path and .fcm is available, otherwise default
+    # Use local .path and .fcm if available, otherwise default
     if [[ ! -f "$MODEL/modipsl/modeles/$component/arch/arch-$arch.path" ]]; then
         cp -f "$default_path_path" "$MODEL/modipsl/modeles/$component/arch"
@@ -703 +711 @@
     makelmdz="makelmdz_fcm $optim_flag -arch $arch -j $make_j"
     local para_compile_opt="-mem -parallel $parallel"; if [[ $parallel = "none" ]]; then para_compile_opt=""; fi
-    echo "$jobcmd ./$makelmdz $opt_rad $opt_cosp $opt_makelmdz_xios $opt_aer $opt_inlandsis $opt_isotopes -p $compphysiq -d ${grid_resolution} -v $fcm_veget_version $para_compile_opt $fortran_file" > compile.sh
+    echo "$jobcmd ./$makelmdz $opt_rad $opt_cosp $opt_makelmdz_xios $opt_aer $opt_inlandsis $opt_strataer $opt_isotopes -p $compphysiq -d ${grid_resolution} -v $fcm_veget_version $para_compile_opt $fortran_file" > compile.sh
     echo "Compiling lmdz using $(\cat compile.sh) (log: $lmdzlog) $(date)"
     chmod +x ./compile.sh

BOL/script_install_amaury/test_convergence.sh

@@ -1 +1 @@
 #!/bin/bash
+
+# Quick tool to check convergence for a number of flags between two revs
 
 set -eu
@@ -55 +57 @@
 
   # Check some additional params on sparse configs
-#  comp_bench "$rev1" "$rev2" "-xios -rad oldrad -parallel $para -veget none -compilephysiq lmd"  # xios broken for 5017
+  comp_bench "$rev1" "$rev2" "-xios -rad oldrad -parallel mpi_omp -veget none -compilephysiq lmd"
   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)
+    comp_bench "$rev1" "$rev2" "-cosp v1 -rad oldrad -parallel $para -veget none -compilephysiq lmd"  # cosp v1 (no 2 because broken atm)
     comp_bench "$rev1" "$rev2" "-debug -rad oldrad -parallel $para -veget none -compilephysiq lmd"  # debug
   done
+  comp_bench "$rev1" "$rev2" "-cosp v2 -xios -rad oldrad -parallel mpi_omp -veget none -compilephysiq lmd"  # cosp v1 (no 2 because broken atm)
 
   local origdim="$dim"
@@ -76 +79 @@
 }
 
-comp_full 5159 5017
-comp_bench 5159 5150 "-xios -rad oldrad -parallel mpi_omp -veget none -compilephysiq lmd"  # xios broken for 5017
+comp_full 5316 5217
+#comp_bench 5205 5205 "-rad oldrad -parallel none -veget CMIP6 -compilephysiq lmd -debug"