fixes for gdm v2

docs/usage/mapping_equipment.md

@@ -49,8 +49,6 @@ import shift
 
 BASE_SHIFT_PATH =Path(shift.__file__).parent.parent.parent
 MODELS_FOLFER =  BASE_SHIFT_PATH/"tests"/"models"
-
-print(f"{MODELS_FOLFER=}")
 catalog_sys = DistributionSystem.from_json(MODELS_FOLFER / "p1rhs7_1247.json")
 
 class AreaBasedLoadMapper(EdgeEquipmentMapper):

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nrel-shift"
-version = "0.3.0"
+version = "0.4.0"
 description = "Framework for developing synthetic distribution feeder model."
 readme = "README.md"
 requires-python = ">=3.10"

src/shift/mapper/base_phase_mapper.py

@@ -35,7 +35,6 @@ def _validate_asset_phases(self):
         """Internal method to validate asset phases with respect to node phases."""
         node_phases = self.node_phase_mapping
         for node, asset_map in self.asset_phase_mapping.items():
-            print(node, asset_map)
             phs = set([el for item in asset_map.values() for el in item])
             if not phs.issubset(node_phases[node]):
                 msg = f"{phs=} is not subset of {node_phases[node]=}"

src/shift/mapper/edge_equipment_mapper.py

@@ -110,7 +110,7 @@ def filter_func(x: DistributionTransformerEquipment):
                 return False
             if num_phase < 3 and x.windings[0].num_phases != min(num_phase, 1):
                 return False
-            wdg_voltages = [wdg.nominal_voltage for wdg in x.windings]
+            wdg_voltages = [wdg.rated_voltage for wdg in x.windings]
             for v1, v2 in zip(
                 sorted(voltages, reverse=True), sorted(wdg_voltages, reverse=True)[: len(voltages)]
             ):

src/shift/parcel.py

@@ -26,7 +26,6 @@ def parcels_from_geodataframe(geo_df: GeoDataFrame) -> list[ParcelModel]:
     for idx, geometry in enumerate(geo_df.to_dict(orient="records")):
         name = f"parcel_{idx}"
         geometry_obj = geometry["geometry"]
-        print(geometry)
         match geometry_obj.geom_type:
             case "Point":
                 parcels.append(

src/shift/system_builder.py

@@ -96,7 +96,7 @@ def _add_asset(self, bus_name: str, asset_type: VALID_NODE_TYPES):
             phases=self.phase_mapper.asset_phase_mapping[bus_name][asset_type],
             equipment=self.equipment_mapper.node_asset_equipment_mapping[bus_name][asset_type],
         )
-        asset_obj.pprint()
+
         self._system.add_component(asset_obj)
 
     def _add_bus(self, node_obj: NodeModel):
@@ -105,7 +105,7 @@ def _add_bus(self, node_obj: NodeModel):
             name=node_obj.name,
             phases=self.phase_mapper.node_phase_mapping[node_obj.name],
             coordinate=node_obj.location,
-            nominal_voltage=self.voltage_mapper.node_voltage_mapping[node_obj.name],
+            rated_voltage=self.voltage_mapper.node_voltage_mapping[node_obj.name],
             voltage_type=VoltageTypes.LINE_TO_GROUND,
         )
         self._system.add_component(bus)
@@ -130,7 +130,7 @@ def _get_wdg_voltages(tr_equipment: DistributionTransformerEquipment) -> Positiv
         """Internal method to return winding phase voltages."""
         return PositiveVoltage(
             [
-                wdg.nominal_voltage.to("kilovolt").magnitude
+                wdg.rated_voltage.to("kilovolt").magnitude
                 / (
                     1 / math.sqrt(3)
                     if wdg.voltage_type == VoltageTypes.LINE_TO_GROUND