From 57e41436bf5ee6344585a241fc038562c550164e Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Fri, 23 Jun 2023 10:17:33 +0200
Subject: [PATCH] Updated tools.
---
models/mitgcm/compare-models.sh | 13 ++++---------
models/mitgcm/logback.groovy | 32 --------------------------------
models/mitgcm/logback.xml | 15 +++++++++++++++
3 files changed, 19 insertions(+), 41 deletions(-)
delete mode 100644 models/mitgcm/logback.groovy
create mode 100644 models/mitgcm/logback.xml
diff --git a/models/mitgcm/compare-models.sh b/models/mitgcm/compare-models.sh
index b96fb84..e161fa4 100755
--- a/models/mitgcm/compare-models.sh
+++ b/models/mitgcm/compare-models.sh
@@ -16,18 +16,13 @@ checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
# main
-for I in jss-jobs-22-mitgcm_tutorial_barotropic_gyre_combined_iface-map.job \
-jss-jobs-23-mitgcm_tutorial_barotropic_gyre_combined_map.job \
-jss-jobs-28-mitgcm_tutorial_barotropic_gyre_dynamic_iface-map.job \
-jss-jobs-29-mitgcm_tutorial_barotropic_gyre_dynamic_map.job \
-jss-jobs-34-mitgcm_tutorial_barotropic_gyre_static_iface-map.job \
-jss-jobs-35-mitgcm_tutorial_barotropic_gyre_static_map.job ; do
-
+for JOB in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do
+ BASENAME=`basename "${JOB}"`
information "----------------------------------------"
- information $I
+ information $BASENAME
information "----------------------------------------"
- export JOB_DIRECTORY="${OPTIMIZATION_DATA}/$I"
+ export JOB_DIRECTORY="${JOB}"
checkDirectory "job directory" "${JOB_DIRECTORY}"
diff --git a/models/mitgcm/logback.groovy b/models/mitgcm/logback.groovy
deleted file mode 100644
index 5bf5a90..0000000
--- a/models/mitgcm/logback.groovy
+++ /dev/null
@@ -1,32 +0,0 @@
-import ch.qos.logback.classic.filter.ThresholdFilter
-import ch.qos.logback.core.filter.EvaluatorFilter
-import ch.qos.logback.classic.boolex.GEventEvaluator
-
-import static ch.qos.logback.core.spi.FilterReply.DENY
-import static ch.qos.logback.core.spi.FilterReply.NEUTRAL
-
-appender("FILE", FileAppender) {
- filter(ThresholdFilter) {
- level=INFO
- }
- file = "kieker.log"
- append = true
- encoder(PatternLayoutEncoder) {
- pattern = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"
- }
-}
-
-appender("STDOUT", ConsoleAppender) {
- filter(ThresholdFilter) {
- level=INFO
- }
- encoder(PatternLayoutEncoder) {
- pattern = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"
- }
- target="System.out"
-}
-
-root(DEBUG, ["STDOUT", "FILE"])
-
-
-
diff --git a/models/mitgcm/logback.xml b/models/mitgcm/logback.xml
new file mode 100644
index 0000000..2af965c
--- /dev/null
+++ b/models/mitgcm/logback.xml
@@ -0,0 +1,15 @@
+<configuration>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!-- encoders are assigned the type
+ ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+ <encoder>
+ <!-- pattern>%d{HH:mm:ss.SSS} [%thread] %-5level- %msg%n</pattern -->
+ <pattern>%-5level- %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
--
GitLab