From 7d99e7872cb03cb3cd9a48b5549fcf1c1260b527 Mon Sep 17 00:00:00 2001 From: Kevin Milner Date: Tue, 21 May 2024 13:14:55 -0700 Subject: [PATCH] updated paths after upstream reorganization --- .../scratch/kevin/nshm23/prvi/InitialDefModConvert.java | 8 ++++---- .../kevin/nshm23/prvi/InitialSubductionDefModConvert.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/scratch/kevin/nshm23/prvi/InitialDefModConvert.java b/src/main/java/scratch/kevin/nshm23/prvi/InitialDefModConvert.java index 54e6229b..5fdfac4b 100644 --- a/src/main/java/scratch/kevin/nshm23/prvi/InitialDefModConvert.java +++ b/src/main/java/scratch/kevin/nshm23/prvi/InitialDefModConvert.java @@ -27,11 +27,11 @@ public class InitialDefModConvert { public static void main(String[] args) throws IOException { -// File dir = new File("/home/kevin/workspace/opensha/src/main/resources/data/erf/prvi25/fault_models/initial"); - File dir = new File("C:\\Users\\kmilner\\git\\opensha\\opensha\\src\\main\\resources\\data\\erf\\prvi25\\fault_models\\initial"); - File inputFile = new File(dir, "NSHM2025_GeoDefModel_PRVI.geojson"); + File dir = new File("/home/kevin/workspace/opensha/src/main/resources/data/erf/prvi25/fault_models/crustal"); +// File dir = new File("C:\\Users\\kmilner\\git\\opensha\\opensha\\src\\main\\resources\\data\\erf\\prvi25\\fault_models\\initial"); + File inputFile = new File(dir, "NSHM2025_GeoDefModel_PRVI_v1-1.geojson"); File inputPolys = new File(dir, "NSHM2025_FaultPolygons_PRVI_v1.geojson"); - File outputFile = new File(dir, "NSHM2025_GeoDefModel_PRVI_mod.geojson"); + File outputFile = new File(dir, "NSHM2025_GeoDefModel_PRVI_v1-1_mod.geojson"); List features = new ArrayList<>(FeatureCollection.read(inputFile).features); List polyFeatures = new ArrayList<>(FeatureCollection.read(inputPolys).features); diff --git a/src/main/java/scratch/kevin/nshm23/prvi/InitialSubductionDefModConvert.java b/src/main/java/scratch/kevin/nshm23/prvi/InitialSubductionDefModConvert.java index 84d0c5d4..9c2e4115 100644 --- a/src/main/java/scratch/kevin/nshm23/prvi/InitialSubductionDefModConvert.java +++ b/src/main/java/scratch/kevin/nshm23/prvi/InitialSubductionDefModConvert.java @@ -34,7 +34,7 @@ public class InitialSubductionDefModConvert { public static void main(String[] args) throws IOException { - File fmDir = new File("/home/kevin/workspace/opensha/src/main/resources/data/erf/prvi25/fault_models/initial"); + File fmDir = new File("/home/kevin/workspace/opensha/src/main/resources/data/erf/prvi25/fault_models/subduction"); File dmDir = new File("/home/kevin/workspace/opensha/src/main/resources/data/erf/prvi25/def_models/subduction"); File inputFile = new File(fmDir, "PRVI_sub_v2_13May2024.geojson"); File fmOutputFile = new File(fmDir, "PRVI_sub_v2_fault_model.geojson");