Merge branch 'increment-prvi' into 'main'

increment prvi and added test suite

See merge request !803

nshms.yml

@@ -160,7 +160,7 @@ nshms:
   # PRVI 2025 NSHM
   -
     repo: nshm-prvi
-    tag: 2.a.0
+    tag: 2.a.1
     year: 2025
     deployment:
       baseHref: /ws/nshmp/prvi-2025/dynamic

src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java

@@ -111,7 +111,7 @@ class NshmTests {
 
     // run single model
     NshmModel nshmModel =
-        NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
+        NshmTestUtils.loadModel(NSHMS.get("nshm-prvi-2025"));
 
     NshmTestUtils.writeExpecteds(nshmModel, Optional.empty());
     nshmModel.exec.shutdown();
@@ -199,11 +199,11 @@ class NshmTests {
    *
    * To run test: ./gradlew testPrvi2025
    */
-  // @Test
-  // final void testPrvi2025() throws IOException {
-  // Nshm nshm = NSHMS.get("nshm-prvi-2025");
-  // NshmTestUtils.testNshm(nshm, getDataPath(nshm));
-  // }
+  @Test
+  final void testPrvi2025() throws IOException, InterruptedException, ExecutionException {
+    Nshm nshm = NSHMS.get("nshm-prvi-2025");
+    NshmTestUtils.testNshm(nshm, getDataPath(nshm));
+  }
 
   private static Optional<Path> getDataPath(Nshm nshm) {
     return Files.exists(DATA_PATH.resolve(nshm.modelName())) ? Optional.of(DATA_PATH)

src/test/resources/e2e/nshm-prvi-2025/SAN_JUAN_PR.json

+{
+  "PGA": {
+    "xs": [
+      -6.061887011404528,
+      -5.654992310486769,
+      -5.251433780649187,
+      -4.845968672541022,
+      -4.439655747510518,
+      -4.034190639402354,
+      -3.6306105459899607,
+      -3.223888366691745,
+      -2.8184232585835804,
+      -2.4123999590012524,
+      -2.0099154790312257,
+      -1.5994875815809322,
+      -1.1973282616072674,
+      -0.789658080940789,
+      -0.38566248081198456,
+      0.01980262729617973,
+      0.4252677354043441,
+      0.832909122935104,
+      1.235471471385307,
+      1.6428726885203377
+    ],
+    "ys": [
+      0.9100967755453667,
+      0.6755274996128332,
+      0.48391394764970497,
+      0.33247900600281405,
+      0.21847393366483714,
+      0.13701006884893108,
+      0.08192036352296404,
+      0.04638867539774388,
+      0.025092700568478263,
+      0.012984711288360162,
+      0.006488967272432372,
+      0.0030588603016201725,
+      0.0013860628495818656,
+      5.777256943832912E-4,
+      2.2125049276964896E-4,
+      7.525366557631453E-5,
+      2.233206747375521E-5,
+      5.665265525323787E-6,
+      1.2511450837221482E-6,
+      2.2694333578329093E-7
+    ]
+  },
+  "SA0P2": {
+    "xs": [
+      -5.704782974989785,
+      -5.30031936921871,
+      -4.8941864814530085,
+      -4.491841500681089,
+      -4.080441657053109,
+      -3.6769508832486624,
+      -3.2728041668937564,
+      -2.866459937849852,
+      -2.4615808244845034,
+      -2.05572501506252,
+      -1.6502599069543555,
+      -1.2447947988461912,
+      -0.8393296907380268,
+      -0.4338645826298623,
+      -0.028399474521698,
+      0.37843643572024505,
+      0.7839015438284094,
+      1.1878434223960523,
+      1.5933085305042167,
+      1.998773638612381
+    ],
+    "ys": [
+      1.2044030615681947,
+      0.9353809555197352,
+      0.6987596147727709,
+      0.5036919712952665,
+      0.34581153237686235,
+      0.2290210000244498,
+      0.14479574186239821,
+      0.08703521722850752,
+      0.04995882984713672,
+      0.027343448068674052,
+      0.014333422756536356,
+      0.0072022103891063545,
+      0.003460843947170409,
+      0.0015786307667305538,
+      6.757205425854971E-4,
+      2.670580103920038E-4,
+      9.694382392879655E-5,
+      3.212925557009286E-5,
+      9.655377887072045E-6,
+      2.6672115271474727E-6
+    ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076538,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.153556358747558,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.532476871297972,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.3160815469734789,
+      0.0861776962410524,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591926
+    ],
+    "ys": [
+      0.5707865995826802,
+      0.39160408417702025,
+      0.2584721260403715,
+      0.1634393585817664,
+      0.09906806475299583,
+      0.056297616824740083,
+      0.030616252824421396,
+      0.015598819665575634,
+      0.007585300280481742,
+      0.003519850168660882,
+      0.0015681115877464876,
+      6.689038891857706E-4,
+      2.6997170365564534E-4,
+      1.0115570319269991E-4,
+      3.444240726350007E-5,
+      1.0488009472318914E-5,
+      2.713561955997951E-6,
+      6.007236750665009E-7,
+      1.0542300000673484E-7,
+      1.4596860967124675E-8
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873973,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.09779696897375159,
+      0.06344670726958232,
+      0.039266461071760905,
+      0.022993884911884054,
+      0.0126222483851046,
+      0.006547968906671401,
+      0.0031880369656747927,
+      0.0014774831075764709,
+      6.498382192141003E-4,
+      2.672601720864216E-4,
+      1.0152584853169425E-4,
+      3.471390626754962E-5,
+      1.0204558413992004E-5,
+      2.536787140369459E-6,
+      4.6234028087528965E-7,
+      4.958499084937277E-8,
+      9.175588344297641E-10,
+      1.5973820383963869E-12,
+      0.0,
+      0.0
+    ]
+  }
+}