Skip to content
Snippets Groups Projects
Commit 31724fc9 authored by PIANEZZE Joris's avatar PIANEZZE Joris
Browse files

Add parallel compilation for toy model

parent 22a81951
No related branches found
No related tags found
1 merge request!1Add parallel compilation for toy model + typo in Makefile for OASIS's compilation
No preview for this file type
......@@ -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} && \
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment