From 3fbbd6cd982abb3a286de68c44940971e4222d79 Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Fri, 23 Jun 2023 10:27:58 +0200
Subject: [PATCH] Cleanup of compare model scripts.
---
models/mitgcm/compare-models.sh | 15 +++++++++-----
models/uvic/compare-models.sh | 35 +++++++++++++++++++++++----------
2 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/models/mitgcm/compare-models.sh b/models/mitgcm/compare-models.sh
index e161fa4..16c4afb 100755
--- a/models/mitgcm/compare-models.sh
+++ b/models/mitgcm/compare-models.sh
@@ -11,18 +11,19 @@ else
exit 1
fi
+export JAVA_OPTS="-Dlogback.configurationFile=${BASE_DIR}/logback.xml"
+
checkExecutable "Restructuring" "${RESTRUCTURING}"
checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
# main
-
-for JOB in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do
- BASENAME=`basename "${JOB}"`
+for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do
+ BASENAME=`basename "${JOB_DIRECTORY}"`
information "----------------------------------------"
information $BASENAME
information "----------------------------------------"
- export JOB_DIRECTORY="${JOB}"
+ export JOB_DIRECTORY
checkDirectory "job directory" "${JOB_DIRECTORY}"
@@ -58,7 +59,11 @@ for JOB in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do
LIST="$LIST $J"
fi
done
- "${RESTRUCTURING}" -i "${ORIGINAL}" $LIST -o "${JOB_DIRECTORY}" -e demo -s kuhn
+ "${RESTRUCTURING}" -i "${ORIGINAL}" $LIST -o "${JOB_DIRECTORY}" -e compare -s kuhn
+ for K in $LIST ; do
+ OPTIMIZED=`basename $K`
+ "${DELTA}" -i "${JOB_DIRECTORY}/original-model-${OPTIMIZED}.xmi" -o "${JOB_DIRECTORY}/original-model-${OPTIMIZED}"
+ done
fi
done
diff --git a/models/uvic/compare-models.sh b/models/uvic/compare-models.sh
index 5e09687..1f64785 100755
--- a/models/uvic/compare-models.sh
+++ b/models/uvic/compare-models.sh
@@ -17,31 +17,46 @@ checkExecutable "Restructuring" "${RESTRUCTURING}"
checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
# main
-for J in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do
- BASENAME=`basename $J`
+for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do
+ BASENAME=`basename $JOB_DIRECTORY`
information "----------------------------------------"
information $BASENAME
information "----------------------------------------"
- export JOB_DIRECTORY="$J"
+ export JOB_DIRECTORY
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 "kieker-repositories.tar.xz" ] ; then
- tar -xpf kieker-repositories.tar.xz
- mv kieker-repositories/* .
+ 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="original-model"
+ ORIGINAL="${JOB_DIRECTORY}/original-model"
if [ -d "${ORIGINAL}" ] ; then
LIST=""
- for K in "optimized-"* ; do
- if [ -d "$K" ] ; then
- LIST="$LIST $K"
+ for J in "${JOB_DIRECTORY}/optimized-"* ; do
+ if [ -d "$J" ] ; then
+ LIST="$LIST $J"
fi
done
"${RESTRUCTURING}" -i "${ORIGINAL}" $LIST -o "${JOB_DIRECTORY}" -e compare -s kuhn
--
GitLab