From 740f145930c40f6ebf5e8be9cc5dbec65b0180c1 Mon Sep 17 00:00:00 2001
From: Juan Escobar <escj@aero.obs-mip.fr>
Date: Thu, 19 Jul 2018 12:17:30 +0200
Subject: [PATCH] Juan 19/07/2018: COUPLING , oasis3-mct_v3.tar.gz , add/use
generic rule make.generic_mesonh
---
src/LIB/oasis3-mct_v3.tar.gz | 4 ++--
src/Makefile.MESONH.mk | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/LIB/oasis3-mct_v3.tar.gz b/src/LIB/oasis3-mct_v3.tar.gz
index c24b374c0..a0270b42c 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 405e511f1..bda290237 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 #
--
GitLab