Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pvelissariou1 committed Sep 14, 2023
2 parents b623ca8 + 8046a56 commit 57517bf
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 14 deletions.
2 changes: 1 addition & 1 deletion NEMS
59 changes: 49 additions & 10 deletions scripts/functions_build
Original file line number Diff line number Diff line change
Expand Up @@ -740,16 +740,40 @@ UsageBuild()
# by using the --thirdparty="parmetis" option. We issue a warning here to let the user
# know that he/she might need to specify this library.
if [[ ":${chk_component}:" == *:"SCHISM":* ]]; then
if ! $( checkSUBSTR "${tmp_thirdparty}" PARMETIS ) && \
[ -z "${PARMETIS_HOME}" ] && [ -z "${PARMETISHOME}" ]; then
procWarn "The PARMETIS library might be needed for the compilation of SCHISM." \
"Please supply the PARMETIS_HOME or PARMETISHOME environment" \
"variable that points to the location of the pre-compiled library or use the" \
"--thirdparty="parmetis" option in the build.sh script to compile the" \
"library from within CoastalApp (NOTE: need to download first the library" \
"by running the download_parmetis.sh script found in the scripts directory." \
"Finally, if the library is not provided, then SCHISM can use its internal" \
"version of ParMETIS or the NO_PARMETIS option (OFF by default)."

#################### BEG :: TO BE MOVED? ####################
# This block might need to be moved elsewhere in th build system
if [ -n "${USE_PAHM}" ]; then
USE_PAHM="$( getYesNo "${USE_PAHM}" )"
if [ -z "${USE_PAHM}" -o "${USE_PAHM}" == "no" ]; then
export USE_PAHM=
else
export USE_PAHM=ON
fi
fi

if [ -n "${NO_PARMETIS}" ]; then
NO_PARMETIS="$( getYesNo "${NO_PARMETIS}" )"
if [ -z "${NO_PARMETIS}" -o "${NO_PARMETIS}" == "no" ]; then
export NO_PARMETIS=
else
export NO_PARMETIS=ON
fi
fi
#################### END:: TO BE MOVED? ####################

if [ -z "${NO_PARMETIS}" ]; then
if ! $( checkSUBSTR "${tmp_thirdparty}" PARMETIS ) && \
[ -z "${PARMETIS_HOME}" ] && [ -z "${PARMETISHOME}" ]; then
procWarn "The PARMETIS library might be needed for the compilation of SCHISM." \
"Please supply the PARMETIS_HOME or PARMETISHOME environment" \
"variable that points to the location of the pre-compiled library or use the" \
"--thirdparty="parmetis" option in the build.sh script to compile the" \
"library from within CoastalApp (NOTE: need to download first the library" \
"by running the download_parmetis.sh script found in the scripts directory." \
"Finally, if the library is not provided, then SCHISM can use its internal" \
"version of ParMETIS or the NO_PARMETIS option (OFF by default)."
fi
fi
fi

Expand Down Expand Up @@ -1883,6 +1907,21 @@ installNems() {
done
fi
######

###### Extra SCHISM files
if [ "${icmp}" == "SCHISM" ]; then
echo
echo " --- Installing from: ${icmp} to ${instdir} ---"
for iprog in ${APP_DIR}/SCHISM/build/bin/*
do
prog="${iprog}"

if [ -n "${prog:+1}" ]; then
${CPBIN} ${prog} ${instdir}/
fi
done
fi
######
done

###### Install the NEMS/exe/NEMS* files
Expand Down
6 changes: 3 additions & 3 deletions scripts/functions_utilities
Original file line number Diff line number Diff line change
Expand Up @@ -817,9 +817,9 @@ getYesNo()
fi

case "${param}" in
1|y|yes|yea|yeah|yep) answer="yes" ;;
0|n|no|not|nop|nope) answer="no" ;;
*) answer="" ;; # DEFAULT
1|y|yes|yea|yeah|yep|on) answer="yes" ;;
0|n|no|not|nop|nope|off) answer="no" ;;
*) answer="" ;; # DEFAULT
esac

echo -n "${answer}"
Expand Down

0 comments on commit 57517bf

Please sign in to comment.