From 80a8d4e40bfe07bc1d789b2e0b149cb5e6cba2d3 Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Mon, 9 Dec 2024 12:20:22 -0700 Subject: [PATCH] moved coeff init to static init block --- .../nshmp/gmm/AbrahamsonGulerce_2020.java | 13 +++++++++---- .../usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java index f4639525..7cf2c870 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java @@ -122,10 +122,15 @@ public abstract class AbrahamsonGulerce_2020 implements GroundMotionModel { .set(VS30, Range.closed(150.0, 1000.0)) .build(); - static final CoefficientContainer COEFFS = new CoefficientContainer("AG20.csv"); - static final CoefficientContainer COEFFS_PRVI = new CoefficientContainer("AG20_PRVI.csv"); - static final CoefficientContainer COEFFS_AK_ADJUSTED = - new CoefficientContainer("nga-sub-ak-interface-adjustment.csv"); + static final CoefficientContainer COEFFS; + static final CoefficientContainer COEFFS_PRVI; + static final CoefficientContainer COEFFS_AK_ADJUSTED; + + static { + COEFFS = new CoefficientContainer("AG20.csv"); + COEFFS_PRVI = new CoefficientContainer("AG20_PRVI.csv"); + COEFFS_AK_ADJUSTED = new CoefficientContainer("nga-sub-ak-interface-adjustment.csv"); + } private static final double C1S = 7.5; private static final double C4 = 10.0; diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java index e3a74453..f0ded92f 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java @@ -145,10 +145,15 @@ public abstract class KuehnEtAl_2020 implements GroundMotionModel { .set(VS30, Range.closed(150.0, 1500.0)) .build(); - static final CoefficientContainer COEFFS = new CoefficientContainer("KBCG20.csv"); - static final CoefficientContainer COEFFS_PRVI = new CoefficientContainer("KBCG20_PRVI.csv"); - static final CoefficientContainer COEFFS_AK_ADJUSTED = - new CoefficientContainer("nga-sub-ak-interface-adjustment.csv"); + static final CoefficientContainer COEFFS; + static final CoefficientContainer COEFFS_PRVI; + static final CoefficientContainer COEFFS_AK_ADJUSTED; + + static { + COEFFS = new CoefficientContainer("KBCG20.csv"); + COEFFS_PRVI = new CoefficientContainer("KBCG20_PRVI.csv"); + COEFFS_AK_ADJUSTED = new CoefficientContainer("nga-sub-ak-interface-adjustment.csv"); + } private static final double δM = 0.1; // p. 20 private static final double MREF = 6.0; // p. 20 -- GitLab