Skip to content
Snippets Groups Projects
Commit a3971a81 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

updated conus model path

parent 311dc991
No related branches found
No related tags found
2 merge requests!655Production Release | nshmp-haz,!652Increment lib
...@@ -80,6 +80,7 @@ class NshmTestsConus { ...@@ -80,6 +80,7 @@ class NshmTestsConus {
private static final Set<Imt> IMTS = EnumSet.of(PGA, SA0P2, SA1P0, SA5P0); private static final Set<Imt> IMTS = EnumSet.of(PGA, SA0P2, SA1P0, SA5P0);
private static final String MODEL_NAME = "nshm-conus-2018-5.1-maint"; private static final String MODEL_NAME = "nshm-conus-2018-5.1-maint";
private static final String MODEL_NAME_OUT = "nshm-conus";
private static final int MODEL_YEAR = 2018; private static final int MODEL_YEAR = 2018;
private static final Path MODEL_PATH = Paths.get("../" + MODEL_NAME); private static final Path MODEL_PATH = Paths.get("../" + MODEL_NAME);
private static final Path DATA_PATH = Paths.get("src/test/resources/e2e"); private static final Path DATA_PATH = Paths.get("src/test/resources/e2e");
...@@ -187,7 +188,7 @@ class NshmTestsConus { ...@@ -187,7 +188,7 @@ class NshmTestsConus {
private static Map<String, XySequence> readExpected(NamedLocation loc) { private static Map<String, XySequence> readExpected(NamedLocation loc) {
String filename = resultFilename(MODEL_NAME, MODEL_YEAR, loc); String filename = resultFilename(MODEL_NAME_OUT, MODEL_YEAR, loc);
Path resultPath = DATA_PATH.resolve(filename); Path resultPath = DATA_PATH.resolve(filename);
JsonObject obj = null; JsonObject obj = null;
...@@ -246,7 +247,7 @@ class NshmTestsConus { ...@@ -246,7 +247,7 @@ class NshmTestsConus {
/* Initialize and shut down executor to generate results. */ /* Initialize and shut down executor to generate results. */
setUpBeforeClass(); setUpBeforeClass();
writeExpecteds(MODEL_NAME, MODEL_YEAR, SITES); writeExpecteds(MODEL_NAME_OUT, MODEL_YEAR, SITES);
tearDownAfterClass(); tearDownAfterClass();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment