shakemap-modules 1.0.7__tar.gz → 1.0.9__tar.gz

{shakemap-modules-1.0.7/src/shakemap_modules.egg-info → shakemap-modules-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shakemap-modules
-Version: 1.0.7
+Version: 1.0.9
 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
@@ -182,6 +182,7 @@ Requires-Dist: flake8>=3.9; extra == "dev"
 Requires-Dist: ipython>=7.26; extra == "dev"
 Requires-Dist: vcrpy>=5.1.0; extra == "dev"
 Requires-Dist: esi-releases; extra == "dev"
+Requires-Dist: deepdiff>=6.7.1; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest>=6.2; extra == "test"
 Requires-Dist: pytest-cov>=2.12; extra == "test"
@@ -197,7 +198,19 @@ Requires-Dist: shakemap-modules[assemble,associate,augment,contour,coverage,dyfi
 
 ## Introduction
 
-ShakeMap processing modules.
+This repository holds the core modules of the ShakeMap processing software. The modules may be used either as
+a library of classes that can be included in other programs (as they are with ShakeMap), or as standalone 
+programs. See the [ShakeMap Documentation](https://ghsc.code-pages.usgs.gov/esi/shakemap/) for more on ShakeMap
+and its software architecture.
 
 ## Installation
 
+To install the library modules, use pip:
+
+    pip install shakemap-modules
+
+To install as standalone modules, clone the repository, and execute:
+
+    bash install.sh
+
+which will create a conda environment with the various dependencies.

shakemap-modules-1.0.9/README.md

@@ -0,0 +1,20 @@
+# shakemap-modules
+
+## Introduction
+
+This repository holds the core modules of the ShakeMap processing software. The modules may be used either as
+a library of classes that can be included in other programs (as they are with ShakeMap), or as standalone 
+programs. See the [ShakeMap Documentation](https://ghsc.code-pages.usgs.gov/esi/shakemap/) for more on ShakeMap
+and its software architecture.
+
+## Installation
+
+To install the library modules, use pip:
+
+    pip install shakemap-modules
+
+To install as standalone modules, clone the repository, and execute:
+
+    bash install.sh
+
+which will create a conda environment with the various dependencies.

{shakemap-modules-1.0.7 → shakemap-modules-1.0.9}/pyproject.toml

@@ -177,6 +177,7 @@ dev = [
     "ipython>=7.26",
     "vcrpy>=5.1.0",
     "esi-releases",
+    "deepdiff>=6.7.1"
 ]
 test = [
     "pytest>=6.2",

{shakemap-modules-1.0.7 → shakemap-modules-1.0.9}/src/shakemap_modules/coremods/dyfi.py

@@ -9,10 +9,10 @@ import pandas as pd
 
 # local imports
 from shakemap_modules.base.base import CoreModule
+from shakemap_modules.base.cli import get_module_args
 from shakemap_modules.utils.comcat import get_bytes, get_detail_json
 from shakemap_modules.utils.config import get_config_paths
 from shakemap_modules.utils.dataframe import dataframe_to_xml
-from shakemap_modules.base.cli import get_module_args
 from shakemap_modules.utils.logging import get_generic_logger
 
 # Get rid of stupid pandas warning
@@ -232,7 +232,6 @@ def _parse_geocoded_json(bytes_data, min_nresp):
 
 
 def get_stddev(dataframe):
-    print(dataframe.columns)
     nresp = dataframe["nresp"]
     dataframe["stddev"] = stddev_function(nresp)
     return

{shakemap-modules-1.0.7 → shakemap-modules-1.0.9}/src/shakemap_modules/coremods/model.py

@@ -2,10 +2,12 @@
 Process a ShakeMap, based on the configuration and data found in
 shake_data.hdf, and produce output in shake_result.hdf.
 """
+
 # stdlib imports
 import argparse
 import concurrent.futures as cf
 import copy
+import importlib.metadata
 import inspect
 import json
 import os
@@ -13,7 +15,6 @@ import os.path
 import pathlib
 import re
 import shutil
-import importlib.metadata
 import time as time
 from datetime import date
 from time import gmtime, strftime
@@ -26,7 +27,6 @@ import numpy.ma as ma
 import openquake.hazardlib.const as oqconst
 import pandas as pd
 from esi_core.shakemap.covariance_matrix import make_sd_array, make_sigma_matrix
-
 from esi_core.shakemap.geodetic_distances import geodetic_distance_fast
 from esi_shakelib.directivity.rowshandel2013 import Rowshandel2013
 from esi_shakelib.multigmpe import MultiGMPE
@@ -35,9 +35,9 @@ from esi_shakelib.utils.containers import ShakeMapInputContainer
 from esi_shakelib.utils.imt_string import oq_to_file
 from esi_shakelib.utils.utils import (
     get_extent,
+    get_shakelib_version,
     thirty_sec_max,
     thirty_sec_min,
-    get_shakelib_version,
 )
 from esi_shakelib.virtualipe import VirtualIPE
 
@@ -1395,7 +1395,7 @@ class ModelModule(CoreModule):
             self.ccf.getCorrelation(t1_22, t2_22, matrix22)
             sta_phi_flat = sta_phi.flatten()
             make_sigma_matrix(matrix22, sta_phi_flat, sta_phi_flat)
-            np.fill_diagonal(matrix22, np.diag(matrix22) + sta_sig_extra ** 2)
+            np.fill_diagonal(matrix22, np.diag(matrix22) + sta_sig_extra**2)
             cov_WD_WD_inv = np.linalg.pinv(matrix22)
             #
             # Hold on to some things we'll need later
@@ -2203,7 +2203,7 @@ class ModelModule(CoreModule):
                 else:
                     mytau = sdf[key + "_tau"][six]
                 myphi = sdf[key + "_phi"][six]
-                mysigma = np.sqrt(mytau ** 2 + myphi ** 2)
+                mysigma = np.sqrt(mytau**2 + myphi**2)
                 mysigma_rock = sdf[key + "_sigma_rock"][six]
                 mysigma_soil = sdf[key + "_sigma_soil"][six]
                 imt_name = key.lower().replace("_pred", "")
@@ -2677,7 +2677,7 @@ class ModelModule(CoreModule):
             target_res = (
                 -(latspan + lonspan)
                 - np.sqrt(
-                    latspan ** 2 + lonspan ** 2 + 2 * latspan * lonspan * (2 * nmax - 1)
+                    latspan**2 + lonspan**2 + 2 * latspan * lonspan * (2 * nmax - 1)
                 )
             ) / (2 * (1 - nmax))
 

{shakemap-modules-1.0.7 → shakemap-modules-1.0.9}/src/shakemap_modules/data/modules.conf

@@ -119,9 +119,9 @@
 # example
 # ##########################################################################
 [gmice_modules]
-    WGRW12 = WGRW12, esi_utils_gmice.gmice.wgrw12
-    Wald99 = Wald99, esi_utils_gmice.gmice.wald99
-    AK07 = AK07, esi_utils_gmice.gmice.ak07
+    WGRW12 = WGRW12, esi_shakelib.gmice.wgrw12
+    Wald99 = Wald99, esi_shakelib.gmice.wald99
+    AK07 = AK07, esi_shakelib.gmice.ak07
 
 # ##########################################################################
 # ccf_modules -- Cross-correlation modules. Similar to gmice_modules,