diff --git a/models/config.template b/models/config.template
new file mode 100644
index 0000000000000000000000000000000000000000..0270ad200cc940ef76e5a0c82646378039646c44
--- /dev/null
+++ b/models/config.template
@@ -0,0 +1,37 @@
+# Main replication directory
+export REPLICATION_DIR="/home/reiner/temp/experiment/experiments"
+
+# Library path including Kieker libraries
+export KIEKER_LIBRARY_PATH="${REPLICATION_DIR}/../install/km/lib/"
+
+# Location for dynamic and static data
+export DATA_PATH="/home/reiner/Projects/OceanDSL/architecture-recovery-and-optimization-data"
+
+# List of external functions
+export EXTERNAL_FUNCTIONS_MAP="${REPLICATION_DIR}/builtin-functions.csv"
+export STATIC_AUX_MODULE_MAP="${REPLICATION_DIR}/uvic-aux-map-file.csv"
+
+export TOOL_DIR="/home/reiner/temp/experiment/install"
+
+# Data directory for results from the optimization
+OPTIMIZATION_DATA="/home/reiner/Projects/OceanDSL/restructuring-results"
+
+DAR="${TOOL_DIR}/oceandsl-tools/bin/dar"
+SAR="${TOOL_DIR}/oceandsl-tools/bin/sar"
+MAA="${TOOL_DIR}/oceandsl-tools/bin/maa"
+MOP="${TOOL_DIR}/oceandsl-tools/bin/mop"
+MVIS="${TOOL_DIR}/oceandsl-tools/bin/mvis"
+RELABEL="${TOOL_DIR}/oceandsl-tools/bin/relabel"
+FXCA="${TOOL_DIR}/oceandsl-tools/bin/fxca"
+FXTRAN="${TOOL_DIR}/fxtran"
+RESTRUCTURING="${TOOL_DIR}/oceandsl-tools/bin/restructuring"
+DELTA="${TOOL_DIR}/oceandsl-tools/bin/delta"
+
+# collector tool
+COLLECTOR="${TOOL_DIR}/collector/bin/collector"
+
+# addr2line
+ADDR2LINE=`which addr2line`
+
+# Hostname where the dynamic analysis was executed
+HOST=glasgow
diff --git a/models/find-project.sh b/models/find-project.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9416ae157d8eedd3320d95a26d1fb2aa137e9928
--- /dev/null
+++ b/models/find-project.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
+
+. "${BASE_DIR}/../common-functions.rc"
+
+if [ -f "$BASE_DIR/config" ] ; then
+ . $BASE_DIR/config
+else
+ echo "Config file not found."
+fi
+
+for I in `find "${OPTIMIZATION_DATA}" -name "type-model.xmi"` ; do
+ DIR=`dirname $I`
+ if [ ! -f "${DIR}/.project" ] ; then
+ basename $DIR
+ fi
+done
+
+# end
+
diff --git a/models/mitgcm/combine-models.sh b/models/mitgcm/combine-models.sh
index 7774f61dc569606649f5df2d95245f3287aa313b..601662393d052510b7ee50017b96ace397ff9860 100755
--- a/models/mitgcm/combine-models.sh
+++ b/models/mitgcm/combine-models.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
diff --git a/models/mitgcm/compare-models.sh b/models/mitgcm/compare-models.sh
index 16c4afb108749483b3e713a764c775b49fb07028..50038692d3f69eb23d15f5254aa4f5f284ee4623 100755
--- a/models/mitgcm/compare-models.sh
+++ b/models/mitgcm/compare-models.sh
@@ -4,6 +4,12 @@ export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
. "${BASE_DIR}/../../common-functions.rc"
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
@@ -18,7 +24,7 @@ checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
# main
for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do
- BASENAME=`basename "${JOB_DIRECTORY}"`
+ BASENAME=`basename "${JOB_DIRECTORY}"`
information "----------------------------------------"
information $BASENAME
information "----------------------------------------"
@@ -27,28 +33,6 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do
checkDirectory "job directory" "${JOB_DIRECTORY}"
- export ORIGINAL_ARCHIVE="${JOB_DIRECTORY}/optimized-models.tar.xz"
- export OPTIMIZED_ARCHIVE="${JOB_DIRECTORY}/original-model.tar.xz"
- export COMBINED_ARCHIVE="${JOB_DIRECTORY}/kieker-repositories.tar.xz"
-
- cd "${JOB_DIRECTORY}"
-
- if [ -f "${ORIGINAL_ARCHIVE}" ] && [ -f "${OPTIMIZED_ARCHIVE}" ] ; then
- tar -xpf "${ORIGINAL_ARCHIVE}"
- tar -xpf "${OPTIMIZED_ARCHIVE}"
- elif [ -f "${COMBINED_ARCHIVE}" ] ; then
- rm -rf "${JOB_DIRECTORY}/original-model"
- for J in "${JOB_DIRECTORY}/optimized-"* ; do
- if [ -d "$J" ] ; then
- rm -rf "$J"
- fi
- done
- tar -xpf "${COMBINED_ARCHIVE}"
- mv "${JOB_DIRECTORY}/kieker-repositories/"* .
- else
- echo "No data."
- fi
-
ORIGINAL="${JOB_DIRECTORY}/original-model"
if [ -d "${ORIGINAL}" ] ; then
diff --git a/models/mitgcm/compute-statistics.sh b/models/mitgcm/compute-statistics.sh
index 2ab33ed54d9847f22ee3dd8f7159bca496e7d2b4..47cba7f47f7fa4353a72175ddc202364f3c7a199 100755
--- a/models/mitgcm/compute-statistics.sh
+++ b/models/mitgcm/compute-statistics.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
diff --git a/models/mitgcm/config.template b/models/mitgcm/config.template
index fe0364ac1f9d57b3d9065777e7f4f5ba14bf650d..6b136e17513289049fc6d3fa8973cffebee103ca 100644
--- a/models/mitgcm/config.template
+++ b/models/mitgcm/config.template
@@ -1,38 +1,3 @@
-# Main replication directory
-export REPLICATION_DIR="/home/reiner/temp/experiment/experiments"
-
-# Library path including Kieker libraries
-export KIEKER_LIBRARY_PATH="${REPLICATION_DIR}/../install/km/lib/"
-
-# Location for dynamic and static data
-export DATA_PATH="/home/reiner/Projects/OceanDSL/architecture-recovery-and-optimization-data"
-
-# List of external functions
-export EXTERNAL_FUNCTIONS_MAP="${REPLICATION_DIR}/builtin-functions.csv"
-export STATIC_AUX_MODULE_MAP="${REPLICATION_DIR}/mitgcm-aux-map-file.csv"
-
-export TOOL_DIR="/home/reiner/temp/experiment/install"
-
-# Data directory for results from the optimization
-OPTIMIZATION_DATA="/home/reiner/jss-results"
-
-DAR="${TOOL_DIR}/oceandsl-tools/bin/dar"
-SAR="${TOOL_DIR}/oceandsl-tools/bin/sar"
-MAA="${TOOL_DIR}/oceandsl-tools/bin/maa"
-MOP="${TOOL_DIR}/oceandsl-tools/bin/mop"
-MVIS="${TOOL_DIR}/oceandsl-tools/bin/mvis"
-RELABEL="${TOOL_DIR}/oceandsl-tools/bin/relabel"
-FXCA="${TOOL_DIR}/oceandsl-tools/bin/fxca"
-FXTRAN="${TOOL_DIR}/fxtran"
-RESTRUCTURING="${TOOL_DIR}/oceandsl-tools/bin/restructuring"
-DELTA="${TOOL_DIR}/oceandsl-tools/bin/delta"
-
-# collector tool
-COLLECTOR="${TOOL_DIR}/collector/bin/collector"
-
-# addr2line
-ADDR2LINE=`which addr2line`
-
# Repository prefix for the mitgcm model variants
REPOSITORY_DIR="${REPLICATION_DIR}/MITgcm"
# Compile configurtion for kieker
@@ -44,5 +9,3 @@ PROCESSED_CODE_PATH="${REPOSITORY_DIR}/verification/${EXPERIMENT_NAME}/build"
# Path to the executable
EXECUTABLE="${REPOSITORY_DIR}/verification/${EXPERIMENT_NAME}/build/mitgcmuv"
-# Hostname where the dynamic analysis was executed
-HOST=glasgow
diff --git a/models/mitgcm/prepare-models-for-inspection.sh b/models/mitgcm/prepare-models-for-inspection.sh
index 813ba3f917144cd82c05d80ec40a855e62e00cdc..f46db08e5f7637f713ae3b0a893835d3dbb50b59 100755
--- a/models/mitgcm/prepare-models-for-inspection.sh
+++ b/models/mitgcm/prepare-models-for-inspection.sh
@@ -4,6 +4,12 @@ export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
. "${BASE_DIR}/../../common-functions.rc"
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
@@ -56,12 +62,16 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do
echo "$ORIGINAL -> $OPTIMIZED in $STEPS"
- cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "$OPTIMIZED/.project"
+ if [ -d "$OPTIMIZED" ] ; then
+ cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "$OPTIMIZED/.project"
- rm -rf "merge-${OPTIMIZED}"
- mkdir "merge-${OPTIMIZED}"
+ rm -rf "merge-${OPTIMIZED}"
+ mkdir "merge-${OPTIMIZED}"
- "${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> "${MOP_LOG}" 2>&1
+ "${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> "${MOP_LOG}" 2>&1
+ else
+ warning "Missing $OPTIMIZED model"
+ fi
done
else
error "Missing MED output for job $BASENAME"
diff --git a/models/mitgcm/run-architecture-analysis.sh b/models/mitgcm/run-architecture-analysis.sh
index 56d3653684cca0c3f60563415bc89e0fdc0f63f5..c6b863536b97e7516a14bcf9fa61cba013cbe5b8 100755
--- a/models/mitgcm/run-architecture-analysis.sh
+++ b/models/mitgcm/run-architecture-analysis.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
diff --git a/models/mitgcm/run-dynamic-analysis.sh b/models/mitgcm/run-dynamic-analysis.sh
index f0dc1cef1c96094ab9ceec8f2d4a6d569fb8b627..e29d0f0832fbbf631be108def3eae32cc231528f 100755
--- a/models/mitgcm/run-dynamic-analysis.sh
+++ b/models/mitgcm/run-dynamic-analysis.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "${BASE_DIR}/config" ] ; then
. "${BASE_DIR}/config"
else
diff --git a/models/mitgcm/run-dynamic-observation.sh b/models/mitgcm/run-dynamic-observation.sh
index 50ffcddd0460c62df42ea710e55be93a1b8ed29d..c3b09e9e0a732d97f412e75d50a615b5645d81b7 100755
--- a/models/mitgcm/run-dynamic-observation.sh
+++ b/models/mitgcm/run-dynamic-observation.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. "${BASE_DIR}/config"
else
diff --git a/models/mitgcm/run-static-analysis.sh b/models/mitgcm/run-static-analysis.sh
index 8dfa290f424602400b176b0e409575c17dd72054..f46c3c2fc618a252894344ffde84f16b5bd3b1dd 100755
--- a/models/mitgcm/run-static-analysis.sh
+++ b/models/mitgcm/run-static-analysis.sh
@@ -13,6 +13,12 @@ fi
checkMode $2
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "${BASE_DIR}/config" ] ; then
. "${BASE_DIR}/config"
else
diff --git a/models/mitgcm/run-static-code-processing.sh b/models/mitgcm/run-static-code-processing.sh
index 221311d64c5c6ef3d901ee05ad0edc54daccc8ab..43fc12ee9e84b07f215ce2c4ec57bf146e7b2835 100755
--- a/models/mitgcm/run-static-code-processing.sh
+++ b/models/mitgcm/run-static-code-processing.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. "${BASE_DIR}/config"
else
diff --git a/models/uvic/combine-models.sh b/models/uvic/combine-models.sh
index cebc7355576e47c09083c6646f93f164ab7cfe3e..fd13df570256cfdbef530fb1d771bcb0a0d69427 100755
--- a/models/uvic/combine-models.sh
+++ b/models/uvic/combine-models.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
diff --git a/models/uvic/compare-models.sh b/models/uvic/compare-models.sh
index 1f64785e46cbf67cd66db978f140c77e62c7a8f1..b0d675e75c1abfbb076f8be5265fed4dc3775000 100755
--- a/models/uvic/compare-models.sh
+++ b/models/uvic/compare-models.sh
@@ -4,6 +4,12 @@ export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
. "${BASE_DIR}/../../common-functions.rc"
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
@@ -27,28 +33,6 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do
checkDirectory "job directory" "${JOB_DIRECTORY}"
- export ORIGINAL_ARCHIVE="${JOB_DIRECTORY}/optimized-models.tar.xz"
- export OPTIMIZED_ARCHIVE="${JOB_DIRECTORY}/original-model.tar.xz"
- export COMBINED_ARCHIVE="${JOB_DIRECTORY}/kieker-repositories.tar.xz"
-
- cd "${JOB_DIRECTORY}"
-
- if [ -f "${ORIGINAL_ARCHIVE}" ] && [ -f "${OPTIMIZED_ARCHIVE}" ] ; then
- tar -xpf "${ORIGINAL_ARCHIVE}"
- tar -xpf "${OPTIMIZED_ARCHIVE}"
- elif [ -f "${COMBINED_ARCHIVE}" ] ; then
- rm -rf "${JOB_DIRECTORY}/original-model"
- for J in "${JOB_DIRECTORY}/optimized-"* ; do
- if [ -d "$J" ] ; then
- rm -rf "$J"
- fi
- done
- tar -xpf "${COMBINED_ARCHIVE}"
- mv "${JOB_DIRECTORY}/kieker-repositories/"* .
- else
- echo "No data."
- fi
-
ORIGINAL="${JOB_DIRECTORY}/original-model"
if [ -d "${ORIGINAL}" ] ; then
diff --git a/models/uvic/compute-statistics.sh b/models/uvic/compute-statistics.sh
index adb0581efce8db4037b4aef7dec3ba6cd7a8aae8..42320eab1625ac076878d4a8394d3182419ac38e 100755
--- a/models/uvic/compute-statistics.sh
+++ b/models/uvic/compute-statistics.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
diff --git a/models/uvic/config.template b/models/uvic/config.template
index 5fe8dd552e3f633dc2cf7513db129cc773c371d4..c7491e3facfce1380ee5f849380aebab15bbdde2 100644
--- a/models/uvic/config.template
+++ b/models/uvic/config.template
@@ -1,38 +1,3 @@
-# Main replication directory
-export REPLICATION_DIR="/home/reiner/temp/experiment/experiments"
-
-# Library path including Kieker libraries
-export KIEKER_LIBRARY_PATH="${REPLICATION_DIR}/../install/km/lib/"
-
-# Location for dynamic and static data
-export DATA_PATH="/home/reiner/Projects/OceanDSL/architecture-recovery-and-optimization-data"
-
-# List of external functions
-export EXTERNAL_FUNCTIONS_MAP="${REPLICATION_DIR}/builtin-functions.csv"
-export STATIC_AUX_MODULE_MAP="${REPLICATION_DIR}/uvic-aux-map-file.csv"
-
-export TOOL_DIR="/home/reiner/temp/experiment/install"
-
-# Data directory for results from the optimization
-OPTIMIZATION_DATA="/home/reiner/jss-results"
-
-DAR="${TOOL_DIR}/oceandsl-tools/bin/dar"
-SAR="${TOOL_DIR}/oceandsl-tools/bin/sar"
-MAA="${TOOL_DIR}/oceandsl-tools/bin/maa"
-MOP="${TOOL_DIR}/oceandsl-tools/bin/mop"
-MVIS="${TOOL_DIR}/oceandsl-tools/bin/mvis"
-RELABEL="${TOOL_DIR}/oceandsl-tools/bin/relabel"
-FXCA="${TOOL_DIR}/oceandsl-tools/bin/fxca"
-FXTRAN="${TOOL_DIR}/fxtran"
-RESTRUCTURING="${TOOL_DIR}/oceandsl-tools/bin/restructuring"
-DELTA="${TOOL_DIR}/oceandsl-tools/bin/delta"
-
-# collector tool
-COLLECTOR="${TOOL_DIR}/collector/bin/collector"
-
-# addr2line
-ADDR2LINE=`which addr2line`
-
# Path to uvic repository
REPOSITORY_DIR="${REPLICATION_DIR}/UVic_ESCM/2.9"
# Compile configurtion for kieker
@@ -44,5 +9,3 @@ PROCESSED_CODE_PATH="${REPOSITORY_DIR}/run/code"
# Path to the executable
EXECUTABLE="${REPOSITORY_DIR}/run/UVic_ESCM"
-# Hostname where the dynamic analysis was executed
-HOST=glasgow
diff --git a/models/uvic/prepare-models-for-inspection.sh b/models/uvic/prepare-models-for-inspection.sh
index 8207b1219147aa0190fab5c58cf1c0896a7fcfdd..f412b1ec01f2c06b1283f2afe20954e31f37efaf 100755
--- a/models/uvic/prepare-models-for-inspection.sh
+++ b/models/uvic/prepare-models-for-inspection.sh
@@ -4,6 +4,12 @@ export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
. "${BASE_DIR}/../../common-functions.rc"
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
@@ -56,12 +62,16 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do
echo "$ORIGINAL -> $OPTIMIZED in $STEPS"
- cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "$OPTIMIZED/.project"
+ if [ -d "$OPTIMIZED" ] ; then
+ cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "$OPTIMIZED/.project"
- rm -rf "merge-${OPTIMIZED}"
- mkdir "merge-${OPTIMIZED}"
+ rm -rf "merge-${OPTIMIZED}"
+ mkdir "merge-${OPTIMIZED}"
- "${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> "${MOP_LOG}" 2>&1
+ "${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> "${MOP_LOG}" 2>&1
+ else
+ warning "Missing $OPTIMIZED model"
+ fi
done
else
error "Missing MED output for job $BASENAME"
diff --git a/models/uvic/run-architecture-analysis.sh b/models/uvic/run-architecture-analysis.sh
index 56d3653684cca0c3f60563415bc89e0fdc0f63f5..c6b863536b97e7516a14bcf9fa61cba013cbe5b8 100755
--- a/models/uvic/run-architecture-analysis.sh
+++ b/models/uvic/run-architecture-analysis.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. $BASE_DIR/config
else
diff --git a/models/uvic/run-dynamic-analysis.sh b/models/uvic/run-dynamic-analysis.sh
index 53496b724a9661d78812b14d472028e2ec2a5623..fceb6e2ef1f7833dee67d28d1e06d8f3ecedda83 100755
--- a/models/uvic/run-dynamic-analysis.sh
+++ b/models/uvic/run-dynamic-analysis.sh
@@ -11,6 +11,12 @@ else
exit 1
fi
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "${BASE_DIR}/config" ] ; then
. "${BASE_DIR}/config"
else
diff --git a/models/uvic/run-dynamic-observation.sh b/models/uvic/run-dynamic-observation.sh
index 929fca7912f1e03d581cf3bc643ffa5c4c762bc2..f70cc37bb48c2660e9b93374cb84a83b0f985464 100755
--- a/models/uvic/run-dynamic-observation.sh
+++ b/models/uvic/run-dynamic-observation.sh
@@ -4,6 +4,12 @@ export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
. "${BASE_DIR}/../../common-functions.rc"
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. "${BASE_DIR}/config"
else
diff --git a/models/uvic/run-static-analysis.sh b/models/uvic/run-static-analysis.sh
index aa0861f0089dd3bf12de9de25f067635e816e1bf..74219abb559d2b82c1ec3b3d94319cbdfacc1f7a 100755
--- a/models/uvic/run-static-analysis.sh
+++ b/models/uvic/run-static-analysis.sh
@@ -13,6 +13,12 @@ fi
checkMode $2
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "${BASE_DIR}/config" ] ; then
. "${BASE_DIR}/config"
else
diff --git a/models/uvic/run-static-code-processing.sh b/models/uvic/run-static-code-processing.sh
index cb81d16e702689e296165127c29a71f46b7f2362..5f20d3e9af0a868c976e622ccfb5f75d73a55cf6 100755
--- a/models/uvic/run-static-code-processing.sh
+++ b/models/uvic/run-static-code-processing.sh
@@ -4,6 +4,12 @@ export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
. "${BASE_DIR}/../../common-functions.rc"
+if [ -f "${BASE_DIR}/../config" ] ; then
+ . "${BASE_DIR}/../config"
+else
+ echo "Main config file not found."
+ exit 1
+fi
if [ -f "$BASE_DIR/config" ] ; then
. "${BASE_DIR}/config"
else