Skip to content
Snippets Groups Projects
Commit 9a594bcd authored by Guillaume Samson's avatar Guillaume Samson :snowman2:
Browse files

Merge branch 'cherry-pick-655e45c3' into 'branch_4.2'

Merge branch '83-makenemo-t-option-not-working-with-agrif-based-configurations' into 'branch_4.2'

See merge request nemo/nemo!131
parents 30db01b1 59515370
No related branches found
No related tags found
No related merge requests found
......@@ -60,8 +60,8 @@ if [ "$MYFILE" == "agrif2model.f90" ];then
if [ -d ${MYDIR}/${NEW_CONF}/WORK ]; then
\cp ${MYDIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${MYDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
else
\cp ${MYDIR}/${NEW_CONF}/src/${MYFILE/.f90/.F90} ${MYDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
\cp ${CONFIG_DIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${MYDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
fi
else
cd ${MYDIR}/${NEW_CONF}/NEMOFILES/ppsrc/nemo ; ${MYDIR}/${NEW_CONF}/NEMOFILES/conv ${MYDIR}/${NEW_CONF}/NEMOFILES/agrif_oce.in -rm -incdir ${MYDIR}/${NEW_CONF}/NEMOFILES/inc -comdirout ${MYDIR}/${NEW_CONF}/NEMOFILES/obj -convfile ${MYFILE} > /dev/null
fi
\ No newline at end of file
fi
......@@ -14,7 +14,7 @@ search_src 1
src::ioipsl $MAIN_DIR/ext/IOIPSL/src
src::agrif $MAIN_DIR/ext/AGRIF/AGRIF_FILES
src::nemo $CONFIG_DIR/$NEW_CONF/NEMOFILES/obj
src::nemo $NEMO_TDIR/$NEW_CONF/NEMOFILES/obj
src::ppr_1d $MAIN_DIR/ext/PPR/src
......@@ -41,7 +41,7 @@ bld::pp::ioipsl 1
bld::pp::nemo 1
bld::pp::agrif 1
bld::pp::ppr_1d 1
bld::tool::fppflags::nemo %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/NEMOFILES/inc
bld::tool::fppflags::nemo %FPPFLAGS -I$NEMO_TDIR/$NEW_CONF/NEMOFILES/inc
bld::tool::fppflags::ioipsl %FPPFLAGS
bld::tool::fppflags::agrif %FPPFLAGS -include ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
bld::tool::fppflags::ppr_1d %FPPFLAGS
......
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