updates for 12/12 draft model

Author: Kevin Milner

src/main/java/scratch/kevin/nshm23/BranchAveragedHazardScriptWriter.java

@@ -70,31 +70,34 @@ public static void main(String[] args) throws IOException {
 		gridSpacing = 0.01;
 
 		gmms = new AttenRelRef[] { AttenRelRef.USGS_PRVI_ACTIVE, AttenRelRef.USGS_PRVI_INTERFACE, AttenRelRef.USGS_PRVI_SLAB };
+		periods = new double[] { 0d, 0.2d, 1d, 5d };
+		supersample = true;
 
 //		String suffix = "ba_only-LARGE";
 //		String solFileName = "results_PRVI_SUB_FM_LARGE_branch_averaged_gridded.zip";
 
 //		String suffix = "ba_only-LARGE-true_pt_src";
 //		String solFileName = "results_PRVI_SUB_FM_LARGE_branch_averaged_gridded.zip";
 
-		String baseDirName = "2024_11_19-prvi25_crustal_subduction_combined_branches";
+//		String baseDirName = "2024_12_12-prvi25_crustal_subduction_combined_branches";
 //		String suffix = "ba_only";
-//		String suffix = "ba_only-test_grid_branch";
-		String suffix = "ba_only-test_grid_branch-supersample"; supersample = true;
-		String solFileName = "combined_branch_averaged_solution.zip";
+//		String solFileName = "combined_branch_averaged_solution.zip";
 
-//		String baseDirName = "2024_11_19-prvi25_crustal_branches-dmSample5x";
+//		String baseDirName = "2024_12_12-prvi25_crustal_branches-dmSample5x";
 //		String suffix = "ba_only";
 //		String solFileName = "results_PRVI_CRUSTAL_FM_V1p1_branch_averaged_gridded.zip";
 
-//		String baseDirName = "2024_11_19-prvi25_subduction_branches";
-//		String suffix = "ba_only-SLAB_only";
-//		String solFileName = "results_PRVI_SLAB_ONLY_branch_averaged_gridded.zip";
-//		bgOps = new IncludeBackgroundOption[] { IncludeBackgroundOption.ONLY };
-////		String suffix = "ba_only-INTERFACE_only";
-////		String solFileName = "results_PRVI_INTERFACE_ONLY_branch_averaged_gridded.zip";
-////		String suffix = "ba_only-both_fms";
-////		String solFileName = "results_PRVI_SUB_FMs_combined_branch_averaged_gridded.zip";
+		String baseDirName = "2024_12_12-prvi25_subduction_branches";
+		String suffix = "ba_only-SLAB_only";
+		String solFileName = "results_PRVI_SLAB_ONLY_branch_averaged_gridded.zip";
+		bgOps = new IncludeBackgroundOption[] { IncludeBackgroundOption.ONLY };
+//		String suffix = "ba_only-INTERFACE_only";
+//		String solFileName = "results_PRVI_INTERFACE_ONLY_branch_averaged_gridded.zip";
+//		String suffix = "ba_only-both_fms";
+//		String solFileName = "results_PRVI_SUB_FMs_combined_branch_averaged_gridded.zip";
+		
+//		vs30 = 760d; suffix += "-vs760";
+		vs30 = 260d; suffix += "-vs260";
 
 		/*
 		 * RSQSim

src/main/java/scratch/kevin/nshm23/MPJ_LogicTreeInversionRunnerScriptWriter.java

@@ -158,7 +158,7 @@ public static void main(String[] args) throws IOException {
 		int samplingBranchCountMultiplier = 1;
 
 		String dirName = new SimpleDateFormat("yyyy_MM_dd").format(new Date());
-//		String dirName = "2024_11_19";
+//		String dirName = "2024_12_12";
 		String dirSuffix = null;
 
 		/*
@@ -653,7 +653,7 @@ public static void main(String[] args) throws IOException {
 
 //		dirName += "-proxyGriddedTests";
 
-//		Class<? extends InversionConfigurationFactory> factoryClass = PRVI25_InvConfigFactory.class;
+		Class<? extends InversionConfigurationFactory> factoryClass = PRVI25_InvConfigFactory.class;
 
 //		Class<? extends InversionConfigurationFactory> factoryClass = PRVI25_InvConfigFactory.GriddedUseM1Bounds.class;
 //		dirName += "-grid_bounds_m1";
@@ -673,8 +673,8 @@ public static void main(String[] args) throws IOException {
 //		Class<? extends InversionConfigurationFactory> factoryClass = PRVI25_InvConfigFactory.GriddedForceSlab2Depths.class;
 //		dirName += "-gridded_use_slab2";
 
-		Class<? extends InversionConfigurationFactory> factoryClass = PRVI25_InvConfigFactory.NoProxyLengthLimit.class;
-		dirName += "-no_proxy_len_limit";
+//		Class<? extends InversionConfigurationFactory> factoryClass = PRVI25_InvConfigFactory.NoProxyLengthLimit.class;
+//		dirName += "-no_proxy_len_limit";
 
 		if (!factoryClass.equals(PRVI25_InvConfigFactory.class)) {
 			// try instantiate it to make sure we get any static modifiers that might change branch weights

src/main/java/scratch/kevin/prvi25/CrustalSubductionTrueMeanCreator.java

@@ -100,7 +100,7 @@ public static void main(String[] args) throws IOException {
 				subductionBASols.put(fm, sol);
 			}
 		}
-		Preconditions.checkState(!subductionBASols.isEmpty());
+		Preconditions.checkState(subductionBASols.size() == 2);
 
 		List<LogicTreeLevel<? extends LogicTreeNode>> levels = new ArrayList<>();
 		List<LogicTreeBranch<LogicTreeNode>> branches = new ArrayList<>();

src/main/java/scratch/kevin/prvi25/figures/BranchSensitivityColorScaleWriter.java

@@ -9,15 +9,15 @@ public class PRVI_Paths {
 
 	public static final File INV_DIR = new File("/data/kevin/nshm23/batch_inversions/");
 
-	public static final File CRUSTAL_DIR = new File(INV_DIR, "2024_11_19-prvi25_crustal_branches-dmSample5x");
+	public static final File CRUSTAL_DIR = new File(INV_DIR, "2024_12_12-prvi25_crustal_branches-dmSample5x");
 	public static final File CRUSTAL_SOL_GRIDDED = new File(CRUSTAL_DIR, "results_PRVI_CRUSTAL_FM_V1p1_branch_averaged_gridded.zip");
 	public static final File CRUSTAL_SOL_SUPRA_ONLY = new File(CRUSTAL_DIR, "results_PRVI_CRUSTAL_FM_V1p1_branch_averaged.zip");
 
-	public static final File SUBDUCTION_DIR = new File(INV_DIR, "2024_11_19-prvi25_subduction_branches");
+	public static final File SUBDUCTION_DIR = new File(INV_DIR, "2024_12_12-prvi25_subduction_branches");
 	public static final File SUBDUCTION_SOL_LARGE = new File(SUBDUCTION_DIR, "results_PRVI_SUB_FM_LARGE_branch_averaged_gridded.zip");
 	public static final File SUBDUCTION_SOL_SMALL = new File(SUBDUCTION_DIR, "results_PRVI_SUB_FM_SMALL_branch_averaged_gridded.zip");
 
-	public static final File COMBINED_DIR = new File(INV_DIR, "2024_11_19-prvi25_crustal_subduction_combined_branches");
+	public static final File COMBINED_DIR = new File(INV_DIR, "2024_12_12-prvi25_crustal_subduction_combined_branches");
 	public static final File COMBINED_SOL = new File(COMBINED_DIR, "combined_branch_averaged_solution.zip");
 
 }