Changeset 4901

Timestamp:

Apr 15, 2024, 12:13:24 PM (8 months ago)

Author:

abarral

Message:

fix orch compilation for >2.0
remove unused ORCHPATH

Location:

BOL/script_install_amaury

Files:

• arch_local/arch-local-gfortran.path (modified) (1 diff)
• install_lmdz.sh (modified) (6 diffs)

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

@@ -17 +17 @@
 
 # Exported
-ORCH_INCDIR="-I$ORCH_LIBDIR_"
-ORCH_LIBDIR="-L$ORCH_LIBDIR_"
+ORCH_INCDIR="-I$ORCH_INCDIR_ -I$ORCH_LIBDIR_"
+ORCH_LIBDIR="-L$ORCH_LIBDIR_ -L$ORCH_INCDIR_"

BOL/script_install_amaury/install_lmdz.sh

@@ -280 +280 @@
 }
 
-function download_model_AMAURY {  # TODO TEMP while waiting for tar: we copy the base from a local path = IPSLCM7 + ORCH2.2 latest
+function download_model_AMAURY {  # TODO TEMP while waiting for tar: we copy the base from a local path = IPSLCM7 + ORCH2.2 8504
     if [[ ! -d ../MODEL_REF ]]; then
         cd ..
@@ -288 +288 @@
         cd modipsl/util
         ./model IPSLCM7_work
-        rm -rf oasis3-mct
+        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
+        svn co svn://forge.ipsl.fr/orchidee/branches/ORCHIDEE_2_2/ORCHIDEE -r 8504
         cd ../../../script_install
     fi
@@ -530 +530 @@
     install_arch "ORCHIDEE"
 
-    ORCHPATH=""
-
-
     if [[ $veget != "none" ]]; then
         cd "$MODEL/modipsl/modeles/ORCHIDEE"
-        ORCHPATH=$(pwd)
 
         orchideelog="$(pwd)/orchidee.log"
@@ -552 +548 @@
         fi
 
-        local varenv="IOIPSL_LIBDIR_=$IOIPSL_LIBDIR_ IOIPSL_INCDIR_=$IOIPSL_INCDIR_ ORCHPATH=$ORCHPATH XIOS_INCDIR_=$XIOS_INCDIR_ XIOS_LIBDIR_=$XIOS_LIBDIR_"
+        local varenv="IOIPSL_LIBDIR_=$IOIPSL_LIBDIR_ IOIPSL_INCDIR_=$IOIPSL_INCDIR_ 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
@@ -572 +568 @@
     fi
 
+    ORCH_INCDIR_="$MODEL/modipsl/modeles/ORCHIDEE/inc"
     ORCH_LIBDIR_="$MODEL/modipsl/modeles/ORCHIDEE/lib"
 }
@@ -621 +618 @@
 
     # Compile
-    local varenv="IOIPSL_LIBDIR_=$IOIPSL_LIBDIR_ IOIPSL_INCDIR_=$IOIPSL_INCDIR_ ORCH_LIBDIR_=$ORCH_LIBDIR_ ORCHPATH=$ORCHPATH XIOS_INCDIR_=$XIOS_INCDIR_ XIOS_LIBDIR_=$XIOS_LIBDIR_"
+    local varenv="IOIPSL_LIBDIR_=\"$IOIPSL_LIBDIR_\" IOIPSL_INCDIR_=\"$IOIPSL_INCDIR_\" ORCH_INCDIR_=\"$ORCH_INCDIR_\" ORCH_LIBDIR_=\"$ORCH_LIBDIR_\" XIOS_INCDIR_=\"$XIOS_INCDIR_\" XIOS_LIBDIR_=\"$XIOS_LIBDIR_\""
     makelmdz="makelmdz_fcm $optim_debug -arch $arch -j $make_j"
     if [[ $parallel = "none" ]]; then