Changeset 4890

Timestamp:

Apr 3, 2024, 12:58:58 PM (8 months ago)

Author:

abarral

Message:

copy local arch to module arch dir
standardize none/NONE

File:

• BOL/script_install_amaury/install_lmdz.sh (modified) (18 diffs)

BOL/script_install_amaury/install_lmdz.sh

@@ -66 +66 @@
     # surface/vegetation scheme treatment
     # controlled by the single variable veget which can have the following values
-    # - NONE: bucket scheme (default)
+    # - none: bucket scheme (default)
     # - CMIP6: orchidee version used in CMIP exercise, rev 5661
     # - number: orchidee version number
-    veget="NONE"
+    veget="none"
     # choose the resolution for the bench runs
     # grid_resolution= 32x24x11 or 48x36x19 for tests (test without ORCHIDEE)
@@ -97 +97 @@
     compile_with_fcm=1
 
-    #Compilation with Cosp (cosp=NONE/v1/v2; default=NONE)
-    cosp="NONE"
+    #Compilation with Cosp (cosp=none/v1/v2; default=none)
+    cosp="none"
     opt_cosp=""
 
@@ -208 +208 @@
 
     # Check on veget version
-    if [[ $veget != 'NONE' && $veget != "CMIP6" ]]; then
+    if [[ $veget != 'none' && $veget != "CMIP6" ]]; then
         re='^[0-9]+$'
         if ! [[ $veget =~ $re ]]; then
@@ -216 +216 @@
 
     #Define veget-related suffix for gcm name
-    if [[ $veget = 'NONE' ]]; then
+    if [[ $veget = 'none' ]]; then
         suff_orc=''
         #For use with tutorial, orchidee_rev is also defined (will be
@@ -302 +302 @@
 }
 
-function download_model_AMAURY {
+function download_model_AMAURY {  # TODO
     MODEL=$(readlink -f "$MODEL"); echo "$MODEL"  # absolute path
 
@@ -313 +313 @@
 }
 
-function check_arch {
+function install_arch {
     # TODO     if [[ $(gfortran -dumpversion | cut -d. -f1) -ge 10 ]]; then allow_arg_mismatch="-fallow-argument-mismatch"; fi
 
@@ -334 +334 @@
     # check compiler
     compiler=$(< "$fcm_path" grep "%COMPILER" | sed -e "s/%COMPILER\s*//")
+
+    # Copy arch to different components
+    # TODO check that this doesn't error if the source and destination are the same
+    \cp -f "$arch_dir/arch-$arch.fcm" "$MODEL/modipsl/modeles/IOIPSL/arch"
+    \cp -f "$arch_dir/arch-$arch.path" "$MODEL/modipsl/modeles/IOIPSL/arch"
+    \cp -f "$arch_dir/arch-$arch.fcm" "$MODEL/modipsl/modeles/ORCHIDEE/arch"
+    \cp -f "$arch_dir/arch-$arch.path" "$MODEL/modipsl/modeles/ORCHIDEE/arch"
+
+    # TODO TEMP compat w/ old orch version - make a proper case later
+    sed -i'' -e "s/-I//" -e "s/-L//" "$MODEL/modipsl/modeles/ORCHIDEE/arch/arch-$arch.path"  # /!\ we only replace first occurence on purpose
 }
 
@@ -348 +358 @@
           ifort)  opt1="-compiler intel"; opt2="-CC icc -FC ifort -CXX icpc";;
           pgf90)  opt1="-compiler pgf90"; opt2="-CC pgcc -FC pgf90 -CXX pgCC";;
-          *)      echo "unexpected compiler $compiler" for netcdf; exit 1
+          *)      echo "unexpected compiler $compiler for netcdf"; exit 1
         esac
 
@@ -415 +425 @@
     echo "Compiling IOIPSL, the interface library with Netcdf $(date) (log: $ioipsllog)"
 
-    if ! ./makeioipsl_fcm -arch "$arch" -arch_path "$arch_dir" -job 8 > "$ioipsllog" 2>&1; then
-    echo "IOIPSL compile failed, exiting"; exit 1
+    if ! ./makeioipsl_fcm -arch "$arch" -job 8 > "$ioipsllog" 2>&1; then
+        echo "IOIPSL compile failed, exiting"; exit 1
     fi
     cp lib/* ../../lib
@@ -457 +467 @@
 
 function get_orchidee_version {  # Set / Check ORCHIDEE version
-  if [[ $veget = "NONE" ]]; then
+  if [[ $veget = "none" ]]; then
     veget_version="false"
   elif [[ $veget = "CMIP6" ]]; then
@@ -489 +499 @@
   get_orchidee_version
 
-  if [[ $veget != "NONE" ]]; then
+  if [[ $veget != "none" ]]; then
     cd "$MODEL/modipsl/modeles/ORCHIDEE"
 
@@ -511 +521 @@
     fi
 
-    # TODO debug
-    echo "./makeorchidee_fcm $xios_orchid $opt_orc -parallel none -arch $arch -arch_path $arch_dir"
-
-    if ! ./makeorchidee_fcm "$xios_orchid" "$opt_orc" -parallel none -arch "$arch" -arch_path "$arch_dir" > "$orchideelog" 2>&1; then
+    if ! ./makeorchidee_fcm "$xios_orchid" "$opt_orc" -parallel none -arch "$arch" > "$orchideelog" 2>&1; then
       echo "ORCHIDEE seq compilation failed, exiting"; exit 1
     fi
@@ -527 +534 @@
 #download_model
 download_model_AMAURY
-check_arch
+install_arch
 check_available_software
 install_netcdf
@@ -675 +682 @@
 
 veget_version=false
-if [[ $veget != 'NONE' ]]; then
+if [[ $veget != 'none' ]]; then
     cd "$MODEL/modipsl/modeles/ORCHIDEE"
 
@@ -750 +757 @@
     fi # of "if [[ -d tools ]]"
     echo "install_lmdz.sh orchidee_compil_seq_OK $(date)"
-fi # of if [[ "$veget" != 'NONE' ]]
+fi # of if [[ "$veget" != 'none' ]]
 
 
@@ -951 +958 @@
     #
     cd "$ORCHPATH"
-    if [[ -d src_parallel && $veget != 'NONE' ]]; then
+    if [[ -d src_parallel && $veget != 'none' ]]; then
         cd arch
         sed  \
@@ -980 +987 @@
                            -arch $arch >> "$orchideelog" 2>&1
         echo "End of ORCHIDEE compilation in parallel mode $(date)"
-    elif [[ $veget != 'NONE' ]]; then
+    elif [[ $veget != 'none' ]]; then
         echo '##########################################################'
         echo ' Orchidee version too old                                 '
@@ -986 +993 @@
         echo '##########################################################'
         exit 1
-    fi #�of [ -d src_parallel && $veget != 'NONE' ]
+    fi #�of [ -d src_parallel && $veget != 'none' ]
 
     # LMDZ