Changeset 4900 for BOL/script_install_amaury/arch_local

Timestamp:

Apr 15, 2024, 11:18:38 AM (9 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/arch_local

Files:

• arch-local-gfortran-parallel.fcm (modified) (2 diffs)
• arch-local-gfortran.path (modified) (1 diff)

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"