diff --git a/src/test/java/gov/usgs/earthquake/nshmp/gmm/SEA99_test.java b/src/test/java/gov/usgs/earthquake/nshmp/gmm/SEA99_test.java index a5c358926cd2bb12431187a6502363dee205679c..bad18276049a55e8f07ec089424dc1565dceb144 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/gmm/SEA99_test.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/gmm/SEA99_test.java @@ -1,6 +1,6 @@ package gov.usgs.earthquake.nshmp.gmm; -import static gov.usgs.earthquake.nshmp.gmm.Gmm.SEA99_PRVI; +import static gov.usgs.earthquake.nshmp.gmm.Gmm.SPUDICH_99_PRVI; import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA; import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P1; import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P5; @@ -35,7 +35,7 @@ public class SEA99_test implements ArgumentsProvider { } /* Result generation sets */ - private static Set<Gmm> gmms = EnumSet.of(SEA99_PRVI); + private static Set<Gmm> gmms = EnumSet.of(SPUDICH_99_PRVI); // private static Set<Imt> imts = SpudichEtAl_1999_PRVI.COEFFS.imts(); private static Set<Imt> imts = EnumSet.of(PGA, SA0P1, SA0P5, SA2P0); diff --git a/src/test/resources/gmm/sea99-results.csv b/src/test/resources/gmm/sea99-results.csv index 64c63bc08ad8956a9cdf224bda34b2cd59da0702..a232470033c572460599873ed9770ac69e510d70 100644 --- a/src/test/resources/gmm/sea99-results.csv +++ b/src/test/resources/gmm/sea99-results.csv @@ -1,24 +1,24 @@ -0-SEA99_PRVI-PGA,0.1897430161,0.2240000000 -1-SEA99_PRVI-PGA,0.0174183111,0.2240000000 -2-SEA99_PRVI-PGA,0.3214887646,0.2240000000 -3-SEA99_PRVI-PGA,0.0295125030,0.2240000000 -4-SEA99_PRVI-PGA,0.5447105663,0.2240000000 -5-SEA99_PRVI-PGA,0.0500041494,0.2240000000 -0-SEA99_PRVI-SA0P1,0.3262097462,0.2950000000 -1-SEA99_PRVI-SA0P1,0.0282558510,0.2950000000 -2-SEA99_PRVI-SA0P1,0.6926230371,0.2950000000 -3-SEA99_PRVI-SA0P1,0.0599940792,0.2950000000 -4-SEA99_PRVI-SA0P1,0.9364766051,0.2950000000 -5-SEA99_PRVI-SA0P1,0.0811163484,0.2950000000 -0-SEA99_PRVI-SA0P5,0.2191634575,0.2750000000 -1-SEA99_PRVI-SA0P5,0.0190970592,0.2750000000 -2-SEA99_PRVI-SA0P5,0.5306010965,0.2750000000 -3-SEA99_PRVI-SA0P5,0.0462345351,0.2750000000 -4-SEA99_PRVI-SA0P5,1.0734161944,0.2750000000 -5-SEA99_PRVI-SA0P5,0.0935333512,0.2750000000 -0-SEA99_PRVI-SA2P0,0.0364705131,0.3410000000 -1-SEA99_PRVI-SA2P0,0.0031015763,0.3410000000 -2-SEA99_PRVI-SA2P0,0.1078802324,0.3410000000 -3-SEA99_PRVI-SA2P0,0.0091745013,0.3410000000 -4-SEA99_PRVI-SA2P0,0.2691174589,0.3410000000 -5-SEA99_PRVI-SA2P0,0.0228866625,0.3410000000 +0-SPUDICH_99_PRVI-PGA,0.1897430161,0.2240000000 +1-SPUDICH_99_PRVI-PGA,0.0174183111,0.2240000000 +2-SPUDICH_99_PRVI-PGA,0.3214887646,0.2240000000 +3-SPUDICH_99_PRVI-PGA,0.0295125030,0.2240000000 +4-SPUDICH_99_PRVI-PGA,0.5447105663,0.2240000000 +5-SPUDICH_99_PRVI-PGA,0.0500041494,0.2240000000 +0-SPUDICH_99_PRVI-SA0P1,0.3262097462,0.2950000000 +1-SPUDICH_99_PRVI-SA0P1,0.0282558510,0.2950000000 +2-SPUDICH_99_PRVI-SA0P1,0.6926230371,0.2950000000 +3-SPUDICH_99_PRVI-SA0P1,0.0599940792,0.2950000000 +4-SPUDICH_99_PRVI-SA0P1,0.9364766051,0.2950000000 +5-SPUDICH_99_PRVI-SA0P1,0.0811163484,0.2950000000 +0-SPUDICH_99_PRVI-SA0P5,0.2191634575,0.2750000000 +1-SPUDICH_99_PRVI-SA0P5,0.0190970592,0.2750000000 +2-SPUDICH_99_PRVI-SA0P5,0.5306010965,0.2750000000 +3-SPUDICH_99_PRVI-SA0P5,0.0462345351,0.2750000000 +4-SPUDICH_99_PRVI-SA0P5,1.0734161944,0.2750000000 +5-SPUDICH_99_PRVI-SA0P5,0.0935333512,0.2750000000 +0-SPUDICH_99_PRVI-SA2P0,0.0364705131,0.3410000000 +1-SPUDICH_99_PRVI-SA2P0,0.0031015763,0.3410000000 +2-SPUDICH_99_PRVI-SA2P0,0.1078802324,0.3410000000 +3-SPUDICH_99_PRVI-SA2P0,0.0091745013,0.3410000000 +4-SPUDICH_99_PRVI-SA2P0,0.2691174589,0.3410000000 +5-SPUDICH_99_PRVI-SA2P0,0.0228866625,0.3410000000