From 31724fc9726c9f43d7427ab3d38e1377d6ada51c Mon Sep 17 00:00:00 2001
From: PIANEZZE Joris <joris.pianezze@cnrs.fr>
Date: Tue, 22 Oct 2024 14:25:50 +0200
Subject: [PATCH] Add parallel compilation for toy model
---
src/LIB/toy_2.0.tar.gz | 4 ++--
src/Makefile | 6 +++---
src/Makefile.MESONH.mk | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/LIB/toy_2.0.tar.gz b/src/LIB/toy_2.0.tar.gz
index 5fc746f33..1ae7e7f80 100644
--- a/src/LIB/toy_2.0.tar.gz
+++ b/src/LIB/toy_2.0.tar.gz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:afc23307e39621b9a615e4e3a790ad3cb972d1cea1cd50273099af1dca918e75
-size 5641
+oid sha256:8ea9023e4d9d5690b37bca2f6f2cc7c4e8c47261bf21c8a7b625f4a95db902bb
+size 5663
diff --git a/src/Makefile b/src/Makefile
index 981c7c8ae..1ca6d51c1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -385,11 +385,11 @@ endif
ifeq "$(VER_OASIS)" "OASISAUTO"
#
ifeq "$(VER_CDF)" "CDFAUTO"
-$(OASIS_KEY) : $(CDF_MOD)
+$(OASIS_MOD) : $(CDF_MOD)
endif
#
-oasis : $(OASIS_KEY)
-$(OASIS_KEY):
+oasis : $(OASIS_MOD)
+$(OASIS_MOD):
cd ${SRC_MESONH}/src/LIB/oasis3-mct_${VERSION_OASIS}/util/make_dir && \
$(MAKE) -f TopMakefileOasis3 makedirs-static makemct-static makescrip-static makepsmile-static && \
cd ${SRC_MESONH}/src/LIB/toy_${VERSION_TOY} && \
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index caebcb7e1..842e693fc 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -474,7 +474,7 @@ endif
#
ifeq "$(VER_OASIS)" "OASISAUTO"
OASIS_PATH ?= ${OBJDIR_MASTER}/OASIS3-MCT_5.0
-OASIS_KEY ?= ${OASIS_PATH}/build/lib/psmile.MPI1/mod_oasis.mod
+OASIS_MOD ?= ${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
LIB_OASIS ?= -L${OASIS_PATH}/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
@@ -490,7 +490,7 @@ ifndef OASISDIR
$(error You have chosen VER_OASIS=OASISPERSO, please set OASISDIR environment variable)
endif
OASIS_PATH ?= ${OASISDIR}
-OASIS_KEY ?= ${OASIS_PATH}/build/lib/psmile.MPI1/mod_oasis.mod
+OASIS_MOD ?= ${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
LIB_OASIS ?= -L${OASIS_PATH}/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
--
GitLab