From 225e13f451c1958aed7672d2b384af3f65c238d6 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 10:37:53 -0600
Subject: [PATCH 01/63] updated disagg swagger schema

---
 .../earthquake/nshmp/www/hazard/DisaggController.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
index ba7c7c070..cd47c9d99 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
@@ -15,7 +15,6 @@ import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestIml;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestRp;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.Response;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
-
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -102,10 +101,10 @@ public class DisaggController {
       @PathVariable double latitude,
       @Schema(
           minimum = "150",
-          maximum = "3000") @PathVariable double vs30,
+          maximum = "1500") @PathVariable double vs30,
       @Schema(
-          minimum = "150",
-          maximum = "3000") @PathVariable double returnPeriod,
+          minimum = "50",
+          maximum = "10000") @PathVariable double returnPeriod,
       @QueryValue @Nullable Set<Imt> imt,
       @QueryValue @Nullable Set<DisaggDataType> out) {
     try {
@@ -149,7 +148,7 @@ public class DisaggController {
           minimum = "150",
           maximum = "3000") @PathVariable double vs30,
       @Schema(
-          example = "{\"PGA\": 0, \"SA0P2\": 0, \"SA1P0\": 0, \"SA2P0\": 0}") @QueryValue @Nullable Map<Imt, Double> imls,
+          example = "{\"PGA\": 0.1, \"SA0P2\": 0.2, \"SA1P0\": 0.05, \"SA2P0\": 0.01}") @QueryValue @Nullable Map<Imt, Double> imls,
       @QueryValue @Nullable Set<DisaggDataType> out) {
     try {
       Map<Imt, Double> imtImlMap = http.getParameters().asMap(Imt.class, Double.class);
-- 
GitLab


From e6530db9fc636f9f01d4cd70b89209439000e516 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 14:32:49 -0600
Subject: [PATCH 02/63] updated lib

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index edac1e9b9..0f0bd8e52 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
 micronautRxVersion = 2.1.1
 nodePluginVersion = 3.0.1
 nodeVersion = 16.3.0
-nshmpLibVersion = 1.3.9
+nshmpLibVersion = 1.3.13
 nshmpWsUtilsVersion = 0.3.11
 openApiVersion = 4.0.0
 shadowVersion = 7.1.2
-- 
GitLab


From 9b865cf0bf7957f0d8cb1f3164c8ff88e0c0bac2 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 14:33:22 -0600
Subject: [PATCH 03/63] updated conus beta

---
 nshms.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nshms.yml b/nshms.yml
index 029867c06..f9cace132 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -73,7 +73,7 @@ nshms:
   # CONUS 2023 NSHM
   -
     repo: nshm-conus
-    tag: 6.b.2
+    tag: 6.b.3
     year: 2023
     deployment:
       baseHref: /ws/nshmp/conus-2023/dynamic
-- 
GitLab


From 1a11924f507813ffe03e2c2643404aadfa0316b2 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 14:33:35 -0600
Subject: [PATCH 04/63] updated conus test results

---
 .../e2e/nshm-conus-2023/BOSTON_MA.json        | 160 +++++++++---------
 .../e2e/nshm-conus-2023/CHICAGO_IL.json       | 160 +++++++++---------
 .../e2e/nshm-conus-2023/LOS_ANGELES_CA.json   | 160 +++++++++---------
 .../e2e/nshm-conus-2023/NEW_MADRID_MO.json    | 160 +++++++++---------
 .../e2e/nshm-conus-2023/NEW_YORK_NY.json      | 160 +++++++++---------
 .../e2e/nshm-conus-2023/RENO_NV.json          | 156 ++++++++---------
 .../nshm-conus-2023/SALT_LAKE_CITY_UT.json    | 158 ++++++++---------
 .../e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json | 156 ++++++++---------
 .../e2e/nshm-conus-2023/SEATTLE_WA.json       | 160 +++++++++---------
 9 files changed, 715 insertions(+), 715 deletions(-)

diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
index 4b53dcbef..78d802b8b 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.034140124524401905,
-      0.022996758272726864,
-      0.015043403291769857,
-      0.009499014416585823,
-      0.005787553958793812,
-      0.0033272472192361607,
-      0.001839552284077412,
-      9.560239115187544E-4,
-      4.7475120990463364E-4,
-      2.2539035174014697E-4,
-      1.0334735728954467E-4,
-      4.6006986494045055E-5,
-      1.9813826529752363E-5,
-      8.129796400746868E-6,
-      3.0969361779079166E-6,
-      1.0724925749896956E-6,
-      3.179875072442146E-7,
-      7.941384728317632E-8,
-      1.5631082627119162E-8,
-      2.1759631112132076E-9
+      0.03781690942134722,
+      0.02560998712695722,
+      0.01683517841756172,
+      0.010675317900339305,
+      0.006527977980738499,
+      0.0037666741939616057,
+      0.0020910571328798195,
+      0.0010923590899631103,
+      5.458772566494526E-4,
+      2.6104985735441133E-4,
+      1.2062939801655834E-4,
+      5.4113647550187295E-5,
+      2.347538999109399E-5,
+      9.699580588310418E-6,
+      3.7213621990011277E-6,
+      1.2984686317975073E-6,
+      3.8820660002283173E-7,
+      9.785045471794203E-8,
+      1.946037843483608E-8,
+      2.7422728345358543E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.007903887706570899,
-      0.005241415828342099,
-      0.003358765496510537,
-      0.002062236342198035,
-      0.0011974265717558203,
-      6.581346095286463E-4,
-      3.3828123260531674E-4,
-      1.6439089763304547E-4,
-      7.575311546049768E-5,
-      3.303730843395667E-5,
-      1.3769453847428236E-5,
-      5.497669147626031E-6,
-      2.076993455240851E-6,
-      7.519197222974893E-7,
-      2.4394598117779956E-7,
-      7.127632256133505E-8,
-      1.7589707849391878E-8,
-      3.524521937943962E-9,
-      5.234716675441611E-10,
-      5.229662716256705E-11
+      0.00921320730094861,
+      0.00612172117222991,
+      0.003927784889616463,
+      0.002415843378135533,
+      0.0014072769298912606,
+      7.774423342976144E-4,
+      4.024693099758766E-4,
+      1.9730634218575704E-4,
+      9.182408947706067E-5,
+      4.0465849036853986E-5,
+      1.703760017497274E-5,
+      6.866482223986137E-6,
+      2.6160622771360306E-6,
+      9.542403834324573E-7,
+      3.1185607453236485E-7,
+      9.181884057053901E-8,
+      2.2848239268149787E-8,
+      4.620311222721343E-9,
+      6.936412711209975E-10,
+      7.028579358099718E-11
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.06280362919338868,
-      0.04723192992454075,
-      0.03487303678639892,
-      0.025077268653052404,
-      0.017487440054238673,
-      0.011800856568647267,
-      0.0077088747884492045,
-      0.00485533109784549,
-      0.002970458049892235,
-      0.0017654727315382435,
-      0.0010257307937179595,
-      5.724510494335054E-4,
-      3.126870519006663E-4,
-      1.6232983441098812E-4,
-      8.005198098637073E-5,
-      3.637408153200208E-5,
-      1.4834328636117501E-5,
-      5.213753689217435E-6,
-      1.5443331884889456E-6,
-      3.5401386082877373E-7
+      0.06599397975220576,
+      0.04951601624256741,
+      0.036513738982136494,
+      0.026258583569526425,
+      0.01833916291963426,
+      0.012411914456006224,
+      0.008141006833289569,
+      0.005152225174879873,
+      0.003167899870405807,
+      0.001891726179226934,
+      0.0011035470885633653,
+      6.179966567302162E-4,
+      3.385611975149567E-4,
+      1.7630584453206903E-4,
+      8.72617228563019E-5,
+      3.982648113280293E-5,
+      1.632507906376405E-5,
+      5.769066788130919E-6,
+      1.7184900721224076E-6,
+      3.963193550050803E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.08840949087978585,
-      0.06662099002739914,
-      0.04862237659478602,
-      0.034452008336861656,
-      0.023342752120996797,
-      0.015315067528164902,
-      0.009638015838324677,
-      0.005807354940786627,
-      0.0033713872373271497,
-      0.0018838298686472878,
-      0.00101674836790084,
-      5.298117647953759E-4,
-      2.6590749566827494E-4,
-      1.2776174248125812E-4,
-      5.8086279166964426E-5,
-      2.4461727225544027E-5,
-      9.351763530360808E-6,
-      3.1456056263895486E-6,
-      8.878514484949065E-7,
-      2.004285363822191E-7
+      0.09353115905390523,
+      0.0703016736669049,
+      0.05123931616345851,
+      0.03630581145641291,
+      0.024635985605014427,
+      0.016213078359687383,
+      0.010249801865790506,
+      0.0062122987954390104,
+      0.0036307543903602354,
+      0.0020431384223740232,
+      0.0011103316932372833,
+      5.822894133817993E-4,
+      2.9401954680419504E-4,
+      1.4214673052602845E-4,
+      6.507484914740439E-5,
+      2.762583302658458E-5,
+      1.065899008792829E-5,
+      3.622386410973509E-6,
+      1.0342006360285484E-6,
+      2.3647467423869639E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
index 64045111b..36cd53800 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.03135725218822521,
-      0.02063513494836405,
-      0.013365226757157627,
-      0.008532068157203192,
-      0.005394114751401507,
-      0.0032908784812738508,
-      0.001933037803789934,
-      0.001040622588925618,
-      5.039738690989495E-4,
-      2.1200950619937434E-4,
-      7.58320340581136E-5,
-      2.2740678178255835E-5,
-      5.7869320625718405E-6,
-      1.3973316773906963E-6,
-      3.6337940428009047E-7,
-      1.1385114569297925E-7,
-      3.1704766349290966E-8,
-      7.4501614780895174E-9,
-      1.3716779825061576E-9,
-      1.7774636897699117E-10
+      0.03324893310902484,
+      0.022004431105884844,
+      0.01431014775274047,
+      0.009151239631673426,
+      0.0057796167722751765,
+      0.00351403260771589,
+      0.0020552936759178297,
+      0.0011024828423755128,
+      5.332796764095534E-4,
+      2.2502078443087167E-4,
+      8.132456018629311E-5,
+      2.4983602810937415E-5,
+      6.6829514950423814E-6,
+      1.744963240725027E-6,
+      4.909788509372824E-7,
+      1.5684348441413008E-7,
+      4.4159912147687756E-8,
+      1.0492474877263185E-8,
+      1.9576567710691036E-9,
+      2.5802146447004877E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.009345625234480587,
-      0.006574876442465404,
-      0.004656603648936798,
-      0.003302647529702358,
-      0.0022927829064374457,
-      0.0015204831435768897,
-      9.269402804612737E-4,
-      5.068516290057169E-4,
-      2.4121707317102952E-4,
-      9.660310004720301E-5,
-      3.187187379412594E-5,
-      8.393597524084288E-6,
-      1.6825762628351352E-6,
-      2.6944079895203686E-7,
-      3.479148327094692E-8,
-      6.484847561777669E-9,
-      1.552680390939133E-9,
-      3.1977644617796417E-10,
-      5.148314866822282E-11,
-      5.973257867891577E-12
+      0.010005966930455426,
+      0.0070201385492799345,
+      0.004946069582032201,
+      0.0034831512155612545,
+      0.0023991290974655823,
+      0.0015793614229230987,
+      9.569588656999187E-4,
+      5.209847415833335E-4,
+      2.4735052236108E-4,
+      9.904665205541751E-5,
+      3.277868452186688E-5,
+      8.712990693707899E-6,
+      1.7904539860522427E-6,
+      3.053453022508045E-7,
+      4.5864222733130684E-8,
+      9.670711470276267E-9,
+      2.3562950445765526E-9,
+      4.914029457128014E-10,
+      7.99798410640728E-11,
+      9.381018392075352E-12
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.038831826132400014,
-      0.02576399052237043,
-      0.016918946582474326,
-      0.01095891934373803,
-      0.006965358859620503,
-      0.004289616845894357,
-      0.0025181360514077954,
-      0.0013849848975063244,
-      7.227430485631245E-4,
-      3.641450368842957E-4,
-      1.8309424861504635E-4,
-      9.180416612879497E-5,
-      4.7053232168305155E-5,
-      2.3599573386277656E-5,
-      1.1426015796876628E-5,
-      5.127829852689393E-6,
-      2.068964865105813E-6,
-      7.193033853228008E-7,
-      2.1067326196680176E-7,
-      4.7693449532928206E-8
+      0.04088625408517391,
+      0.02742434591762619,
+      0.01821903404509547,
+      0.011934422965670087,
+      0.007663011513102015,
+      0.004765114308889278,
+      0.0028282312853084653,
+      0.0015783077414236475,
+      8.390693640246431E-4,
+      4.318004979848098E-4,
+      2.2144131101680214E-4,
+      1.1266780710891709E-4,
+      5.821356278132561E-5,
+      2.9316226798325754E-5,
+      1.4233176969030012E-5,
+      6.407467702128437E-6,
+      2.5948292983347617E-6,
+      9.058302958854361E-7,
+      2.664550977482879E-7,
+      6.060200630189976E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.0665732762258882,
-      0.04482593685797904,
-      0.029239778748198948,
-      0.018691138345740835,
-      0.011568335069275744,
-      0.007034631275880489,
-      0.004104911619872562,
-      0.0022539698879928114,
-      0.0011558262326008804,
-      5.49795662099864E-4,
-      2.4599994309126513E-4,
-      1.06108926566201E-4,
-      4.539325061828138E-5,
-      1.946324271149397E-5,
-      8.235518127785476E-6,
-      3.309615592894283E-6,
-      1.2203858775884328E-6,
-      3.969683232968708E-7,
-      1.0797100762607447E-7,
-      2.3262394059408082E-8
+      0.0691554767286036,
+      0.04697296493489196,
+      0.030953931061635506,
+      0.020002703636453695,
+      0.012514413169193663,
+      0.007683322438550794,
+      0.004524345762442764,
+      0.0025095609630764104,
+      0.001303814344569991,
+      6.313143767624346E-4,
+      2.8898318737977953E-4,
+      1.2787451423137346E-4,
+      5.6009010931444306E-5,
+      2.444851739501035E-5,
+      1.0472190893854823E-5,
+      4.248516889956776E-6,
+      1.5807570795442502E-6,
+      5.190573795746768E-7,
+      1.4267651060313717E-7,
+      3.112422839449763E-8
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
index 5ed8cf75d..899d3f467 100644
--- a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.8930394300275821,
-      0.6749918381679874,
-      0.49303515325532005,
-      0.34750344309204567,
-      0.23683057852368883,
-      0.15353992971871455,
-      0.0961504205688885,
-      0.057118255524974404,
-      0.03254983412381369,
-      0.017706551998919143,
-      0.009199256321560047,
-      0.004564415356652822,
-      0.0021562936253538795,
-      9.547518736988405E-4,
-      3.843661108834438E-4,
-      1.3593109798767843E-4,
-      3.889249998627689E-5,
-      8.457986321819216E-6,
-      1.1051308985395114E-6,
-      5.259011100968705E-8
+      0.7868229507766732,
+      0.5989999740713615,
+      0.4411933145811913,
+      0.3138528363617102,
+      0.21596260906881826,
+      0.14138668083572575,
+      0.08936175659864179,
+      0.053571208295266515,
+      0.030805802165079648,
+      0.01691363012419211,
+      0.00887050490251598,
+      0.004442451953532403,
+      0.00211670264649697,
+      9.438419330811554E-4,
+      3.819154377529803E-4,
+      1.3550505201544378E-4,
+      3.8845344810999264E-5,
+      8.454437599000299E-6,
+      1.1049521824670764E-6,
+      5.2588487621771735E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.27348424396332727,
-      0.19783508806705066,
-      0.1384820333106381,
-      0.09328684511002477,
-      0.06015381428487856,
-      0.03745072919769844,
-      0.02240846172409476,
-      0.01292221354972295,
-      0.007068213472104339,
-      0.0035706726317248933,
-      0.0016390539611305112,
-      6.752487606634823E-4,
-      2.4533284562506884E-4,
-      8.032285440828849E-5,
-      2.247175730385522E-5,
-      5.411418886960912E-6,
-      9.928107472863706E-7,
-      1.1743055609458905E-7,
-      5.982617399200269E-9,
-      3.071987966436827E-14
+      0.2542985961896629,
+      0.1860513815459171,
+      0.13155312718011508,
+      0.08938668609700867,
+      0.05807099427773341,
+      0.03639542346903606,
+      0.021912933201174326,
+      0.012707809816302823,
+      0.0069846599769759305,
+      0.003542480929942337,
+      0.0016311355865872895,
+      6.735471519384868E-4,
+      2.4513239707115337E-4,
+      8.03508366264512E-5,
+      2.2497141682863387E-5,
+      5.4211128874109765E-6,
+      9.955933871382086E-7,
+      1.1798184600469259E-7,
+      6.032781739742643E-9,
+      3.1737259531833734E-14
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      1.0408774927742945,
-      0.8228815592058314,
-      0.6353827790239575,
-      0.47852776659542795,
-      0.35102245255593834,
-      0.2495855477480165,
-      0.1707599949868633,
-      0.11090265514843083,
-      0.06815040581058016,
-      0.03924877869438323,
-      0.02116071390003618,
-      0.010447140759295407,
-      0.0048755764198802195,
-      0.002092817691903345,
-      8.186454543042516E-4,
-      2.734436254989102E-4,
-      7.233828570932013E-5,
-      1.3617045711482666E-5,
-      1.5643150627006195E-6,
-      5.836979641093877E-8
+      0.9060051232217639,
+      0.7175752958409577,
+      0.5558555572960041,
+      0.42078460948974206,
+      0.3107593352604376,
+      0.22259208945018233,
+      0.15336119255340921,
+      0.10025626794045822,
+      0.0620233986634114,
+      0.03600102576167425,
+      0.019590569749519476,
+      0.009779698336973813,
+      0.004621183161915629,
+      0.0020103826897193175,
+      7.962597777072059E-4,
+      2.687947423527658E-4,
+      7.171139765481873E-5,
+      1.3578410116556566E-5,
+      1.5629304265358868E-6,
+      5.830091651054837E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      1.2322842421810511,
-      1.0061597602503232,
-      0.7986159168246194,
-      0.6201221946003167,
-      0.4676124373980192,
-      0.3456609702956266,
-      0.247711664304258,
-      0.1705552243103603,
-      0.11226595990131216,
-      0.06992833061816081,
-      0.04100714363585288,
-      0.022529752631688313,
-      0.011592421694006833,
-      0.005606862118102381,
-      0.002546612025525221,
-      0.0010623256549632133,
-      3.933660299968117E-4,
-      1.2270161178495203E-4,
-      2.972703740529991E-5,
-      5.047438500391396E-6
+      1.070491121815655,
+      0.874908825634708,
+      0.6955542513007297,
+      0.5416958681285222,
+      0.4104584089223994,
+      0.30531106839534905,
+      0.22031724779258055,
+      0.1527501072974481,
+      0.10121660039467142,
+      0.06347142603560565,
+      0.03749794864850485,
+      0.020783089957195106,
+      0.010808160040269188,
+      0.0052941181283052766,
+      0.0024377564292367812,
+      0.0010302190494455154,
+      3.8564882358079914E-4,
+      1.2133563966813449E-4,
+      2.959166719348735E-5,
+      5.041371572081886E-6
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
index 88ececb0f..bccd4ff49 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.11443891919536114,
-      0.08617987073173887,
-      0.06341011863765277,
-      0.04558938778556612,
-      0.03219115304867416,
-      0.022123712914637106,
-      0.015105385561292508,
-      0.010196566351738967,
-      0.006966398174996786,
-      0.004891284147012434,
-      0.003580482939033717,
-      0.0027123799513555104,
-      0.002051688508124924,
-      0.0014690904037393062,
-      9.446659961148896E-4,
-      5.272033868089062E-4,
-      2.4502289831120555E-4,
-      9.420764352199944E-5,
-      2.8810319073444973E-5,
-      6.703925835075132E-6
+      0.11534974599388693,
+      0.08698148362667113,
+      0.06406292276167219,
+      0.046078192405115966,
+      0.03253637462327355,
+      0.022366693877149558,
+      0.015293415446741955,
+      0.010356860424666315,
+      0.007106470813094831,
+      0.00500706584678398,
+      0.0036674141315344282,
+      0.0027708487867755156,
+      0.002086773137749997,
+      0.001487821691947794,
+      9.535157338758259E-4,
+      5.308929783756661E-4,
+      2.4632953188630317E-4,
+      9.45996695314454E-5,
+      2.890552912548327E-5,
+      6.721429379688254E-6
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.02584615652637672,
-      0.018579319755662165,
-      0.013287432283307131,
-      0.009521297399456233,
-      0.006879224545983419,
-      0.005092871105945046,
-      0.0038950406088637487,
-      0.003110206584836829,
-      0.0025637151164687004,
-      0.002111223503910751,
-      0.0016690438461587575,
-      0.0012233087464873704,
-      8.070734144378035E-4,
-      4.744746274525545E-4,
-      2.371650677546818E-4,
-      1.0084961104742617E-4,
-      3.50155905256611E-5,
-      9.644567735209852E-6,
-      1.96937309904246E-6,
-      2.796507143377928E-7
+      0.026538247127206118,
+      0.01906655327064791,
+      0.013626789983486496,
+      0.00976641241039197,
+      0.00706601708351237,
+      0.005239513882617428,
+      0.004007441363707505,
+      0.0031914729308122084,
+      0.002618022856257823,
+      0.0021443231305726383,
+      0.0016874006667018065,
+      0.0012325536428221145,
+      8.112607839937964E-4,
+      4.7620846546351115E-4,
+      2.3778952000443155E-4,
+      1.0104841608143451E-4,
+      3.506862368489196E-5,
+      9.65602594855597E-6,
+      1.9712202459681616E-6,
+      2.798557895371194E-7
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.20153343863066206,
-      0.1738240853513121,
-      0.14678429583021144,
-      0.12073845792265267,
-      0.09660000326712054,
-      0.07522929063718366,
-      0.057143821282328935,
-      0.04227240543728441,
-      0.030612544187388655,
-      0.021707706932396337,
-      0.015153890104753015,
-      0.010336962475302467,
-      0.007030622559647016,
-      0.004726872732572119,
-      0.0031582251757611016,
-      0.0020409670909132226,
-      0.0012199076476002615,
-      6.312579948869293E-4,
-      2.6953331972370034E-4,
-      8.796833421459317E-5
+      0.2008267606411687,
+      0.1730315848271916,
+      0.14594179639708077,
+      0.11988197257474568,
+      0.0957725674466078,
+      0.07448415764500856,
+      0.05653535014883013,
+      0.04183964847744843,
+      0.0303591809822878,
+      0.021603536983251643,
+      0.015147902209371053,
+      0.010380513858986464,
+      0.007086868639928332,
+      0.004776405847494422,
+      0.003194033664349469,
+      0.002063032278608447,
+      0.0012314821193950324,
+      6.362959860235963E-4,
+      2.7133142360006776E-4,
+      8.845979888500936E-5
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.23286196515853597,
-      0.20161676779547133,
-      0.17011159846949805,
-      0.1395735907671064,
-      0.110272951764528,
-      0.084666169231571,
-      0.06298145137335848,
-      0.045442839066931806,
-      0.03196224782058494,
-      0.02190393267137673,
-      0.014686769873750595,
-      0.00970317866203249,
-      0.006402827405022937,
-      0.004283977056377879,
-      0.0029136021846499598,
-      0.001960487126474647,
-      0.0012363099308865468,
-      6.809155093872539E-4,
-      3.0634374346337885E-4,
-      1.07763096593597E-4
+      0.23235672977120592,
+      0.2010308578772427,
+      0.16949594749416608,
+      0.13897123143573237,
+      0.10971503991301251,
+      0.08417324450282236,
+      0.06257442666659786,
+      0.045144369921103086,
+      0.03178577283279019,
+      0.021843269000236743,
+      0.014712774190862492,
+      0.009775248303873085,
+      0.006484422014715581,
+      0.004352494841555028,
+      0.002960985572647082,
+      0.0019882654343830203,
+      0.0012502056040323956,
+      6.867898974882985E-4,
+      3.0838031869483585E-4,
+      1.083218280210284E-4
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
index e7ad4abbf..9ce8bc628 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.03509019788270474,
-      0.023672043210050033,
-      0.015461485757251958,
-      0.009720859117992194,
-      0.005895073366015707,
-      0.0033855697856321324,
-      0.001885538074362394,
-      9.998085436733444E-4,
-      5.141862182733718E-4,
-      2.563642074000904E-4,
-      1.2447201188700214E-4,
-      5.868023247408325E-5,
-      2.6554460076681254E-5,
-      1.1310951244249482E-5,
-      4.425335683649439E-6,
-      1.5608457515917777E-6,
-      4.686633450593086E-7,
-      1.1798360523614773E-7,
-      2.3340930684216454E-8,
-      3.26172321192792E-9
+      0.0382624680623094,
+      0.026030463448604706,
+      0.017155400855241892,
+      0.010885390093212644,
+      0.006660097241570285,
+      0.003858088495130119,
+      0.0021663261007892464,
+      0.0011583421935267536,
+      6.009032500164473E-4,
+      3.0233926709153134E-4,
+      1.4817587290785013E-4,
+      7.050104808577861E-5,
+      3.218992880314699E-5,
+      1.3832096806263693E-5,
+      5.459529842118775E-6,
+      1.9428392150340858E-6,
+      5.888734403531783E-7,
+      1.4974470891297607E-7,
+      2.995182697021266E-8,
+      4.239346142112846E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.008377282812600046,
-      0.005476844637973868,
-      0.0034436262299643123,
-      0.002072114140374086,
-      0.0011827637162730514,
-      6.440748955771398E-4,
-      3.319815028194056E-4,
-      1.643292227687863E-4,
-      7.84693595634633E-5,
-      3.602258495773719E-5,
-      1.5947992659543457E-5,
-      6.7669098447223684E-6,
-      2.696748714096915E-6,
-      1.016464108113229E-6,
-      3.392355330334583E-7,
-      1.0117067756070208E-7,
-      2.534217137374941E-8,
-      5.133261263594803E-9,
-      7.696469754433571E-10,
-      7.743740364093729E-11
+      0.009600199498981159,
+      0.006320598140568551,
+      0.003998495592416973,
+      0.002420968116332609,
+      0.0013922805998762867,
+      7.653511087722587E-4,
+      3.9910028144341994E-4,
+      2.0013103147428781E-4,
+      9.684010210476128E-5,
+      4.501923579779383E-5,
+      2.0158227838894868E-5,
+      8.640044965400363E-6,
+      3.4752442404719267E-6,
+      1.3213285385796125E-6,
+      4.4489663641411424E-7,
+      1.3385272064306846E-7,
+      3.383715559062798E-8,
+      6.9217291724856125E-9,
+      1.0496384684360479E-9,
+      1.071989454665421E-10
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.059836867159019626,
-      0.045516758737146105,
-      0.034156674346348455,
-      0.025115768817839612,
-      0.01803708685195293,
-      0.012623813542426124,
-      0.008600310243214374,
-      0.005669934234218897,
-      0.0036321765951007425,
-      0.002255850871109844,
-      0.001363787634638478,
-      7.886024999850143E-4,
-      4.4348111236770826E-4,
-      2.3570968271206984E-4,
-      1.183098098256845E-4,
-      5.446617653660456E-5,
-      2.24299649120295E-5,
-      7.943991154558558E-6,
-      2.3685115488022294E-6,
-      5.463678230612657E-7
+      0.06295212478082787,
+      0.04804845815748257,
+      0.0361916108234815,
+      0.0267152751305139,
+      0.01926073686033505,
+      0.013535182229688402,
+      0.009262342125760426,
+      0.006136637176633701,
+      0.003951706514772565,
+      0.0024672025970475927,
+      0.001499024950979399,
+      8.710019776437941E-4,
+      4.921002498934159E-4,
+      2.6283929164592834E-4,
+      1.3262871270711607E-4,
+      6.141179303724591E-5,
+      2.544365025981951E-5,
+      9.06649630578154E-6,
+      2.7195777970597315E-6,
+      6.313004310982964E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.08365637087581765,
-      0.06328091751692146,
-      0.046584611885054375,
-      0.033452127341389866,
-      0.023108697668719053,
-      0.015553782424031421,
-      0.010110754664545038,
-      0.00633314983898454,
-      0.003838481095569623,
-      0.0022438161088123455,
-      0.0012660232441720149,
-      6.877554096479659E-4,
-      3.5831753841646097E-4,
-      1.7776416830023428E-4,
-      8.296222379738778E-5,
-      3.565312965801539E-5,
-      1.3833941676241391E-5,
-      4.702643288690328E-6,
-      1.3372112510983788E-6,
-      3.033970972209854E-7
+      0.08776972431938838,
+      0.06659157694814948,
+      0.049225799499276135,
+      0.03552861479492542,
+      0.024688518599665057,
+      0.016720836145648118,
+      0.01094027406228688,
+      0.006899372453907445,
+      0.004211132882578026,
+      0.0024795228150876546,
+      0.0014092415433829238,
+      7.711400309583001E-4,
+      4.0474448623951237E-4,
+      2.0238516038224294E-4,
+      9.527876089291166E-5,
+      4.134621298433285E-5,
+      1.6214324144157016E-5,
+      5.575162343216448E-6,
+      1.6050336029577984E-6,
+      3.6913561822247894E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
index 7aa1e653f..8367876f9 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.42663422439067866,
-      0.30034534474600294,
-      0.20319181287826804,
-      0.1317182804744252,
-      0.08239186580714886,
-      0.049295392461194326,
-      0.02910710156537928,
-      0.01679236513036096,
-      0.009624862833596362,
-      0.005422635011184332,
-      0.0029461698418783333,
-      0.0014925315566456988,
-      6.766086847822063E-4,
-      2.633598609025862E-4,
-      8.418508555076697E-5,
-      2.0903797690684733E-5,
-      3.450979358876711E-6,
-      3.0109881252425987E-7,
-      5.0815529053615285E-9,
-      1.0636033291493928E-11
+      0.42208271051403046,
+      0.29741505562391685,
+      0.20134874165633232,
+      0.1305394914031066,
+      0.08159855815766615,
+      0.048747243858519765,
+      0.028728543066498365,
+      0.0165441497545661,
+      0.00947241143924665,
+      0.005336503708211274,
+      0.0029018426273452174,
+      0.0014720823187714567,
+      6.683502338795141E-4,
+      2.6054273485112787E-4,
+      8.340470321860671E-5,
+      2.0739047756728618E-5,
+      3.4299913798081007E-6,
+      2.997988841557021E-7,
+      5.025722906176405E-9,
+      1.0054998350751101E-11
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.1114803801635311,
-      0.07597754261786671,
-      0.0501055535519571,
-      0.031995614416187104,
-      0.01971567273072919,
-      0.011808741802172805,
-      0.006801160884047568,
-      0.0037530702390507526,
-      0.0019421497128878798,
-      9.122577764241953E-4,
-      3.785896263413558E-4,
-      1.341923952396422E-4,
-      3.8601805959510175E-5,
-      8.864649889289734E-6,
-      1.3237321176197512E-6,
-      1.1421820637782702E-7,
-      3.9762479918198074E-9,
-      4.54506897153046E-11,
+      0.11164603476372417,
+      0.07615302033867133,
+      0.05023218916490202,
+      0.03206205379070699,
+      0.01973607720387932,
+      0.011805505973328502,
+      0.006791558526586791,
+      0.003745403489667254,
+      0.0019379262080626738,
+      9.104396500283078E-4,
+      3.779357081441099E-4,
+      1.3398373542307244E-4,
+      3.8539619855725496E-5,
+      8.848137363408722E-6,
+      1.3209823866585529E-6,
+      1.1402111764402845E-7,
+      3.993898781907206E-9,
+      4.57747291671781E-11,
       0.0,
       0.0
     ]
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.4684376217858109,
-      0.3392503567268995,
-      0.24003411818483583,
-      0.1660473101168749,
-      0.11287127625863354,
-      0.07567810091139443,
-      0.05003751350413061,
-      0.032283004508963264,
-      0.020255514423656928,
-      0.012226776028886202,
-      0.007066698930791792,
-      0.0037710888995055518,
-      0.0018360803139157917,
-      7.578194493417702E-4,
-      2.569613864931385E-4,
-      6.711383488815794E-5,
-      1.2520271060591594E-5,
-      1.4773362122043648E-6,
-      9.218341162439102E-8,
-      1.7917352823542414E-10
+      0.4599155461589819,
+      0.3319649086597787,
+      0.23409206986520695,
+      0.16154647326844573,
+      0.10974945705851255,
+      0.07368404021013333,
+      0.04881628439753486,
+      0.03151539823238062,
+      0.019734131847006696,
+      0.011863259940844108,
+      0.006829054480992549,
+      0.0036370634708222313,
+      0.0017718673884405407,
+      7.330338912127748E-4,
+      2.4937961771369805E-4,
+      6.540575764264173E-5,
+      1.2274495275130132E-5,
+      1.4624587583248914E-6,
+      9.203515745538137E-8,
+      1.7885452404470933E-10
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.587975786269801,
-      0.44036140193430356,
-      0.320112093545525,
-      0.22805481267112981,
-      0.15829875762666953,
-      0.10910808265547933,
-      0.07421316234424216,
-      0.04962871575469566,
-      0.03256862264345402,
-      0.020764710851960265,
-      0.012780484539353841,
-      0.0075280980055690856,
-      0.0041829972051391625,
-      0.002131825886551728,
-      9.575627615492798E-4,
-      3.6218289173164323E-4,
-      1.1127544422929404E-4,
-      2.6205999047220843E-5,
-      4.246048820908114E-6,
-      4.026984526362189E-7
+      0.5781736131159295,
+      0.4317558628608713,
+      0.3127299521443648,
+      0.22201616924311307,
+      0.15372574540645126,
+      0.10590175150198311,
+      0.07213141667988376,
+      0.04834103453366969,
+      0.031763983053272216,
+      0.020237222675818754,
+      0.012424027707767982,
+      0.0072957051804368265,
+      0.004046254486904427,
+      0.0020623972288192683,
+      9.280649502297485E-4,
+      3.520634680161896E-4,
+      1.0857326034440289E-4,
+      2.5689366239442765E-5,
+      4.192750623848367E-6,
+      4.01123348460218E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
index f4f20c587..d7a96302b 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.11219098214739304,
-      0.08193542790248964,
-      0.05842502282318569,
-      0.04072857499162738,
-      0.02788677472071821,
-      0.018512543004405645,
-      0.012146480839269105,
-      0.007835718613338807,
-      0.005113686294432937,
-      0.003416732614470255,
-      0.002323688239482103,
-      0.0015492364832766833,
-      9.571342003723067E-4,
-      5.183887216670749E-4,
-      2.3538879216000952E-4,
-      8.703406774261094E-5,
-      2.42709025241149E-5,
-      4.63551520457338E-6,
-      4.445081399101097E-7,
-      1.3384862684136067E-8
+      0.1066205260901246,
+      0.07825583368489923,
+      0.056109842470212556,
+      0.03934203889371674,
+      0.027094158525910624,
+      0.018091906437977468,
+      0.011936509153668218,
+      0.007741438737676913,
+      0.005076325830295601,
+      0.00340464389948409,
+      0.002321055813108433,
+      0.0015492739820206014,
+      9.575059527875631E-4,
+      5.18588452697687E-4,
+      2.3545109060021696E-4,
+      8.704532042458257E-5,
+      2.427075127671637E-5,
+      4.6354399691063655E-6,
+      4.445186505995051E-7,
+      1.3362154203028717E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.037528458578661966,
-      0.027907820940292698,
-      0.020296660680350048,
-      0.0143517988889845,
-      0.009814590351937193,
-      0.006552910312885635,
-      0.004285136570175629,
-      0.0027799919960277125,
-      0.0017746532324514148,
-      0.00108132707111879,
-      6.059660460962039E-4,
-      3.0037482195210605E-4,
-      1.2686529173816776E-4,
-      4.563808543711145E-5,
-      1.2816776643999983E-5,
-      2.813751553242538E-6,
-      4.3798093187898446E-7,
-      3.78243276990977E-8,
-      9.645509292239546E-10,
+      0.03668139913725896,
+      0.027416185277202007,
+      0.020013441545351698,
+      0.014186157289335533,
+      0.00971580082012322,
+      0.006493622679459942,
+      0.004251065202650582,
+      0.0027618184401512072,
+      0.0017658984392134578,
+      0.0010776067815833582,
+      6.045776102932352E-4,
+      2.999138195955864E-4,
+      1.2672661498885026E-4,
+      4.5597555745573066E-5,
+      1.2806028374110111E-5,
+      2.811031292211179E-6,
+      4.3749715102153516E-7,
+      3.7783452369069785E-8,
+      9.623240540872695E-10,
       0.0
     ]
   },
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.14755329378979273,
-      0.113359294048349,
-      0.08421019134105376,
-      0.0604410154779526,
-      0.042098126497287454,
-      0.028562208412314292,
-      0.01890095822589587,
-      0.012177890259887565,
-      0.007791880932176469,
-      0.005068144100918392,
-      0.003426460724381372,
-      0.002348315582046171,
-      0.0015592502145499016,
-      9.072292226041189E-4,
-      4.3288277746987157E-4,
-      1.587108237468096E-4,
-      4.254229381134994E-5,
-      7.418489918810133E-6,
-      7.197558643861303E-7,
-      2.263720678874752E-8
+      0.1349931553096723,
+      0.10345943906469635,
+      0.0769239914133015,
+      0.055486209971864056,
+      0.03900001317460326,
+      0.02678500066257991,
+      0.017968206202401048,
+      0.01173766157331265,
+      0.007606679496527605,
+      0.005001050150819256,
+      0.0034065854722393333,
+      0.002344470201826488,
+      0.0015592089355909338,
+      9.075635513349779E-4,
+      4.330276156939576E-4,
+      1.5874554685976004E-4,
+      4.254754130488548E-5,
+      7.419397242177774E-6,
+      7.200876073546254E-7,
+      2.266803290550335E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.18978988971700783,
-      0.15157605579328254,
-      0.11628733503254238,
-      0.08609542143308128,
-      0.061096559370017914,
-      0.04236098763195781,
-      0.02862409554558565,
-      0.01886750482585816,
-      0.0122375335022219,
-      0.007900716230762248,
-      0.005198868201063042,
-      0.003540172353396182,
-      0.002464639414487041,
-      0.0016681578113355898,
-      0.0010209101740962269,
-      5.271544454673987E-4,
-      2.1961669569318387E-4,
-      7.112998803514315E-5,
-      1.6600250552528635E-5,
-      2.386272725595525E-6
+      0.1728841872965669,
+      0.1375827373817079,
+      0.10543463713960693,
+      0.07824019989964623,
+      0.055887122092807634,
+      0.039159099313921884,
+      0.02682324594932466,
+      0.017949410300669166,
+      0.011815578180490236,
+      0.007730434545688283,
+      0.005141237870537882,
+      0.0035259505457939508,
+      0.0024637091317716063,
+      0.0016696333053445832,
+      0.0010219552979188978,
+      5.275816856796742E-4,
+      2.1974043251097854E-4,
+      7.115551098628321E-5,
+      1.660393923546466E-5,
+      2.386951424389801E-6
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
index 359c3198e..a9bf63d5f 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.7746367562815772,
-      0.5686052431806999,
-      0.40227467541483064,
-      0.2755871907406573,
-      0.18476999731569105,
-      0.12025386508322182,
-      0.07754541783037242,
-      0.048709426308416584,
-      0.02994162599286055,
-      0.01773333819383354,
-      0.009943003674454587,
-      0.0051338708921865464,
-      0.0023532435289291965,
-      9.186108388174573E-4,
-      2.91134922239425E-4,
-      7.081671567626723E-5,
-      1.0380093911107993E-5,
-      5.655988991794296E-7,
-      4.335520555056763E-9,
-      4.1099056908468094E-11
+      0.7412020069287325,
+      0.546771097372181,
+      0.3895666182491331,
+      0.2693187943302815,
+      0.18242338921639994,
+      0.11995038403977892,
+      0.07799644881444773,
+      0.04927358342759975,
+      0.030376607486987953,
+      0.018008349759277505,
+      0.010097680914907158,
+      0.00521278561086945,
+      0.0023892049050663073,
+      9.327513480139984E-4,
+      2.9569244893226095E-4,
+      7.195033306131465E-5,
+      1.0565214635249342E-5,
+      5.827800074435574E-7,
+      4.900599416825652E-9,
+      4.275194655099434E-11
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.20263986131553968,
-      0.14678294845713188,
-      0.10462524254291136,
-      0.07285460878576448,
-      0.04905617784732996,
-      0.03201875897479764,
-      0.020189248475681296,
-      0.012467468773957125,
-      0.007532959771686708,
-      0.004346640850204765,
-      0.0023153926031180033,
-      0.001091335657598864,
-      4.329297811692454E-4,
-      1.421540893693734E-4,
-      3.464257319303906E-5,
-      5.721595674845194E-6,
-      4.629202269862235E-7,
-      1.0201961208946842E-8,
+      0.19989802787063055,
+      0.1454791924374374,
+      0.10406351582976882,
+      0.07264283835386522,
+      0.04900244150364073,
+      0.03203461887322696,
+      0.0202326926768266,
+      0.012514319742195705,
+      0.007570412205123908,
+      0.004370698137649081,
+      0.002328097436837211,
+      0.0010968941346559207,
+      4.3491809840385653E-4,
+      1.427451566651518E-4,
+      3.477749217799798E-5,
+      5.745950716089173E-6,
+      4.6551996044968885E-7,
+      1.0273248639993878E-8,
       0.0,
       0.0
     ]
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.9950149041471343,
-      0.7822054510524109,
-      0.5930970746391648,
-      0.43283746778356513,
-      0.30517281769505006,
-      0.20927080695971087,
-      0.14061027134169302,
-      0.09247391728292101,
-      0.059646322474660424,
-      0.0372499286478018,
-      0.022180858795201035,
-      0.011987617233244183,
-      0.005763068284039041,
-      0.002281406462237881,
-      7.143583176709967E-4,
-      1.6231834263474734E-4,
-      2.3172627377515066E-5,
-      1.3221435247206632E-6,
-      1.0390900005539278E-8,
-      2.4891617693814247E-11
+      0.941446692674993,
+      0.7407885169406322,
+      0.563676262226526,
+      0.4142531765743614,
+      0.2952951724787791,
+      0.2055261969138869,
+      0.1405332525902355,
+      0.09407170389206379,
+      0.06152413341756263,
+      0.03870360907811028,
+      0.02306193103598436,
+      0.01242056330021445,
+      0.005944148449743759,
+      0.002343796648641668,
+      7.320727193201749E-4,
+      1.6617918651901805E-4,
+      2.373369787480074E-5,
+      1.3637344746821936E-6,
+      1.1750308079023131E-8,
+      2.573279141406786E-11
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      1.1725719133529338,
-      0.9595400391715598,
-      0.7565353507328292,
-      0.5764603342356731,
-      0.4211860880325202,
-      0.29987701376720033,
-      0.2077125723429759,
-      0.1405145495941157,
-      0.09352246860961959,
-      0.06102120142703036,
-      0.03873832947352556,
-      0.023464391399195275,
-      0.01315742042994123,
-      0.006578116613440269,
-      0.0028173300502167117,
-      9.861066793382697E-4,
-      2.697271888406998E-4,
-      5.3391584263627216E-5,
-      6.048245836640893E-6,
-      2.123505790177978E-7
+      1.1094705753560454,
+      0.9074498058082456,
+      0.7162917121900128,
+      0.5477892655903103,
+      0.4030663143449499,
+      0.29003473458033724,
+      0.20377246183432465,
+      0.14019231121072628,
+      0.09489231245407237,
+      0.06276041979515903,
+      0.0401527687724505,
+      0.024367211576743906,
+      0.0136370347718493,
+      0.006794920278788953,
+      0.002900600612398345,
+      0.00101273146372814,
+      2.7665341473606154E-4,
+      5.4736799591264516E-5,
+      6.206212855747993E-6,
+      2.2238003232261039E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
index 5d653cfed..649aa23fe 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.2260389941027982,
-      0.18673287871717797,
-      0.14894826654797788,
-      0.11449461648567111,
-      0.08506284895448553,
-      0.06050807474287691,
-      0.04186643845074871,
-      0.027849209529987005,
-      0.017968829044643447,
-      0.011171394311388378,
-      0.0066417651372260526,
-      0.0037158797491691348,
-      0.00191167641932664,
-      8.796636053695822E-4,
-      3.509779712411307E-4,
-      1.182406018533433E-4,
-      3.102542758912421E-5,
-      5.9153879649216E-6,
-      6.471765277197742E-7,
-      2.1638094074644876E-8
+      0.2720012839099464,
+      0.22500101891286955,
+      0.1795956127957704,
+      0.1380152103367654,
+      0.10236460084101376,
+      0.07254027934989354,
+      0.04987402230582741,
+      0.03285731579837476,
+      0.0209271590832584,
+      0.012804398289015523,
+      0.007478196138367596,
+      0.004109055516008944,
+      0.002078683165252033,
+      9.424289908426162E-4,
+      3.712971432068213E-4,
+      1.2376763365575736E-4,
+      3.217585650066018E-5,
+      6.088764006370009E-6,
+      6.638069060296292E-7,
+      2.2338042216476536E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.08486848560499322,
-      0.0635671121445339,
-      0.04641120376548576,
-      0.03297860619359377,
-      0.022699906546387684,
-      0.01521446969486093,
-      0.009903407719051592,
-      0.006335747888701792,
-      0.0039865876097801385,
-      0.0024302704469097176,
-      0.0014012006706543927,
-      7.363411888351279E-4,
-      3.373119800831176E-4,
-      1.331554495380604E-4,
-      4.1773579822682375E-5,
-      1.0192004683187488E-5,
-      1.6283915890889046E-6,
-      1.142921653056598E-7,
-      1.671555398835124E-10,
-      2.447116464287589E-12
+      0.10112155116443493,
+      0.07536274297033069,
+      0.05467225443720265,
+      0.03855135589753426,
+      0.026295074114303603,
+      0.017434536142098132,
+      0.011196417577343755,
+      0.0070428555522426255,
+      0.004340897633319749,
+      0.002584434083125346,
+      0.0014543142944078412,
+      7.472476663557046E-4,
+      3.358110282768571E-4,
+      1.3061836671336092E-4,
+      4.0509946695418904E-5,
+      9.83906313046857E-6,
+      1.5976112911162914E-6,
+      1.1702442353526242E-7,
+      2.9729067075443623E-10,
+      4.389238001777538E-12
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.24758645161159107,
-      0.21368051350451356,
-      0.17903579294302124,
-      0.14471686198216982,
-      0.11240870512653817,
-      0.08366414518041265,
-      0.05952936285783296,
-      0.040201939466709996,
-      0.025824445204410205,
-      0.01571897546733584,
-      0.009073275949873377,
-      0.0048338434728619935,
-      0.002392938789438222,
-      0.001043844605181894,
-      3.926954996484337E-4,
-      1.2065853222813827E-4,
-      2.8945445199153775E-5,
-      5.0431958827163675E-6,
-      6.458915879250966E-7,
-      5.0977545729106306E-8
+      0.2997574596960255,
+      0.2594970677904381,
+      0.21800348948407317,
+      0.17666524901866726,
+      0.1375855038726806,
+      0.10267707671363704,
+      0.07323059909803735,
+      0.0495145751290026,
+      0.031761383858285856,
+      0.019223717074444042,
+      0.010977650963636176,
+      0.005754173014131576,
+      0.002791308105856049,
+      0.001189193451117029,
+      4.3628590817867453E-4,
+      1.305744694545304E-4,
+      3.0452965136500134E-5,
+      5.153654934301513E-6,
+      6.486338325711446E-7,
+      5.098248660411605E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.27464111040686656,
-      0.24397151910936232,
-      0.21108722461286616,
-      0.1776053800398283,
-      0.143858391830204,
-      0.11269887180037957,
-      0.08472552519443224,
-      0.060841173672394874,
-      0.04176039523356019,
-      0.027304863909348488,
-      0.01700707209018706,
-      0.010053394813066925,
-      0.005599824780819147,
-      0.0029013745282167906,
-      0.001369595818065326,
-      5.712689186226531E-4,
-      2.0583910689957137E-4,
-      6.246219285651837E-5,
-      1.534383975886173E-5,
-      3.029313657208876E-6
+      0.33134195947353257,
+      0.2952442825082112,
+      0.2561058686047792,
+      0.21595142650255816,
+      0.1752830008987528,
+      0.1375976824795585,
+      0.10364510277886793,
+      0.07453632475792718,
+      0.05117114296700223,
+      0.033382624917334625,
+      0.020666555202340092,
+      0.012084714154117097,
+      0.006625971666421022,
+      0.0033650785545447535,
+      0.0015524800541055423,
+      6.317979271851182E-4,
+      2.219466181801561E-4,
+      6.563867979464505E-5,
+      1.5714570279941968E-5,
+      3.047854069812862E-6
     ]
   }
 }
\ No newline at end of file
-- 
GitLab


From 94b519c4e9ef9913b64985ea40197d3fba967862 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 14:41:03 -0600
Subject: [PATCH 05/63] formatting

---
 .../gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
index cd47c9d99..ae7cb13e7 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
@@ -15,6 +15,7 @@ import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestIml;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestRp;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.Response;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
+
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
-- 
GitLab


From b04ff29177b3baade5b618ba1913978ae0a2f73a Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 10:37:53 -0600
Subject: [PATCH 06/63] updated disagg swagger schema

---
 .../earthquake/nshmp/www/hazard/DisaggController.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
index ba7c7c070..cd47c9d99 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
@@ -15,7 +15,6 @@ import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestIml;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestRp;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.Response;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
-
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -102,10 +101,10 @@ public class DisaggController {
       @PathVariable double latitude,
       @Schema(
           minimum = "150",
-          maximum = "3000") @PathVariable double vs30,
+          maximum = "1500") @PathVariable double vs30,
       @Schema(
-          minimum = "150",
-          maximum = "3000") @PathVariable double returnPeriod,
+          minimum = "50",
+          maximum = "10000") @PathVariable double returnPeriod,
       @QueryValue @Nullable Set<Imt> imt,
       @QueryValue @Nullable Set<DisaggDataType> out) {
     try {
@@ -149,7 +148,7 @@ public class DisaggController {
           minimum = "150",
           maximum = "3000") @PathVariable double vs30,
       @Schema(
-          example = "{\"PGA\": 0, \"SA0P2\": 0, \"SA1P0\": 0, \"SA2P0\": 0}") @QueryValue @Nullable Map<Imt, Double> imls,
+          example = "{\"PGA\": 0.1, \"SA0P2\": 0.2, \"SA1P0\": 0.05, \"SA2P0\": 0.01}") @QueryValue @Nullable Map<Imt, Double> imls,
       @QueryValue @Nullable Set<DisaggDataType> out) {
     try {
       Map<Imt, Double> imtImlMap = http.getParameters().asMap(Imt.class, Double.class);
-- 
GitLab


From abbec03d362cf085caf8b1d2cafc6c9a8eda9cf0 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 16:19:50 -0600
Subject: [PATCH 07/63] fixed props conflict

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index df14f1441..9ec679a3e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
 micronautRxVersion = 2.1.1
 nodePluginVersion = 3.0.1
 nodeVersion = 16.3.0
-nshmpLibVersion = 1.3.10
+nshmpLibVersion = 1.3.13
 nshmpWsUtilsVersion = 0.3.12
 openApiVersion = 4.0.0
 shadowVersion = 7.1.2
-- 
GitLab


From 579d559d06e19254719389c2f2f003c927112952 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 14:33:22 -0600
Subject: [PATCH 08/63] updated conus beta

---
 nshms.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nshms.yml b/nshms.yml
index 029867c06..f9cace132 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -73,7 +73,7 @@ nshms:
   # CONUS 2023 NSHM
   -
     repo: nshm-conus
-    tag: 6.b.2
+    tag: 6.b.3
     year: 2023
     deployment:
       baseHref: /ws/nshmp/conus-2023/dynamic
-- 
GitLab


From 8d9e72861888a58f9469c65cdfa8a274535573c6 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 14:33:35 -0600
Subject: [PATCH 09/63] updated conus test results

---
 .../e2e/nshm-conus-2023/BOSTON_MA.json        | 160 +++++++++---------
 .../e2e/nshm-conus-2023/CHICAGO_IL.json       | 160 +++++++++---------
 .../e2e/nshm-conus-2023/LOS_ANGELES_CA.json   | 160 +++++++++---------
 .../e2e/nshm-conus-2023/NEW_MADRID_MO.json    | 160 +++++++++---------
 .../e2e/nshm-conus-2023/NEW_YORK_NY.json      | 160 +++++++++---------
 .../e2e/nshm-conus-2023/RENO_NV.json          | 156 ++++++++---------
 .../nshm-conus-2023/SALT_LAKE_CITY_UT.json    | 158 ++++++++---------
 .../e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json | 156 ++++++++---------
 .../e2e/nshm-conus-2023/SEATTLE_WA.json       | 160 +++++++++---------
 9 files changed, 715 insertions(+), 715 deletions(-)

diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
index 4b53dcbef..78d802b8b 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.034140124524401905,
-      0.022996758272726864,
-      0.015043403291769857,
-      0.009499014416585823,
-      0.005787553958793812,
-      0.0033272472192361607,
-      0.001839552284077412,
-      9.560239115187544E-4,
-      4.7475120990463364E-4,
-      2.2539035174014697E-4,
-      1.0334735728954467E-4,
-      4.6006986494045055E-5,
-      1.9813826529752363E-5,
-      8.129796400746868E-6,
-      3.0969361779079166E-6,
-      1.0724925749896956E-6,
-      3.179875072442146E-7,
-      7.941384728317632E-8,
-      1.5631082627119162E-8,
-      2.1759631112132076E-9
+      0.03781690942134722,
+      0.02560998712695722,
+      0.01683517841756172,
+      0.010675317900339305,
+      0.006527977980738499,
+      0.0037666741939616057,
+      0.0020910571328798195,
+      0.0010923590899631103,
+      5.458772566494526E-4,
+      2.6104985735441133E-4,
+      1.2062939801655834E-4,
+      5.4113647550187295E-5,
+      2.347538999109399E-5,
+      9.699580588310418E-6,
+      3.7213621990011277E-6,
+      1.2984686317975073E-6,
+      3.8820660002283173E-7,
+      9.785045471794203E-8,
+      1.946037843483608E-8,
+      2.7422728345358543E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.007903887706570899,
-      0.005241415828342099,
-      0.003358765496510537,
-      0.002062236342198035,
-      0.0011974265717558203,
-      6.581346095286463E-4,
-      3.3828123260531674E-4,
-      1.6439089763304547E-4,
-      7.575311546049768E-5,
-      3.303730843395667E-5,
-      1.3769453847428236E-5,
-      5.497669147626031E-6,
-      2.076993455240851E-6,
-      7.519197222974893E-7,
-      2.4394598117779956E-7,
-      7.127632256133505E-8,
-      1.7589707849391878E-8,
-      3.524521937943962E-9,
-      5.234716675441611E-10,
-      5.229662716256705E-11
+      0.00921320730094861,
+      0.00612172117222991,
+      0.003927784889616463,
+      0.002415843378135533,
+      0.0014072769298912606,
+      7.774423342976144E-4,
+      4.024693099758766E-4,
+      1.9730634218575704E-4,
+      9.182408947706067E-5,
+      4.0465849036853986E-5,
+      1.703760017497274E-5,
+      6.866482223986137E-6,
+      2.6160622771360306E-6,
+      9.542403834324573E-7,
+      3.1185607453236485E-7,
+      9.181884057053901E-8,
+      2.2848239268149787E-8,
+      4.620311222721343E-9,
+      6.936412711209975E-10,
+      7.028579358099718E-11
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.06280362919338868,
-      0.04723192992454075,
-      0.03487303678639892,
-      0.025077268653052404,
-      0.017487440054238673,
-      0.011800856568647267,
-      0.0077088747884492045,
-      0.00485533109784549,
-      0.002970458049892235,
-      0.0017654727315382435,
-      0.0010257307937179595,
-      5.724510494335054E-4,
-      3.126870519006663E-4,
-      1.6232983441098812E-4,
-      8.005198098637073E-5,
-      3.637408153200208E-5,
-      1.4834328636117501E-5,
-      5.213753689217435E-6,
-      1.5443331884889456E-6,
-      3.5401386082877373E-7
+      0.06599397975220576,
+      0.04951601624256741,
+      0.036513738982136494,
+      0.026258583569526425,
+      0.01833916291963426,
+      0.012411914456006224,
+      0.008141006833289569,
+      0.005152225174879873,
+      0.003167899870405807,
+      0.001891726179226934,
+      0.0011035470885633653,
+      6.179966567302162E-4,
+      3.385611975149567E-4,
+      1.7630584453206903E-4,
+      8.72617228563019E-5,
+      3.982648113280293E-5,
+      1.632507906376405E-5,
+      5.769066788130919E-6,
+      1.7184900721224076E-6,
+      3.963193550050803E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.08840949087978585,
-      0.06662099002739914,
-      0.04862237659478602,
-      0.034452008336861656,
-      0.023342752120996797,
-      0.015315067528164902,
-      0.009638015838324677,
-      0.005807354940786627,
-      0.0033713872373271497,
-      0.0018838298686472878,
-      0.00101674836790084,
-      5.298117647953759E-4,
-      2.6590749566827494E-4,
-      1.2776174248125812E-4,
-      5.8086279166964426E-5,
-      2.4461727225544027E-5,
-      9.351763530360808E-6,
-      3.1456056263895486E-6,
-      8.878514484949065E-7,
-      2.004285363822191E-7
+      0.09353115905390523,
+      0.0703016736669049,
+      0.05123931616345851,
+      0.03630581145641291,
+      0.024635985605014427,
+      0.016213078359687383,
+      0.010249801865790506,
+      0.0062122987954390104,
+      0.0036307543903602354,
+      0.0020431384223740232,
+      0.0011103316932372833,
+      5.822894133817993E-4,
+      2.9401954680419504E-4,
+      1.4214673052602845E-4,
+      6.507484914740439E-5,
+      2.762583302658458E-5,
+      1.065899008792829E-5,
+      3.622386410973509E-6,
+      1.0342006360285484E-6,
+      2.3647467423869639E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
index 64045111b..36cd53800 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.03135725218822521,
-      0.02063513494836405,
-      0.013365226757157627,
-      0.008532068157203192,
-      0.005394114751401507,
-      0.0032908784812738508,
-      0.001933037803789934,
-      0.001040622588925618,
-      5.039738690989495E-4,
-      2.1200950619937434E-4,
-      7.58320340581136E-5,
-      2.2740678178255835E-5,
-      5.7869320625718405E-6,
-      1.3973316773906963E-6,
-      3.6337940428009047E-7,
-      1.1385114569297925E-7,
-      3.1704766349290966E-8,
-      7.4501614780895174E-9,
-      1.3716779825061576E-9,
-      1.7774636897699117E-10
+      0.03324893310902484,
+      0.022004431105884844,
+      0.01431014775274047,
+      0.009151239631673426,
+      0.0057796167722751765,
+      0.00351403260771589,
+      0.0020552936759178297,
+      0.0011024828423755128,
+      5.332796764095534E-4,
+      2.2502078443087167E-4,
+      8.132456018629311E-5,
+      2.4983602810937415E-5,
+      6.6829514950423814E-6,
+      1.744963240725027E-6,
+      4.909788509372824E-7,
+      1.5684348441413008E-7,
+      4.4159912147687756E-8,
+      1.0492474877263185E-8,
+      1.9576567710691036E-9,
+      2.5802146447004877E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.009345625234480587,
-      0.006574876442465404,
-      0.004656603648936798,
-      0.003302647529702358,
-      0.0022927829064374457,
-      0.0015204831435768897,
-      9.269402804612737E-4,
-      5.068516290057169E-4,
-      2.4121707317102952E-4,
-      9.660310004720301E-5,
-      3.187187379412594E-5,
-      8.393597524084288E-6,
-      1.6825762628351352E-6,
-      2.6944079895203686E-7,
-      3.479148327094692E-8,
-      6.484847561777669E-9,
-      1.552680390939133E-9,
-      3.1977644617796417E-10,
-      5.148314866822282E-11,
-      5.973257867891577E-12
+      0.010005966930455426,
+      0.0070201385492799345,
+      0.004946069582032201,
+      0.0034831512155612545,
+      0.0023991290974655823,
+      0.0015793614229230987,
+      9.569588656999187E-4,
+      5.209847415833335E-4,
+      2.4735052236108E-4,
+      9.904665205541751E-5,
+      3.277868452186688E-5,
+      8.712990693707899E-6,
+      1.7904539860522427E-6,
+      3.053453022508045E-7,
+      4.5864222733130684E-8,
+      9.670711470276267E-9,
+      2.3562950445765526E-9,
+      4.914029457128014E-10,
+      7.99798410640728E-11,
+      9.381018392075352E-12
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.038831826132400014,
-      0.02576399052237043,
-      0.016918946582474326,
-      0.01095891934373803,
-      0.006965358859620503,
-      0.004289616845894357,
-      0.0025181360514077954,
-      0.0013849848975063244,
-      7.227430485631245E-4,
-      3.641450368842957E-4,
-      1.8309424861504635E-4,
-      9.180416612879497E-5,
-      4.7053232168305155E-5,
-      2.3599573386277656E-5,
-      1.1426015796876628E-5,
-      5.127829852689393E-6,
-      2.068964865105813E-6,
-      7.193033853228008E-7,
-      2.1067326196680176E-7,
-      4.7693449532928206E-8
+      0.04088625408517391,
+      0.02742434591762619,
+      0.01821903404509547,
+      0.011934422965670087,
+      0.007663011513102015,
+      0.004765114308889278,
+      0.0028282312853084653,
+      0.0015783077414236475,
+      8.390693640246431E-4,
+      4.318004979848098E-4,
+      2.2144131101680214E-4,
+      1.1266780710891709E-4,
+      5.821356278132561E-5,
+      2.9316226798325754E-5,
+      1.4233176969030012E-5,
+      6.407467702128437E-6,
+      2.5948292983347617E-6,
+      9.058302958854361E-7,
+      2.664550977482879E-7,
+      6.060200630189976E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.0665732762258882,
-      0.04482593685797904,
-      0.029239778748198948,
-      0.018691138345740835,
-      0.011568335069275744,
-      0.007034631275880489,
-      0.004104911619872562,
-      0.0022539698879928114,
-      0.0011558262326008804,
-      5.49795662099864E-4,
-      2.4599994309126513E-4,
-      1.06108926566201E-4,
-      4.539325061828138E-5,
-      1.946324271149397E-5,
-      8.235518127785476E-6,
-      3.309615592894283E-6,
-      1.2203858775884328E-6,
-      3.969683232968708E-7,
-      1.0797100762607447E-7,
-      2.3262394059408082E-8
+      0.0691554767286036,
+      0.04697296493489196,
+      0.030953931061635506,
+      0.020002703636453695,
+      0.012514413169193663,
+      0.007683322438550794,
+      0.004524345762442764,
+      0.0025095609630764104,
+      0.001303814344569991,
+      6.313143767624346E-4,
+      2.8898318737977953E-4,
+      1.2787451423137346E-4,
+      5.6009010931444306E-5,
+      2.444851739501035E-5,
+      1.0472190893854823E-5,
+      4.248516889956776E-6,
+      1.5807570795442502E-6,
+      5.190573795746768E-7,
+      1.4267651060313717E-7,
+      3.112422839449763E-8
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
index 5ed8cf75d..899d3f467 100644
--- a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.8930394300275821,
-      0.6749918381679874,
-      0.49303515325532005,
-      0.34750344309204567,
-      0.23683057852368883,
-      0.15353992971871455,
-      0.0961504205688885,
-      0.057118255524974404,
-      0.03254983412381369,
-      0.017706551998919143,
-      0.009199256321560047,
-      0.004564415356652822,
-      0.0021562936253538795,
-      9.547518736988405E-4,
-      3.843661108834438E-4,
-      1.3593109798767843E-4,
-      3.889249998627689E-5,
-      8.457986321819216E-6,
-      1.1051308985395114E-6,
-      5.259011100968705E-8
+      0.7868229507766732,
+      0.5989999740713615,
+      0.4411933145811913,
+      0.3138528363617102,
+      0.21596260906881826,
+      0.14138668083572575,
+      0.08936175659864179,
+      0.053571208295266515,
+      0.030805802165079648,
+      0.01691363012419211,
+      0.00887050490251598,
+      0.004442451953532403,
+      0.00211670264649697,
+      9.438419330811554E-4,
+      3.819154377529803E-4,
+      1.3550505201544378E-4,
+      3.8845344810999264E-5,
+      8.454437599000299E-6,
+      1.1049521824670764E-6,
+      5.2588487621771735E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.27348424396332727,
-      0.19783508806705066,
-      0.1384820333106381,
-      0.09328684511002477,
-      0.06015381428487856,
-      0.03745072919769844,
-      0.02240846172409476,
-      0.01292221354972295,
-      0.007068213472104339,
-      0.0035706726317248933,
-      0.0016390539611305112,
-      6.752487606634823E-4,
-      2.4533284562506884E-4,
-      8.032285440828849E-5,
-      2.247175730385522E-5,
-      5.411418886960912E-6,
-      9.928107472863706E-7,
-      1.1743055609458905E-7,
-      5.982617399200269E-9,
-      3.071987966436827E-14
+      0.2542985961896629,
+      0.1860513815459171,
+      0.13155312718011508,
+      0.08938668609700867,
+      0.05807099427773341,
+      0.03639542346903606,
+      0.021912933201174326,
+      0.012707809816302823,
+      0.0069846599769759305,
+      0.003542480929942337,
+      0.0016311355865872895,
+      6.735471519384868E-4,
+      2.4513239707115337E-4,
+      8.03508366264512E-5,
+      2.2497141682863387E-5,
+      5.4211128874109765E-6,
+      9.955933871382086E-7,
+      1.1798184600469259E-7,
+      6.032781739742643E-9,
+      3.1737259531833734E-14
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      1.0408774927742945,
-      0.8228815592058314,
-      0.6353827790239575,
-      0.47852776659542795,
-      0.35102245255593834,
-      0.2495855477480165,
-      0.1707599949868633,
-      0.11090265514843083,
-      0.06815040581058016,
-      0.03924877869438323,
-      0.02116071390003618,
-      0.010447140759295407,
-      0.0048755764198802195,
-      0.002092817691903345,
-      8.186454543042516E-4,
-      2.734436254989102E-4,
-      7.233828570932013E-5,
-      1.3617045711482666E-5,
-      1.5643150627006195E-6,
-      5.836979641093877E-8
+      0.9060051232217639,
+      0.7175752958409577,
+      0.5558555572960041,
+      0.42078460948974206,
+      0.3107593352604376,
+      0.22259208945018233,
+      0.15336119255340921,
+      0.10025626794045822,
+      0.0620233986634114,
+      0.03600102576167425,
+      0.019590569749519476,
+      0.009779698336973813,
+      0.004621183161915629,
+      0.0020103826897193175,
+      7.962597777072059E-4,
+      2.687947423527658E-4,
+      7.171139765481873E-5,
+      1.3578410116556566E-5,
+      1.5629304265358868E-6,
+      5.830091651054837E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      1.2322842421810511,
-      1.0061597602503232,
-      0.7986159168246194,
-      0.6201221946003167,
-      0.4676124373980192,
-      0.3456609702956266,
-      0.247711664304258,
-      0.1705552243103603,
-      0.11226595990131216,
-      0.06992833061816081,
-      0.04100714363585288,
-      0.022529752631688313,
-      0.011592421694006833,
-      0.005606862118102381,
-      0.002546612025525221,
-      0.0010623256549632133,
-      3.933660299968117E-4,
-      1.2270161178495203E-4,
-      2.972703740529991E-5,
-      5.047438500391396E-6
+      1.070491121815655,
+      0.874908825634708,
+      0.6955542513007297,
+      0.5416958681285222,
+      0.4104584089223994,
+      0.30531106839534905,
+      0.22031724779258055,
+      0.1527501072974481,
+      0.10121660039467142,
+      0.06347142603560565,
+      0.03749794864850485,
+      0.020783089957195106,
+      0.010808160040269188,
+      0.0052941181283052766,
+      0.0024377564292367812,
+      0.0010302190494455154,
+      3.8564882358079914E-4,
+      1.2133563966813449E-4,
+      2.959166719348735E-5,
+      5.041371572081886E-6
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
index 88ececb0f..bccd4ff49 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.11443891919536114,
-      0.08617987073173887,
-      0.06341011863765277,
-      0.04558938778556612,
-      0.03219115304867416,
-      0.022123712914637106,
-      0.015105385561292508,
-      0.010196566351738967,
-      0.006966398174996786,
-      0.004891284147012434,
-      0.003580482939033717,
-      0.0027123799513555104,
-      0.002051688508124924,
-      0.0014690904037393062,
-      9.446659961148896E-4,
-      5.272033868089062E-4,
-      2.4502289831120555E-4,
-      9.420764352199944E-5,
-      2.8810319073444973E-5,
-      6.703925835075132E-6
+      0.11534974599388693,
+      0.08698148362667113,
+      0.06406292276167219,
+      0.046078192405115966,
+      0.03253637462327355,
+      0.022366693877149558,
+      0.015293415446741955,
+      0.010356860424666315,
+      0.007106470813094831,
+      0.00500706584678398,
+      0.0036674141315344282,
+      0.0027708487867755156,
+      0.002086773137749997,
+      0.001487821691947794,
+      9.535157338758259E-4,
+      5.308929783756661E-4,
+      2.4632953188630317E-4,
+      9.45996695314454E-5,
+      2.890552912548327E-5,
+      6.721429379688254E-6
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.02584615652637672,
-      0.018579319755662165,
-      0.013287432283307131,
-      0.009521297399456233,
-      0.006879224545983419,
-      0.005092871105945046,
-      0.0038950406088637487,
-      0.003110206584836829,
-      0.0025637151164687004,
-      0.002111223503910751,
-      0.0016690438461587575,
-      0.0012233087464873704,
-      8.070734144378035E-4,
-      4.744746274525545E-4,
-      2.371650677546818E-4,
-      1.0084961104742617E-4,
-      3.50155905256611E-5,
-      9.644567735209852E-6,
-      1.96937309904246E-6,
-      2.796507143377928E-7
+      0.026538247127206118,
+      0.01906655327064791,
+      0.013626789983486496,
+      0.00976641241039197,
+      0.00706601708351237,
+      0.005239513882617428,
+      0.004007441363707505,
+      0.0031914729308122084,
+      0.002618022856257823,
+      0.0021443231305726383,
+      0.0016874006667018065,
+      0.0012325536428221145,
+      8.112607839937964E-4,
+      4.7620846546351115E-4,
+      2.3778952000443155E-4,
+      1.0104841608143451E-4,
+      3.506862368489196E-5,
+      9.65602594855597E-6,
+      1.9712202459681616E-6,
+      2.798557895371194E-7
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.20153343863066206,
-      0.1738240853513121,
-      0.14678429583021144,
-      0.12073845792265267,
-      0.09660000326712054,
-      0.07522929063718366,
-      0.057143821282328935,
-      0.04227240543728441,
-      0.030612544187388655,
-      0.021707706932396337,
-      0.015153890104753015,
-      0.010336962475302467,
-      0.007030622559647016,
-      0.004726872732572119,
-      0.0031582251757611016,
-      0.0020409670909132226,
-      0.0012199076476002615,
-      6.312579948869293E-4,
-      2.6953331972370034E-4,
-      8.796833421459317E-5
+      0.2008267606411687,
+      0.1730315848271916,
+      0.14594179639708077,
+      0.11988197257474568,
+      0.0957725674466078,
+      0.07448415764500856,
+      0.05653535014883013,
+      0.04183964847744843,
+      0.0303591809822878,
+      0.021603536983251643,
+      0.015147902209371053,
+      0.010380513858986464,
+      0.007086868639928332,
+      0.004776405847494422,
+      0.003194033664349469,
+      0.002063032278608447,
+      0.0012314821193950324,
+      6.362959860235963E-4,
+      2.7133142360006776E-4,
+      8.845979888500936E-5
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.23286196515853597,
-      0.20161676779547133,
-      0.17011159846949805,
-      0.1395735907671064,
-      0.110272951764528,
-      0.084666169231571,
-      0.06298145137335848,
-      0.045442839066931806,
-      0.03196224782058494,
-      0.02190393267137673,
-      0.014686769873750595,
-      0.00970317866203249,
-      0.006402827405022937,
-      0.004283977056377879,
-      0.0029136021846499598,
-      0.001960487126474647,
-      0.0012363099308865468,
-      6.809155093872539E-4,
-      3.0634374346337885E-4,
-      1.07763096593597E-4
+      0.23235672977120592,
+      0.2010308578772427,
+      0.16949594749416608,
+      0.13897123143573237,
+      0.10971503991301251,
+      0.08417324450282236,
+      0.06257442666659786,
+      0.045144369921103086,
+      0.03178577283279019,
+      0.021843269000236743,
+      0.014712774190862492,
+      0.009775248303873085,
+      0.006484422014715581,
+      0.004352494841555028,
+      0.002960985572647082,
+      0.0019882654343830203,
+      0.0012502056040323956,
+      6.867898974882985E-4,
+      3.0838031869483585E-4,
+      1.083218280210284E-4
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
index e7ad4abbf..9ce8bc628 100644
--- a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.03509019788270474,
-      0.023672043210050033,
-      0.015461485757251958,
-      0.009720859117992194,
-      0.005895073366015707,
-      0.0033855697856321324,
-      0.001885538074362394,
-      9.998085436733444E-4,
-      5.141862182733718E-4,
-      2.563642074000904E-4,
-      1.2447201188700214E-4,
-      5.868023247408325E-5,
-      2.6554460076681254E-5,
-      1.1310951244249482E-5,
-      4.425335683649439E-6,
-      1.5608457515917777E-6,
-      4.686633450593086E-7,
-      1.1798360523614773E-7,
-      2.3340930684216454E-8,
-      3.26172321192792E-9
+      0.0382624680623094,
+      0.026030463448604706,
+      0.017155400855241892,
+      0.010885390093212644,
+      0.006660097241570285,
+      0.003858088495130119,
+      0.0021663261007892464,
+      0.0011583421935267536,
+      6.009032500164473E-4,
+      3.0233926709153134E-4,
+      1.4817587290785013E-4,
+      7.050104808577861E-5,
+      3.218992880314699E-5,
+      1.3832096806263693E-5,
+      5.459529842118775E-6,
+      1.9428392150340858E-6,
+      5.888734403531783E-7,
+      1.4974470891297607E-7,
+      2.995182697021266E-8,
+      4.239346142112846E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.008377282812600046,
-      0.005476844637973868,
-      0.0034436262299643123,
-      0.002072114140374086,
-      0.0011827637162730514,
-      6.440748955771398E-4,
-      3.319815028194056E-4,
-      1.643292227687863E-4,
-      7.84693595634633E-5,
-      3.602258495773719E-5,
-      1.5947992659543457E-5,
-      6.7669098447223684E-6,
-      2.696748714096915E-6,
-      1.016464108113229E-6,
-      3.392355330334583E-7,
-      1.0117067756070208E-7,
-      2.534217137374941E-8,
-      5.133261263594803E-9,
-      7.696469754433571E-10,
-      7.743740364093729E-11
+      0.009600199498981159,
+      0.006320598140568551,
+      0.003998495592416973,
+      0.002420968116332609,
+      0.0013922805998762867,
+      7.653511087722587E-4,
+      3.9910028144341994E-4,
+      2.0013103147428781E-4,
+      9.684010210476128E-5,
+      4.501923579779383E-5,
+      2.0158227838894868E-5,
+      8.640044965400363E-6,
+      3.4752442404719267E-6,
+      1.3213285385796125E-6,
+      4.4489663641411424E-7,
+      1.3385272064306846E-7,
+      3.383715559062798E-8,
+      6.9217291724856125E-9,
+      1.0496384684360479E-9,
+      1.071989454665421E-10
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.059836867159019626,
-      0.045516758737146105,
-      0.034156674346348455,
-      0.025115768817839612,
-      0.01803708685195293,
-      0.012623813542426124,
-      0.008600310243214374,
-      0.005669934234218897,
-      0.0036321765951007425,
-      0.002255850871109844,
-      0.001363787634638478,
-      7.886024999850143E-4,
-      4.4348111236770826E-4,
-      2.3570968271206984E-4,
-      1.183098098256845E-4,
-      5.446617653660456E-5,
-      2.24299649120295E-5,
-      7.943991154558558E-6,
-      2.3685115488022294E-6,
-      5.463678230612657E-7
+      0.06295212478082787,
+      0.04804845815748257,
+      0.0361916108234815,
+      0.0267152751305139,
+      0.01926073686033505,
+      0.013535182229688402,
+      0.009262342125760426,
+      0.006136637176633701,
+      0.003951706514772565,
+      0.0024672025970475927,
+      0.001499024950979399,
+      8.710019776437941E-4,
+      4.921002498934159E-4,
+      2.6283929164592834E-4,
+      1.3262871270711607E-4,
+      6.141179303724591E-5,
+      2.544365025981951E-5,
+      9.06649630578154E-6,
+      2.7195777970597315E-6,
+      6.313004310982964E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.08365637087581765,
-      0.06328091751692146,
-      0.046584611885054375,
-      0.033452127341389866,
-      0.023108697668719053,
-      0.015553782424031421,
-      0.010110754664545038,
-      0.00633314983898454,
-      0.003838481095569623,
-      0.0022438161088123455,
-      0.0012660232441720149,
-      6.877554096479659E-4,
-      3.5831753841646097E-4,
-      1.7776416830023428E-4,
-      8.296222379738778E-5,
-      3.565312965801539E-5,
-      1.3833941676241391E-5,
-      4.702643288690328E-6,
-      1.3372112510983788E-6,
-      3.033970972209854E-7
+      0.08776972431938838,
+      0.06659157694814948,
+      0.049225799499276135,
+      0.03552861479492542,
+      0.024688518599665057,
+      0.016720836145648118,
+      0.01094027406228688,
+      0.006899372453907445,
+      0.004211132882578026,
+      0.0024795228150876546,
+      0.0014092415433829238,
+      7.711400309583001E-4,
+      4.0474448623951237E-4,
+      2.0238516038224294E-4,
+      9.527876089291166E-5,
+      4.134621298433285E-5,
+      1.6214324144157016E-5,
+      5.575162343216448E-6,
+      1.6050336029577984E-6,
+      3.6913561822247894E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
index 7aa1e653f..8367876f9 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.42663422439067866,
-      0.30034534474600294,
-      0.20319181287826804,
-      0.1317182804744252,
-      0.08239186580714886,
-      0.049295392461194326,
-      0.02910710156537928,
-      0.01679236513036096,
-      0.009624862833596362,
-      0.005422635011184332,
-      0.0029461698418783333,
-      0.0014925315566456988,
-      6.766086847822063E-4,
-      2.633598609025862E-4,
-      8.418508555076697E-5,
-      2.0903797690684733E-5,
-      3.450979358876711E-6,
-      3.0109881252425987E-7,
-      5.0815529053615285E-9,
-      1.0636033291493928E-11
+      0.42208271051403046,
+      0.29741505562391685,
+      0.20134874165633232,
+      0.1305394914031066,
+      0.08159855815766615,
+      0.048747243858519765,
+      0.028728543066498365,
+      0.0165441497545661,
+      0.00947241143924665,
+      0.005336503708211274,
+      0.0029018426273452174,
+      0.0014720823187714567,
+      6.683502338795141E-4,
+      2.6054273485112787E-4,
+      8.340470321860671E-5,
+      2.0739047756728618E-5,
+      3.4299913798081007E-6,
+      2.997988841557021E-7,
+      5.025722906176405E-9,
+      1.0054998350751101E-11
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.1114803801635311,
-      0.07597754261786671,
-      0.0501055535519571,
-      0.031995614416187104,
-      0.01971567273072919,
-      0.011808741802172805,
-      0.006801160884047568,
-      0.0037530702390507526,
-      0.0019421497128878798,
-      9.122577764241953E-4,
-      3.785896263413558E-4,
-      1.341923952396422E-4,
-      3.8601805959510175E-5,
-      8.864649889289734E-6,
-      1.3237321176197512E-6,
-      1.1421820637782702E-7,
-      3.9762479918198074E-9,
-      4.54506897153046E-11,
+      0.11164603476372417,
+      0.07615302033867133,
+      0.05023218916490202,
+      0.03206205379070699,
+      0.01973607720387932,
+      0.011805505973328502,
+      0.006791558526586791,
+      0.003745403489667254,
+      0.0019379262080626738,
+      9.104396500283078E-4,
+      3.779357081441099E-4,
+      1.3398373542307244E-4,
+      3.8539619855725496E-5,
+      8.848137363408722E-6,
+      1.3209823866585529E-6,
+      1.1402111764402845E-7,
+      3.993898781907206E-9,
+      4.57747291671781E-11,
       0.0,
       0.0
     ]
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.4684376217858109,
-      0.3392503567268995,
-      0.24003411818483583,
-      0.1660473101168749,
-      0.11287127625863354,
-      0.07567810091139443,
-      0.05003751350413061,
-      0.032283004508963264,
-      0.020255514423656928,
-      0.012226776028886202,
-      0.007066698930791792,
-      0.0037710888995055518,
-      0.0018360803139157917,
-      7.578194493417702E-4,
-      2.569613864931385E-4,
-      6.711383488815794E-5,
-      1.2520271060591594E-5,
-      1.4773362122043648E-6,
-      9.218341162439102E-8,
-      1.7917352823542414E-10
+      0.4599155461589819,
+      0.3319649086597787,
+      0.23409206986520695,
+      0.16154647326844573,
+      0.10974945705851255,
+      0.07368404021013333,
+      0.04881628439753486,
+      0.03151539823238062,
+      0.019734131847006696,
+      0.011863259940844108,
+      0.006829054480992549,
+      0.0036370634708222313,
+      0.0017718673884405407,
+      7.330338912127748E-4,
+      2.4937961771369805E-4,
+      6.540575764264173E-5,
+      1.2274495275130132E-5,
+      1.4624587583248914E-6,
+      9.203515745538137E-8,
+      1.7885452404470933E-10
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.587975786269801,
-      0.44036140193430356,
-      0.320112093545525,
-      0.22805481267112981,
-      0.15829875762666953,
-      0.10910808265547933,
-      0.07421316234424216,
-      0.04962871575469566,
-      0.03256862264345402,
-      0.020764710851960265,
-      0.012780484539353841,
-      0.0075280980055690856,
-      0.0041829972051391625,
-      0.002131825886551728,
-      9.575627615492798E-4,
-      3.6218289173164323E-4,
-      1.1127544422929404E-4,
-      2.6205999047220843E-5,
-      4.246048820908114E-6,
-      4.026984526362189E-7
+      0.5781736131159295,
+      0.4317558628608713,
+      0.3127299521443648,
+      0.22201616924311307,
+      0.15372574540645126,
+      0.10590175150198311,
+      0.07213141667988376,
+      0.04834103453366969,
+      0.031763983053272216,
+      0.020237222675818754,
+      0.012424027707767982,
+      0.0072957051804368265,
+      0.004046254486904427,
+      0.0020623972288192683,
+      9.280649502297485E-4,
+      3.520634680161896E-4,
+      1.0857326034440289E-4,
+      2.5689366239442765E-5,
+      4.192750623848367E-6,
+      4.01123348460218E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
index f4f20c587..d7a96302b 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.11219098214739304,
-      0.08193542790248964,
-      0.05842502282318569,
-      0.04072857499162738,
-      0.02788677472071821,
-      0.018512543004405645,
-      0.012146480839269105,
-      0.007835718613338807,
-      0.005113686294432937,
-      0.003416732614470255,
-      0.002323688239482103,
-      0.0015492364832766833,
-      9.571342003723067E-4,
-      5.183887216670749E-4,
-      2.3538879216000952E-4,
-      8.703406774261094E-5,
-      2.42709025241149E-5,
-      4.63551520457338E-6,
-      4.445081399101097E-7,
-      1.3384862684136067E-8
+      0.1066205260901246,
+      0.07825583368489923,
+      0.056109842470212556,
+      0.03934203889371674,
+      0.027094158525910624,
+      0.018091906437977468,
+      0.011936509153668218,
+      0.007741438737676913,
+      0.005076325830295601,
+      0.00340464389948409,
+      0.002321055813108433,
+      0.0015492739820206014,
+      9.575059527875631E-4,
+      5.18588452697687E-4,
+      2.3545109060021696E-4,
+      8.704532042458257E-5,
+      2.427075127671637E-5,
+      4.6354399691063655E-6,
+      4.445186505995051E-7,
+      1.3362154203028717E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.037528458578661966,
-      0.027907820940292698,
-      0.020296660680350048,
-      0.0143517988889845,
-      0.009814590351937193,
-      0.006552910312885635,
-      0.004285136570175629,
-      0.0027799919960277125,
-      0.0017746532324514148,
-      0.00108132707111879,
-      6.059660460962039E-4,
-      3.0037482195210605E-4,
-      1.2686529173816776E-4,
-      4.563808543711145E-5,
-      1.2816776643999983E-5,
-      2.813751553242538E-6,
-      4.3798093187898446E-7,
-      3.78243276990977E-8,
-      9.645509292239546E-10,
+      0.03668139913725896,
+      0.027416185277202007,
+      0.020013441545351698,
+      0.014186157289335533,
+      0.00971580082012322,
+      0.006493622679459942,
+      0.004251065202650582,
+      0.0027618184401512072,
+      0.0017658984392134578,
+      0.0010776067815833582,
+      6.045776102932352E-4,
+      2.999138195955864E-4,
+      1.2672661498885026E-4,
+      4.5597555745573066E-5,
+      1.2806028374110111E-5,
+      2.811031292211179E-6,
+      4.3749715102153516E-7,
+      3.7783452369069785E-8,
+      9.623240540872695E-10,
       0.0
     ]
   },
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.14755329378979273,
-      0.113359294048349,
-      0.08421019134105376,
-      0.0604410154779526,
-      0.042098126497287454,
-      0.028562208412314292,
-      0.01890095822589587,
-      0.012177890259887565,
-      0.007791880932176469,
-      0.005068144100918392,
-      0.003426460724381372,
-      0.002348315582046171,
-      0.0015592502145499016,
-      9.072292226041189E-4,
-      4.3288277746987157E-4,
-      1.587108237468096E-4,
-      4.254229381134994E-5,
-      7.418489918810133E-6,
-      7.197558643861303E-7,
-      2.263720678874752E-8
+      0.1349931553096723,
+      0.10345943906469635,
+      0.0769239914133015,
+      0.055486209971864056,
+      0.03900001317460326,
+      0.02678500066257991,
+      0.017968206202401048,
+      0.01173766157331265,
+      0.007606679496527605,
+      0.005001050150819256,
+      0.0034065854722393333,
+      0.002344470201826488,
+      0.0015592089355909338,
+      9.075635513349779E-4,
+      4.330276156939576E-4,
+      1.5874554685976004E-4,
+      4.254754130488548E-5,
+      7.419397242177774E-6,
+      7.200876073546254E-7,
+      2.266803290550335E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.18978988971700783,
-      0.15157605579328254,
-      0.11628733503254238,
-      0.08609542143308128,
-      0.061096559370017914,
-      0.04236098763195781,
-      0.02862409554558565,
-      0.01886750482585816,
-      0.0122375335022219,
-      0.007900716230762248,
-      0.005198868201063042,
-      0.003540172353396182,
-      0.002464639414487041,
-      0.0016681578113355898,
-      0.0010209101740962269,
-      5.271544454673987E-4,
-      2.1961669569318387E-4,
-      7.112998803514315E-5,
-      1.6600250552528635E-5,
-      2.386272725595525E-6
+      0.1728841872965669,
+      0.1375827373817079,
+      0.10543463713960693,
+      0.07824019989964623,
+      0.055887122092807634,
+      0.039159099313921884,
+      0.02682324594932466,
+      0.017949410300669166,
+      0.011815578180490236,
+      0.007730434545688283,
+      0.005141237870537882,
+      0.0035259505457939508,
+      0.0024637091317716063,
+      0.0016696333053445832,
+      0.0010219552979188978,
+      5.275816856796742E-4,
+      2.1974043251097854E-4,
+      7.115551098628321E-5,
+      1.660393923546466E-5,
+      2.386951424389801E-6
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
index 359c3198e..a9bf63d5f 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.7746367562815772,
-      0.5686052431806999,
-      0.40227467541483064,
-      0.2755871907406573,
-      0.18476999731569105,
-      0.12025386508322182,
-      0.07754541783037242,
-      0.048709426308416584,
-      0.02994162599286055,
-      0.01773333819383354,
-      0.009943003674454587,
-      0.0051338708921865464,
-      0.0023532435289291965,
-      9.186108388174573E-4,
-      2.91134922239425E-4,
-      7.081671567626723E-5,
-      1.0380093911107993E-5,
-      5.655988991794296E-7,
-      4.335520555056763E-9,
-      4.1099056908468094E-11
+      0.7412020069287325,
+      0.546771097372181,
+      0.3895666182491331,
+      0.2693187943302815,
+      0.18242338921639994,
+      0.11995038403977892,
+      0.07799644881444773,
+      0.04927358342759975,
+      0.030376607486987953,
+      0.018008349759277505,
+      0.010097680914907158,
+      0.00521278561086945,
+      0.0023892049050663073,
+      9.327513480139984E-4,
+      2.9569244893226095E-4,
+      7.195033306131465E-5,
+      1.0565214635249342E-5,
+      5.827800074435574E-7,
+      4.900599416825652E-9,
+      4.275194655099434E-11
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.20263986131553968,
-      0.14678294845713188,
-      0.10462524254291136,
-      0.07285460878576448,
-      0.04905617784732996,
-      0.03201875897479764,
-      0.020189248475681296,
-      0.012467468773957125,
-      0.007532959771686708,
-      0.004346640850204765,
-      0.0023153926031180033,
-      0.001091335657598864,
-      4.329297811692454E-4,
-      1.421540893693734E-4,
-      3.464257319303906E-5,
-      5.721595674845194E-6,
-      4.629202269862235E-7,
-      1.0201961208946842E-8,
+      0.19989802787063055,
+      0.1454791924374374,
+      0.10406351582976882,
+      0.07264283835386522,
+      0.04900244150364073,
+      0.03203461887322696,
+      0.0202326926768266,
+      0.012514319742195705,
+      0.007570412205123908,
+      0.004370698137649081,
+      0.002328097436837211,
+      0.0010968941346559207,
+      4.3491809840385653E-4,
+      1.427451566651518E-4,
+      3.477749217799798E-5,
+      5.745950716089173E-6,
+      4.6551996044968885E-7,
+      1.0273248639993878E-8,
       0.0,
       0.0
     ]
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.9950149041471343,
-      0.7822054510524109,
-      0.5930970746391648,
-      0.43283746778356513,
-      0.30517281769505006,
-      0.20927080695971087,
-      0.14061027134169302,
-      0.09247391728292101,
-      0.059646322474660424,
-      0.0372499286478018,
-      0.022180858795201035,
-      0.011987617233244183,
-      0.005763068284039041,
-      0.002281406462237881,
-      7.143583176709967E-4,
-      1.6231834263474734E-4,
-      2.3172627377515066E-5,
-      1.3221435247206632E-6,
-      1.0390900005539278E-8,
-      2.4891617693814247E-11
+      0.941446692674993,
+      0.7407885169406322,
+      0.563676262226526,
+      0.4142531765743614,
+      0.2952951724787791,
+      0.2055261969138869,
+      0.1405332525902355,
+      0.09407170389206379,
+      0.06152413341756263,
+      0.03870360907811028,
+      0.02306193103598436,
+      0.01242056330021445,
+      0.005944148449743759,
+      0.002343796648641668,
+      7.320727193201749E-4,
+      1.6617918651901805E-4,
+      2.373369787480074E-5,
+      1.3637344746821936E-6,
+      1.1750308079023131E-8,
+      2.573279141406786E-11
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      1.1725719133529338,
-      0.9595400391715598,
-      0.7565353507328292,
-      0.5764603342356731,
-      0.4211860880325202,
-      0.29987701376720033,
-      0.2077125723429759,
-      0.1405145495941157,
-      0.09352246860961959,
-      0.06102120142703036,
-      0.03873832947352556,
-      0.023464391399195275,
-      0.01315742042994123,
-      0.006578116613440269,
-      0.0028173300502167117,
-      9.861066793382697E-4,
-      2.697271888406998E-4,
-      5.3391584263627216E-5,
-      6.048245836640893E-6,
-      2.123505790177978E-7
+      1.1094705753560454,
+      0.9074498058082456,
+      0.7162917121900128,
+      0.5477892655903103,
+      0.4030663143449499,
+      0.29003473458033724,
+      0.20377246183432465,
+      0.14019231121072628,
+      0.09489231245407237,
+      0.06276041979515903,
+      0.0401527687724505,
+      0.024367211576743906,
+      0.0136370347718493,
+      0.006794920278788953,
+      0.002900600612398345,
+      0.00101273146372814,
+      2.7665341473606154E-4,
+      5.4736799591264516E-5,
+      6.206212855747993E-6,
+      2.2238003232261039E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
index 5d653cfed..649aa23fe 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.2260389941027982,
-      0.18673287871717797,
-      0.14894826654797788,
-      0.11449461648567111,
-      0.08506284895448553,
-      0.06050807474287691,
-      0.04186643845074871,
-      0.027849209529987005,
-      0.017968829044643447,
-      0.011171394311388378,
-      0.0066417651372260526,
-      0.0037158797491691348,
-      0.00191167641932664,
-      8.796636053695822E-4,
-      3.509779712411307E-4,
-      1.182406018533433E-4,
-      3.102542758912421E-5,
-      5.9153879649216E-6,
-      6.471765277197742E-7,
-      2.1638094074644876E-8
+      0.2720012839099464,
+      0.22500101891286955,
+      0.1795956127957704,
+      0.1380152103367654,
+      0.10236460084101376,
+      0.07254027934989354,
+      0.04987402230582741,
+      0.03285731579837476,
+      0.0209271590832584,
+      0.012804398289015523,
+      0.007478196138367596,
+      0.004109055516008944,
+      0.002078683165252033,
+      9.424289908426162E-4,
+      3.712971432068213E-4,
+      1.2376763365575736E-4,
+      3.217585650066018E-5,
+      6.088764006370009E-6,
+      6.638069060296292E-7,
+      2.2338042216476536E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.08486848560499322,
-      0.0635671121445339,
-      0.04641120376548576,
-      0.03297860619359377,
-      0.022699906546387684,
-      0.01521446969486093,
-      0.009903407719051592,
-      0.006335747888701792,
-      0.0039865876097801385,
-      0.0024302704469097176,
-      0.0014012006706543927,
-      7.363411888351279E-4,
-      3.373119800831176E-4,
-      1.331554495380604E-4,
-      4.1773579822682375E-5,
-      1.0192004683187488E-5,
-      1.6283915890889046E-6,
-      1.142921653056598E-7,
-      1.671555398835124E-10,
-      2.447116464287589E-12
+      0.10112155116443493,
+      0.07536274297033069,
+      0.05467225443720265,
+      0.03855135589753426,
+      0.026295074114303603,
+      0.017434536142098132,
+      0.011196417577343755,
+      0.0070428555522426255,
+      0.004340897633319749,
+      0.002584434083125346,
+      0.0014543142944078412,
+      7.472476663557046E-4,
+      3.358110282768571E-4,
+      1.3061836671336092E-4,
+      4.0509946695418904E-5,
+      9.83906313046857E-6,
+      1.5976112911162914E-6,
+      1.1702442353526242E-7,
+      2.9729067075443623E-10,
+      4.389238001777538E-12
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.24758645161159107,
-      0.21368051350451356,
-      0.17903579294302124,
-      0.14471686198216982,
-      0.11240870512653817,
-      0.08366414518041265,
-      0.05952936285783296,
-      0.040201939466709996,
-      0.025824445204410205,
-      0.01571897546733584,
-      0.009073275949873377,
-      0.0048338434728619935,
-      0.002392938789438222,
-      0.001043844605181894,
-      3.926954996484337E-4,
-      1.2065853222813827E-4,
-      2.8945445199153775E-5,
-      5.0431958827163675E-6,
-      6.458915879250966E-7,
-      5.0977545729106306E-8
+      0.2997574596960255,
+      0.2594970677904381,
+      0.21800348948407317,
+      0.17666524901866726,
+      0.1375855038726806,
+      0.10267707671363704,
+      0.07323059909803735,
+      0.0495145751290026,
+      0.031761383858285856,
+      0.019223717074444042,
+      0.010977650963636176,
+      0.005754173014131576,
+      0.002791308105856049,
+      0.001189193451117029,
+      4.3628590817867453E-4,
+      1.305744694545304E-4,
+      3.0452965136500134E-5,
+      5.153654934301513E-6,
+      6.486338325711446E-7,
+      5.098248660411605E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.27464111040686656,
-      0.24397151910936232,
-      0.21108722461286616,
-      0.1776053800398283,
-      0.143858391830204,
-      0.11269887180037957,
-      0.08472552519443224,
-      0.060841173672394874,
-      0.04176039523356019,
-      0.027304863909348488,
-      0.01700707209018706,
-      0.010053394813066925,
-      0.005599824780819147,
-      0.0029013745282167906,
-      0.001369595818065326,
-      5.712689186226531E-4,
-      2.0583910689957137E-4,
-      6.246219285651837E-5,
-      1.534383975886173E-5,
-      3.029313657208876E-6
+      0.33134195947353257,
+      0.2952442825082112,
+      0.2561058686047792,
+      0.21595142650255816,
+      0.1752830008987528,
+      0.1375976824795585,
+      0.10364510277886793,
+      0.07453632475792718,
+      0.05117114296700223,
+      0.033382624917334625,
+      0.020666555202340092,
+      0.012084714154117097,
+      0.006625971666421022,
+      0.0033650785545447535,
+      0.0015524800541055423,
+      6.317979271851182E-4,
+      2.219466181801561E-4,
+      6.563867979464505E-5,
+      1.5714570279941968E-5,
+      3.047854069812862E-6
     ]
   }
 }
\ No newline at end of file
-- 
GitLab


From 408865779e5c10b32a4864489a51550f8c277588 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 14:41:03 -0600
Subject: [PATCH 10/63] formatting

---
 .../gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
index cd47c9d99..ae7cb13e7 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
@@ -15,6 +15,7 @@ import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestIml;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestRp;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.Response;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
+
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
-- 
GitLab


From 1654cade6d52a431388e29125d3c455827cc014c Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 29 Aug 2023 16:21:03 -0600
Subject: [PATCH 11/63] increase conus test memory

---
 gradle/nshm.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 3b3ce34fd..0aad9e2f5 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -164,7 +164,7 @@ task testConus2023(type: Test) {
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
-      "-Xmx8g",
+      "-Xmx16g",
       )
 
   filter {
-- 
GitLab


From 313cd9914a36eb2ba54f7e8eafdb957d7e6d7434 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 09:47:08 -0600
Subject: [PATCH 12/63] add memory

---
 .gitlab-ci.yml     |  3 +++
 gradle/nshm.gradle | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2f90721e..113928057 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,6 +239,9 @@ NSHM Tests:
       - CMD: testConus2023
       - CMD: testHawaii2021
   script:
+    - memory="$(free -g | awk '/^Mem:/{print $2}')";
+    - export CI_RUNNER_MEMORY="$(printf "%.f" "$(echo "${memory} * 0.90" | bc)")g";
+    - echo "${CI_RUNNER_MEMORY}"
     - ./gradlew ${CMD}
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 0aad9e2f5..6a761b87d 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -13,6 +13,8 @@ import org.yaml.snakeyaml.Yaml
 
 ext {
   nshmDir = "nshms";
+  envMemory = System.getenv("CI_RUNNER_MEMORY")
+  def xmx = envMemory ? envMemory : "16g"
 
   // Download and unzip NSHM
   downloadNshm = {nshm ->
@@ -92,7 +94,7 @@ task testAlaska2007(type: Test) {
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
-      "-Xmx8g",
+      "-Xmx${xmx}",
       )
 
   filter {
@@ -116,7 +118,7 @@ task testAlaska2023(type: Test) {
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
-      "-Xmx8g",
+      "-Xmx${xmx}",
       )
 
   filter {
@@ -140,7 +142,7 @@ task testConus2018(type: Test) {
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
-      "-Xmx8g",
+      "-Xmx${xmx}",
       )
 
   filter {
@@ -164,7 +166,7 @@ task testConus2023(type: Test) {
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
-      "-Xmx16g",
+      "-Xmx${xmx}",
       )
 
   filter {
@@ -188,7 +190,7 @@ task testHawaii2021(type: Test) {
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
-      "-Xmx8g",
+      "-Xmx${xmx}",
       )
 
   filter {
-- 
GitLab


From 021ea0e64a8cc5bf5ccce31ce5c36b66341667bc Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 09:50:01 -0600
Subject: [PATCH 13/63] remove def

---
 gradle/nshm.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 6a761b87d..f4ba17188 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -14,7 +14,7 @@ import org.yaml.snakeyaml.Yaml
 ext {
   nshmDir = "nshms";
   envMemory = System.getenv("CI_RUNNER_MEMORY")
-  def xmx = envMemory ? envMemory : "16g"
+  xmx = envMemory ? envMemory : "16g"
 
   // Download and unzip NSHM
   downloadNshm = {nshm ->
-- 
GitLab


From 930db2b04a0f6dcdb17f1fb0479f2daddb8c232c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 09:58:34 -0600
Subject: [PATCH 14/63] install free

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 113928057..811a74a9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,6 +239,7 @@ NSHM Tests:
       - CMD: testConus2023
       - CMD: testHawaii2021
   script:
+    - yum install procps -y
     - memory="$(free -g | awk '/^Mem:/{print $2}')";
     - export CI_RUNNER_MEMORY="$(printf "%.f" "$(echo "${memory} * 0.90" | bc)")g";
     - echo "${CI_RUNNER_MEMORY}"
-- 
GitLab


From e38ae50db70f4389891a847bb190aeb815dc5c4b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 10:03:41 -0600
Subject: [PATCH 15/63] test

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 811a74a9e..e8d3faf94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -208,6 +208,7 @@ Container Registry:
 
 Build Project:
   script:
+    - cat /proc/meminfo
     - ./gradlew assemble
   stage: build
 
-- 
GitLab


From e5369e309632ae7dacb563e0db99176930cdea05 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 10:11:21 -0600
Subject: [PATCH 16/63] get mem

---
 .gitlab-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8d3faf94..467daa0f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -208,7 +208,6 @@ Container Registry:
 
 Build Project:
   script:
-    - cat /proc/meminfo
     - ./gradlew assemble
   stage: build
 
@@ -240,9 +239,7 @@ NSHM Tests:
       - CMD: testConus2023
       - CMD: testHawaii2021
   script:
-    - yum install procps -y
-    - memory="$(free -g | awk '/^Mem:/{print $2}')";
-    - export CI_RUNNER_MEMORY="$(printf "%.f" "$(echo "${memory} * 0.90" | bc)")g";
+    - export CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)"
     - echo "${CI_RUNNER_MEMORY}"
     - ./gradlew ${CMD}
     - cat ${JACOCO_HTML_DIR}/index.html
-- 
GitLab


From 2b45b5d261eb830979841b3255ce193979be740c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 10:19:38 -0600
Subject: [PATCH 17/63] export mem

---
 .gitlab-ci.yml     | 3 ++-
 gradle/nshm.gradle | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 467daa0f0..b7d2133e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,7 +239,8 @@ NSHM Tests:
       - CMD: testConus2023
       - CMD: testHawaii2021
   script:
-    - export CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)"
+    - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)"
+    - export CI_RUNNER_MEMORY
     - echo "${CI_RUNNER_MEMORY}"
     - ./gradlew ${CMD}
     - cat ${JACOCO_HTML_DIR}/index.html
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index f4ba17188..e42ccd414 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -82,6 +82,7 @@ task nshms() {
 task testAlaska2007(type: Test) {
   description = "Test Alaska 2007 NSHM"
   group = "verification"
+  println("Memory: " + xmx)
 
   doFirst {
     downloadNshm(findNshm("nshm-alaska", 2007))
-- 
GitLab


From 4bc81c2fe5637f7fa8879d78defa106711a0602a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 10:21:11 -0600
Subject: [PATCH 18/63] add g

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7d2133e7..28321b70d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,9 +239,8 @@ NSHM Tests:
       - CMD: testConus2023
       - CMD: testHawaii2021
   script:
-    - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)"
+    - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
-    - echo "${CI_RUNNER_MEMORY}"
     - ./gradlew ${CMD}
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
-- 
GitLab


From 27082174a921ef734e85720b4ac3ccebc8a9181b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 10:55:34 -0600
Subject: [PATCH 19/63] test parallel stream

---
 gradle/nshm.gradle                                        | 1 -
 .../gov/usgs/earthquake/nshmp/model/NshmTestUtils.java    | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index e42ccd414..f4ba17188 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -82,7 +82,6 @@ task nshms() {
 task testAlaska2007(type: Test) {
   description = "Test Alaska 2007 NSHM"
   group = "verification"
-  println("Memory: " + xmx)
 
   doFirst {
     downloadNshm(findNshm("nshm-alaska", 2007))
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index b87699669..ec4802e48 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -81,9 +81,13 @@ class NshmTestUtils {
   static void testNshm(Nshm nshm) {
     NshmModel nshmModel = loadModel(nshm);
 
-    for (NamedLocation location : nshm.locations()) {
+    nshm.locations().parallelStream().forEach(location -> {
       compareCurves(nshmModel, location);
-    }
+    });
+
+    // for (NamedLocation location : nshm.locations()) {
+    //   compareCurves(nshmModel, location);
+    // }
 
     nshmModel.exec.shutdown();
   }
-- 
GitLab


From 7e89466033abe7a8b4f006d52ad1125a70213e55 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 11:36:02 -0600
Subject: [PATCH 20/63] remove stream

---
 .../gov/usgs/earthquake/nshmp/model/NshmTestUtils.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index ec4802e48..b87699669 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -81,13 +81,9 @@ class NshmTestUtils {
   static void testNshm(Nshm nshm) {
     NshmModel nshmModel = loadModel(nshm);
 
-    nshm.locations().parallelStream().forEach(location -> {
+    for (NamedLocation location : nshm.locations()) {
       compareCurves(nshmModel, location);
-    });
-
-    // for (NamedLocation location : nshm.locations()) {
-    //   compareCurves(nshmModel, location);
-    // }
+    }
 
     nshmModel.exec.shutdown();
   }
-- 
GitLab


From c84cb368b6d46ff45457c1407b50cf52c85323cd Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 11:37:44 -0600
Subject: [PATCH 21/63] add info

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28321b70d..53a0001f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -241,7 +241,7 @@ NSHM Tests:
   script:
     - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
-    - ./gradlew ${CMD}
+    - ./gradlew ${CMD} --info
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
-- 
GitLab


From b384c88dd1fb2409c8145a7396e90444a569c9d4 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 11:51:33 -0600
Subject: [PATCH 22/63] test

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index b87699669..5c0e00b0b 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -16,6 +16,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -40,6 +41,7 @@ import io.swagger.v3.core.util.Yaml;
  * Utilities to run tests on a NSHM.
  */
 class NshmTestUtils {
+  private static Logger LOGGER = Logger.getAnonymousLogger();
   private static final Path DATA_PATH = Paths.get("src/test/resources/e2e");
 
   private static final double TOLERANCE = 1e-12;
@@ -55,6 +57,7 @@ class NshmTestUtils {
    */
   static NshmModel loadModel(Nshm nshm) {
     int cores = Runtime.getRuntime().availableProcessors();
+    LOGGER.info("Cores: " + cores);
     return new NshmModel(
         nshm,
         ModelLoader.load(nshm.modelPath()),
@@ -80,8 +83,11 @@ class NshmTestUtils {
    */
   static void testNshm(Nshm nshm) {
     NshmModel nshmModel = loadModel(nshm);
+    LOGGER.info("Model loaded");
+    LOGGER.info("Number of sites: " + nshm.locations().size());
 
     for (NamedLocation location : nshm.locations()) {
+      LOGGER.info("Location: " + location.toString());
       compareCurves(nshmModel, location);
     }
 
-- 
GitLab


From 73b0cfb531bf003bb7a92981fa559f459db2e813 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 12:17:07 -0600
Subject: [PATCH 23/63] test

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 5c0e00b0b..10e95153e 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -135,8 +135,11 @@ class NshmTestUtils {
   }
 
   private static void compareCurves(NshmModel nshmModel, NamedLocation location) {
+    LOGGER.info("Compare curves");
     Map<String, XySequence> actual = generateActual(nshmModel, location);
+    LOGGER.info("Generated acutal");
     Map<String, XySequence> expected = readExpected(nshmModel, location);
+    LOGGER.info("Read expected");
 
     for (String key : actual.keySet()) {
       assertCurveEquals(expected.get(key), actual.get(key), TOLERANCE);
-- 
GitLab


From 21175bc0aa5c6809c80d02abc505726e9711d2b7 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 12:25:16 -0600
Subject: [PATCH 24/63] test

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 10e95153e..bea84d4b4 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -149,25 +149,29 @@ class NshmTestUtils {
   private static Map<String, XySequence> generateActual(
       NshmModel nshmModel,
       NamedLocation location) {
-
+    LOGGER.info("Generate acutal");
     Site site = createSite(
         location.location(),
         nshmModel.model.siteData());
+    LOGGER.info("site created ");
 
     CalcConfig config = CalcConfig.copyOf(nshmModel.model.config())
         .imts(nshmModel.nshm.imts())
         .build();
+    LOGGER.info("calc created ");
 
     Hazard hazard = HazardCalcs.hazard(
         nshmModel.model,
         config,
         site,
         nshmModel.exec);
+    LOGGER.info("hazard created ");
 
     Map<String, XySequence> xyMap = hazard.curves().entrySet().stream()
         .collect(Collectors.toMap(
             e -> e.getKey().toString(),
             Entry::getValue));
+    LOGGER.info("xyMap created ");
 
     return xyMap;
   }
-- 
GitLab


From d04d9b81dbc7a858b79d7215c9cb8580d1d034c0 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 15:20:27 -0600
Subject: [PATCH 25/63] test

---
 .../gov/usgs/earthquake/nshmp/model/NshmTestUtils.java   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index bea84d4b4..5c0e00b0b 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -135,11 +135,8 @@ class NshmTestUtils {
   }
 
   private static void compareCurves(NshmModel nshmModel, NamedLocation location) {
-    LOGGER.info("Compare curves");
     Map<String, XySequence> actual = generateActual(nshmModel, location);
-    LOGGER.info("Generated acutal");
     Map<String, XySequence> expected = readExpected(nshmModel, location);
-    LOGGER.info("Read expected");
 
     for (String key : actual.keySet()) {
       assertCurveEquals(expected.get(key), actual.get(key), TOLERANCE);
@@ -149,29 +146,25 @@ class NshmTestUtils {
   private static Map<String, XySequence> generateActual(
       NshmModel nshmModel,
       NamedLocation location) {
-    LOGGER.info("Generate acutal");
+
     Site site = createSite(
         location.location(),
         nshmModel.model.siteData());
-    LOGGER.info("site created ");
 
     CalcConfig config = CalcConfig.copyOf(nshmModel.model.config())
         .imts(nshmModel.nshm.imts())
         .build();
-    LOGGER.info("calc created ");
 
     Hazard hazard = HazardCalcs.hazard(
         nshmModel.model,
         config,
         site,
         nshmModel.exec);
-    LOGGER.info("hazard created ");
 
     Map<String, XySequence> xyMap = hazard.curves().entrySet().stream()
         .collect(Collectors.toMap(
             e -> e.getKey().toString(),
             Entry::getValue));
-    LOGGER.info("xyMap created ");
 
     return xyMap;
   }
-- 
GitLab


From 5dcc5888e1beb847d0c5831671dae14119416398 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 15:26:21 -0600
Subject: [PATCH 26/63] test

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 5c0e00b0b..f867f6d9b 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -61,7 +61,7 @@ class NshmTestUtils {
     return new NshmModel(
         nshm,
         ModelLoader.load(nshm.modelPath()),
-        Executors.newFixedThreadPool(cores));
+        Executors.newFixedThreadPool(4));
   }
 
   /**
-- 
GitLab


From 6edafea04a9cae7aaccb8ed2e2463b415bb1852c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 15:34:16 -0600
Subject: [PATCH 27/63] test

---
 gradle/nshm.gradle                                        | 8 ++++----
 .../gov/usgs/earthquake/nshmp/model/NshmTestUtils.java    | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index f4ba17188..2597e0c20 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -140,10 +140,10 @@ task testConus2018(type: Test) {
   }
 
   useJUnitPlatform()
-  jvmArgs(
-      "-Xms2g",
-      "-Xmx${xmx}",
-      )
+  // jvmArgs(
+  //     "-Xms2g",
+  //     "-Xmx${xmx}",
+  //     )
 
   filter {
     includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests.testConus2018"
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index f867f6d9b..04c7e2a22 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -61,7 +61,7 @@ class NshmTestUtils {
     return new NshmModel(
         nshm,
         ModelLoader.load(nshm.modelPath()),
-        Executors.newFixedThreadPool(4));
+        Executors.newFixedThreadPool(cores));
   }
 
   /**
@@ -155,6 +155,8 @@ class NshmTestUtils {
         .imts(nshmModel.nshm.imts())
         .build();
 
+    LOGGER.info(config.toString());
+
     Hazard hazard = HazardCalcs.hazard(
         nshmModel.model,
         config,
-- 
GitLab


From 60757614e220aa05d948aef2e1e7bc3ef928ec6d Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 15:42:15 -0600
Subject: [PATCH 28/63] test

---
 gradle/nshm.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 2597e0c20..db97e35b9 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -140,10 +140,10 @@ task testConus2018(type: Test) {
   }
 
   useJUnitPlatform()
-  // jvmArgs(
-  //     "-Xms2g",
-  //     "-Xmx${xmx}",
-  //     )
+  jvmArgs(
+      "-Xms${xmx}",
+      "-Xmx${xmx}",
+      )
 
   filter {
     includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests.testConus2018"
-- 
GitLab


From 350042ac4d84a781f6b5336c556706972d7846a9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 15:43:39 -0600
Subject: [PATCH 29/63] test

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 04c7e2a22..5c0e00b0b 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -155,8 +155,6 @@ class NshmTestUtils {
         .imts(nshmModel.nshm.imts())
         .build();
 
-    LOGGER.info(config.toString());
-
     Hazard hazard = HazardCalcs.hazard(
         nshmModel.model,
         config,
-- 
GitLab


From d008b9ce502fadbd899fb518c0a8a30199be44ba Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 10:20:39 -0600
Subject: [PATCH 30/63] test

---
 .../earthquake/nshmp/model/NshmTestUtils.java | 16 +++++++----
 .../earthquake/nshmp/model/NshmTests.java     | 28 +++++++++++++------
 src/test/resources/junit-platform.properties  |  4 +++
 3 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 src/test/resources/junit-platform.properties

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 5c0e00b0b..52bbd3537 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -12,6 +12,7 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
@@ -34,7 +35,7 @@ import gov.usgs.earthquake.nshmp.calc.Site;
 import gov.usgs.earthquake.nshmp.data.XySequence;
 import gov.usgs.earthquake.nshmp.geo.Location;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
-
+import gov.usgs.earthquake.nshmp.site.NshmpSite;
 import io.swagger.v3.core.util.Yaml;
 
 /**
@@ -81,14 +82,19 @@ class NshmTestUtils {
    *
    * @param nshm The NSHM to test
    */
-  static void testNshm(Nshm nshm) {
+  static void testNshm(Nshm nshm, Optional<NshmpSite> site) {
     NshmModel nshmModel = loadModel(nshm);
     LOGGER.info("Model loaded");
     LOGGER.info("Number of sites: " + nshm.locations().size());
 
-    for (NamedLocation location : nshm.locations()) {
-      LOGGER.info("Location: " + location.toString());
-      compareCurves(nshmModel, location);
+    if (site.isPresent()) {
+      LOGGER.info("Location: " + site.get().toString());
+      compareCurves(nshmModel, site.get());
+    } else {
+      for (NamedLocation location : nshm.locations()) {
+        LOGGER.info("Location: " + location.toString());
+        compareCurves(nshmModel, location);
+      }
     }
 
     nshmModel.exec.shutdown();
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 85927eac3..30823fee4 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -6,7 +6,9 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.logging.Logger;
 
 import org.junit.jupiter.api.Test;
 
@@ -21,6 +23,7 @@ import gov.usgs.earthquake.nshmp.site.NshmpSite;
  * Test NSHMs.
  */
 class NshmTests {
+  private static Logger LOGGER = Logger.getAnonymousLogger();
   /* Alaska test sites */
   private static final List<NamedLocation> ALASKA_LOCATIONS = List.of(
       NshmpSite.ANCHORAGE_AK,
@@ -33,10 +36,10 @@ class NshmTests {
   private static final List<NamedLocation> CONUS_LOCATIONS = List.of(
       NshmpSite.LOS_ANGELES_CA,
       NshmpSite.SAN_FRANCISCO_CA,
-      NshmpSite.SEATTLE_WA,
-      NshmpSite.SALT_LAKE_CITY_UT,
-      NshmpSite.RENO_NV,
-      NshmpSite.NEW_MADRID_MO,
+      // NshmpSite.SEATTLE_WA,
+      // NshmpSite.SALT_LAKE_CITY_UT,
+      // NshmpSite.RENO_NV,
+      // NshmpSite.NEW_MADRID_MO,
       NshmpSite.BOSTON_MA,
       NshmpSite.NEW_YORK_NY,
       NshmpSite.CHICAGO_IL);
@@ -108,6 +111,13 @@ class NshmTests {
     // }
   }
 
+  private NshmpSite getSite() {
+    var arg = System.getProperty("TEST_SITE");
+    LOGGER.info("\n\n ---------------- TEST SITE: " + arg + "\n\n-------------");
+
+    return arg == null ? null : NshmpSite.valueOf(arg);
+  }
+
   /**
    * Test Alaska 2007 NSHM
    *
@@ -115,7 +125,7 @@ class NshmTests {
    */
   @Test
   final void testAlaska2007() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2007"));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2007"), Optional.ofNullable(getSite()));
   }
 
   /**
@@ -125,7 +135,7 @@ class NshmTests {
    */
   @Test
   final void testAlaska2023() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2023"));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2023"), Optional.ofNullable(getSite()));
   }
 
   /**
@@ -135,7 +145,7 @@ class NshmTests {
    */
   @Test
   final void testConus2018() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
   }
 
   /**
@@ -145,7 +155,7 @@ class NshmTests {
    */
   @Test
   final void testConus2023() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2023"));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2023"), Optional.of(getSite()));
   }
 
   /**
@@ -155,6 +165,6 @@ class NshmTests {
    */
   @Test
   final void testHawaii2021() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-hawaii-2021"));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-hawaii-2021"), Optional.of(getSite()));
   }
 }
diff --git a/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties
new file mode 100644
index 000000000..8f308f80e
--- /dev/null
+++ b/src/test/resources/junit-platform.properties
@@ -0,0 +1,4 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
+junit.jupiter.execution.parallel.config.fixed.parallelism
-- 
GitLab


From 0c6e8db298d703d0cedb3300161f8dfcc7e26bef Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 10:27:14 -0600
Subject: [PATCH 31/63] test 1 core

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 52bbd3537..42ac001fc 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -12,8 +12,8 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -36,6 +36,7 @@ import gov.usgs.earthquake.nshmp.data.XySequence;
 import gov.usgs.earthquake.nshmp.geo.Location;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
 import gov.usgs.earthquake.nshmp.site.NshmpSite;
+
 import io.swagger.v3.core.util.Yaml;
 
 /**
@@ -62,7 +63,7 @@ class NshmTestUtils {
     return new NshmModel(
         nshm,
         ModelLoader.load(nshm.modelPath()),
-        Executors.newFixedThreadPool(cores));
+        Executors.newFixedThreadPool(1));
   }
 
   /**
-- 
GitLab


From 4fcec0ed7e2ee2421ef349361aa257664f571bc3 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 10:33:13 -0600
Subject: [PATCH 32/63] test threaded

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 2 +-
 .../java/gov/usgs/earthquake/nshmp/model/NshmTests.java     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 42ac001fc..7546fb6b2 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -63,7 +63,7 @@ class NshmTestUtils {
     return new NshmModel(
         nshm,
         ModelLoader.load(nshm.modelPath()),
-        Executors.newFixedThreadPool(1));
+        Executors.newFixedThreadPool(cores));
   }
 
   /**
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 30823fee4..8d033a6b9 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
 import org.junit.jupiter.api.Test;
@@ -145,7 +146,10 @@ class NshmTests {
    */
   @Test
   final void testConus2018() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
+    var service = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+    service.execute(() -> {
+      NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
+    });
   }
 
   /**
-- 
GitLab


From 1d9c002a9c9632fd8219e244915763557a51ad63 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 10:44:55 -0600
Subject: [PATCH 33/63] test latch

---
 .../gov/usgs/earthquake/nshmp/model/NshmTests.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 8d033a6b9..be1cd6c81 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
@@ -143,13 +144,18 @@ class NshmTests {
    * Test CONUS 2018 NSHM
    *
    * To run test: ./gradlew testConus2018
+   * @throws InterruptedException
    */
   @Test
-  final void testConus2018() throws IOException {
-    var service = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+  final void testConus2018() throws IOException, InterruptedException {
+    var cores = Runtime.getRuntime().availableProcessors();
+    var service = Executors.newFixedThreadPool(cores);
+    CountDownLatch latch = new CountDownLatch(1);
     service.execute(() -> {
       NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
+      latch.countDown();
     });
+    latch.await();
   }
 
   /**
-- 
GitLab


From eb6c9985033ca0d8e17d48eb2b6f8af41eb8541e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 11:07:32 -0600
Subject: [PATCH 34/63] single site

---
 gradle/nshm.gradle                            | 10 ++++++++
 .../earthquake/nshmp/model/NshmTestUtils.java |  5 ++--
 .../earthquake/nshmp/model/NshmTests.java     | 25 ++++++-------------
 src/test/resources/junit-platform.properties  |  4 ---
 4 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 src/test/resources/junit-platform.properties

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index db97e35b9..910405dd3 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -91,6 +91,8 @@ task testAlaska2007(type: Test) {
     exceptionFormat "full"
   }
 
+  systemProperties(System.getProperties())
+
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
@@ -115,6 +117,8 @@ task testAlaska2023(type: Test) {
     exceptionFormat "full"
   }
 
+  systemProperties(System.getProperties())
+
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
@@ -139,6 +143,8 @@ task testConus2018(type: Test) {
     exceptionFormat "full"
   }
 
+  systemProperties(System.getProperties())
+
   useJUnitPlatform()
   jvmArgs(
       "-Xms${xmx}",
@@ -163,6 +169,8 @@ task testConus2023(type: Test) {
     exceptionFormat "full"
   }
 
+  systemProperties(System.getProperties())
+
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
@@ -187,6 +195,8 @@ task testHawaii2021(type: Test) {
     exceptionFormat "full"
   }
 
+  systemProperties(System.getProperties())
+
   useJUnitPlatform()
   jvmArgs(
       "-Xms2g",
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 7546fb6b2..8edc45346 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -43,7 +43,8 @@ import io.swagger.v3.core.util.Yaml;
  * Utilities to run tests on a NSHM.
  */
 class NshmTestUtils {
-  private static Logger LOGGER = Logger.getAnonymousLogger();
+  private static Logger LOGGER = Logger.getLogger(NshmTestUtils.class.getName());
+
   private static final Path DATA_PATH = Paths.get("src/test/resources/e2e");
 
   private static final double TOLERANCE = 1e-12;
@@ -85,8 +86,6 @@ class NshmTestUtils {
    */
   static void testNshm(Nshm nshm, Optional<NshmpSite> site) {
     NshmModel nshmModel = loadModel(nshm);
-    LOGGER.info("Model loaded");
-    LOGGER.info("Number of sites: " + nshm.locations().size());
 
     if (site.isPresent()) {
       LOGGER.info("Location: " + site.get().toString());
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index be1cd6c81..6a63f9048 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -113,13 +113,6 @@ class NshmTests {
     // }
   }
 
-  private NshmpSite getSite() {
-    var arg = System.getProperty("TEST_SITE");
-    LOGGER.info("\n\n ---------------- TEST SITE: " + arg + "\n\n-------------");
-
-    return arg == null ? null : NshmpSite.valueOf(arg);
-  }
-
   /**
    * Test Alaska 2007 NSHM
    *
@@ -148,14 +141,7 @@ class NshmTests {
    */
   @Test
   final void testConus2018() throws IOException, InterruptedException {
-    var cores = Runtime.getRuntime().availableProcessors();
-    var service = Executors.newFixedThreadPool(cores);
-    CountDownLatch latch = new CountDownLatch(1);
-    service.execute(() -> {
-      NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
-      latch.countDown();
-    });
-    latch.await();
+    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
   }
 
   /**
@@ -165,7 +151,7 @@ class NshmTests {
    */
   @Test
   final void testConus2023() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2023"), Optional.of(getSite()));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2023"), Optional.ofNullable(getSite()));
   }
 
   /**
@@ -175,6 +161,11 @@ class NshmTests {
    */
   @Test
   final void testHawaii2021() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-hawaii-2021"), Optional.of(getSite()));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-hawaii-2021"), Optional.ofNullable(getSite()));
+  }
+
+  private NshmpSite getSite() {
+    var testSite = System.getProperty("TEST_SITE");
+    return testSite == null ? null : NshmpSite.valueOf(testSite);
   }
 }
diff --git a/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties
deleted file mode 100644
index 8f308f80e..000000000
--- a/src/test/resources/junit-platform.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-junit.jupiter.execution.parallel.enabled = true
-junit.jupiter.execution.parallel.mode.default = concurrent
-junit.jupiter.execution.parallel.mode.classes.default = concurrent
-junit.jupiter.execution.parallel.config.fixed.parallelism
-- 
GitLab


From 9c743f94d4592ea297ff9c662c32fa9a7539cc3b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 11:08:18 -0600
Subject: [PATCH 35/63] cleanup

---
 .../gov/usgs/earthquake/nshmp/model/NshmTests.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 6a63f9048..e49414cd1 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -8,9 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
-import java.util.logging.Logger;
 
 import org.junit.jupiter.api.Test;
 
@@ -25,7 +22,6 @@ import gov.usgs.earthquake.nshmp.site.NshmpSite;
  * Test NSHMs.
  */
 class NshmTests {
-  private static Logger LOGGER = Logger.getAnonymousLogger();
   /* Alaska test sites */
   private static final List<NamedLocation> ALASKA_LOCATIONS = List.of(
       NshmpSite.ANCHORAGE_AK,
@@ -38,10 +34,10 @@ class NshmTests {
   private static final List<NamedLocation> CONUS_LOCATIONS = List.of(
       NshmpSite.LOS_ANGELES_CA,
       NshmpSite.SAN_FRANCISCO_CA,
-      // NshmpSite.SEATTLE_WA,
-      // NshmpSite.SALT_LAKE_CITY_UT,
-      // NshmpSite.RENO_NV,
-      // NshmpSite.NEW_MADRID_MO,
+      NshmpSite.SEATTLE_WA,
+      NshmpSite.SALT_LAKE_CITY_UT,
+      NshmpSite.RENO_NV,
+      NshmpSite.NEW_MADRID_MO,
       NshmpSite.BOSTON_MA,
       NshmpSite.NEW_YORK_NY,
       NshmpSite.CHICAGO_IL);
-- 
GitLab


From b3d51d89415be39b1e0154dad0210e2b8a13e84f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 11:13:21 -0600
Subject: [PATCH 36/63] test single site

---
 .gitlab-ci.yml | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53a0001f4..04bb908d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -234,14 +234,50 @@ NSHM Tests:
   parallel:
     matrix:
       - CMD: testAlaska2007
+        TEST_SITE:
+          - ANCHORAGE_AK
+          - FAIRBANKS_AK
+          - JUNEAU_AK
+          - KODIAK_AK
+          - VALDEZ_AK
       - CMD: testAlaska2023
+        TEST_SITE:
+          - ANCHORAGE_AK
+          - FAIRBANKS_AK
+          - JUNEAU_AK
+          - KODIAK_AK
+          - VALDEZ_AK
       - CMD: testConus2018
+        TEST_SITE:
+          - LOS_ANGELES_CA
+          - SAN_FRANCISCO_CA
+          - SEATTLE_WA
+          - SALT_LAKE_CITY_UT
+          - RENO_NV
+          - NEW_MADRID_MO
+          - BOSTON_MA
+          - NEW_YORK_NY
+          - CHICAGO_IL
       - CMD: testConus2023
+        TEST_SITE:
+          - LOS_ANGELES_CA
+          - SAN_FRANCISCO_CA
+          - SEATTLE_WA
+          - SALT_LAKE_CITY_UT
+          - RENO_NV
+          - NEW_MADRID_MO
+          - BOSTON_MA
+          - NEW_YORK_NY
+          - CHICAGO_IL
       - CMD: testHawaii2021
+        TEST_SITE:
+          - HILO_HI
+          - HONOLULU_HI
+          - KAILUA_KONA_HI
   script:
     - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
-    - ./gradlew ${CMD} --info
+    - ./gradlew ${CMD} -DTEST_SITE=${TEST_SITE} --info
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
-- 
GitLab


From 9ae9951e8c281411c5447244351c483d57004a36 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 12:09:39 -0600
Subject: [PATCH 37/63] test

---
 .gitlab-ci.yml | 134 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 90 insertions(+), 44 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04bb908d8..292195724 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,7 +223,7 @@ Markdown Lint:
     - ./gradlew markdownlint
   stage: test
 
-NSHM Tests:
+.nshm-test:
   artifacts:
     paths:
       - ${JACOCO_HTML_DIR}
@@ -231,49 +231,49 @@ NSHM Tests:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
   needs: []
-  parallel:
-    matrix:
-      - CMD: testAlaska2007
-        TEST_SITE:
-          - ANCHORAGE_AK
-          - FAIRBANKS_AK
-          - JUNEAU_AK
-          - KODIAK_AK
-          - VALDEZ_AK
-      - CMD: testAlaska2023
-        TEST_SITE:
-          - ANCHORAGE_AK
-          - FAIRBANKS_AK
-          - JUNEAU_AK
-          - KODIAK_AK
-          - VALDEZ_AK
-      - CMD: testConus2018
-        TEST_SITE:
-          - LOS_ANGELES_CA
-          - SAN_FRANCISCO_CA
-          - SEATTLE_WA
-          - SALT_LAKE_CITY_UT
-          - RENO_NV
-          - NEW_MADRID_MO
-          - BOSTON_MA
-          - NEW_YORK_NY
-          - CHICAGO_IL
-      - CMD: testConus2023
-        TEST_SITE:
-          - LOS_ANGELES_CA
-          - SAN_FRANCISCO_CA
-          - SEATTLE_WA
-          - SALT_LAKE_CITY_UT
-          - RENO_NV
-          - NEW_MADRID_MO
-          - BOSTON_MA
-          - NEW_YORK_NY
-          - CHICAGO_IL
-      - CMD: testHawaii2021
-        TEST_SITE:
-          - HILO_HI
-          - HONOLULU_HI
-          - KAILUA_KONA_HI
+  # parallel:
+  #   matrix:
+  #     - CMD: testAlaska2007
+  #       TEST_SITE:
+  #         - ANCHORAGE_AK
+  #         - FAIRBANKS_AK
+  #         - JUNEAU_AK
+  #         - KODIAK_AK
+  #         - VALDEZ_AK
+  #     - CMD: testAlaska2023
+  #       TEST_SITE:
+  #         - ANCHORAGE_AK
+  #         - FAIRBANKS_AK
+  #         - JUNEAU_AK
+  #         - KODIAK_AK
+  #         - VALDEZ_AK
+  #     - CMD: testConus2018
+  #       TEST_SITE:
+  #         - LOS_ANGELES_CA
+  #         - SAN_FRANCISCO_CA
+  #         - SEATTLE_WA
+  #         - SALT_LAKE_CITY_UT
+  #         - RENO_NV
+  #         - NEW_MADRID_MO
+  #         - BOSTON_MA
+  #         - NEW_YORK_NY
+  #         - CHICAGO_IL
+  #     - CMD: testConus2023
+  #       TEST_SITE:
+  #         - LOS_ANGELES_CA
+  #         - SAN_FRANCISCO_CA
+  #         - SEATTLE_WA
+  #         - SALT_LAKE_CITY_UT
+  #         - RENO_NV
+  #         - NEW_MADRID_MO
+  #         - BOSTON_MA
+  #         - NEW_YORK_NY
+  #         - CHICAGO_IL
+  #     - CMD: testHawaii2021
+  #       TEST_SITE:
+  #         - HILO_HI
+  #         - HONOLULU_HI
+  #         - KAILUA_KONA_HI
   script:
     - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
@@ -281,6 +281,52 @@ NSHM Tests:
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
+Alaska 2007 NSHM Test:
+  extends:
+    - .nshm-test
+  variables:
+    CMD: testAlaska2007
+
+Alaska 2023 NSHM Test:
+  extends:
+    - .nshm-test
+  variables:
+    CMD: testAlaska2023
+
+CONUS 2018 NSHM Test:
+  extends:
+    - .nshm-test
+  parallel:
+    matrix:
+      - TEST_SITE: LOS_ANGELES_CA
+      - TEST_SITE: SAN_FRANCISCO_CA
+      - TEST_SITE: SEATTLE_WA
+      - TEST_SITE: SALT_LAKE_CITY_UT
+      - TEST_SITE: RENO_NV
+      - TEST_SITE: NEW_MADRID_MO
+      - TEST_SITE: BOSTON_MA
+      - TEST_SITE: NEW_YORK_NY
+      - TEST_SITE: CHICAGO_IL
+  variables:
+    CMD: testConus2018
+
+CONUS 2023 NSHM Test:
+  extends:
+    - .nshm-test
+  parallel:
+    matrix:
+      - TEST_SITE: LOS_ANGELES_CA
+      - TEST_SITE: SAN_FRANCISCO_CA
+      - TEST_SITE: SEATTLE_WA
+      - TEST_SITE: SALT_LAKE_CITY_UT
+      - TEST_SITE: RENO_NV
+      - TEST_SITE: NEW_MADRID_MO
+      - TEST_SITE: BOSTON_MA
+      - TEST_SITE: NEW_YORK_NY
+      - TEST_SITE: CHICAGO_IL
+  variables:
+    CMD: testConus2023
+
 YAML Lint:
   allow_failure: true
   needs: []
-- 
GitLab


From d832575744f6946b8dacb68a2d7b261b5227a15e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 12:32:41 -0600
Subject: [PATCH 38/63] test

---
 .gitlab-ci.yml | 56 +-------------------------------------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 292195724..dab3a25e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -231,53 +231,10 @@ Markdown Lint:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
   needs: []
-  # parallel:
-  #   matrix:
-  #     - CMD: testAlaska2007
-  #       TEST_SITE:
-  #         - ANCHORAGE_AK
-  #         - FAIRBANKS_AK
-  #         - JUNEAU_AK
-  #         - KODIAK_AK
-  #         - VALDEZ_AK
-  #     - CMD: testAlaska2023
-  #       TEST_SITE:
-  #         - ANCHORAGE_AK
-  #         - FAIRBANKS_AK
-  #         - JUNEAU_AK
-  #         - KODIAK_AK
-  #         - VALDEZ_AK
-  #     - CMD: testConus2018
-  #       TEST_SITE:
-  #         - LOS_ANGELES_CA
-  #         - SAN_FRANCISCO_CA
-  #         - SEATTLE_WA
-  #         - SALT_LAKE_CITY_UT
-  #         - RENO_NV
-  #         - NEW_MADRID_MO
-  #         - BOSTON_MA
-  #         - NEW_YORK_NY
-  #         - CHICAGO_IL
-  #     - CMD: testConus2023
-  #       TEST_SITE:
-  #         - LOS_ANGELES_CA
-  #         - SAN_FRANCISCO_CA
-  #         - SEATTLE_WA
-  #         - SALT_LAKE_CITY_UT
-  #         - RENO_NV
-  #         - NEW_MADRID_MO
-  #         - BOSTON_MA
-  #         - NEW_YORK_NY
-  #         - CHICAGO_IL
-  #     - CMD: testHawaii2021
-  #       TEST_SITE:
-  #         - HILO_HI
-  #         - HONOLULU_HI
-  #         - KAILUA_KONA_HI
   script:
     - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
-    - ./gradlew ${CMD} -DTEST_SITE=${TEST_SITE} --info
+    - ./gradlew ${CMD} -DTEST_SITE=${TEST_SITE} --info --no-daemon --no-cache
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
@@ -296,17 +253,6 @@ Alaska 2023 NSHM Test:
 CONUS 2018 NSHM Test:
   extends:
     - .nshm-test
-  parallel:
-    matrix:
-      - TEST_SITE: LOS_ANGELES_CA
-      - TEST_SITE: SAN_FRANCISCO_CA
-      - TEST_SITE: SEATTLE_WA
-      - TEST_SITE: SALT_LAKE_CITY_UT
-      - TEST_SITE: RENO_NV
-      - TEST_SITE: NEW_MADRID_MO
-      - TEST_SITE: BOSTON_MA
-      - TEST_SITE: NEW_YORK_NY
-      - TEST_SITE: CHICAGO_IL
   variables:
     CMD: testConus2018
 
-- 
GitLab


From eaf9187f464e589d3642f07b7f857f6c345a9a90 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 12:33:16 -0600
Subject: [PATCH 39/63] test

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTests.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index e49414cd1..9f375760f 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -96,7 +96,7 @@ class NshmTests {
 
     // run single model
     NshmModel nshmModel =
-        NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
+        NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
 
     NshmTestUtils.writeExpecteds(nshmModel);
     nshmModel.exec.shutdown();
@@ -133,10 +133,9 @@ class NshmTests {
    * Test CONUS 2018 NSHM
    *
    * To run test: ./gradlew testConus2018
-   * @throws InterruptedException
    */
   @Test
-  final void testConus2018() throws IOException, InterruptedException {
+  final void testConus2018() throws IOException {
     NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
   }
 
@@ -162,6 +161,6 @@ class NshmTests {
 
   private NshmpSite getSite() {
     var testSite = System.getProperty("TEST_SITE");
-    return testSite == null ? null : NshmpSite.valueOf(testSite);
+    return testSite == null || testSite == "" ? null : NshmpSite.valueOf(testSite);
   }
 }
-- 
GitLab


From e91200163c1375d7d898ba03a34b8071ffbbc048 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 12:38:10 -0600
Subject: [PATCH 40/63] test

---
 src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 9f375760f..e174fc117 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -161,6 +161,6 @@ class NshmTests {
 
   private NshmpSite getSite() {
     var testSite = System.getProperty("TEST_SITE");
-    return testSite == null || testSite == "" ? null : NshmpSite.valueOf(testSite);
+    return testSite == null ? null : NshmpSite.valueOf(testSite);
   }
 }
-- 
GitLab


From 43bfbb14cb32392a8ab87a1976fd9492fefaa0c5 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 12:41:30 -0600
Subject: [PATCH 41/63] test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dab3a25e5..0c067caee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -234,7 +234,7 @@ Markdown Lint:
   script:
     - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
-    - ./gradlew ${CMD} -DTEST_SITE=${TEST_SITE} --info --no-daemon --no-cache
+    - ./gradlew ${CMD} -DTEST_SITE=${TEST_SITE} --info --no-daemon
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
-- 
GitLab


From c6a6010d199a5fcf97bc5869d7a4b40f8edf6ac2 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 12:46:21 -0600
Subject: [PATCH 42/63] test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c067caee..2472e6b96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -234,7 +234,7 @@ Markdown Lint:
   script:
     - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
-    - ./gradlew ${CMD} -DTEST_SITE=${TEST_SITE} --info --no-daemon
+    - ./gradlew ${CMD} --info --no-daemon
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
-- 
GitLab


From facad472791b3c73ad68eb30d50eb6039278828b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 13:01:31 -0600
Subject: [PATCH 43/63] test

---
 src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index e174fc117..58cc6adcd 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -10,6 +10,8 @@ import java.util.Optional;
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
 
 import gov.usgs.earthquake.nshmp.NamedLocation;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
@@ -21,6 +23,7 @@ import gov.usgs.earthquake.nshmp.site.NshmpSite;
 /**
  * Test NSHMs.
  */
+@TestInstance(Lifecycle.PER_CLASS)
 class NshmTests {
   /* Alaska test sites */
   private static final List<NamedLocation> ALASKA_LOCATIONS = List.of(
-- 
GitLab


From c6ed898cef42588061c28e6d6196303d7b1b5346 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 13:32:46 -0600
Subject: [PATCH 44/63] test

---
 gradle/nshm.gradle                            |  2 +-
 .../nshmp/model/Conus2018Tests.java           | 42 +++++++++++++++++++
 .../earthquake/nshmp/model/NshmTestUtils.java | 12 ++++++
 .../earthquake/nshmp/model/NshmTests.java     | 18 ++++----
 4 files changed, 64 insertions(+), 10 deletions(-)
 create mode 100644 src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 910405dd3..008bf38fd 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -152,7 +152,7 @@ task testConus2018(type: Test) {
       )
 
   filter {
-    includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests.testConus2018"
+    includeTestsMatching "gov.usgs.earthquake.nshmp.model.Conus2018Tests"
   }
 }
 
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java
new file mode 100644
index 000000000..baeb1da4b
--- /dev/null
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java
@@ -0,0 +1,42 @@
+package gov.usgs.earthquake.nshmp.model;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import gov.usgs.earthquake.nshmp.NamedLocation;
+import gov.usgs.earthquake.nshmp.model.NshmTestUtils.Nshm;
+import gov.usgs.earthquake.nshmp.model.NshmTestUtils.NshmModel;
+
+@TestInstance(Lifecycle.PER_CLASS)
+class Conus2018Tests {
+
+  Nshm nshm = NshmTests.NSHMS.get("nshm-conus-2018");
+  NshmModel nshmModel;
+
+  @BeforeAll
+  void load() {
+    nshmModel = NshmTestUtils.loadModel(nshm);
+  }
+
+  @AfterAll
+  void stop() {
+    nshmModel.exec.shutdown();
+  }
+
+  @ParameterizedTest
+  @MethodSource("conusSites")
+  final void testConus2018(NamedLocation location) throws IOException {
+    NshmTestUtils.testNshm(nshmModel, location);
+  }
+
+  private static Stream<NamedLocation> conusSites() {
+    return NshmTests.CONUS_LOCATIONS.stream();
+  }
+}
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 8edc45346..91d95cf6b 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -100,6 +100,18 @@ class NshmTestUtils {
     nshmModel.exec.shutdown();
   }
 
+  static void testNshm(Nshm nshm, NamedLocation location) {
+    NshmModel nshmModel = loadModel(nshm);
+    LOGGER.info("Location: " + location.toString());
+    compareCurves(nshmModel, location);
+    nshmModel.exec.shutdown();
+  }
+
+  static void testNshm(NshmModel nshmModel, NamedLocation location) {
+    LOGGER.info("Location: " + location.toString());
+    compareCurves(nshmModel, location);
+  }
+
   /**
    * Write expected values
    *
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 58cc6adcd..a5ba46a7e 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -10,8 +10,8 @@ import java.util.Optional;
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import gov.usgs.earthquake.nshmp.NamedLocation;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
@@ -23,10 +23,9 @@ import gov.usgs.earthquake.nshmp.site.NshmpSite;
 /**
  * Test NSHMs.
  */
-@TestInstance(Lifecycle.PER_CLASS)
 class NshmTests {
   /* Alaska test sites */
-  private static final List<NamedLocation> ALASKA_LOCATIONS = List.of(
+  static final List<NamedLocation> ALASKA_LOCATIONS = List.of(
       NshmpSite.ANCHORAGE_AK,
       NshmpSite.FAIRBANKS_AK,
       NshmpSite.JUNEAU_AK,
@@ -34,7 +33,7 @@ class NshmTests {
       NshmpSite.VALDEZ_AK);
 
   /* CONUS test sites */
-  private static final List<NamedLocation> CONUS_LOCATIONS = List.of(
+  static final List<NamedLocation> CONUS_LOCATIONS = List.of(
       NshmpSite.LOS_ANGELES_CA,
       NshmpSite.SAN_FRANCISCO_CA,
       NshmpSite.SEATTLE_WA,
@@ -54,7 +53,7 @@ class NshmTests {
   private static final Set<Imt> IMTS = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0, Imt.SA5P0);
   private static final Set<Imt> AK_2007_IMTS = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0);
 
-  private static final Map<String, Nshm> NSHMS;
+  static final Map<String, Nshm> NSHMS;
 
   static {
     Map<String, Nshm> nshms = new HashMap<>();
@@ -137,9 +136,10 @@ class NshmTests {
    *
    * To run test: ./gradlew testConus2018
    */
-  @Test
-  final void testConus2018() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
+  @ParameterizedTest
+  @MethodSource("conusSites")
+  final void testConus2018(NamedLocation location) throws IOException {
+    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), location);
   }
 
   /**
-- 
GitLab


From 87de6fa9834b4d9419dc659a0c696402b3339356 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 13:41:23 -0600
Subject: [PATCH 45/63] test

---
 .../java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java  | 3 +++
 src/test/resources/e2e/ junit-platform.properties             | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 src/test/resources/e2e/ junit-platform.properties

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java
index baeb1da4b..28b702553 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java
@@ -7,6 +7,8 @@ import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -15,6 +17,7 @@ import gov.usgs.earthquake.nshmp.model.NshmTestUtils.Nshm;
 import gov.usgs.earthquake.nshmp.model.NshmTestUtils.NshmModel;
 
 @TestInstance(Lifecycle.PER_CLASS)
+@Execution(ExecutionMode.CONCURRENT)
 class Conus2018Tests {
 
   Nshm nshm = NshmTests.NSHMS.get("nshm-conus-2018");
diff --git a/src/test/resources/e2e/ junit-platform.properties b/src/test/resources/e2e/ junit-platform.properties
new file mode 100644
index 000000000..fe1e8bb73
--- /dev/null
+++ b/src/test/resources/e2e/ junit-platform.properties	
@@ -0,0 +1,4 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.config.fixed.parallelism
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent
-- 
GitLab


From 5df8c19e71649a202d26de88c9f4b22a7d7d518f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 13:49:49 -0600
Subject: [PATCH 46/63] test

---
 .gitlab-ci.yml                                | 30 +++++++++----
 .../nshmp/model/Conus2018Tests.java           | 45 -------------------
 .../earthquake/nshmp/model/NshmTests.java     | 13 +++---
 .../resources/e2e/ junit-platform.properties  |  4 --
 4 files changed, 27 insertions(+), 65 deletions(-)
 delete mode 100644 src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java
 delete mode 100644 src/test/resources/e2e/ junit-platform.properties

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2472e6b96..7b1b3fe0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -231,30 +231,44 @@ Markdown Lint:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
   needs: []
-  script:
+  before_script:
     - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
-    - ./gradlew ${CMD} --info --no-daemon
+    - ./gradlew ${CMD} --info
+  after_script:
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
 Alaska 2007 NSHM Test:
   extends:
     - .nshm-test
-  variables:
-    CMD: testAlaska2007
+  script:
+    - ./gradlew testAlaska2007 --info
 
 Alaska 2023 NSHM Test:
   extends:
     - .nshm-test
   variables:
     CMD: testAlaska2023
+  script:
+    - ./gradlew testAlaska2007 --info
 
 CONUS 2018 NSHM Test:
   extends:
     - .nshm-test
-  variables:
-    CMD: testConus2018
+  parallel:
+    matrix:
+      - TEST_SITE: LOS_ANGELES_CA
+      - TEST_SITE: SAN_FRANCISCO_CA
+      - TEST_SITE: SEATTLE_WA
+      - TEST_SITE: SALT_LAKE_CITY_UT
+      - TEST_SITE: RENO_NV
+      - TEST_SITE: NEW_MADRID_MO
+      - TEST_SITE: BOSTON_MA
+      - TEST_SITE: NEW_YORK_NY
+      - TEST_SITE: CHICAGO_IL
+  script:
+    - ./gradlew testConus2018 -DTEST_SITE=${TEST_SITE} --info
 
 CONUS 2023 NSHM Test:
   extends:
@@ -270,8 +284,8 @@ CONUS 2023 NSHM Test:
       - TEST_SITE: BOSTON_MA
       - TEST_SITE: NEW_YORK_NY
       - TEST_SITE: CHICAGO_IL
-  variables:
-    CMD: testConus2023
+  script:
+    - ./gradlew testConus2023 -DTEST_SITE=${TEST_SITE} --info
 
 YAML Lint:
   allow_failure: true
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java
deleted file mode 100644
index 28b702553..000000000
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/Conus2018Tests.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gov.usgs.earthquake.nshmp.model;
-
-import java.io.IOException;
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.TestInstance.Lifecycle;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import gov.usgs.earthquake.nshmp.NamedLocation;
-import gov.usgs.earthquake.nshmp.model.NshmTestUtils.Nshm;
-import gov.usgs.earthquake.nshmp.model.NshmTestUtils.NshmModel;
-
-@TestInstance(Lifecycle.PER_CLASS)
-@Execution(ExecutionMode.CONCURRENT)
-class Conus2018Tests {
-
-  Nshm nshm = NshmTests.NSHMS.get("nshm-conus-2018");
-  NshmModel nshmModel;
-
-  @BeforeAll
-  void load() {
-    nshmModel = NshmTestUtils.loadModel(nshm);
-  }
-
-  @AfterAll
-  void stop() {
-    nshmModel.exec.shutdown();
-  }
-
-  @ParameterizedTest
-  @MethodSource("conusSites")
-  final void testConus2018(NamedLocation location) throws IOException {
-    NshmTestUtils.testNshm(nshmModel, location);
-  }
-
-  private static Stream<NamedLocation> conusSites() {
-    return NshmTests.CONUS_LOCATIONS.stream();
-  }
-}
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index a5ba46a7e..66b0c1436 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -10,8 +10,6 @@ import java.util.Optional;
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
 
 import gov.usgs.earthquake.nshmp.NamedLocation;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
@@ -25,7 +23,7 @@ import gov.usgs.earthquake.nshmp.site.NshmpSite;
  */
 class NshmTests {
   /* Alaska test sites */
-  static final List<NamedLocation> ALASKA_LOCATIONS = List.of(
+  private static final List<NamedLocation> ALASKA_LOCATIONS = List.of(
       NshmpSite.ANCHORAGE_AK,
       NshmpSite.FAIRBANKS_AK,
       NshmpSite.JUNEAU_AK,
@@ -33,7 +31,7 @@ class NshmTests {
       NshmpSite.VALDEZ_AK);
 
   /* CONUS test sites */
-  static final List<NamedLocation> CONUS_LOCATIONS = List.of(
+  private static final List<NamedLocation> CONUS_LOCATIONS = List.of(
       NshmpSite.LOS_ANGELES_CA,
       NshmpSite.SAN_FRANCISCO_CA,
       NshmpSite.SEATTLE_WA,
@@ -136,10 +134,9 @@ class NshmTests {
    *
    * To run test: ./gradlew testConus2018
    */
-  @ParameterizedTest
-  @MethodSource("conusSites")
-  final void testConus2018(NamedLocation location) throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), location);
+  @Test
+  final void testConus2018() throws IOException {
+    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
   }
 
   /**
diff --git a/src/test/resources/e2e/ junit-platform.properties b/src/test/resources/e2e/ junit-platform.properties
deleted file mode 100644
index fe1e8bb73..000000000
--- a/src/test/resources/e2e/ junit-platform.properties	
+++ /dev/null
@@ -1,4 +0,0 @@
-junit.jupiter.execution.parallel.enabled = true
-junit.jupiter.execution.parallel.config.fixed.parallelism
-junit.jupiter.execution.parallel.mode.default = concurrent
-junit.jupiter.execution.parallel.mode.classes.default = concurrent
-- 
GitLab


From 8437a2b0904297f913a5f5be9e0b63a414561f3c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 13:59:24 -0600
Subject: [PATCH 47/63] test

---
 gradle/nshm.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 008bf38fd..910405dd3 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -152,7 +152,7 @@ task testConus2018(type: Test) {
       )
 
   filter {
-    includeTestsMatching "gov.usgs.earthquake.nshmp.model.Conus2018Tests"
+    includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests.testConus2018"
   }
 }
 
-- 
GitLab


From 266724c5c7ae9d7efeba6bc26d6bf79ff67e43ae Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 14:12:22 -0600
Subject: [PATCH 48/63] add sites

---
 .gitlab-ci.yml | 52 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b1b3fe0d..d2069a382 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,6 +239,14 @@ Markdown Lint:
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
+
+.alaska-sites: &alaska-sites
+  - TEST_SITE: ANCHORAGE_AK
+  - TEST_SITE: FAIRBANKS_AK
+  - TEST_SITE: JUNEAU_AK
+  - TEST_SITE: KODIAK_AK
+  - TEST_SITE: VALDEZ_AK
+
 Alaska 2007 NSHM Test:
   extends:
     - .nshm-test
@@ -248,25 +256,29 @@ Alaska 2007 NSHM Test:
 Alaska 2023 NSHM Test:
   extends:
     - .nshm-test
-  variables:
-    CMD: testAlaska2023
+  parallel:
+    matrix:
+      *alaska-sites
   script:
-    - ./gradlew testAlaska2007 --info
+    - ./gradlew testAlaksa2023 -DTEST_SITE=${TEST_SITE} --info
+
+.conus-sites: &conus-sites
+  - TEST_SITE: LOS_ANGELES_CA
+  - TEST_SITE: SAN_FRANCISCO_CA
+  - TEST_SITE: SEATTLE_WA
+  - TEST_SITE: SALT_LAKE_CITY_UT
+  - TEST_SITE: RENO_NV
+  - TEST_SITE: NEW_MADRID_MO
+  - TEST_SITE: BOSTON_MA
+  - TEST_SITE: NEW_YORK_NY
+  - TEST_SITE: CHICAGO_IL
 
 CONUS 2018 NSHM Test:
   extends:
     - .nshm-test
   parallel:
     matrix:
-      - TEST_SITE: LOS_ANGELES_CA
-      - TEST_SITE: SAN_FRANCISCO_CA
-      - TEST_SITE: SEATTLE_WA
-      - TEST_SITE: SALT_LAKE_CITY_UT
-      - TEST_SITE: RENO_NV
-      - TEST_SITE: NEW_MADRID_MO
-      - TEST_SITE: BOSTON_MA
-      - TEST_SITE: NEW_YORK_NY
-      - TEST_SITE: CHICAGO_IL
+      *conus-sites
   script:
     - ./gradlew testConus2018 -DTEST_SITE=${TEST_SITE} --info
 
@@ -275,18 +287,16 @@ CONUS 2023 NSHM Test:
     - .nshm-test
   parallel:
     matrix:
-      - TEST_SITE: LOS_ANGELES_CA
-      - TEST_SITE: SAN_FRANCISCO_CA
-      - TEST_SITE: SEATTLE_WA
-      - TEST_SITE: SALT_LAKE_CITY_UT
-      - TEST_SITE: RENO_NV
-      - TEST_SITE: NEW_MADRID_MO
-      - TEST_SITE: BOSTON_MA
-      - TEST_SITE: NEW_YORK_NY
-      - TEST_SITE: CHICAGO_IL
+      *conus-sites
   script:
     - ./gradlew testConus2023 -DTEST_SITE=${TEST_SITE} --info
 
+Hawaii 2021 NSHM Test:
+  extends:
+    - .nshm-test
+  script:
+    - ./gradlew testHawaii2021 --info
+
 YAML Lint:
   allow_failure: true
   needs: []
-- 
GitLab


From 869c7f0eba8b9d95d5f518481146154856417fd7 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 14:17:11 -0600
Subject: [PATCH 49/63] cleanup

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2069a382..7ba0c4395 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,7 +239,6 @@ Markdown Lint:
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
-
 .alaska-sites: &alaska-sites
   - TEST_SITE: ANCHORAGE_AK
   - TEST_SITE: FAIRBANKS_AK
@@ -260,7 +259,7 @@ Alaska 2023 NSHM Test:
     matrix:
       *alaska-sites
   script:
-    - ./gradlew testAlaksa2023 -DTEST_SITE=${TEST_SITE} --info
+    - ./gradlew testAlaska2023 -DTEST_SITE=${TEST_SITE} --info
 
 .conus-sites: &conus-sites
   - TEST_SITE: LOS_ANGELES_CA
-- 
GitLab


From d8beb7eb2e4fa76e2a628eb1fa817e6be20dd46e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 14:30:02 -0600
Subject: [PATCH 50/63] test

---
 .gitlab-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ba0c4395..006be2484 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -281,6 +281,12 @@ CONUS 2018 NSHM Test:
   script:
     - ./gradlew testConus2018 -DTEST_SITE=${TEST_SITE} --info
 
+CONUS 2018 NSHM Test 2:
+  extends:
+    - .nshm-test
+  script:
+    - ./gradlew testConus2018 --info
+
 CONUS 2023 NSHM Test:
   extends:
     - .nshm-test
-- 
GitLab


From 8ec53357e5bfb4d6b7002f706135748c9fe145af Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 14:45:57 -0600
Subject: [PATCH 51/63] cleanup

---
 .gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 006be2484..7ba0c4395 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -281,12 +281,6 @@ CONUS 2018 NSHM Test:
   script:
     - ./gradlew testConus2018 -DTEST_SITE=${TEST_SITE} --info
 
-CONUS 2018 NSHM Test 2:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew testConus2018 --info
-
 CONUS 2023 NSHM Test:
   extends:
     - .nshm-test
-- 
GitLab


From 6230209272c9ef2222db61e8b6db057f9ae99782 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 14:48:37 -0600
Subject: [PATCH 52/63] add stages

---
 .gitlab-ci.yml | 55 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ba0c4395..3fb882d25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,9 @@ workflow:
 stages:
   - build
   - test
+  - alaska-test
+  - conus-test
+  - hawaii-test
   - trigger
 
 default:
@@ -223,6 +226,31 @@ Markdown Lint:
     - ./gradlew markdownlint
   stage: test
 
+YAML Lint:
+  allow_failure: true
+  needs: []
+  script:
+    - ./gradlew nodeInstall
+    - ./gradlew yamllint
+  stage: test
+
+Unit Tests:
+  artifacts:
+    paths:
+      - ${JACOCO_HTML_DIR}
+    reports:
+      junit: ${JUNIT_FILES}
+  coverage: '/Total.*?([0-9]{1,3})%/'
+  needs: []
+  script:
+    - ./gradlew check
+    - cat ${JACOCO_HTML_DIR}/index.html
+  stage: test
+
+####
+# NSHMS Tests
+####
+
 .nshm-test:
   artifacts:
     paths:
@@ -237,7 +265,6 @@ Markdown Lint:
     - ./gradlew ${CMD} --info
   after_script:
     - cat ${JACOCO_HTML_DIR}/index.html
-  stage: test
 
 .alaska-sites: &alaska-sites
   - TEST_SITE: ANCHORAGE_AK
@@ -251,6 +278,7 @@ Alaska 2007 NSHM Test:
     - .nshm-test
   script:
     - ./gradlew testAlaska2007 --info
+  stage: alaska-test
 
 Alaska 2023 NSHM Test:
   extends:
@@ -260,6 +288,7 @@ Alaska 2023 NSHM Test:
       *alaska-sites
   script:
     - ./gradlew testAlaska2023 -DTEST_SITE=${TEST_SITE} --info
+  stage: alaska-test
 
 .conus-sites: &conus-sites
   - TEST_SITE: LOS_ANGELES_CA
@@ -280,6 +309,7 @@ CONUS 2018 NSHM Test:
       *conus-sites
   script:
     - ./gradlew testConus2018 -DTEST_SITE=${TEST_SITE} --info
+  stage: conus-test
 
 CONUS 2023 NSHM Test:
   extends:
@@ -289,33 +319,14 @@ CONUS 2023 NSHM Test:
       *conus-sites
   script:
     - ./gradlew testConus2023 -DTEST_SITE=${TEST_SITE} --info
+  stage: conus-test
 
 Hawaii 2021 NSHM Test:
   extends:
     - .nshm-test
   script:
     - ./gradlew testHawaii2021 --info
-
-YAML Lint:
-  allow_failure: true
-  needs: []
-  script:
-    - ./gradlew nodeInstall
-    - ./gradlew yamllint
-  stage: test
-
-Unit Tests:
-  artifacts:
-    paths:
-      - ${JACOCO_HTML_DIR}
-    reports:
-      junit: ${JUNIT_FILES}
-  coverage: '/Total.*?([0-9]{1,3})%/'
-  needs: []
-  script:
-    - ./gradlew check
-    - cat ${JACOCO_HTML_DIR}/index.html
-  stage: test
+  stage: hawaii-test
 
 ####
 # Stage: trigger
-- 
GitLab


From 9a3b5102a7116fc7b8746a0d549afe248cc128a6 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 31 Aug 2023 14:55:22 -0600
Subject: [PATCH 53/63] cleanup

---
 gradle/nshm.gradle                                   |  2 +-
 .../usgs/earthquake/nshmp/model/NshmTestUtils.java   | 12 ------------
 .../gov/usgs/earthquake/nshmp/model/NshmTests.java   |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 910405dd3..86cce87f0 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -147,7 +147,7 @@ task testConus2018(type: Test) {
 
   useJUnitPlatform()
   jvmArgs(
-      "-Xms${xmx}",
+      "-Xms2g",
       "-Xmx${xmx}",
       )
 
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 91d95cf6b..8edc45346 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -100,18 +100,6 @@ class NshmTestUtils {
     nshmModel.exec.shutdown();
   }
 
-  static void testNshm(Nshm nshm, NamedLocation location) {
-    NshmModel nshmModel = loadModel(nshm);
-    LOGGER.info("Location: " + location.toString());
-    compareCurves(nshmModel, location);
-    nshmModel.exec.shutdown();
-  }
-
-  static void testNshm(NshmModel nshmModel, NamedLocation location) {
-    LOGGER.info("Location: " + location.toString());
-    compareCurves(nshmModel, location);
-  }
-
   /**
    * Write expected values
    *
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 66b0c1436..e174fc117 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -51,7 +51,7 @@ class NshmTests {
   private static final Set<Imt> IMTS = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0, Imt.SA5P0);
   private static final Set<Imt> AK_2007_IMTS = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0);
 
-  static final Map<String, Nshm> NSHMS;
+  private static final Map<String, Nshm> NSHMS;
 
   static {
     Map<String, Nshm> nshms = new HashMap<>();
-- 
GitLab


From 9810d6bf8bade7cb056f18db7cef0f49cef9da38 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 10:33:01 -0600
Subject: [PATCH 54/63] generate actual

---
 .gitignore                                    |  1 +
 .gitlab-ci.yml                                | 35 +------
 gradle/nshm.gradle                            | 91 +++++++++++++++++++
 .../nshmp/model/GenerateActual.java           | 22 +++++
 .../earthquake/nshmp/model/NshmTestUtils.java | 36 ++++----
 .../earthquake/nshmp/model/NshmTests.java     | 23 +++--
 6 files changed, 149 insertions(+), 59 deletions(-)
 create mode 100644 src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java

diff --git a/.gitignore b/.gitignore
index d4c5e0c3f..e5021b74c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ nshms/
 .factorypath
 .apt_generated*
 *version.json
+src/test/resources/e2e/actual
 
 # Node
 node_modules
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3fb882d25..7e6bcb78d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -266,13 +266,6 @@ Unit Tests:
   after_script:
     - cat ${JACOCO_HTML_DIR}/index.html
 
-.alaska-sites: &alaska-sites
-  - TEST_SITE: ANCHORAGE_AK
-  - TEST_SITE: FAIRBANKS_AK
-  - TEST_SITE: JUNEAU_AK
-  - TEST_SITE: KODIAK_AK
-  - TEST_SITE: VALDEZ_AK
-
 Alaska 2007 NSHM Test:
   extends:
     - .nshm-test
@@ -283,42 +276,24 @@ Alaska 2007 NSHM Test:
 Alaska 2023 NSHM Test:
   extends:
     - .nshm-test
-  parallel:
-    matrix:
-      *alaska-sites
   script:
-    - ./gradlew testAlaska2023 -DTEST_SITE=${TEST_SITE} --info
+    - ./gradlew testAlaska2023 --info
   stage: alaska-test
 
-.conus-sites: &conus-sites
-  - TEST_SITE: LOS_ANGELES_CA
-  - TEST_SITE: SAN_FRANCISCO_CA
-  - TEST_SITE: SEATTLE_WA
-  - TEST_SITE: SALT_LAKE_CITY_UT
-  - TEST_SITE: RENO_NV
-  - TEST_SITE: NEW_MADRID_MO
-  - TEST_SITE: BOSTON_MA
-  - TEST_SITE: NEW_YORK_NY
-  - TEST_SITE: CHICAGO_IL
-
 CONUS 2018 NSHM Test:
   extends:
     - .nshm-test
-  parallel:
-    matrix:
-      *conus-sites
   script:
-    - ./gradlew testConus2018 -DTEST_SITE=${TEST_SITE} --info
+    - ./gradlew generateConus2018 --info
+    - ./gradlew testConus2018 --info
   stage: conus-test
 
 CONUS 2023 NSHM Test:
   extends:
     - .nshm-test
-  parallel:
-    matrix:
-      *conus-sites
   script:
-    - ./gradlew testConus2023 -DTEST_SITE=${TEST_SITE} --info
+    - ./gradlew generateConus2023 --info
+    - ./gradlew testConus2023 --info
   stage: conus-test
 
 Hawaii 2021 NSHM Test:
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 86cce87f0..086ebc772 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -78,6 +78,97 @@ task nshms() {
   }
 }
 
+// Generate Alaska 2007 for CI
+task generateAlaska2007(type: JavaExec) {
+  description = "Generate alaska-2007 acutal for CI/CD"
+  classpath = sourceSets.test.runtimeClasspath
+
+  doFirst {
+    downloadNshm(findNshm("nshm-alaska", 2007))
+  }
+
+  jvmArgs(
+      "-Xms2g",
+      "-Xmx${xmx}",
+      "-DNSHM=nshm-alaska-2007"
+      )
+
+  main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
+}
+
+// Generate Alaska 2023 for CI
+task generateAlaska2023(type: JavaExec) {
+  description = "Generate alaska-2023 acutal for CI/CD"
+  classpath = sourceSets.test.runtimeClasspath
+
+  doFirst {
+    downloadNshm(findNshm("nshm-alaska", 2023))
+  }
+
+  jvmArgs(
+      "-Xms2g",
+      "-Xmx${xmx}",
+      "-DNSHM=nshm-alaska-2023"
+      )
+
+  main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
+}
+
+
+// Generate CONUS 2018 for CI
+task generateConus2018(type: JavaExec) {
+  description = "Generate conus-2018 acutal for CI/CD"
+  classpath = sourceSets.test.runtimeClasspath
+
+  doFirst {
+    downloadNshm(findNshm("nshm-conus", 2018))
+  }
+
+  jvmArgs(
+      "-Xms2g",
+      "-Xmx${xmx}",
+      "-DNSHM=nshm-conus-2018"
+      )
+
+  main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
+}
+
+// Generate CONUS 2023 for CI
+task generateConus2023(type: JavaExec) {
+  description = "Generate conus-2023 acutal for CI/CD"
+  classpath = sourceSets.test.runtimeClasspath
+
+  doFirst {
+    downloadNshm(findNshm("nshm-conus", 2023))
+  }
+
+  jvmArgs(
+      "-Xms2g",
+      "-Xmx${xmx}",
+      "-DNSHM=nshm-conus-2023"
+      )
+
+  main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
+}
+
+// Generate Hawaii 2021 for CI
+task generateHawaii2021(type: JavaExec) {
+  description = "Generate hawaii-2021 acutal for CI/CD"
+  classpath = sourceSets.test.runtimeClasspath
+
+  doFirst {
+    downloadNshm(findNshm("nshm-hawaii", 2021))
+  }
+
+  jvmArgs(
+      "-Xms2g",
+      "-Xmx${xmx}",
+      "-DNSHM=nshm-hawaii-2021"
+      )
+
+  main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
+}
+
 // Test Alaska 2007 NSHM
 task testAlaska2007(type: Test) {
   description = "Test Alaska 2007 NSHM"
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java b/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java
new file mode 100644
index 000000000..489304c51
--- /dev/null
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java
@@ -0,0 +1,22 @@
+package gov.usgs.earthquake.nshmp.model;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import gov.usgs.earthquake.nshmp.model.NshmTestUtils.Nshm;
+import gov.usgs.earthquake.nshmp.model.NshmTestUtils.NshmModel;
+
+/**
+ * Generate actual results to compare to expected results.
+ *
+ * Used in CI environment for faster unit tests.
+ */
+class GenerateActual {
+
+  public static void main(String[] args) throws IOException {
+    Nshm nshm = NshmTests.NSHMS.get(System.getProperty("NSHM"));
+    NshmModel nshmModel = NshmTestUtils.loadModel(nshm);
+    NshmTestUtils.writeExpecteds(nshmModel, Optional.of(NshmTests.DATA_PATH));
+    nshmModel.exec.shutdown();
+  }
+}
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 8edc45346..cb390cc0f 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -35,7 +35,6 @@ import gov.usgs.earthquake.nshmp.calc.Site;
 import gov.usgs.earthquake.nshmp.data.XySequence;
 import gov.usgs.earthquake.nshmp.geo.Location;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
-import gov.usgs.earthquake.nshmp.site.NshmpSite;
 
 import io.swagger.v3.core.util.Yaml;
 
@@ -84,17 +83,12 @@ class NshmTestUtils {
    *
    * @param nshm The NSHM to test
    */
-  static void testNshm(Nshm nshm, Optional<NshmpSite> site) {
+  static void testNshm(Nshm nshm, Optional<Path> dataPath) {
     NshmModel nshmModel = loadModel(nshm);
 
-    if (site.isPresent()) {
-      LOGGER.info("Location: " + site.get().toString());
-      compareCurves(nshmModel, site.get());
-    } else {
-      for (NamedLocation location : nshm.locations()) {
-        LOGGER.info("Location: " + location.toString());
-        compareCurves(nshmModel, location);
-      }
+    for (NamedLocation location : nshm.locations()) {
+      LOGGER.info("Location: " + location.toString());
+      compareCurves(nshmModel, location, dataPath);
     }
 
     nshmModel.exec.shutdown();
@@ -105,11 +99,11 @@ class NshmTestUtils {
    *
    * @param nshmModel The NSHM model
    */
-  static void writeExpecteds(NshmModel nshmModel) throws IOException {
+  static void writeExpecteds(NshmModel nshmModel, Optional<Path> dataPath) throws IOException {
     for (NamedLocation location : nshmModel.nshm.locations()) {
       Map<String, XySequence> xyMap = generateActual(nshmModel, location);
       String json = GSON.toJson(xyMap);
-      writeExpected(nshmModel.nshm, location, json);
+      writeExpected(nshmModel.nshm, location, json, dataPath);
     }
   }
 
@@ -140,9 +134,11 @@ class NshmTestUtils {
         Double.valueOf(expected).equals(Double.valueOf(actual));
   }
 
-  private static void compareCurves(NshmModel nshmModel, NamedLocation location) {
-    Map<String, XySequence> actual = generateActual(nshmModel, location);
-    Map<String, XySequence> expected = readExpected(nshmModel, location);
+  private static void compareCurves(NshmModel nshmModel, NamedLocation location,
+      Optional<Path> dataPath) {
+    Map<String, XySequence> actual = dataPath.isPresent()
+        ? readExpected(nshmModel, location, dataPath) : generateActual(nshmModel, location);
+    Map<String, XySequence> expected = readExpected(nshmModel, location, Optional.empty());
 
     for (String key : actual.keySet()) {
       assertCurveEquals(expected.get(key), actual.get(key), TOLERANCE);
@@ -175,8 +171,9 @@ class NshmTestUtils {
     return xyMap;
   }
 
-  private static Map<String, XySequence> readExpected(NshmModel nshmModel, NamedLocation loc) {
-    Path resultPath = DATA_PATH
+  private static Map<String, XySequence> readExpected(NshmModel nshmModel, NamedLocation loc,
+      Optional<Path> dataPath) {
+    Path resultPath = dataPath.orElse(DATA_PATH)
         .resolve(nshmModel.nshm.modelName())
         .resolve(nshmModel.nshm.resultFilename(loc));
 
@@ -199,8 +196,9 @@ class NshmTestUtils {
   private static void writeExpected(
       Nshm nshm,
       NamedLocation loc,
-      String json) throws IOException {
-    Path modelDir = DATA_PATH.resolve(nshm.modelName());
+      String json,
+      Optional<Path> dataPath) throws IOException {
+    Path modelDir = dataPath.orElse(DATA_PATH).resolve(nshm.modelName());
     if (!Files.exists(modelDir)) {
       Files.createDirectories(modelDir);
     }
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index e174fc117..68417b075 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -1,6 +1,8 @@
 package gov.usgs.earthquake.nshmp.model;
 
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -22,6 +24,8 @@ import gov.usgs.earthquake.nshmp.site.NshmpSite;
  * Test NSHMs.
  */
 class NshmTests {
+  static Path DATA_PATH = Paths.get("src/test/resources/e2e/actual");
+
   /* Alaska test sites */
   private static final List<NamedLocation> ALASKA_LOCATIONS = List.of(
       NshmpSite.ANCHORAGE_AK,
@@ -51,7 +55,7 @@ class NshmTests {
   private static final Set<Imt> IMTS = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0, Imt.SA5P0);
   private static final Set<Imt> AK_2007_IMTS = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0);
 
-  private static final Map<String, Nshm> NSHMS;
+  static final Map<String, Nshm> NSHMS;
 
   static {
     Map<String, Nshm> nshms = new HashMap<>();
@@ -98,7 +102,7 @@ class NshmTests {
     NshmModel nshmModel =
         NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
 
-    NshmTestUtils.writeExpecteds(nshmModel);
+    NshmTestUtils.writeExpecteds(nshmModel, Optional.empty());
     nshmModel.exec.shutdown();
 
     // run all models
@@ -116,7 +120,7 @@ class NshmTests {
    */
   @Test
   final void testAlaska2007() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2007"), Optional.ofNullable(getSite()));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2007"), getDataPath());
   }
 
   /**
@@ -126,7 +130,7 @@ class NshmTests {
    */
   @Test
   final void testAlaska2023() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2023"), Optional.ofNullable(getSite()));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2023"), getDataPath());
   }
 
   /**
@@ -136,7 +140,7 @@ class NshmTests {
    */
   @Test
   final void testConus2018() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), Optional.ofNullable(getSite()));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), getDataPath());
   }
 
   /**
@@ -146,7 +150,7 @@ class NshmTests {
    */
   @Test
   final void testConus2023() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2023"), Optional.ofNullable(getSite()));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2023"), getDataPath());
   }
 
   /**
@@ -156,11 +160,10 @@ class NshmTests {
    */
   @Test
   final void testHawaii2021() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-hawaii-2021"), Optional.ofNullable(getSite()));
+    NshmTestUtils.testNshm(NSHMS.get("nshm-hawaii-2021"), getDataPath());
   }
 
-  private NshmpSite getSite() {
-    var testSite = System.getProperty("TEST_SITE");
-    return testSite == null ? null : NshmpSite.valueOf(testSite);
+  private static Optional<Path> getDataPath() {
+    return System.getenv("GITLAB_CI") != null ? Optional.of(DATA_PATH) : Optional.empty();
   }
 }
-- 
GitLab


From 1af0478ce919478df8c245719a4bfe0d827d631b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 10:56:27 -0600
Subject: [PATCH 55/63] add jvm args

---
 build.gradle       | 10 +++++-----
 gradle/nshm.gradle | 30 +++++-------------------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5ab547bc0..78d36a5f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,11 +70,11 @@ tasks.withType(JavaExec) {
   }
 
   jvmArgs(
-      '-noverify',
-      '-Xms2g',
-      '-Xmx8g',
-      '-XX:TieredStopAtLevel=1',
-      '-Dcom.sun.management.jmxremote',
+      "-noverify",
+      "-Xms2g",
+      "-Xmx${xmx}",
+      "-XX:TieredStopAtLevel=1",
+      "-Dcom.sun.management.jmxremote",
       )
 }
 
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 086ebc772..e2bce69e0 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -87,11 +87,7 @@ task generateAlaska2007(type: JavaExec) {
     downloadNshm(findNshm("nshm-alaska", 2007))
   }
 
-  jvmArgs(
-      "-Xms2g",
-      "-Xmx${xmx}",
-      "-DNSHM=nshm-alaska-2007"
-      )
+  jvmArgs("-DNSHM=nshm-alaska-2007")
 
   main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
 }
@@ -105,11 +101,7 @@ task generateAlaska2023(type: JavaExec) {
     downloadNshm(findNshm("nshm-alaska", 2023))
   }
 
-  jvmArgs(
-      "-Xms2g",
-      "-Xmx${xmx}",
-      "-DNSHM=nshm-alaska-2023"
-      )
+  jvmArgs("-DNSHM=nshm-alaska-2023")
 
   main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
 }
@@ -124,11 +116,7 @@ task generateConus2018(type: JavaExec) {
     downloadNshm(findNshm("nshm-conus", 2018))
   }
 
-  jvmArgs(
-      "-Xms2g",
-      "-Xmx${xmx}",
-      "-DNSHM=nshm-conus-2018"
-      )
+  jvmArgs("-DNSHM=nshm-conus-2018")
 
   main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
 }
@@ -142,11 +130,7 @@ task generateConus2023(type: JavaExec) {
     downloadNshm(findNshm("nshm-conus", 2023))
   }
 
-  jvmArgs(
-      "-Xms2g",
-      "-Xmx${xmx}",
-      "-DNSHM=nshm-conus-2023"
-      )
+  jvmArgs("-DNSHM=nshm-conus-2023")
 
   main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
 }
@@ -160,11 +144,7 @@ task generateHawaii2021(type: JavaExec) {
     downloadNshm(findNshm("nshm-hawaii", 2021))
   }
 
-  jvmArgs(
-      "-Xms2g",
-      "-Xmx${xmx}",
-      "-DNSHM=nshm-hawaii-2021"
-      )
+  jvmArgs("-DNSHM=nshm-hawaii-2021")
 
   main = "gov.usgs.earthquake.nshmp.model.GenerateActual"
 }
-- 
GitLab


From 135b5575f672325809b3f3f60d551471df163857 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 11:01:56 -0600
Subject: [PATCH 56/63] use data path check

---
 .../earthquake/nshmp/model/NshmTests.java     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 68417b075..414c78883 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -1,6 +1,7 @@
 package gov.usgs.earthquake.nshmp.model;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -120,7 +121,8 @@ class NshmTests {
    */
   @Test
   final void testAlaska2007() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2007"), getDataPath());
+    Nshm nshm = NSHMS.get("nshm-alaska-2007");
+    NshmTestUtils.testNshm(nshm, getDataPath(nshm));
   }
 
   /**
@@ -130,7 +132,8 @@ class NshmTests {
    */
   @Test
   final void testAlaska2023() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2023"), getDataPath());
+    Nshm nshm = NSHMS.get("nshm-alaska-2023");
+    NshmTestUtils.testNshm(nshm, getDataPath(nshm));
   }
 
   /**
@@ -140,7 +143,8 @@ class NshmTests {
    */
   @Test
   final void testConus2018() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2018"), getDataPath());
+    Nshm nshm = NSHMS.get("nshm-conus-2018");
+    NshmTestUtils.testNshm(nshm, getDataPath(nshm));
   }
 
   /**
@@ -150,7 +154,8 @@ class NshmTests {
    */
   @Test
   final void testConus2023() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-conus-2023"), getDataPath());
+    Nshm nshm = NSHMS.get("nshm-conus-2023");
+    NshmTestUtils.testNshm(nshm, getDataPath(nshm));
   }
 
   /**
@@ -160,10 +165,11 @@ class NshmTests {
    */
   @Test
   final void testHawaii2021() throws IOException {
-    NshmTestUtils.testNshm(NSHMS.get("nshm-hawaii-2021"), getDataPath());
+    Nshm nshm = NSHMS.get("nshm-hawaii-2021");
+    NshmTestUtils.testNshm(nshm, getDataPath(nshm));
   }
 
-  private static Optional<Path> getDataPath() {
-    return System.getenv("GITLAB_CI") != null ? Optional.of(DATA_PATH) : Optional.empty();
+  private static Optional<Path> getDataPath(Nshm nshm) {
+    return Files.exists(DATA_PATH.resolve(nshm.modelName())) ? Optional.of(DATA_PATH) : Optional.empty();
   }
 }
-- 
GitLab


From d9cb3e3144eba3e3ad3c3aa1f96d101119246166 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 11:03:44 -0600
Subject: [PATCH 57/63] clean teask

---
 gradle/nshm.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index e2bce69e0..ea8f4b107 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -78,6 +78,10 @@ task nshms() {
   }
 }
 
+task cleanGenerated(type: Delete) {
+  delete "src/test/resources/e2e/actual"
+}
+
 // Generate Alaska 2007 for CI
 task generateAlaska2007(type: JavaExec) {
   description = "Generate alaska-2007 acutal for CI/CD"
-- 
GitLab


From de40dffec701422dbf1773e36084d08b471537ad Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 11:03:48 -0600
Subject: [PATCH 58/63] cleanup

---
 src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 414c78883..1a886f348 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -170,6 +170,7 @@ class NshmTests {
   }
 
   private static Optional<Path> getDataPath(Nshm nshm) {
-    return Files.exists(DATA_PATH.resolve(nshm.modelName())) ? Optional.of(DATA_PATH) : Optional.empty();
+    return Files.exists(DATA_PATH.resolve(nshm.modelName())) ? Optional.of(DATA_PATH)
+        : Optional.empty();
   }
 }
-- 
GitLab


From 3d2d3860138d07e6bb77c9b4d83d5179f2c48a01 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 11:05:53 -0600
Subject: [PATCH 59/63] load model when needed

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index cb390cc0f..e951a913e 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -84,14 +84,16 @@ class NshmTestUtils {
    * @param nshm The NSHM to test
    */
   static void testNshm(Nshm nshm, Optional<Path> dataPath) {
-    NshmModel nshmModel = loadModel(nshm);
+    NshmModel nshmModel = dataPath.isPresent() ? null : loadModel(nshm);
 
     for (NamedLocation location : nshm.locations()) {
       LOGGER.info("Location: " + location.toString());
       compareCurves(nshmModel, location, dataPath);
     }
 
-    nshmModel.exec.shutdown();
+    if (nshmModel != null) {
+      nshmModel.exec.shutdown();
+    }
   }
 
   /**
-- 
GitLab


From 2f5ce99c70c1ab35212479b8d4edc6fc568b7ff9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 11:07:42 -0600
Subject: [PATCH 60/63] load model

---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index e951a913e..cb390cc0f 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -84,16 +84,14 @@ class NshmTestUtils {
    * @param nshm The NSHM to test
    */
   static void testNshm(Nshm nshm, Optional<Path> dataPath) {
-    NshmModel nshmModel = dataPath.isPresent() ? null : loadModel(nshm);
+    NshmModel nshmModel = loadModel(nshm);
 
     for (NamedLocation location : nshm.locations()) {
       LOGGER.info("Location: " + location.toString());
       compareCurves(nshmModel, location, dataPath);
     }
 
-    if (nshmModel != null) {
-      nshmModel.exec.shutdown();
-    }
+    nshmModel.exec.shutdown();
   }
 
   /**
-- 
GitLab


From c3776fee79c5e52c5d52d242f5a3e76aadb7cd16 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 11:14:50 -0600
Subject: [PATCH 61/63] change to single stage

---
 .gitlab-ci.yml | 79 +++++++++++++++-----------------------------------
 1 file changed, 23 insertions(+), 56 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e6bcb78d..fe91137db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,15 +226,7 @@ Markdown Lint:
     - ./gradlew markdownlint
   stage: test
 
-YAML Lint:
-  allow_failure: true
-  needs: []
-  script:
-    - ./gradlew nodeInstall
-    - ./gradlew yamllint
-  stage: test
-
-Unit Tests:
+NSHM Test:
   artifacts:
     paths:
       - ${JACOCO_HTML_DIR}
@@ -242,16 +234,30 @@ Unit Tests:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
   needs: []
+  parallel:
+    matrix:
+      - NSHM: Alaska2007
+      - NSHM: Alaska2023
+      - NSHM: Conus2018
+      - NSHM: Conus2023
+      - NSHM: Hawaii2021
   script:
-    - ./gradlew check
+    - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
+    - export CI_RUNNER_MEMORY
+    - ./gradlew generate${NSHM} --info
+    - ./gradlew test${NSHM} --info
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
-####
-# NSHMS Tests
-####
+YAML Lint:
+  allow_failure: true
+  needs: []
+  script:
+    - ./gradlew nodeInstall
+    - ./gradlew yamllint
+  stage: test
 
-.nshm-test:
+Unit Tests:
   artifacts:
     paths:
       - ${JACOCO_HTML_DIR}
@@ -259,49 +265,10 @@ Unit Tests:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
   needs: []
-  before_script:
-    - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
-    - export CI_RUNNER_MEMORY
-    - ./gradlew ${CMD} --info
-  after_script:
-    - cat ${JACOCO_HTML_DIR}/index.html
-
-Alaska 2007 NSHM Test:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew testAlaska2007 --info
-  stage: alaska-test
-
-Alaska 2023 NSHM Test:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew testAlaska2023 --info
-  stage: alaska-test
-
-CONUS 2018 NSHM Test:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew generateConus2018 --info
-    - ./gradlew testConus2018 --info
-  stage: conus-test
-
-CONUS 2023 NSHM Test:
-  extends:
-    - .nshm-test
   script:
-    - ./gradlew generateConus2023 --info
-    - ./gradlew testConus2023 --info
-  stage: conus-test
-
-Hawaii 2021 NSHM Test:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew testHawaii2021 --info
-  stage: hawaii-test
+    - ./gradlew check
+    - cat ${JACOCO_HTML_DIR}/index.html
+  stage: test
 
 ####
 # Stage: trigger
-- 
GitLab


From e49951ef08a80eb78ba6a2266aec54ed246809c0 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 11:27:27 -0600
Subject: [PATCH 62/63] cleanup

---
 .gitlab-ci.yml                                                  | 2 +-
 .../java/gov/usgs/earthquake/nshmp/model/GenerateActual.java    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe91137db..20d024faf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,7 +226,7 @@ Markdown Lint:
     - ./gradlew markdownlint
   stage: test
 
-NSHM Test:
+NSHM Tests:
   artifacts:
     paths:
       - ${JACOCO_HTML_DIR}
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java b/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java
index 489304c51..4a9c54d11 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/GenerateActual.java
@@ -10,6 +10,8 @@ import gov.usgs.earthquake.nshmp.model.NshmTestUtils.NshmModel;
  * Generate actual results to compare to expected results.
  *
  * Used in CI environment for faster unit tests.
+ *
+ * See nshms.gradle for generate tasks.
  */
 class GenerateActual {
 
-- 
GitLab


From 0331346e89ac015c9f92ab371dbe4c890e87d0fe Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 1 Sep 2023 11:33:20 -0600
Subject: [PATCH 63/63] cleanup

---
 .gitlab-ci.yml                                                 | 3 ---
 .../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java    | 1 -
 src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java   | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20d024faf..982acd057 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,9 +15,6 @@ workflow:
 stages:
   - build
   - test
-  - alaska-test
-  - conus-test
-  - hawaii-test
   - trigger
 
 default:
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index cb390cc0f..9d0daaba4 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -59,7 +59,6 @@ class NshmTestUtils {
    */
   static NshmModel loadModel(Nshm nshm) {
     int cores = Runtime.getRuntime().availableProcessors();
-    LOGGER.info("Cores: " + cores);
     return new NshmModel(
         nshm,
         ModelLoader.load(nshm.modelPath()),
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 1a886f348..d9c9eb673 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -101,7 +101,7 @@ class NshmTests {
 
     // run single model
     NshmModel nshmModel =
-        NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
+        NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
 
     NshmTestUtils.writeExpecteds(nshmModel, Optional.empty());
     nshmModel.exec.shutdown();
-- 
GitLab