From dc8a2f2c3b676f49cb160ca89331e227b6d49533 Mon Sep 17 00:00:00 2001
From: JorisP <pianezze.joris@gmail.com>
Date: Tue, 26 Sep 2023 16:47:01 +0200
Subject: [PATCH] Change OASISBASHRC and CDFBASHRC to OASISPERSO and CDFPERSO,
add tests to verify presence of environment variables for coupling stuff
---
src/LIB/oasis3-mct_v3.tar.gz | 3 ---
src/LIB/toy_v1-0.tar.gz | 3 ---
src/Makefile | 2 +-
src/Makefile.MESONH.mk | 17 ++++++++++++-----
src/configure | 8 ++++----
5 files changed, 17 insertions(+), 16 deletions(-)
delete mode 100644 src/LIB/oasis3-mct_v3.tar.gz
delete mode 100644 src/LIB/toy_v1-0.tar.gz
diff --git a/src/LIB/oasis3-mct_v3.tar.gz b/src/LIB/oasis3-mct_v3.tar.gz
deleted file mode 100644
index a0270b42c..000000000
--- a/src/LIB/oasis3-mct_v3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93053077ed42fa1ca41b2806b0629e8da130302c3c7c45eb7cff2bc23dda659a
-size 16950048
diff --git a/src/LIB/toy_v1-0.tar.gz b/src/LIB/toy_v1-0.tar.gz
deleted file mode 100644
index de54521d2..000000000
--- a/src/LIB/toy_v1-0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22757def28c47328b44de5f10029803ad2e01b1923c3e6defa3b403f20639040
-size 7607
diff --git a/src/Makefile b/src/Makefile
index b9544933e..3ae75868a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -386,7 +386,7 @@ ifeq "$(VER_OASIS)" "OASISAUTO"
#
oasis : $(OASIS_KEY)
$(OASIS_KEY):
- cd ${SRC_MESONH}/src/LIB/oasis3-mct_v3/util/make_dir && make realclean -f TopMakefileOasis3 && make -f TopMakefileOasis3 && cd ${SRC_MESONH}/src/LIB/toy_v1-0 && make clean && make
+ cd ${SRC_MESONH}/src/LIB/oasis3-mct_${VERSION_OASIS}/util/make_dir && make realclean -f TopMakefileOasis3 && make -f TopMakefileOasis3 && cd ${SRC_MESONH}/src/LIB/toy_${VERSION_TOY} && make clean && make
cleanmaster : cleanoasis
cleanoasis :
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index 339f4bb79..5a45c0632 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -495,7 +495,7 @@ endif
##########################################################
#
ifeq "$(VER_OASIS)" "OASISAUTO"
-OASIS_PATH ?= ${SRC_MESONH}/src/LIB/work_oasis3-mct
+OASIS_PATH ?= ${SRC_MESONH}/src/LIB/oasis3-mct_${VERSION_OASIS}/compile_generic_mesonh
OASIS_KEY ?= ${OASIS_PATH}/build/lib/psmile.MPI1/mod_oasis.mod
# INC_OASIS : includes all *o and *mod for each library
INC_OASIS ?= -I${OASIS_PATH}/build/lib/psmile.MPI1 -I$(OASIS_PATH)/build/lib/mct -I$(OASIS_PATH)/build/lib/scrip
@@ -504,10 +504,13 @@ INC += $(INC_OASIS)
LIBS += $(LIB_OASIS)
VPATH += ${OASIS_PATH}/build/lib/psmile.MPI1
CPPFLAGS += -DCPLOASIS
-
endif
-ifeq "$(VER_OASIS)" "OASISBASHRC"
+# OASIS installed manually, need to defined OASISDIR environment variable
+ifeq "$(VER_OASIS)" "OASISPERSO"
+ifndef OASISDIR
+$(error You chose VER_OASIS=OASISPERSO, please set OASISDIR environment variable)
+endif
OASIS_PATH ?= ${OASISDIR}
OASIS_KEY ?= ${OASIS_PATH}/build/lib/psmile.MPI1/mod_oasis.mod
# INC_OASIS : includes all *o and *mod for each library
@@ -551,9 +554,13 @@ DIR_LIBAEC?=${SRC_MESONH}/src/LIB/libaec-${VERSION_LIBAEC}
endif
#
-# NetCDF : CDF LaReunion Local
+# NetCDF installed manually, need to defined NETCDF_CONFIG environment variable
#
-ifeq "$(VER_CDF)" "CDFBASHRC"
+ifeq "$(VER_CDF)" "CDFPERSO"
+#
+ifndef NETCDF_CONFIG
+$(error You chose VER_CDF=CDFPERSO, please set NETCDF_CONFIG environment variable)
+endif
#
INC_NETCDF ?= $(shell $(NETCDF_CONFIG) --fflags)
LIB_NETCDF ?= $(shell $(NETCDF_CONFIG) --flibs)
diff --git a/src/configure b/src/configure
index cd10928c1..d6867ff45 100755
--- a/src/configure
+++ b/src/configure
@@ -25,12 +25,12 @@ export LFI_INT=${LFI_INT:-8}
export MNH_REAL=${MNH_REAL:-"8"}
export MNH_IOCDF4=${MNH_IOCDF4:-1}
-export VERSION_OASIS=${VERSION_OASIS:-"mct_v3"}
-export VERSION_TOY=${VERSION_TOY:-"v1-0"}
-
export VERSION_ECRAD=${VERSION_ECRAD:-"1.4.0"}
export VER_ECRAD=${VERSION_ECRAD//./}
+export VERSION_OASIS=${VERSION_OASIS:-"5.0"}
+export VERSION_TOY=${VERSION_TOY:-"1.0"}
+
export MNH_LEN_HREC=${MNH_LEN_HREC:-16}
#
# Install MNH_EXPAND if VER_MNHEXP=MNHEXPAUTO
@@ -672,7 +672,7 @@ fi
# Install OASIS if VER_OASIS=OASISAUTO
#
if [ "x${VER_OASIS}" == "xOASISAUTO" ] ; then
-( cd $LOCAL/src/LIB ; [ ! -d oasis3-${VERSION_OASIS} ] && tar xvfz oasis3-${VERSION_OASIS}.tar.gz ; [ ! -d toy_${VERSION_TOY} ] && tar xvfz toy_${VERSION_TOY}.tar.gz )
+( cd $LOCAL/src/LIB ; [ ! -d oasis3-mct_${VERSION_OASIS} ] && tar xvfz oasis3-mct_${VERSION_OASIS}.tar.gz ; [ ! -d toy_${VERSION_TOY} ] && tar xvfz toy_${VERSION_TOY}.tar.gz )
fi
#
# Install GRIBAPI or ecCodes
--
GitLab