update

GEMScienceTools · Jul 5, 2024 · e65db46 · e65db46
1 parent 51fd29f
commit e65db46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/openquake/smt/residuals/sm_database.py b/openquake/smt/residuals/sm_database.py
@@ -32,7 +32,7 @@
 from openquake.smt.sm_utils import vs30_to_z1pt0_as08, z1pt0_to_z2pt5
 from openquake.smt.sm_utils import vs30_to_z1pt0_cy14, vs30_to_z2pt5_cb14
 import openquake.smt.sm_utils as utils
-from openquake.smt import surface_utils
+from openquake.smt.residuals import sm_database_surface_utils
 from openquake.smt.residuals.context_db import ContextDB
 from openquake.hazardlib.geo import geodetic
 
@@ -175,7 +175,7 @@ def to_dict(self):
                                self.hypocentre.latitude,
                                self.hypocentre.depth]
             elif key == "surface" and self.surface is not None:
-                output[key] = surface_utils.surfaces_to_dict[
+                output[key] = sm_database_surface_utils.surfaces_to_dict[
                     self.surface.__class__.__name__](self.surface)
             else:
                 output[key] = getattr(self, key)
@@ -193,8 +193,8 @@ def from_dict(cls, data, mesh_spacing=1.):
             if key in ["id", "name", "magnitude", "length", "width", "depth"]:
                 continue
             elif key == "surface" and data["surface"] is not None:
-                rup.surface = surface_utils.surfaces_from_dict(data[key]["type"],
-                                                               mesh_spacing)
+                rup.surface = sm_database_surface_utils.surfaces_from_dict(
+                    data[key]["type"], mesh_spacing)
             else:
                 setattr(rup, key, data[key])
         return rup

diff --git a/openquake/smt/surface_utils.py → ...mt/residuals/sm_database_surface_utils.py b/openquake/smt/surface_utils.py → ...mt/residuals/sm_database_surface_utils.py
@@ -173,12 +173,4 @@ def multi_surface_from_dict(data, mesh_spacing=1.):
     return MultiSurface(surfaces)
 
 
-surfaces_from_dict["MultiSurface"] = multi_surface_from_dict
-
-
-# surfaces_to_dict = {
-#    "PlanarSurface": planar_fault_surface_to_dict,
-#    "SimpleFaultSurface": simple_fault_surface_to_dict,
-#    "ComplexFaultSurface": complex_fault_surface_to_dict,
-#    "MultiSurface": multi_surface_to_dict
-#    }
+surfaces_from_dict["MultiSurface"] = multi_surface_from_dict