Changeset 4961

Timestamp:

Jun 4, 2024, 11:12:05 AM (2 weeks ago)

Author:

abarral

Message:

add MESOIPSL-GNU arch
fix ncdf dir detection

Location:

BOL/script_install_amaury

Files:

• arch_local/arch-X64_ADASTRA-GNU.path (modified) (1 diff)
• arch_local/arch-X64_MESOIPSL-GNU.fcm (added)
• arch_local/arch-X64_MESOIPSL-GNU.path (added)
• install_lmdz.sh (modified) (2 diffs)

BOL/script_install_amaury/arch_local/arch-X64_ADASTRA-GNU.path

@@ -3 +3 @@
 NETCDF_LIBDIR="-L${NETCDF_DIR}/lib" # for some reason on adastra `nf-config --flibs` is empty
 NETCDF_LIB="-lnetcdf -lnetcdff"  # same as above
-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

@@ -345 +345 @@
         sed -i"" -e "s/ts.second=dt_routing/ts%second=dt_routing/" -e "380,390 s/USE grid/USE grid, temp_disabled => contfrac/" ORCHIDEE/src_sechiba/routing_native_flow.f90
 
-        cd ../../../script_install
+        cd ../../script_install
     fi
 
@@ -404 +404 @@
 
     if [[ $netcdf = 0 ]]; then
-        ncdfdir=$(nc-config --prefix)
+        ncdfdir=$(nf-config --prefix)
     else
         cd "$MODEL"