Changeset 4900 for BOL

Timestamp:

Apr 15, 2024, 11:18:38 AM (8 months ago)

Author:

abarral

Message:

change bundled veget version
fix veget version update
unbundle XIOS
split init and install arch
fix ORCHIDEE XIOS library forwarding
fix local netcdf compil
fix Makefile linking

Location:

BOL/script_install_amaury

Files:

• arch_local/arch-local-gfortran-parallel.fcm (modified) (2 diffs)
• arch_local/arch-local-gfortran.path (modified) (1 diff)
• install_lmdz.sh (modified) (17 diffs)

BOL/script_install_amaury/arch_local/arch-local-gfortran-parallel.fcm

@@ -12 +12 @@
 %BASE_CFLAGS         -w -std=c++11 -D__XIOS_EXCEPTION  # xios
 # /!\ LD must be written in Makefile syntax
-%BASE_LD             -Wl,-rpath=$(shell dirname $(readlink -f "$(which mpif90)"))/../lib:$(shell nf-config --prefix)/lib -lstdc++
+%BASE_LD             -Wl,-rpath=$(shell dirname $(shell readlink -f "$(shell which mpif90)"))/../lib:$(shell nf-config --prefix)/lib -lstdc++
 %BASE_INC            -D__NONE__  # xios
 
@@ -25 +25 @@
 
 %MPI_FFLAGS          -fcray-pointer
-%MPI_LD              -L$(shell dirname $(readlink -f "$(which mpif90)"))/../lib -lmpi
+%MPI_LD              -L$(shell dirname $(shell readlink -f "$(shell which mpif90)"))/../lib -lmpi
 %OMP_LD              -fopenmp
 %OMP_FFLAGS          -fopenmp -fcray-pointer

BOL/script_install_amaury/arch_local/arch-local-gfortran.path

@@ -1 @@
-NETCDF_INCDIR="$(nf-config --fflags)"
-NETCDF_LIBDIR="$(nf-config --flibs)"
-NETCDF_LIB="$(nf-config --flibs)"
+NETCDF_INCDIR="-I$(nf-config --includedir)"
+# Ugly hack for orchidee <=2.0
+NETCDF_LIBDIR="-L$(nf-config --flibs | sed -e "s/-L//")"
 NETCDF95_INCDIR="-I$LMDGCM/../../include"
 NETCDF95_LIBDIR="-L$LMDGCM/../../lib"

BOL/script_install_amaury/install_lmdz.sh

@@ -37 +37 @@
 
 ### Functions
-# TODO add make_j parallel argument -> check what is used for libigcm
 
 function myget { # Get a file from LMDZ repository
@@ -137 +136 @@
         -physiq     to choose which physics package to use (default <$physiq>)
 
-        -veget      surface/vegetation scheme treatment controlled by the single variable veget which can have the following values: none: bucket scheme (default); CMIP6: orchidee version used in CMIP exercise, rev 5661; number: orchidee version number (default $veget)
+        -veget      surface/vegetation scheme treatment controlled by the single variable veget which can have the following values: none: bucket scheme (default); CMIP6 | veget2.0: orchidee version used in CMIP exercise, rev 5661; veget2.2: orchidee branch 2.2, rev 8529 (bundled); number: orchidee version number (default $veget)
 
         -arch       name of the arch to use (default <$arch>)
@@ -190 +189 @@
 
     # Check on veget version
-    if [[ $veget != 'none' && $veget != "CMIP6" ]]; then
+    if [[ $veget != 'none' && $veget != "CMIP6" && $veget != "orch2.0" && $veget != "orch2.2" ]]; then
         re='^[0-9]+$'
         if ! [[ $veget =~ $re ]]; then
@@ -200 +199 @@
     if [[ $veget = 'none' ]]; then
         suff_orc=''
-        #For use with tutorial, orchidee_rev is also defined (will be
-        #written in surface_env at the end of the script)
-        orchidee_rev=''
     else
         suff_orc='_orch'
@@ -284 +280 @@
 }
 
-function download_model_AMAURY {  # TODO
+function download_model_AMAURY {  # TODO TEMP while waiting for tar: we copy the base from a local path = IPSLCM7 + ORCH2.2 latest
+    if [[ ! -d ../MODEL_REF ]]; then
+        cd ..
+        mkdir MODEL_REF
+        cd MODEL_REF
+        svn co --username icmc_users https://forge.ipsl.fr/igcmg/svn/modipsl/trunk modipsl
+        cd modipsl/util
+        ./model IPSLCM7_work
+        rm -rf oasis3-mct
+        cd ../modeles
+        rm -rf ICOSA_LMDZ ORCHIDEE_4 ORCHIDEE_2_2 NEMO DYNAMICO XIOS INCA
+        svn co svn://forge.ipsl.fr/orchidee/branches/ORCHIDEE_2_2/ORCHIDEE
+        cd ../../../script_install
+    fi
+
+    if [[ ! -d "$MODEL" ]]; then
+        \cp -r ../MODEL_REF .
+        mv MODEL_REF "$MODEL"
+    fi
     MODEL=$(readlink -f "$MODEL"); echo "$MODEL"  # absolute path
 
@@ -295 +309 @@
 }
 
-function install_arch {
+function init_arch {
     if [[ ! -d $arch_dir ]]; then
         echo "Error: no arch dir $arch_dir"; exit 1
@@ -314 +328 @@
     # 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
-    for dir in "IOIPSL" "ORCHIDEE" "LMDZ" "XIOS"; do
-        \cp -f "$arch_dir/arch-$arch.fcm" "$MODEL/modipsl/modeles/$dir/arch"
-        \cp -f "$arch_dir/arch-$arch.path" "$MODEL/modipsl/modeles/$dir/arch"
-    done
-
-    # 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
-
-    # Adapt for XIOS, which uses different naming conventions
-    sed -i'' -e "s/%COMPILER/%FCOMPILER/" -e "s/%LINK/%LINKER/" -e "s/-fdefault-real-8//" "$MODEL/modipsl/modeles/XIOS/arch/arch-$arch.fcm"
+}
+
+function install_arch {
+    local component=$1
+
+    if [[ ! -f "$MODEL/modipsl/modeles/$component/arch/arch-$arch.fcm" ]]; then
+        \cp -f "$arch_dir/arch-$arch.fcm" "$MODEL/modipsl/modeles/$component/arch"
+        \cp -f "$arch_dir/arch-$arch.path" "$MODEL/modipsl/modeles/$component/arch"
+
+        if [[ $component = "XIOS" ]]; then
+            # Adapt for XIOS, which uses different naming conventions
+            sed -i'' -e "s/%COMPILER/%FCOMPILER/" -e "s/%LINK/%LINKER/" -e "s/-fdefault-real-8//" "$MODEL/modipsl/modeles/XIOS/arch/arch-$arch.fcm"
+        elif [[ $component = "ORCHIDEE" ]]; then
+            if [[ $orcbranch = "/tags/ORCHIDEE_2_0/ORCHIDEE" ]]; then  # 2.0 and before have a different fcm convention
+                sed -i'' -e "s/-I//" -e "s/-L//" "$MODEL/modipsl/modeles/ORCHIDEE/arch/arch-$arch.path"  # /!\ we only replace first occurence on purpose
+            fi
+        fi
+    fi
 }
 
 function install_netcdf {
     echo "Installing Netcdf"
+    local ncdf_compiler="$compiler"
 
     if [[ $netcdf = 0 ]]; then
@@ -338 +358 @@
 
         # Convert non-basic compiler
-        local ncdf_compiler="$compiler"
         case $compiler in  # TODO check if it works with other base compilers
             mpif90) ncdf_compiler=$($compiler --help | head -n 1 | cut -f 2 -d " ")
@@ -365 +384 @@
         fi
 
-
         echo "Repertoire netcdf $ncdfdir"
         if [[ ! -d $ncdfdir ]]; then
@@ -426 +444 @@
 
 function install_IOIPSL {
+    install_arch "IOIPSL"
+
     cd "$MODEL/modipsl/modeles/IOIPSL"
     ioipsllog="$(pwd)/ioipsl.log"
@@ -466 +486 @@
 
         cd XIOS
+
+        install_arch "XIOS"
+
+        echo "Starting XIOS compilation"
         if ! ./make_xios --arch "$arch" --job 8 > "$xioslog" 2>&1; then
             echo "XIOS compilation failed, exiting"; exit 1
@@ -478 +502 @@
 
 function get_orchidee_version {  # Set / Check ORCHIDEE version
-    if [[ $veget = "none" ]]; then
-        veget_version="false"
-    elif [[ $veget = "CMIP6" ]]; then
-        veget_version=orchidee2.0
-    else # specific orchidee revision newer than CMIP6, on 2_1 or 2_2 branches
-        veget_version=orchidee2.1
-        if [[ $veget -lt 4465 ]]; then
-            echo 'ORCHIDEE version must be >=4465, exiting'
-            exit 1
-        fi
-
+    local fetch_rev=""
+    orcbranch=""
+    case $veget in
+        "none") fcm_veget_version="false";;
+        "orch2.0" | "CMIP6") fcm_veget_version=orchidee2.0; fetch_rev=6592;;
+        "orch2.2") fcm_veget_version=orchidee2.1; orcbranch="ORCHIDEE_2_2" ;; # the bundled version
+        *) fetch_rev=$veget
+    esac
+
+    if [[ -n $fetch_rev ]]; then
+        echo "Fetching orch $fetch_rev from the repository"
+        orcbranch=$(svn log -v -q svn://forge.ipsl.jussieu.fr/orchidee/ -r "$fetch_rev" |grep ORCHIDEE |head -1| sed -e 's:ORCHIDEE/.*$:ORCHIDEE:' | awk '{print $2}')
+        echo "branch is $orcbranch"
+        if [[ $fetch_rev -lt 4465 ]]; then echo 'ORCHIDEE version must be >=4465, exiting'; exit 1; fi
+        \rm -rf "$MODEL/modipsl/modeles/ORCHIDEE"
+        echo "IF YOU INSTALL ORCHIDEE THE VERY FIRST TIME, ASK for PASSWORD at orchidee-help@listes.ipsl.fr"
+        cd "$MODEL/modipsl/modeles"
         set +e
-        svn upgrade
-        local orcbranch
-        orcbranch=$(svn log -v -q svn://forge.ipsl.jussieu.fr/orchidee/ -r "$veget" |grep ORCHIDEE |head -1| sed -e 's:ORCHIDEE/.*$:ORCHIDEE:' | awk '{print $2}')
-        echo "IF YOU INSTALL ORCHIDEE THE VERY FIRST TIME, ASK for PASSWORD at orchidee-help@listes.ipsl.fr"
-        svn switch -r "$veget" --accept theirs-full "svn://forge.ipsl.jussieu.fr/orchidee/$orcbranch"
-        svn log -r "$veget" | grep "$veget"
-        if ! svn log -r "$veget" | grep "$veget"; then
-            echo 'Cannot update ORCHIDEE as not on the right branch for ORCHIDEE'
-            exit 1
-        fi
-        svn update -r "$veget"
+        svn co -r "$fetch_rev" "svn://forge.ipsl.jussieu.fr/orchidee/$orcbranch"
         set -e
+        cd -
     fi
 }
@@ -507 +528 @@
 function compile_orchidee {
     get_orchidee_version
+    install_arch "ORCHIDEE"
+
     ORCHPATH=""
 
@@ -529 +552 @@
         fi
 
-        # TODO check that this works with old orchidee versions (cf. -d tools)
-        local varenv="IOIPSL_LIBDIR_=$IOIPSL_LIBDIR_ IOIPSL_INCDIR_=$IOIPSL_INCDIR_ ORCHPATH=$ORCHPATH"
+        local varenv="IOIPSL_LIBDIR_=$IOIPSL_LIBDIR_ IOIPSL_INCDIR_=$IOIPSL_INCDIR_ ORCHPATH=$ORCHPATH XIOS_INCDIR_=$XIOS_INCDIR_ XIOS_LIBDIR_=$XIOS_LIBDIR_"
         if [[ $parallel = "none" ]]; then
             echo "$varenv ./makeorchidee_fcm $xios_orchid $opt_orc -parallel none -arch $arch -j $make_j" > compile.sh
@@ -578 +600 @@
 function compile_lmdz {
     get_lmdz_version
+    install_arch "LMDZ"
 
     exe_name="bin/gcm_${grid_resolution}_phylmd_${rad}${suff_exe}${suff_orc}.e"
@@ -601 +624 @@
     makelmdz="makelmdz_fcm $optim_debug -arch $arch -j $make_j"
     if [[ $parallel = "none" ]]; then
-        echo "$varenv ./$makelmdz $opt_rad $opt_cosp -d ${grid_resolution} -v $veget_version gcm " > compile.sh
-    else
-        echo "$varenv ./$makelmdz $opt_rad $opt_cosp $opt_makelmdz_xios -d ${grid_resolution} -v $veget_version -mem -parallel $parallel gcm" > compile.sh
+        echo "$varenv ./$makelmdz $opt_rad $opt_cosp -d ${grid_resolution} -v $fcm_veget_version gcm " > compile.sh
+    else
+        echo "$varenv ./$makelmdz $opt_rad $opt_cosp $opt_makelmdz_xios -d ${grid_resolution} -v $fcm_veget_version -mem -parallel $parallel gcm" > compile.sh
     fi
     echo "Compiling lmdz using $(\cat compile.sh) (log: $lmdzlog) $(date)"
@@ -828 +851 @@
 #download_model
 download_model_AMAURY
-install_arch
+init_arch
 check_available_software
 install_netcdf