diff --git a/calibration-gui/pom.xml b/calibration-gui/pom.xml index 10e1435f..06feb20e 100644 --- a/calibration-gui/pom.xml +++ b/calibration-gui/pom.xml @@ -5,7 +5,7 @@ gov.llnl.gnem.apps.coda.calibration coda-calibration - 1.0.18 + 1.0.18.1 calibration-gui diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacExporter.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacExporter.java index b4d01750..c2ed7a91 100644 --- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacExporter.java +++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacExporter.java @@ -106,9 +106,7 @@ public SACHeader sacHeaderFromWaveform(Waveform w) throws IOException { header.kevnm = w.getEvent().getEventId(); header.evla = (float) w.getEvent().getLatitude(); header.evlo = (float) w.getEvent().getLongitude(); - //Evdp in meters and we expect Event->Depth to be km so need to convert - // back when we save - header.evdp = (float) (w.getEvent().getDepth() * 1000.0); + header.evdp = (float) (w.getEvent().getDepth()); String depType = w.getSegmentType(); if (depType != null && !depType.trim().isEmpty()) { if (depType.toLowerCase(Locale.ENGLISH).startsWith("dis")) { diff --git a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacLoader.java b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacLoader.java index 5739cb4f..1c87f9cd 100644 --- a/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacLoader.java +++ b/calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/common/gui/converters/sac/SacLoader.java @@ -180,9 +180,7 @@ public Result convertSacFileToWaveform(File file) { if (SACHeader.isDefault(header.evdp)) { eventDepth = 0; } else { - //Just going to assume they are following the SAC header standard - // and using meters for this field and we want Km - eventDepth = header.evdp / 1000.0; + eventDepth = header.evdp; } String dataType = StringUtils.trimToEmpty((String) header.getVariableMap().get("depvariabletype")).toLowerCase(Locale.ENGLISH); diff --git a/calibration-service/calibration-application/pom.xml b/calibration-service/calibration-application/pom.xml index cd8683f7..e7e38320 100644 --- a/calibration-service/calibration-application/pom.xml +++ b/calibration-service/calibration-application/pom.xml @@ -3,7 +3,7 @@ gov.llnl.gnem.apps.coda.calibration calibration-service - 1.0.18 + 1.0.18.1 4.0.0 diff --git a/calibration-service/calibration-model/pom.xml b/calibration-service/calibration-model/pom.xml index 15f4ff81..526bcc36 100644 --- a/calibration-service/calibration-model/pom.xml +++ b/calibration-service/calibration-model/pom.xml @@ -3,7 +3,7 @@ gov.llnl.gnem.apps.coda.calibration calibration-service - 1.0.18 + 1.0.18.1 4.0.0 diff --git a/calibration-service/calibration-repository/pom.xml b/calibration-service/calibration-repository/pom.xml index 82f3a7a4..bf95585f 100644 --- a/calibration-service/calibration-repository/pom.xml +++ b/calibration-service/calibration-repository/pom.xml @@ -3,7 +3,7 @@ gov.llnl.gnem.apps.coda.calibration calibration-service - 1.0.18 + 1.0.18.1 4.0.0 diff --git a/calibration-service/calibration-service-api/pom.xml b/calibration-service/calibration-service-api/pom.xml index 2046b85b..16488bf4 100644 --- a/calibration-service/calibration-service-api/pom.xml +++ b/calibration-service/calibration-service-api/pom.xml @@ -4,7 +4,7 @@ gov.llnl.gnem.apps.coda.calibration calibration-service - 1.0.18 + 1.0.18.1 4.0.0 diff --git a/calibration-service/calibration-service-impl/pom.xml b/calibration-service/calibration-service-impl/pom.xml index 0eeaba6c..756f0489 100644 --- a/calibration-service/calibration-service-impl/pom.xml +++ b/calibration-service/calibration-service-impl/pom.xml @@ -4,7 +4,7 @@ gov.llnl.gnem.apps.coda.calibration calibration-service - 1.0.18 + 1.0.18.1 4.0.0 diff --git a/calibration-service/pom.xml b/calibration-service/pom.xml index 87a0456f..8c4a4914 100644 --- a/calibration-service/pom.xml +++ b/calibration-service/pom.xml @@ -5,7 +5,7 @@ gov.llnl.gnem.apps.coda.calibration coda-calibration - 1.0.18 + 1.0.18.1 4.0.0 diff --git a/calibration-standalone/pom.xml b/calibration-standalone/pom.xml index fb725431..955b21c4 100644 --- a/calibration-standalone/pom.xml +++ b/calibration-standalone/pom.xml @@ -4,7 +4,7 @@ gov.llnl.gnem.apps.coda.calibration coda-calibration - 1.0.18 + 1.0.18.1 4.0.0 diff --git a/docker/Dockerfile b/docker/Dockerfile index 038e4636..5fcb9d6f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.4 +FROM registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.6 ARG USER=1001 ARG JAVA_OPTS="-XX:MaxRAMPercentage=80" ENV JAVA_OPTS=${JAVA_OPTS} @@ -59,4 +59,4 @@ ADD calibration-standalone-*runnable.jar /opt/cct/coda-calibration-standalone.ja ADD run.sh /run.sh EXPOSE 8080 -CMD ["/bin/bash", "/run.sh"] \ No newline at end of file +CMD ["/bin/bash", "/run.sh"] diff --git a/externals/pom.xml b/externals/pom.xml index bdbb8c46..1aaf2768 100644 --- a/externals/pom.xml +++ b/externals/pom.xml @@ -7,7 +7,7 @@ gov.llnl.gnem.apps.coda.calibration coda-calibration - 1.0.18 + 1.0.18.1 externals diff --git a/mapping/pom.xml b/mapping/pom.xml index 0e4c509e..85815926 100644 --- a/mapping/pom.xml +++ b/mapping/pom.xml @@ -7,7 +7,7 @@ gov.llnl.gnem.apps.coda.calibration coda-calibration - 1.0.18 + 1.0.18.1 gov.llnl.gnem.apps.coda.common diff --git a/pom.xml b/pom.xml index af680a4b..5abfb1fd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 gov.llnl.gnem.apps.coda.calibration coda-calibration - 1.0.18 + 1.0.18.1 coda-calibration pom