From 04973ceee08ff18b19be76c1aab6f41883f9d43a Mon Sep 17 00:00:00 2001 From: Kevin Milner Date: Fri, 6 Sep 2024 09:21:22 -0700 Subject: [PATCH] updates for upstream project, mostly PRVI and some RSQSim --- ..._LogicTreeInversionRunnerScriptWriter.java | 46 +++++------ .../CrustalSubductionTrueMeanCreator.java | 2 +- .../scratch/kevin/prvi25/SolAreaValidate.java | 66 +++++++++++++++ .../CrustalCarveoutSmallerRegionMFDPlot.java | 12 ++- .../kevin/simulators/RSQSimCatalog.java | 80 +++++++++++-------- .../multiFault/RSQSimU3RupturePageGen.java | 4 +- .../scratch/kevin/ucerf3/PureScratch.java | 23 +++++- .../eal/MPJ_UCERF3_EAL_CombinerScriptGen.java | 14 ++-- 8 files changed, 175 insertions(+), 72 deletions(-) create mode 100644 src/main/java/scratch/kevin/prvi25/SolAreaValidate.java diff --git a/src/main/java/scratch/kevin/nshm23/MPJ_LogicTreeInversionRunnerScriptWriter.java b/src/main/java/scratch/kevin/nshm23/MPJ_LogicTreeInversionRunnerScriptWriter.java index 53717d8d..35f74aad 100644 --- a/src/main/java/scratch/kevin/nshm23/MPJ_LogicTreeInversionRunnerScriptWriter.java +++ b/src/main/java/scratch/kevin/nshm23/MPJ_LogicTreeInversionRunnerScriptWriter.java @@ -155,8 +155,8 @@ public static void main(String[] args) throws IOException { List> individualRandomLevels = new ArrayList<>(); int samplingBranchCountMultiplier = 1; -// String dirName = new SimpleDateFormat("yyyy_MM_dd").format(new Date()); - String dirName = "2024_08_16"; + String dirName = new SimpleDateFormat("yyyy_MM_dd").format(new Date()); +// String dirName = "2024_09_04"; String dirSuffix = null; /* @@ -602,28 +602,28 @@ public static void main(String[] args) throws IOException { * PRVI25 logic tree * TODO (this is a just a marker to find this part quickly, not an actual todo) */ - List> levels = PRVI25_LogicTreeBranch.levelsOnFault; - dirName += "-prvi25_crustal_branches"; - double avgNumRups = 50000; - gmpes = new AttenRelRef[] { AttenRelRef.USGS_PRVI_ACTIVE }; - - // random DM sampling - levels = new ArrayList<>(levels); - int origNumLevels = levels.size(); - for (int i=levels.size(); --i>=0;) - if (levels.get(i).getNodes().get(0) instanceof PRVI25_CrustalDeformationModels) - levels.remove(i); - Preconditions.checkState(levels.size() == origNumLevels -1); - individualRandomLevels.add(new PRVI25_CrustalRandomlySampledDeformationModelLevel()); - samplingBranchCountMultiplier = 5; // 5 for each branch - dirName += "-dmSample"; - if (samplingBranchCountMultiplier > 1) - dirName += samplingBranchCountMultiplier+"x"; +// List> levels = PRVI25_LogicTreeBranch.levelsOnFault; +// dirName += "-prvi25_crustal_branches"; +// double avgNumRups = 50000; +// gmpes = new AttenRelRef[] { AttenRelRef.USGS_PRVI_ACTIVE }; +// +// // random DM sampling +// levels = new ArrayList<>(levels); +// int origNumLevels = levels.size(); +// for (int i=levels.size(); --i>=0;) +// if (levels.get(i).getNodes().get(0) instanceof PRVI25_CrustalDeformationModels) +// levels.remove(i); +// Preconditions.checkState(levels.size() == origNumLevels -1); +// individualRandomLevels.add(new PRVI25_CrustalRandomlySampledDeformationModelLevel()); +// samplingBranchCountMultiplier = 5; // 5 for each branch +// dirName += "-dmSample"; +// if (samplingBranchCountMultiplier > 1) +// dirName += samplingBranchCountMultiplier+"x"; -// List> levels = PRVI25_LogicTreeBranch.levelsSubduction; -// dirName += "-prvi25_subduction_branches"; -// double avgNumRups = 10000; -// gmpes = new AttenRelRef[] { AttenRelRef.USGS_PRVI_INTERFACE, AttenRelRef.USGS_PRVI_SLAB }; + List> levels = PRVI25_LogicTreeBranch.levelsSubduction; + dirName += "-prvi25_subduction_branches"; + double avgNumRups = 10000; + gmpes = new AttenRelRef[] { AttenRelRef.USGS_PRVI_INTERFACE, AttenRelRef.USGS_PRVI_SLAB }; // levels = new ArrayList<>(levels); // levels.add(NSHM23_LogicTreeBranch.SUB_SECT_CONSTR); diff --git a/src/main/java/scratch/kevin/prvi25/CrustalSubductionTrueMeanCreator.java b/src/main/java/scratch/kevin/prvi25/CrustalSubductionTrueMeanCreator.java index 930b07dc..1031eca3 100644 --- a/src/main/java/scratch/kevin/prvi25/CrustalSubductionTrueMeanCreator.java +++ b/src/main/java/scratch/kevin/prvi25/CrustalSubductionTrueMeanCreator.java @@ -37,7 +37,7 @@ public static void main(String[] args) throws IOException { File crustalDir = new File(args[0]); File subductionDir = new File(args[1]); File outputFile = new File(args[2]); - boolean gridded = args.length < 4 ? false : Boolean.parseBoolean(args[3]); + boolean gridded = args.length < 4 ? true : Boolean.parseBoolean(args[3]); Map crustalBASols = new HashMap<>(); Map subductionBASols = new HashMap<>(); diff --git a/src/main/java/scratch/kevin/prvi25/SolAreaValidate.java b/src/main/java/scratch/kevin/prvi25/SolAreaValidate.java new file mode 100644 index 00000000..0082f8f2 --- /dev/null +++ b/src/main/java/scratch/kevin/prvi25/SolAreaValidate.java @@ -0,0 +1,66 @@ +package scratch.kevin.prvi25; + +import java.io.File; +import java.io.IOException; + +import org.opensha.commons.calc.FaultMomentCalc; +import org.opensha.commons.eq.MagUtils; +import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet; +import org.opensha.sha.earthquake.faultSysSolution.modules.AveSlipModule; + +public class SolAreaValidate { + + public static void main(String[] args) throws IOException { + FaultSystemRupSet rupSet = FaultSystemRupSet.load(new File(args[0])); + AveSlipModule slips = rupSet.getModule(AveSlipModule.class); + + int worstSectMismatch = -1; + double worstSectDiff = 0d; + double worstSectSumArea = 0d; + + int worstMagMismatch = -1; + double worstMagDiff = 0d; + double worstMomentToMag = 0d; + for (int r=0; r worstMagDiff) { + worstMagDiff = magDiff; + worstMagMismatch = r; + worstMomentToMag = momentToMag; + } + } + + double sectDiff = Math.abs(sumSectArea - rupArea); + if (sectDiff > worstSectDiff) { + worstSectMismatch = r; + worstSectDiff = sectDiff; + worstSectSumArea = sumSectArea; + } + } + + if (worstSectMismatch >= 0) { + System.out.println("Worst sum[sectAreas] vs rupArea mismatch: rupture "+worstSectMismatch); + System.out.println("\tsum[sectAreas]:\t"+(float)worstSectSumArea); + System.out.println("\trupArea:\t"+(float)rupSet.getAreaForRup(worstSectMismatch)); + System.out.println("\tdiff:\t"+(float)(rupSet.getAreaForRup(worstSectMismatch) - worstSectSumArea)); + } + if (worstMagMismatch >= 0) { + System.out.println("Worst mag vs area&slip->moment->mag: rupture "+worstMagMismatch); + System.out.println("\tmag:\t"+(float)rupSet.getMagForRup(worstMagMismatch)); + System.out.println("\tmomentToMag:\t"+(float)worstMomentToMag); + System.out.println("\trupArea:\t"+(float)rupSet.getAreaForRup(worstMagMismatch)); + } + } + +} diff --git a/src/main/java/scratch/kevin/prvi25/figures/CrustalCarveoutSmallerRegionMFDPlot.java b/src/main/java/scratch/kevin/prvi25/figures/CrustalCarveoutSmallerRegionMFDPlot.java index 493f313e..599b7541 100644 --- a/src/main/java/scratch/kevin/prvi25/figures/CrustalCarveoutSmallerRegionMFDPlot.java +++ b/src/main/java/scratch/kevin/prvi25/figures/CrustalCarveoutSmallerRegionMFDPlot.java @@ -18,9 +18,12 @@ import org.opensha.commons.gui.plot.PlotLineType; import org.opensha.commons.gui.plot.PlotSpec; import org.opensha.commons.gui.plot.PlotUtils; +import org.opensha.commons.logicTree.LogicTreeBranch; import org.opensha.sha.earthquake.faultSysSolution.FaultSystemSolution; import org.opensha.sha.earthquake.faultSysSolution.util.FaultSysTools; +import org.opensha.sha.earthquake.rupForecastImpl.nshm23.logicTree.NSHM23_MaxMagOffFault; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_DeclusteringAlgorithms; +import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_LogicTreeBranch; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_RegionalSeismicity; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_SeisSmoothingAlgorithms; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.util.PRVI25_RegionLoader; @@ -49,7 +52,8 @@ public static void main(String[] args) throws IOException { EvenlyDiscretizedFunc refMFD = FaultSysTools.initEmptyMFD(sol.getRupSet()); - double mMax = 7.6; + NSHM23_MaxMagOffFault mMax = NSHM23_MaxMagOffFault.MAG_7p6; + DecimalFormat fractDF = new DecimalFormat("0.###"); for (int r=0; r subSectDistsCache; private RSQSimSubSectionMapper subSectMapper; - private static final File fmDmSolDir = new File(System.getProperty("user.home"), ".opensha/ucerf3_fm_dm_sols/"); +// private static final File fmDmSolDir = new File(System.getProperty("user.home"), ".opensha/ucerf3_fm_dm_sols/"); private FaultSystemSolution compSol; public static final double MIN_SUB_SECT_FRACT_DEFAULT = 0.2; @@ -1782,28 +1782,6 @@ private File getSolCacheDir() { } } - public FaultSystemSolution getCompareSol() throws IOException { - synchronized (compSolsTable) { - FaultSystemSolution sol = compSolsTable.get(fm, dm); - - if (sol == null) { - File solDir = getSolCacheDir(); - File solFile = new File(solDir, fm.getFilePrefix()+"_"+dm.getFilePrefix()+"_MEAN_BRANCH_AVG_SOL.zip"); - if (!solFile.exists()) { - // download it - String addr = "http://opensha.usc.edu/ftp/kmilner/ucerf3/2013_05_10-ucerf3p3-production-10runs_fm_dm_sub_plots/" - + fm.getFilePrefix()+"_"+dm.getFilePrefix()+"/"+solFile.getName(); - FileUtils.downloadURL(addr, solFile); - } - - sol = FaultSystemSolution.load(solFile); - compSolsTable.put(fm, dm, sol); - } - - return sol; - } - } - private synchronized Map getSubSectAreas() throws IOException { if (subSectAreas == null) subSectAreas = RSQSimUtils.calcSubSectAreas(getElements(), getSubSects()); @@ -2019,15 +1997,39 @@ public FaultSystemSolution buildSolution(List events, double minMag return RSQSimUtils.buildFaultSystemSolution(getSubSects(), getElements(), events, minMag, minFractForInclusion); } - // TODO duplicate with getCompareSol()? - public FaultSystemSolution getComparisonSolution() throws IOException { - File solFile = new File(fmDmSolDir, getFaultModel().getFilePrefix() - +"_"+getDeformationModel().getFilePrefix()+"_MEAN_BRANCH_AVG_SOL.zip"); - if (solFile.exists()) { - System.out.println("Loading comparison FSS from "+solFile.getAbsolutePath()); - compSol = FaultSystemSolution.load(solFile); - } else { - System.out.println("Comparison sol file doesn't exist: "+solFile.getAbsolutePath()); + public synchronized FaultSystemSolution getComparisonSolution() throws IOException { + if (compSol != null) + return compSol; + File solFile = null; + if (getCatalogDir() != null) { + solFile = new File(getCatalogDir(), "comparison_solution.zip"); + if (!solFile.exists()) + solFile = null; + } + if (solFile == null && fm != null && dm != null) { + File solDir = getSolCacheDir(); + solFile = new File(solDir, fm.getFilePrefix()+"_"+dm.getFilePrefix()+"_MEAN_BRANCH_AVG_SOL.zip"); + if (!solFile.exists()) { + // download it + String addr = "http://data.opensha.org/ftp/kmilner/ucerf3/2013_05_10-ucerf3p3-production-10runs_fm_dm_sub_plots/" + + fm.getFilePrefix()+"_"+dm.getFilePrefix()+"/"+solFile.getName(); + try { + FileUtils.downloadURL(addr, solFile); + } catch (IOException e) { + System.err.println("Failed to download comparison solution from: "+addr); + e.printStackTrace(); + solFile = null; + } + } + } + + if (solFile != null) { + if (solFile.exists()) { + System.out.println("Loading comparison FSS from "+solFile.getAbsolutePath()); + compSol = FaultSystemSolution.load(solFile); + } else { + System.out.println("Comparison sol file doesn't exist: "+solFile.getAbsolutePath()); + } } return compSol; } @@ -2059,6 +2061,14 @@ private List buildStandardPlotLines(File outputDir, int skipYears, boolean hasFM = getFaultModel() != null && getDeformationModel() != null; + String compSolName; + if (fm != null && fm instanceof FaultModels) + compSolName = "UCERF3"; + else if (fm != null && fm instanceof NSHM23_FaultModels) + compSolName = "NSHM23"; + else + compSolName = "Comparison"; + TableBuilder table; if (plotsSet.contains(StandardPlots.MFD)) { @@ -2066,7 +2076,7 @@ private List buildStandardPlotLines(File outputDir, int skipYears, MFDPlot mfdPlot = new MFDPlot(minMag); File mfdCSV = null; if (hasFM) - mfdCSV = new File(fmDmSolDir, getFaultModel().getFilePrefix() + mfdCSV = new File(getSolCacheDir(), getFaultModel().getFilePrefix() +"_"+getDeformationModel().getFilePrefix()+"_supra_plus_sub_seis_cumulative.csv"); // System.out.println(mfdCSV.getAbsolutePath()+" ? "+mfdCSV.exists()); if (mfdCSV != null && mfdCSV.exists()) { @@ -2583,12 +2593,12 @@ private List buildStandardPlotLines(File outputDir, int skipYears, if (plotsSet.contains(StandardPlots.SECTION_RECURRENCE) && hasFM) { if (replot || !new File(outputDir, "interevent_elements_m"+testMagStr+"_scatter.png").exists()) { RSQSimSubSectionMapper mapper = getSubSectMapper(); - SectionRecurrenceComparePlot elemCompare = new SectionRecurrenceComparePlot(getElements(), getCompareSol(), "UCERF3", + SectionRecurrenceComparePlot elemCompare = new SectionRecurrenceComparePlot(getElements(), getComparisonSolution(), compSolName, SectionRecurrenceComparePlot.SectType.ELEMENT, mapper, riMinMags); elemCompare.initialize(getName(), outputDir, "interevent_elements"); plots.add(elemCompare); - SectionRecurrenceComparePlot subSectCompare = new SectionRecurrenceComparePlot(getElements(), getCompareSol(), "UCERF3", + SectionRecurrenceComparePlot subSectCompare = new SectionRecurrenceComparePlot(getElements(), getComparisonSolution(), compSolName, SectionRecurrenceComparePlot.SectType.SUBSECTION, mapper, riMinMags); subSectCompare.initialize(getName(), outputDir, "interevent_sub_sects"); plots.add(subSectCompare); diff --git a/src/main/java/scratch/kevin/simulators/multiFault/RSQSimU3RupturePageGen.java b/src/main/java/scratch/kevin/simulators/multiFault/RSQSimU3RupturePageGen.java index b7831f57..762d495c 100644 --- a/src/main/java/scratch/kevin/simulators/multiFault/RSQSimU3RupturePageGen.java +++ b/src/main/java/scratch/kevin/simulators/multiFault/RSQSimU3RupturePageGen.java @@ -694,7 +694,7 @@ public static void main(String[] args) throws IOException, DocumentException, GM // lines.add(""); System.out.println("Plotting connectivity clusters"); - plotConnectivity(catalog.getCompareSol().getRupSet(), resourcesDir, "connectivity_ucerf3", "UCERF3 Connectivity"); + plotConnectivity(catalog.getComparisonSolution().getRupSet(), resourcesDir, "connectivity_ucerf3", "UCERF3 Connectivity"); plotConnectivity(sol.getRupSet(), resourcesDir, "connectivity_"+catalogTypeFileName, catalogName+" Connectivity"); lines.add("## Fault Connectivity Clusters"); @@ -713,7 +713,7 @@ public static void main(String[] args) throws IOException, DocumentException, GM // cumulant mag System.out.println("Plotting cumulant mag"); - plotCumulantMags(catalog.getCompareSol(), sol, catalogType, resourcesDir); + plotCumulantMags(catalog.getComparisonSolution(), sol, catalogType, resourcesDir); lines.add("## Cumulant Magnitude"); lines.add(topLink); lines.add(""); diff --git a/src/main/java/scratch/kevin/ucerf3/PureScratch.java b/src/main/java/scratch/kevin/ucerf3/PureScratch.java index 7cb120da..c1320cc2 100644 --- a/src/main/java/scratch/kevin/ucerf3/PureScratch.java +++ b/src/main/java/scratch/kevin/ucerf3/PureScratch.java @@ -155,6 +155,7 @@ import org.opensha.sha.earthquake.rupForecastImpl.nshm23.logicTree.NSHM23_DeformationModels; import org.opensha.sha.earthquake.rupForecastImpl.nshm23.logicTree.NSHM23_FaultModels; import org.opensha.sha.earthquake.rupForecastImpl.nshm23.logicTree.NSHM23_LogicTreeBranch; +import org.opensha.sha.earthquake.rupForecastImpl.nshm23.logicTree.NSHM23_MaxMagOffFault; import org.opensha.sha.earthquake.rupForecastImpl.nshm23.logicTree.NSHM23_ScalingRelationships; import org.opensha.sha.earthquake.rupForecastImpl.nshm23.logicTree.NSHM23_SegmentationModels; import org.opensha.sha.earthquake.rupForecastImpl.nshm23.logicTree.NSHM23_SingleStates; @@ -164,8 +165,10 @@ import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_CrustalDeformationModels; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_CrustalFaultModels; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_CrustalGMMs; +import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_DeclusteringAlgorithms; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_LogicTreeBranch; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_RegionalSeismicity; +import org.opensha.sha.earthquake.rupForecastImpl.prvi25.logicTree.PRVI25_SeisSmoothingAlgorithms; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.util.PRVI25_RegionLoader; import org.opensha.sha.earthquake.rupForecastImpl.prvi25.util.PRVI25_RegionLoader.PRVI25_SeismicityRegions; import org.opensha.sha.faultSurface.FaultSection; @@ -2825,13 +2828,31 @@ private static void test325() throws IOException { tree.write(outFile); } + private static void test326() throws IOException { + File dir = new File("/home/kevin/OpenSHA/nshm23/batch_inversions/2024_08_16-prvi25_crustal_branches-dmSample5x/"); + File baSolFile = new File(dir, "results_PRVI_CRUSTAL_FM_V1p1_branch_averaged.zip"); + FaultSystemSolution baSol = FaultSystemSolution.load(baSolFile); + + LogicTreeBranch gridBranch = PRVI25_LogicTreeBranch.fromValues(PRVI25_LogicTreeBranch.levelsCrustalOffFault, + PRVI25_RegionalSeismicity.PREFFERRED, + PRVI25_DeclusteringAlgorithms.AVERAGE, + PRVI25_SeisSmoothingAlgorithms.AVERAGE, + NSHM23_MaxMagOffFault.MAG_7p6); + + PRVI25_GridSourceBuilder.doPreGridBuildHook(baSol, baSol.requireModule(LogicTreeBranch.class)); + GridSourceList gridSources = PRVI25_GridSourceBuilder.buildCrustalGridSourceProv(baSol, gridBranch); + baSol.setGridSourceProvider(gridSources); + + baSol.write(new File("/tmp/prvi_test_grid.zip")); + } + /** * @param args * @throws Exception */ public static void main(String[] args) throws Exception { try { - test325(); + test326(); } catch (Throwable t) { t.printStackTrace(); System.exit(1); diff --git a/src/main/java/scratch/kevin/ucerf3/eal/MPJ_UCERF3_EAL_CombinerScriptGen.java b/src/main/java/scratch/kevin/ucerf3/eal/MPJ_UCERF3_EAL_CombinerScriptGen.java index dab95b73..1ef10d05 100644 --- a/src/main/java/scratch/kevin/ucerf3/eal/MPJ_UCERF3_EAL_CombinerScriptGen.java +++ b/src/main/java/scratch/kevin/ucerf3/eal/MPJ_UCERF3_EAL_CombinerScriptGen.java @@ -11,6 +11,7 @@ import org.opensha.commons.hpc.JavaShellScriptWriter; import org.opensha.commons.hpc.mpj.MPJExpressShellScriptWriter; import org.opensha.commons.hpc.pbs.BatchScriptWriter; +import org.opensha.commons.hpc.pbs.USC_CARC_ScriptWriter; import org.opensha.commons.hpc.pbs.USC_HPCC_ScriptWriter; import org.opensha.sha.earthquake.param.BackgroundRupType; @@ -22,12 +23,12 @@ public class MPJ_UCERF3_EAL_CombinerScriptGen { public static void main(String[] args) throws IOException { File localDir = new File("/home/kevin/OpenSHA/UCERF3/eal"); - File remoteDir = new File("/home/scec-02/kmilner/ucerf3/eal"); + File remoteDir = new File("/project/scec_608/kmilner/ucerf3/eal"); String jobName = new SimpleDateFormat("yyyy_MM_dd").format(new Date()); File trueMeanFile = new File(remoteDir, "2013_05_10-ucerf3p3-production-10runs_COMPOUND_SOL_TRUE_HAZARD_MEAN_SOL_WITH_MAPPING.zip"); - File cfssFile = new File("/home/scec-02/kmilner/ucerf3/inversion_compound_plots/2013_05_10-ucerf3p3-production-10runs/" + File cfssFile = new File("/project/scec_608/kmilner/ucerf3/inversion_compound_plots/2013_05_10-ucerf3p3-production-10runs/" + "2013_05_10-ucerf3p3-production-10runs_COMPOUND_SOL.zip"); // File willsDir = new File(remoteDir, "2017_05_24-ucerf3-ngaw2-cea-proxy-wills2015"); @@ -44,7 +45,7 @@ public static void main(String[] args) throws IOException { BackgroundRupType bgType = BackgroundRupType.CROSSHAIR; - File erfProbsDir = new File("/home/scec-02/kmilner/ucerf3/erf_probs/2014_10_07-ucerf3-erf-probs"); + File erfProbsDir = new File("/project/scec_608/kmilner/ucerf3/erf_probs/2014_10_07-ucerf3-erf-probs"); double erfProbsDuration = 1d; Location tractLoc = null; @@ -52,7 +53,8 @@ public static void main(String[] args) throws IOException { double tractRadius = 0; boolean tractIndividual = false; boolean lec = true; - LossCOV_Model covModel = LossCOV_Model.PORTER_POWER_LAW_2020_09_01; +// LossCOV_Model covModel = LossCOV_Model.PORTER_POWER_LAW_2020_09_01; + LossCOV_Model covModel = LossCOV_Model.PORTER_POWER_LAW_2020_09_01_fixed; // Location tractLoc = new Location(34.108300, -117.289646); // String cityPrefix = "san-bernardino"; @@ -89,11 +91,11 @@ public static void main(String[] args) throws IOException { if (tractIndividual) mins = mins*7; int heapSizeMB = 55*1024; - BatchScriptWriter pbsWrite = new USC_HPCC_ScriptWriter(); + BatchScriptWriter pbsWrite = new USC_CARC_ScriptWriter(); List classpath = new ArrayList<>(); classpath.add(new File(remoteDir, "opensha-dev-all.jar")); JavaShellScriptWriter mpjWrite = new MPJExpressShellScriptWriter( - USC_HPCC_ScriptWriter.JAVA_BIN, heapSizeMB, classpath, USC_HPCC_ScriptWriter.MPJ_HOME); + USC_CARC_ScriptWriter.JAVA_BIN, heapSizeMB, classpath, USC_CARC_ScriptWriter.MPJ_HOME); ((MPJExpressShellScriptWriter)mpjWrite).setUseLaunchWrapper(true); File localJobDir = new File(localDir, jobName);