Changeset 4959

Timestamp:

Jun 3, 2024, 4:50:58 PM (7 months ago)

Author:

abarral

Message:

replace exported env vars in arch files with $(pwd)
copy .env from config/

Location:

BOL/script_install_amaury

Files:

• arch_local/arch-local-gfortran-parallel.env (added)
• arch_local/arch-local-gfortran.env (copied) (copied from BOL/script_install_amaury/arch_local/arch-local-gfortran.path) (1 diff)
• arch_local/arch-local-gfortran.path (modified) (1 diff)
• install_lmdz.sh (modified) (7 diffs)

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

@@ -1 @@
-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"
-NETCDF95_LIB="-lnetcdf95"
-
-# Exported
-IOIPSL_INCDIR="-I$IOIPSL_INCDIR_ -I$IOIPSL_LIBDIR_"
-IOIPSL_LIBDIR="-L$IOIPSL_INCDIR_ -L$IOIPSL_LIBDIR_"
-IOIPSL_LIB="-lioipsl"
-
-# Exported
-XIOS_INCDIR="-I$XIOS_INCDIR_"
-XIOS_LIBDIR="-L$XIOS_LIBDIR_"
-XIOS_LIB="-lxios -lstdc++"
-
-# Exported
-ORCH_INCDIR="-I$ORCH_INCDIR_ -I$ORCH_LIBDIR_"
-ORCH_LIBDIR="-L$ORCH_LIBDIR_ -L$ORCH_INCDIR_"
+# empty

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

@@ -2 +2 @@
 # 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"
+NETCDF95_INCDIR="-I$(pwd)/../../include"
+NETCDF95_LIBDIR="-L$(pwd)/../../lib"
 NETCDF95_LIB="-lnetcdf95"
 
 # Exported
-IOIPSL_INCDIR="-I$IOIPSL_INCDIR_ -I$IOIPSL_LIBDIR_"
-IOIPSL_LIBDIR="-L$IOIPSL_INCDIR_ -L$IOIPSL_LIBDIR_"
+IOIPSL_INCDIR="-I$(pwd)/../IOIPSL/inc -I$(pwd)/../IOIPSL/lib"
+IOIPSL_LIBDIR="-L$(pwd)/../IOIPSL/inc -L$(pwd)/../IOIPSL/lib"
 IOIPSL_LIB="-lioipsl"
 
 # Exported
-XIOS_INCDIR="-I$XIOS_INCDIR_"
-XIOS_LIBDIR="-L$XIOS_LIBDIR_"
+XIOS_INCDIR="-I$(pwd)/../XIOS/inc"
+XIOS_LIBDIR="-L$(pwd)/../XIOS/lib"
 XIOS_LIB="-lxios -lstdc++"
 
 # Exported
-ORCH_INCDIR="-I$ORCH_INCDIR_ -I$ORCH_LIBDIR_"
-ORCH_LIBDIR="-L$ORCH_LIBDIR_ -L$ORCH_INCDIR_"
+ORCH_INCDIR="-I$(pwd)/../ORCHIDEE/inc -I$(pwd)/../ORCHIDEE/lib"
+ORCH_LIBDIR="-L$(pwd)/../ORCHIDEE/inc -L$(pwd)/../ORCHIDEE/lib"

BOL/script_install_amaury/install_lmdz.sh

@@ -386 +386 @@
 
     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"
+        cp -f "$arch_dir/arch-$arch."{fcm,path,env} "$MODEL/modipsl/modeles/$component/arch"
 
         if [[ $component = "XIOS" ]]; then
@@ -510 +509 @@
 
     echo "IOIPSL compiled $(date)"
-
-    IOIPSL_LIBDIR_="$MODEL/modipsl/modeles/IOIPSL/lib"
-    IOIPSL_INCDIR_="$MODEL/modipsl/modeles/IOIPSL/inc"
 }
 
@@ -541 +537 @@
         echo "Compiled XIOS $(date)"
     fi
-
-    XIOS_LIBDIR_="$MODEL/modipsl/modeles/XIOS/lib"
-    XIOS_INCDIR_="$MODEL/modipsl/modeles/XIOS/inc"
 }
 
@@ -594 +587 @@
         fi
 
-        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
+            echo "./makeorchidee_fcm $xios_orchid $opt_orc -parallel none -arch $arch -j $make_j" > compile.sh
         else
             if [[ ! -d src_parallel ]]; then
@@ -602 +594 @@
             fi
             {
-                echo "$varenv ./makeorchidee_fcm -j $make_j $xios_orchid $opt_orc -parallel $parallel -arch $arch"
+                echo "./makeorchidee_fcm -j $make_j $xios_orchid $opt_orc -parallel $parallel -arch $arch"
             } > compile.sh
         fi
@@ -612 +604 @@
         echo "Compiled ORCHIDEE $(date)"
     fi
-
-    ORCH_INCDIR_="$MODEL/modipsl/modeles/ORCHIDEE/inc"
-    ORCH_LIBDIR_="$MODEL/modipsl/modeles/ORCHIDEE/lib"
 }
 
@@ -666 +655 @@
 
     # Compile
-    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"
     local para_compile_opt="-mem -parallel $parallel"; if [[ $parallel = "none" ]]; then para_compile_opt=""; fi
-    echo "$varenv ./$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 gcm" > compile.sh
+    echo "./$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 gcm" > compile.sh
     echo "Compiling lmdz using $(\cat compile.sh) (log: $lmdzlog) $(date)"
     chmod +x ./compile.sh