shakemap-modules 1.1.4__tar.gz → 1.1.6__tar.gz

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/CHANGELOG.md

@@ -1,6 +1,18 @@
 # main
 
-## 1.1.4 / 2025-04-07
+## 1.1.6 / 2025-07-08
+    Fixes:                                                                                  
+    - gridxml now correctly reports shakemap code version.                              
+    - model support for new ffsimmer parameters.                                        
+    - model turn off generic amplification factors for regression plots
+
+## 1.1.5 / 2025-07-01
+    - Revving version number to fix glitch.
+
+## 1.1.4 / 2025-07-01
+    - Refactor to output data needed for realizations for all IMs.
+    - Fix bug where the Generic Amplification Factors were not applied by ffsimmer.
+    - Fix test.
     - Fixed a bug in sm_clone that prevented the preferred Atlas shakemap from being chosen by default.
     - Fixed a bug that caused sm_clone to incorrectly fail on older fault text files.
 

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shakemap-modules
-Version: 1.1.4
+Version: 1.1.6
 Summary: USGS Earthquake Impact ShakeMap Modules
 Author-email: Bruce Worden <cbworden@contractor.usgs.gov>, Eric Thompson <emthompsone@usgs.gov>, Mike Hearne <mhearne@usgs.gov>
 License: License

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/code.json

@@ -1,4 +1,76 @@
 [
+    {
+        "name": "shakemap-modules",
+        "description": "ShakeMap processing modules.",
+        "version": "v1.1.6",
+        "status": "Development",
+        "organization": "U.S. Geological Survey",
+        "vcs": "git",
+        "repositoryURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules.git",
+        "homepageURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules",
+        "downloadURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/archive/v1.1.6/shakemap-modules-v1.1.6.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.6/DISCLAIMER.md",
+        "permissions": {
+            "usageType": "openSource",
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.6/LICENSE.md"
+                }
+            ]
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "utilities"
+        ],
+        "contact": {
+            "name": "Bruce Worden",
+            "email": "cbworden@contractor.usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2025-07-08"
+        }
+    },
+    {
+        "name": "shakemap-modules",
+        "description": "ShakeMap processing modules.",
+        "version": "v1.1.5",
+        "status": "Development",
+        "organization": "U.S. Geological Survey",
+        "vcs": "git",
+        "repositoryURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules.git",
+        "homepageURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules",
+        "downloadURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/archive/v1.1.5/shakemap-modules-v1.1.5.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.5/DISCLAIMER.md",
+        "permissions": {
+            "usageType": "openSource",
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.5/LICENSE.md"
+                }
+            ]
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "utilities"
+        ],
+        "contact": {
+            "name": "Bruce Worden",
+            "email": "cbworden@contractor.usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2025-07-01"
+        }
+    },
     {
         "name": "shakemap-modules",
         "description": "ShakeMap processing modules.",
@@ -32,7 +104,7 @@
             "email": "cbworden@contractor.usgs.gov"
         },
         "date": {
-            "metadataLastUpdated": "2025-03-20"
+            "metadataLastUpdated": "2025-07-01"
         }
     },
     {

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/src/shakemap_modules/coremods/gridxml.py

@@ -90,9 +90,13 @@ class GridXMLModule(CoreModule):
         """
         if self.process == "shakemap":
             install_path, data_path = get_config_paths()
-            datadir = os.path.join(data_path, self._eventid, "current", "products")
+            datadir = os.path.join(
+                data_path, self._eventid, "current", "products"
+            )
             if not os.path.isdir(datadir):
-                raise NotADirectoryError(f"{datadir} is not a valid directory.")
+                raise NotADirectoryError(
+                    f"{datadir} is not a valid directory."
+                )
             datafile = os.path.join(datadir, "shake_result.hdf")
         else:
             if datafile is None:
@@ -178,15 +182,15 @@ class GridXMLModule(CoreModule):
                         event_info["origin_time"], constants.ALT_TIMEFMT
                     )
                 event_dict["event_description"] = event_info["location"]
-                event_dict["event_network"] = info["input"]["event_information"][
-                    "eventsource"
-                ]
+                event_dict["event_network"] = info["input"][
+                    "event_information"
+                ]["eventsource"]
                 event_dict["intensity_observations"] = info["input"][
                     "event_information"
                 ]["intensity_observations"]
-                event_dict["seismic_stations"] = info["input"]["event_information"][
-                    "seismic_stations"
-                ]
+                event_dict["seismic_stations"] = info["input"][
+                    "event_information"
+                ]["seismic_stations"]
                 if info["input"]["event_information"]["fault_ref"] == "Origin":
                     event_dict["point_source"] = "True"
                 else:
@@ -199,10 +203,10 @@ class GridXMLModule(CoreModule):
                 shake_dict["shakemap_version"] = info["processing"][
                     "shakemap_versions"
                 ]["map_version"]
-                shake_dict["code_version"] = "4.1.5"
-                # shake_dict["code_version"] = info["processing"]["shakemap_versions"][
-                #     "shakemap_revision"
-                # ]
+                # shake_dict["code_version"] = "4.1.5"
+                shake_dict["code_version"] = info["processing"][
+                    "shakemap_versions"
+                ]["shakemap_revision"]
                 ptime = info["processing"]["shakemap_versions"]["process_time"]
                 try:
                     shake_dict["process_timestamp"] = datetime.strptime(
@@ -213,14 +217,21 @@ class GridXMLModule(CoreModule):
                         ptime, constants.ALT_TIMEFMT
                     )
 
-                shake_dict["shakemap_originator"] = config["system"]["source_network"]
+                shake_dict["shakemap_originator"] = config["system"][
+                    "source_network"
+                ]
                 shake_dict["map_status"] = config["system"]["map_status"]
                 shake_dict["shakemap_event_type"] = "ACTUAL"
                 if event_dict["event_id"].endswith("_se"):
                     shake_dict["shakemap_event_type"] = "SCENARIO"
 
                 shake_grid = ShakeGrid(
-                    layers, geodict, event_dict, shake_dict, {}, field_keys=field_keys
+                    layers,
+                    geodict,
+                    event_dict,
+                    shake_dict,
+                    {},
+                    field_keys=field_keys,
                 )
                 if component == "GREATER_OF_TWO_HORIZONTAL":
                     fname = f"{xml_type}.xml"

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/src/shakemap_modules/coremods/model.py

@@ -265,10 +265,10 @@ class ModelModule(CoreModule):
         self.do_grid = True
         self.sites_obj_out = None
         self.max_workers = None
-        self.mmi_add_uncertainty = None
-        self.mmi_sigma_hh_yd = None
-        self.mmi_c = None
-        self.mmi_sta_per_ix = None
+        self.rez_add_uncertainty = {}
+        self.rez_sigma_hh_yd = {}
+        self.rez_c = {}
+        self.rez_sta_per_ix = {}
         self.directivity = None
         self.info = {"multigmpe": {}}
         # self.rng_seed = secrets.randbits(128)
@@ -436,7 +436,7 @@ class ModelModule(CoreModule):
         self.rx = self.rupture_obj.getRuptureContext([self.default_gmpe])
 
         # ---------------------------------------------------------------------
-        # Add mechanism and tectonic regine to origin
+        # Add mechanism and tectonic regime to origin
         # ---------------------------------------------------------------------
         try:
             strecdata = self.ic.getStrecJson()
@@ -463,10 +463,16 @@ class ModelModule(CoreModule):
                 max_dip=self.config["modeling"]["ffsim_max_dip"],
                 dx_min_frac=self.config["modeling"]["ffsim_dx_min_frac"],
                 dx_max_frac=self.config["modeling"]["ffsim_dx_max_frac"],
-                delta_depth=self.config["modeling"]["ffsim_delta_depth"],
                 ztor=self.config["modeling"]["ffsim_ztor"],
+                aspect_ratio=self.config["modeling"]["ffsim_aspect_ratio"],
+                min_sz_depth=self.config["modeling"]["ffsim_min_sz_depth"],
+                max_sz_depth=self.config["modeling"]["ffsim_max_sz_depth"],
                 seed=self.rng_seed,
             )
+            # with open("rupt_quads.txt", "wt", encoding="utf-8") as f:
+            #     for irupt in self.rff.rupts:
+            #         irupt.writeTextFile(f)
+
             if self.config["modeling"]["ffsim_true_grid"] is True:
                 self.true_grid = True
 
@@ -685,6 +691,13 @@ class ModelModule(CoreModule):
                         self.gmpe_dict,
                         list(self.oqimt_dict.values()),
                     )
+                    if self.apply_gafs:
+                        for oqimt in self.oqimt_dict.values():
+                            gafs = get_generic_amp_factors(
+                                self.dx_out, str(oqimt)
+                            )
+                            if gafs is not None:
+                                griddict[oqimt]["mean"] += gafs
                 else:
                     griddict = ffsim.compute_grid(
                         vs30grid,
@@ -702,6 +715,12 @@ class ModelModule(CoreModule):
                             griddict[oqpga]["mean"],
                             oqimt,
                         )
+                        if self.apply_gafs:
+                            gafs = get_generic_amp_factors(
+                                self.dx_out, str(oqimt)
+                            )
+                            if gafs is not None:
+                                amp_grid += gafs
                         griddict[oqimt]["mean"] = amp_grid
             else:
                 shapes = []
@@ -724,11 +743,17 @@ class ModelModule(CoreModule):
                     griddict[oqimt] = {}
                     for kk, vv in ptdict[oqimt]["site"].items():
                         griddict[oqimt][kk] = vv.reshape(orig_shape)
+                        if self.apply_gafs and kk == "mean":
+                            gafs = get_generic_amp_factors(
+                                self.dx_out, str(oqimt)
+                            )
+                            if gafs is not None:
+                                griddict[oqimt][kk] += gafs
             # Compute MMI from PGMs or IPE
             if do_mmi:
                 immi = imt.MMI()
+                griddict[immi] = {}
                 if isinstance(self.ipe, VirtualIPE):
-                    griddict[immi] = {}
                     gmice_imt = self.ipe.imt
                     griddict[immi]["mean"], dmda = self.gmice.getMIfromGM(
                         griddict[gmice_imt]["mean"],
@@ -738,6 +763,11 @@ class ModelModule(CoreModule):
                     )
                     gm2mi_var = (self.gmice.getGM2MIsd()[gmice_imt]) ** 2
                     dmda *= dmda
+
+                    if self.apply_gafs:
+                        gafs = get_generic_amp_factors(self.dx_out, str(immi))
+                        if gafs is not None:
+                            griddict[immi]["mean"] += gafs
                     for sdt in stddev_types:
                         if sdt not in griddict[gmice_imt]:
                             continue
@@ -750,19 +780,39 @@ class ModelModule(CoreModule):
                             )
                 else:
                     ffsim = FFSimmer(self.rff, measure="mean")
-                    if self.true_grid:
-                        mmidict = ffsim.true_grid(
-                            self.sites_obj_out.getVs30Grid(),
-                            {immi: self.ipe},
-                            [immi],
-                        )
+                    if self.do_grid:
+                        if self.true_grid:
+                            mmidict = ffsim.true_grid(
+                                self.sites_obj_out.getVs30Grid(),
+                                {immi: self.ipe},
+                                [immi],
+                            )
+                        else:
+                            mmidict = ffsim.compute_grid(
+                                self.sites_obj_out.getVs30Grid(),
+                                {immi: self.ipe},
+                                [immi],
+                            )
+                        for sdt in mmidict[immi]:
+                            griddict[immi][sdt] = mmidict[immi][sdt]
+                        if self.apply_gafs:
+                            gafs = get_generic_amp_factors(
+                                self.dx_out, str(immi)
+                            )
+                            if gafs is not None:
+                                griddict[immi]["mean"] += gafs
                     else:
-                        mmidict = ffsim.compute_grid(
-                            self.sites_obj_out.getVs30Grid(),
-                            {immi: self.ipe},
-                            [immi],
+                        ptdict = ffsim.compute_points(
+                            self.sx_out, {immi: self.ipe}, [immi]
                         )
-                    griddict[immi] = mmidict[immi]
+                        for sdt in ptdict[immi]["site"]:
+                            griddict[immi][sdt] = ptdict[immi]["site"][sdt]
+                            if self.apply_gafs and sdt == "mean":
+                                gafs = get_generic_amp_factors(
+                                    self.dx_out, str(immi)
+                                )
+                                if gafs is not None:
+                                    griddict[immi][sdt] += gafs
         else:
             griddict = {}
             shapes = []
@@ -820,7 +870,7 @@ class ModelModule(CoreModule):
                 self.atten_sx_rock,
                 self.atten_dx,
                 oqimt,
-                self.apply_gafs,
+                False,
             )
             self.atten_rock_mean[imt_str] = x_mean
             self.atten_rock_sd[imt_str] = x_sd[0]
@@ -829,7 +879,7 @@ class ModelModule(CoreModule):
                 self.atten_sx_soil,
                 self.atten_dx,
                 oqimt,
-                self.apply_gafs,
+                False,
             )
             self.atten_soil_mean[imt_str] = x_mean
             self.atten_soil_sd[imt_str] = x_sd[0]
@@ -2045,13 +2095,11 @@ class ModelModule(CoreModule):
             self.outsd[imtstr] = pout_sd[0]
             self.outphi[imtstr] = self.psd[imtstr]
             self.outtau[imtstr] = self.tsd[imtstr]
-            # Special stuff for the MMI priors. When we make this apply to
-            # other IMTs we'll need to mess around with this block
-            if imtstr == "MMI":
-                self.mmi_add_uncertainty = np.array([])
-                self.mmi_sigma_hh_yd = np.array([])
-                self.mmi_c = np.array([])
-                self.mmi_sta_per_ix = np.array([])
+            # Special stuff for the IMT priors.
+            self.rez_add_uncertainty[imtstr] = np.array([])
+            self.rez_sigma_hh_yd[imtstr] = np.array([])
+            self.rez_c[imtstr] = np.array([])
+            self.rez_sta_per_ix[imtstr] = np.array([])
             return
 
         pout_sd2_phi = np.power(self.psd[imtstr], 2.0)
@@ -2096,14 +2144,8 @@ class ModelModule(CoreModule):
         sdsta_phi = sta_phi.flatten()
         matrix12_phi = np.empty(t2_12.shape, dtype=np.double)
         rcmatrix_phi = np.empty(t2_12.shape, dtype=np.double)
-        # Allocate the full big_c matrix only for the desired IMT (MMI). This
-        # is for generating realizations. Someday we will want to make this
-        # apply to other IMTs and become an optional flag for this module
-        # where we save the priors optionally
-        # Note: We would have to set up c_complete = {} at the top of the
-        # module, and then here, it would be c_complete[imtstr] = ...
-        if imtstr == "MMI":
-            c_complete = np.empty_like(t_y0)
+        # Allocate the full big_c matrix only for the desired IMTs
+        c_complete = np.empty_like(t_y0)
         for iy in range(self.smny):
             ss = iy * self.smnx
             se = (iy + 1) * self.smnx
@@ -2180,11 +2222,8 @@ class ModelModule(CoreModule):
             sdgrid_tau[iy, :] = np.sum(
                 np.multiply(c_tmp1, big_c, out=c_tmp2), out=s_tmp3, axis=1
             )
-            # This is where we would have a flag if we were saving the priors
-            # as an option
-            if imtstr == "MMI":
-                # Save big_c to complete full size big_c
-                c_complete[ss:se, :] = big_c
+            # Save big_c to complete full size big_c
+            c_complete[ss:se, :] = big_c
 
         #
         # This processing can result in MMI values that go beyond
@@ -2209,13 +2248,11 @@ class ModelModule(CoreModule):
         self.outphi[imtstr] = self.psd[imtstr]
         self.outtau[imtstr] = np.sqrt(sdgrid_tau, out=sdgrid_tau)
 
-        # Special stuff for the MMI priors. When we make this apply to other
-        # IMTs we'll need to mess around with this block
-        if imtstr == "MMI":
-            self.mmi_add_uncertainty = self.sta_sig_extra[imtstr]
-            self.mmi_sigma_hh_yd = self.cov_hh_yd[imtstr]
-            self.mmi_c = c_complete
-            self.mmi_sta_per_ix = sta_per_ix
+        # Special stuff for the IMT priors.
+        self.rez_add_uncertainty[imtstr] = self.sta_sig_extra[imtstr]
+        self.rez_sigma_hh_yd[imtstr] = self.cov_hh_yd[imtstr]
+        self.rez_c[imtstr] = c_complete
+        self.rez_sta_per_ix[imtstr] = sta_per_ix
 
     def _apply_custom_mask(self):
         """Apply custom masks to IMT grid outputs."""
@@ -2897,6 +2934,10 @@ class ModelModule(CoreModule):
                 dm_arr = getattr(self.dx_out, dm, None)
                 if dm_arr is not None:
                     oc.setArray(["distances"], dm, dm_arr, metadata=metadata)
+        metadata["units"] = "seconds"
+        metadata["digits"] = 1
+        oc.setArray([], "imt_periods", self.imt_per, metadata=metadata)
+        oc.setDictionary([], "imt_per_ix", self.imt_per_ix)
 
         #
         # Output the data and uncertainty grids
@@ -2923,21 +2964,17 @@ class ModelModule(CoreModule):
                 self.outphi[key],
                 self.outtau[key],
             )
-            if key == "MMI":
-                sub_groups = ["imts", component, key]
-                oc.setArray(
-                    sub_groups, "add_uncertainty", self.mmi_add_uncertainty
-                )
-                oc.setArray(sub_groups, "Sigma_HH_YD", self.mmi_sigma_hh_yd)
-                oc.setArray(sub_groups, "C", self.mmi_c)
-                oc.setArray(sub_groups, "sta_per_ix", self.mmi_sta_per_ix)
-                oc.setArray(sub_groups, "sta_phi", self.sta_phi["MMI"])
-                oc.setArray(
-                    sub_groups, "sta_lons_rad", self.sta_lons_rad["MMI"]
-                )
-                oc.setArray(
-                    sub_groups, "sta_lats_rad", self.sta_lats_rad["MMI"]
-                )
+            # Realizations stuff
+            sub_groups = ["imts", component, key]
+            oc.setArray(
+                sub_groups, "add_uncertainty", self.rez_add_uncertainty[key]
+            )
+            oc.setArray(sub_groups, "Sigma_HH_YD", self.rez_sigma_hh_yd[key])
+            oc.setArray(sub_groups, "C", self.rez_c[key])
+            oc.setArray(sub_groups, "sta_per_ix", self.rez_sta_per_ix[key])
+            oc.setArray(sub_groups, "sta_phi", self.sta_phi[key])
+            oc.setArray(sub_groups, "sta_lons_rad", self.sta_lons_rad[key])
+            oc.setArray(sub_groups, "sta_lats_rad", self.sta_lats_rad[key])
         #
         # Directivity
         #
@@ -2991,6 +3028,9 @@ class ModelModule(CoreModule):
         #
         # Store the IMTs
         #
+        period_metadata = {"units": "seconds", "digits": 1}
+        oc.setArray([], "imt_periods", self.imt_per, metadata=period_metadata)
+        oc.setDictionary([], "imt_per_ix", self.imt_per_ix)
         ascii_ids = np.array(
             [np.char.encode(x, encoding="ascii") for x in self.idents]
         ).flatten()
@@ -3027,6 +3067,16 @@ class ModelModule(CoreModule):
                 self.pred_out_sd[key].flatten(),
                 std_metadata,
             )
+            sub_groups = ["imts", component, key]
+            oc.setArray(
+                sub_groups, "add_uncertainty", self.rez_add_uncertainty[key]
+            )
+            oc.setArray(sub_groups, "Sigma_HH_YD", self.rez_sigma_hh_yd[key])
+            oc.setArray(sub_groups, "C", self.rez_c[key])
+            oc.setArray(sub_groups, "sta_per_ix", self.rez_sta_per_ix[key])
+            oc.setArray(sub_groups, "sta_phi", self.sta_phi[key])
+            oc.setArray(sub_groups, "sta_lons_rad", self.sta_lons_rad[key])
+            oc.setArray(sub_groups, "sta_lats_rad", self.sta_lats_rad[key])
 
     def _store_attenuation_data(self, oc):
         """

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/src/shakemap_modules/coremods/shape.py

@@ -146,7 +146,7 @@ def create_polygons(container, datadir, logger, max_workers, method="pcontour"):
         gmice_imts = []
         gmice_pers = []
     else:
-        gmice_imts = gmice.DEFINED_FOR_INTENSITY_MEASURE_TYPES
+        gmice_imts = [imt.__name__ for imt in gmice.DEFINED_FOR_INTENSITY_MEASURE_TYPES]
         gmice_pers = gmice.DEFINED_FOR_SA_PERIODS
 
     component = list(container.getComponents())[0]
@@ -218,10 +218,9 @@ def create_polygons(container, datadir, logger, max_workers, method="pcontour"):
                 contour_levels = None
                 # but wants gmice info
                 oqimt = OQIMT.from_string(imt)
-                if (
-                    imt == "MMI"
-                    or not isinstance(oqimt, tuple(gmice_imts))
-                    or (isinstance(oqimt, OQIMT.SA) and oqimt.period not in gmice_pers)
+                if imt == "MMI" or (
+                    imt not in gmice_imts
+                    and ("SA" not in gmice_imts or oqimt.period not in gmice_pers)
                 ):
                     my_gmice = None
                 else:

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/src/shakemap_modules/data/model.conf

@@ -275,13 +275,21 @@
     #          (between 0 and 1, default 0).
     # ffsim_dx_max_frac: The fraction of the along strike distance to stop
     #          (between 0 and 1, default 1).
-    # ffsim_delta_depth: The depth range of the hypocenter will be drawn from
-    #          hypo_depth - ffsim_delta_depth to hypo_depth + ffsim_delta_depth.
-    #          Units are km. The default is 20.
     # ffsim_ztor: Set the top of rupture (TOR) to a fixed depth. Typically, this 
     #          parameter would be used to set the TOR to 0 for events with
     #          known surface faulting. Depth is positive downward. Units are km. 
     #          (Any negative value (the default is -1) allows the TOR to float.)
+    # ffsim_aspect_ratio: Sets the starting aspect ratio (length/width) of
+    #          the rupture plane. This is a weak constraint: the aspect ratio
+    #          will not be less than this, but could be greater since once the
+    #          rupture reaches its maximum width the length wii be increased
+    #          to meet the area computed for the rupture plane. The default is
+    #          calculated using Huang et al. () equations 2 & 3.
+    # ffsim_min_sz_depth: The minimum seismogenic depth. The default is 0 (the
+    #          surface).
+    # ffsim_max_sz_depth: The maximum seismogenic depth. The default is dependent
+    #          on the tectonic regime.
+    #
     # WARNING: Set *both* ffsim_min_dip and ffsim_max_dip or set *neither*. Don't 
     # just set one of them.
     #

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/src/shakemap_modules/data/modelspec.conf

@@ -64,8 +64,10 @@
     ffsim_max_dip = float(min=0.0, max=90.0, default=None)
     ffsim_dx_min_frac = float(min=0.0, max=1.0, default=0.0)
     ffsim_dx_max_frac = float(min=0.0, max=1.0, default=1.0)
-    ffsim_delta_depth = float(min=0.0, default=20.0)
     ffsim_ztor = float(default=-1.0)
+    ffsim_aspect_ratio = float(default = -1)
+    ffsim_min_sz_depth = float(min = 0, default = 0)
+    ffsim_max_sz_depth = float(default = -1)
 
     [[bias]]
         do_bias = boolean(default=True)

{shakemap_modules-1.1.4 → shakemap_modules-1.1.6}/src/shakemap_modules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shakemap-modules
-Version: 1.1.4
+Version: 1.1.6
 Summary: USGS Earthquake Impact ShakeMap Modules
 Author-email: Bruce Worden <cbworden@contractor.usgs.gov>, Eric Thompson <emthompsone@usgs.gov>, Mike Hearne <mhearne@usgs.gov>
 License: License