diff --git a/src/LIB/oasis3-mct_v3.tar.gz b/src/LIB/oasis3-mct_v3.tar.gz index c24b374c05efaf9d3f3a6142bd626fc0c9e2cce8..a0270b42c75413de3e178b90325aea0d03394767 100644 --- a/src/LIB/oasis3-mct_v3.tar.gz +++ b/src/LIB/oasis3-mct_v3.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb8cde512fdbf27d3c02e417215d81378a441ced8ea423415fa74de4b44d80e3 -size 16951222 +oid sha256:93053077ed42fa1ca41b2806b0629e8da130302c3c7c45eb7cff2bc23dda659a +size 16950048 diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk index 405e511f1acdf06104ce1376c62854c4d426d692..bda29023739010be30b8ab6b399cff8278c5bb70 100644 --- a/src/Makefile.MESONH.mk +++ b/src/Makefile.MESONH.mk @@ -481,11 +481,6 @@ DIR_HDF?=${SRC_MESONH}/src/LIB/hdf5-${VERSION_HDF} # DIR_LIBAEC?=${SRC_MESONH}/src/LIB/libaec-${VERSION_LIBAEC} -# for oasis compilation <=> to find correctly netcdf -NETCDF_INCLUDE ?= ${CDF_PATH}/include -NETCDF_LIBRARY ?= $(LIB_NETCDF) -export NETCDF_INCLUDE NETCDF_LIBRARY - endif # # NetCDF : CDF LaReunion Local @@ -607,7 +602,10 @@ INC += $(INC_NETCDF) LIBS += $(LIB_NETCDF) endif - +# for oasis compilation <=> to find correctly netcdf +NETCDF_INCLUDE ?= ${CDF_PATH}/include +NETCDF_LIBRARY ?= $(LIB_NETCDF) +export NETCDF_INCLUDE NETCDF_LIBRARY F90 CC ########################################################## # Number of NESTED MODEL #