Making scripts more equal

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"

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

models/uvic/compare-models.sh

 #!/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 "----------------------------------------"