Merge pull request #24 from NREL-Distribution-Suites/al/erad_v1

minor updates

Author: AadilLatif

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "NREL-erad"
-version="0.1.2"
+version="0.1.3"
 description = "Graph based scalable tool for computing energy resilience metrics for distribution systems."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -35,7 +35,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
 ]
 dependencies = [
-    "grid-data-models~=2.1.3",
+    "grid-data-models~=2.1.4",
     "gdmloader",
     "geopandas",
     "requests",

src/erad/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.1"
+__version__ = "0.0.2"

src/erad/constants.py

@@ -34,12 +34,12 @@
     AssetTypes.transmission_tower: 0.0,
     AssetTypes.distribution_poles: 0.0,
     AssetTypes.transmission_overhead_lines: 30.0,
-    AssetTypes.distribution_overhead_lines: 10.0,
+    AssetTypes.distribution_overhead_lines: 0.0,
     AssetTypes.transformer_mad_mount: 0.3,
-    AssetTypes.transformer_pole_mount: 6.0,
+    AssetTypes.transformer_pole_mount: 4.0,
     AssetTypes.transmission_junction_box: -1.0,
     AssetTypes.distribution_junction_box: -1.0,
-    AssetTypes.switch: 6.0,
+    AssetTypes.switch: 4.0,
 }
 
 ASSET_TYPES = (

src/erad/default_fragility_curves/default_flood_depth.py

@@ -3,6 +3,33 @@
 import erad.models.fragility_curve as frag
 from erad.enums import AssetTypes
 
+
+moderate_mu_meters = {
+    "Class 1": 1.524,
+    "Class 2": 1.463,
+    "Class 3": 1.372,
+    "Class 4": 1.280,
+    "Class 5": 1.219,
+    "Class 6": 1.128,
+    "Class 7": 1.067,
+    "Class 8": 0.975,
+    "Class 9": 0.914,
+    "Class 10": 0.853,
+}
+
+dispersion_values = {
+    "Class 1": 0.45,
+    "Class 2": 0.45,
+    "Class 3": 0.50,
+    "Class 4": 0.50,
+    "Class 5": 0.50,
+    "Class 6": 0.50,
+    "Class 7": 0.55,
+    "Class 8": 0.55,
+    "Class 9": 0.60,
+    "Class 10": 0.60,
+}
+
 DEFAULT_FLOOD_DEPTH_FRAGILITY_CURVES = frag.HazardFragilityCurves(
     asset_state_param="flood_depth",
     curves=[
@@ -17,63 +44,71 @@
             asset_type=AssetTypes.battery_storage,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.35, "m"), Distance(0.50, "m"), 1 / 0.35],
+                parameters=[Distance(0.4, "m"), Distance(0.01, "m"), 0.7],
             ),
         ),
         frag.FragilityCurve(
             asset_type=AssetTypes.distribution_junction_box,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.40, "m"), Distance(1.0, "m"), 1 / 0.40],
+                parameters=[Distance(0.8, "m"), Distance(2.0, "m"), 1 / 0.8],
             ),
         ),
         frag.FragilityCurve(
             asset_type=AssetTypes.distribution_overhead_lines,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.35, "m"), Distance(1.0, "m"), 1 / 0.35],
+                parameters=[
+                    Distance(dispersion_values["Class 4"], "m"),
+                    Distance(0.01, "m"),
+                    moderate_mu_meters["Class 4"],
+                ],
             ),
         ),
         frag.FragilityCurve(
             asset_type=AssetTypes.distribution_poles,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.35, "m"), Distance(1.0, "m"), 1 / 0.35],
+                parameters=[
+                    Distance(dispersion_values["Class 4"], "m"),
+                    Distance(0.01, "m"),
+                    moderate_mu_meters["Class 4"],
+                ],
             ),
         ),
         frag.FragilityCurve(
             asset_type=AssetTypes.distribution_underground_cables,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.8, "m"), Distance(1.0, "m"), 1 / 0.8],
+                parameters=[Distance(0.8, "m"), Distance(2.0, "m"), 1 / 0.8],
             ),
         ),
         frag.FragilityCurve(
             asset_type=AssetTypes.solar_panels,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.35, "m"), Distance(0.6, "m"), 1 / 0.35],
+                parameters=[Distance(0.4, "m"), Distance(0.01, "m"), 0.8],
             ),
         ),
         frag.FragilityCurve(
             asset_type=AssetTypes.substation,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.40, "m"), Distance(1.0, "m"), 1 / 0.4],
+                parameters=[Distance(0.01, "m"), Distance(0.01, "m"), 1],
             ),
         ),
         frag.FragilityCurve(
             asset_type=AssetTypes.transformer_mad_mount,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.35, "m"), Distance(0.6, "m"), 1 / 0.35],
+                parameters=[Distance(0.5, "m"), Distance(0.01, "m"), 0.9],
             ),
         ),
         frag.FragilityCurve(
             asset_type=AssetTypes.transformer_pole_mount,
             prob_function=frag.ProbabilityFunction(
                 distribution="lognorm",
-                parameters=[Distance(0.30, "m"), Distance(0.8, "m"), 1 / 0.3],
+                parameters=[Distance(0.5, "m"), Distance(0.01, "m"), 1.2],
             ),
         ),
         frag.FragilityCurve(

src/erad/models/fragility_curve.py

@@ -74,11 +74,16 @@ def example(cls) -> "HazardFragilityCurves":
         )
 
     def plot(
-        self, file_path: Path, x_min: float = 0, x_max: float = None, number_of_points: int = 100
+        self,
+        file_path: Path | None = None,
+        x_min: float = 0,
+        x_max: float = 4,
+        number_of_points: int = 100,
     ):
         """Plot the fragility curves."""
-        file_path = Path(file_path)
-        assert file_path.suffix.lower() == ".html", "File path should be an HTML file"
+        if file_path is not None:
+            file_path = Path(file_path)
+            assert file_path.suffix.lower() == ".html", "File path should be an HTML file"
 
         if not self.curves:
             raise ValueError("No curves to plot")
@@ -113,4 +118,5 @@ def plot(
         )
 
         fig.show()
-        fig.write_html(file_path)
+        if file_path:
+            fig.write_html(file_path)

src/erad/systems/asset_system.py

@@ -70,12 +70,14 @@ def get_undirected_graph(self):
         return g
 
     @classmethod
-    def from_gdm(cls, dist_system: DistributionSystem) -> "AssetSystem":
+    def from_gdm(
+        cls, dist_system: DistributionSystem, flip_coordinates: bool = False
+    ) -> "AssetSystem":
         """Create a AssetSystem from a DistributionSystem."""
         asset_map = AssetSystem.map_asets(dist_system)
         # list_of_assets = AssetSystem._build_assets(asset_map)
         system = AssetSystem(auto_add_composed_components=True)
-        list_of_assets = system._build_assets(asset_map)
+        list_of_assets = system._build_assets(asset_map, flip_coordinates)
         system.add_components(*list_of_assets)
         return system
 
@@ -177,10 +179,14 @@ def _prepopulate_bus_assets(
         self,
         asset_map: dict[AssetTypes : list[gdc.DistributionComponentBase]],
         list_of_assets: dict[str, Asset],
+        flip_coordinates: bool = False,
     ):
         for asset_type, components in asset_map.items():
             for component in components:
-                lat, long = AssetSystem._get_component_coordinate(component)
+                if flip_coordinates:
+                    long, lat = AssetSystem._get_component_coordinate(component)
+                else:
+                    lat, long = AssetSystem._get_component_coordinate(component)
                 if isinstance(component, gdc.DistributionBus):
                     list_of_assets[str(component.uuid)] = Asset(
                         name=component.name,
@@ -197,21 +203,26 @@ def _prepopulate_bus_assets(
     def _build_assets(
         self,
         asset_map: dict[AssetTypes : list[gdc.DistributionComponentBase]],
+        flip_coordinates: bool = False,
     ) -> list[Asset]:
         list_of_assets: dict[str, Asset] = {}
 
-        self._prepopulate_bus_assets(asset_map, list_of_assets)
+        self._prepopulate_bus_assets(asset_map, list_of_assets, flip_coordinates)
 
         for asset_type, components in asset_map.items():
             for component in components:
                 if not isinstance(component, gdc.DistributionBus):
-                    lat, long = AssetSystem._get_component_coordinate(component)
+                    if flip_coordinates:
+                        long, lat = AssetSystem._get_component_coordinate(component)
+                    else:
+                        lat, long = AssetSystem._get_component_coordinate(component)
                     if hasattr(component, "buses"):
                         connections = [c.uuid for c in component.buses]
                     elif hasattr(component, "bus"):
                         connections = [component.bus.uuid]
                     else:
                         connections = []
+
                     list_of_assets[str(component.uuid)] = Asset(
                         name=component.name,
                         connections=connections,