From a65255505e1eef0ae82450152a4abc5c00bda3ac Mon Sep 17 00:00:00 2001 From: Aadil Latif Date: Fri, 2 May 2025 11:46:43 -0600 Subject: [PATCH] fixes for gdm v2 --- docs/usage/mapping_equipment.md | 2 -- pyproject.toml | 2 +- src/shift/mapper/base_phase_mapper.py | 1 - src/shift/mapper/edge_equipment_mapper.py | 2 +- src/shift/parcel.py | 1 - src/shift/system_builder.py | 6 +++--- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docs/usage/mapping_equipment.md b/docs/usage/mapping_equipment.md index 64c0ef8..f67261d 100644 --- a/docs/usage/mapping_equipment.md +++ b/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): diff --git a/pyproject.toml b/pyproject.toml index 2d56916..75e716b 100644 --- a/pyproject.toml +++ b/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" diff --git a/src/shift/mapper/base_phase_mapper.py b/src/shift/mapper/base_phase_mapper.py index d49c3b8..83007b3 100644 --- a/src/shift/mapper/base_phase_mapper.py +++ b/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]=}" diff --git a/src/shift/mapper/edge_equipment_mapper.py b/src/shift/mapper/edge_equipment_mapper.py index 534f24e..1701bb6 100644 --- a/src/shift/mapper/edge_equipment_mapper.py +++ b/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)] ): diff --git a/src/shift/parcel.py b/src/shift/parcel.py index d3f35ad..89b0060 100644 --- a/src/shift/parcel.py +++ b/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( diff --git a/src/shift/system_builder.py b/src/shift/system_builder.py index 35a4841..f5f5a35 100644 --- a/src/shift/system_builder.py +++ b/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