diff --git a/models/combine-models.sh b/models/combine-models.sh index f72bc001a4e12f1caf974048225e6839c4f83a18..e305199f1f75871fdcff3f1fa24c74c6200f5781 100755 --- a/models/combine-models.sh +++ b/models/combine-models.sh @@ -24,14 +24,22 @@ else exit 1 fi +if [ "$2" != "" ] ; then + export MODEL="$2" +else + echo "Missing model identifier" +fi + # set mode call, dataflow or both checkMode "$3" -export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml" +export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml" # variables export MODEL_DATA_PATH="${DATA_PATH}/$MODEL/${EXPERIMENT_NAME}" +checkDirectory "Model data path" "${MODEL_DATA_PATH}" + STATIC_FILE_MODEL="${MODEL_DATA_PATH}/static-plain-$MODE-file" STATIC_MAP_MODEL="${MODEL_DATA_PATH}/static-plain-$MODE-map" STATIC_2_LEVEL_MODEL="${MODEL_DATA_PATH}/static-plain-$MODE-2-level" diff --git a/models/mitgcm/compare-models.sh b/models/mitgcm/compare-models.sh index b484f660c8ab207d8dd5250fed42a812adfc3cfc..7a2d54a5b83f55099cdd61bd25635c041a0fc221 100755 --- a/models/mitgcm/compare-models.sh +++ b/models/mitgcm/compare-models.sh @@ -19,13 +19,19 @@ else exit 1 fi +if [ "$2" != "" ] ; then + export MODEL="$2" +else + echo "Missing model identifier" +fi + export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml" checkExecutable "Restructuring" "${RESTRUCTURING}" checkDirectory "Result directory" "${OPTIMIZATION_DATA}" # main -for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*mitgcm*job'` ; do +for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*${MODEL}*job'` ; do BASENAME=`basename "${JOB_DIRECTORY}"` information "----------------------------------------" information $BASENAME diff --git a/models/uvic/compare-models.sh b/models/uvic/compare-models.sh index 3d86e9536ce2b7a114c1c8605c18b93362e0ae4e..7a2d54a5b83f55099cdd61bd25635c041a0fc221 100755 --- a/models/uvic/compare-models.sh +++ b/models/uvic/compare-models.sh @@ -1,5 +1,7 @@ #!/bin/bash +# compare original models with optimized models. + export BASE_DIR=$(cd "$(dirname "$0")"; pwd) . "${BASE_DIR}/../common-functions.rc" @@ -17,14 +19,20 @@ else exit 1 fi +if [ "$2" != "" ] ; then + export MODEL="$2" +else + echo "Missing model identifier" +fi + export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/../logback.xml" checkExecutable "Restructuring" "${RESTRUCTURING}" checkDirectory "Result directory" "${OPTIMIZATION_DATA}" # main -for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*uvic*job'` ; do - BASENAME=`basename $JOB_DIRECTORY` +for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}" -name '*${MODEL}*job'` ; do + BASENAME=`basename "${JOB_DIRECTORY}"` information "----------------------------------------" information $BASENAME information "----------------------------------------"