Updated to support new 'startnum' column in fault selection file

ucgmsim · Aug 15, 2024 · 51e2572 · 51e2572
1 parent b2934db
commit 51e2572
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/srf_generation/source_parameter_generation/generate_realisations_from_nhm.py b/srf_generation/source_parameter_generation/generate_realisations_from_nhm.py
@@ -146,17 +146,23 @@ def generate_fault_realisations(
         vs30_out_file,
         fault_logger,
     )
-    updated_rels_info = pd.read_csv("/home/seb56/cs200/updated_rels_info.csv",index_col=5)
-    this_fault_info = updated_rels_info[updated_rels_info['FN'] == fault_name]
-    #for i in range(1, realisation_count + 1):
-    for i in range(this_fault_info['new_relnum'].min(), realisation_count+1):
-        #realisation_name = get_realisation_name(fault_name, i)
-        this_rel_info = this_fault_info[this_fault_info['new_relnum'] == i]
+    updated_rels_info = pd.read_csv(
+        "/home/seb56/cs200/updated_rels_info.csv", index_col=5
+    )
+    this_fault_info = updated_rels_info[updated_rels_info["FN"] == fault_name]
+    # for i in range(1, realisation_count + 1):
+    for i in range(this_fault_info["new_relnum"].min(), realisation_count + 1):
+        # realisation_name = get_realisation_name(fault_name, i)
+        this_rel_info = this_fault_info[this_fault_info["new_relnum"] == i]
         realisation_name = this_rel_info.index.values[0]
         realisation_file_name = get_srf_path(cybershake_root, realisation_name).replace(
             ".srf", ".csv"
         )
-        additional_source_parameters={"mw":this_rel_info['new_mw'].values[0],"shypo":this_rel_info['new_shypo'].values[0],"dhypo":this_rel_info['new_dhypo'].values[0]}
+        additional_source_parameters = {
+            "mw": this_rel_info["new_mw"].values[0],
+            "shypo": this_rel_info["new_shypo"].values[0],
+            "dhypo": this_rel_info["new_dhypo"].values[0],
+        }
 
         if checkpointing and isfile(realisation_file_name):
             fault_logger.debug(
@@ -201,7 +207,7 @@ def generate_messages(
     primary_logger,
 ):
     messages = []
-    for fault_name, realisation_count in faults.items():
+    for fault_name, (realisation_count, start_num) in faults.items():
         fault_data = nhm_faults[fault_name]
 
         additional_source_specific_data = {}
@@ -214,7 +220,7 @@ def generate_messages(
         messages.append(
             (
                 fault_data,
-                faults[fault_name],
+                realisation_count - start_num + 1,
                 cybershake_root,
                 perturbation_function,
                 unperturbed_function,

diff --git a/srf_generation/source_parameter_generation/uncertainties/versions/cs_200m_add_rels.py b/srf_generation/source_parameter_generation/uncertainties/versions/cs_200m_add_rels.py
@@ -29,7 +29,7 @@ def generate_source_params(
     additional_source_parameters: Dict[str, Any],
     vel_mod_1d: pd.DataFrame,
     vs30_data: pd.DataFrame = None,
-    **kwargs
+    **kwargs,
 ) -> Dict[str, Any]:
     """source_data should have the following parameters available via . notation:
     - source_data.pid: name of the event
@@ -49,19 +49,19 @@ def generate_source_params(
 
     fault: Type4 = fault_factory(TYPE)(source_data)
 
-    #fault.shypo = fault.length * rand_shyp()
-    fault.shypo = additional_source_parameters.pop('shypo')
-    #fault.dhypo = fault.width * truncated_weibull(1)
-    fault.dhypo = additional_source_parameters.pop('dhypo')
+    # fault.shypo = fault.length * rand_shyp()
+    fault.shypo = additional_source_parameters.pop("shypo") * fault.length
+    # fault.dhypo = fault.width * truncated_weibull(1)
+    fault.dhypo = additional_source_parameters.pop("dhypo") * fault.width
 
     fault.rake = truncated_normal(fault.rake, 15, 4)
     mag, sigma = lw_to_mw_sigma_scaling_relation(
-         fault.length, fault.width, fault.mwsr, fault.rake
+        fault.length, fault.width, fault.mwsr, fault.rake
     )
     # perturbated_magnitude = truncated_normal(mag, sigma, 1)
 
-    assert 'mw' in additional_source_parameters, f"{additional_source_parameters}"
-    perturbated_magnitude = additional_source_parameters.pop('mw')
+    assert "mw" in additional_source_parameters, f"{additional_source_parameters}"
+    perturbated_magnitude = additional_source_parameters.pop("mw")
 
     params = fault.to_dict()
     params.update({"dt": 0.005, "seed": get_seed(), "genslip_version": "5.4.2"})