zz/dss_writer_edits

.gitignore

@@ -176,6 +176,7 @@ cython_debug/
 *.dbl
 *.DBL
 .qodo
+.DS_Store
 
 # OpenDSS output artifacts (written by tests / writer)
 /*.dss

src/ditto/constants.py

@@ -0,0 +1 @@
+LL_LN_CONVERSION_FACTOR = 1.732

src/ditto/enumerations.py

@@ -6,15 +6,18 @@ class OpenDSSFileTypes(str, Enum):
     COORDINATE_FILE = "BusCoords.dss"
     LOADSHAPE_FILE = "LoadShape.dss"
     WIRES_FILE = "WireData.dss"
+    CABLES_FILE = "CableData.dss"
     LINE_GEOMETRIES_FILE = "LineGeometry.dss"
     LINECODES_FILE = "LineCodes.dss"
     SWITCH_CODES_FILE = "SwitchCodes.dss"
     FUSE_CODES_FILE = "FuseCodes.dss"
+    RECLOSER_CODES_FILE = "RecloserCodes.dss"
     TRANSFORMERS_FILE = "Transformers.dss"
     CAPACITORS_FILE = "Capacitors.dss"
     LINES_FILE = "Lines.dss"
     LOADS_FILE = "Loads.dss"
     SOLAR_FILE = "Solar.dss"
     SWITCH_FILE = "Switches.dss"
     FUSE_FILE = "Fuses.dss"
+    RECLOSER_FILE = "Reclosers.dss"
     REGULATOR_CONTROLLERS_FILE = "RegControllers.dss"

src/ditto/writers/opendss/__init__.py

@@ -13,6 +13,9 @@
 )
 from ditto.writers.opendss.equipment.geometry_branch_equipment import GeometryBranchEquipmentMapper
 from ditto.writers.opendss.equipment.bare_conductor_equipment import BareConductorEquipmentMapper
+from ditto.writers.opendss.equipment.concentric_cable_equipment import (
+    ConcentricCableEquipmentMapper,
+)
 from ditto.writers.opendss.components.distribution_capacitor import DistributionCapacitorMapper
 from ditto.writers.opendss.components.distribution_load import DistributionLoadMapper
 from ditto.writers.opendss.components.distribution_transformer import DistributionTransformerMapper
@@ -34,3 +37,10 @@
 )
 from ditto.writers.opendss.profile import ProfileMapper
 from ditto.writers.opendss.components.distribution_solar import DistributionSolarMapper
+
+from ditto.writers.opendss.components.matrix_impedance_recloser import (
+    MatrixImpedanceRecloserMapper,
+)
+from ditto.writers.opendss.equipment.matrix_impedance_recloser_equipment import (
+    MatrixImpedanceRecloserEquipmentMapper,
+)

src/ditto/writers/opendss/components/distribution_branch.py

@@ -16,11 +16,11 @@ def __init__(self, model: Component, system: DistributionSystem):
     opendss_file = OpenDSSFileTypes.LINES_FILE.value
 
     def map_name(self):
-        self.opendss_dict["Name"] = self.model.name
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
 
     def map_buses(self):
-        self.opendss_dict["Bus1"] = self.model.buses[0].name
-        self.opendss_dict["Bus2"] = self.model.buses[1].name
+        self.opendss_dict["Bus1"] = self.get_opendss_safe_name(self.model.buses[0].name)
+        self.opendss_dict["Bus2"] = self.get_opendss_safe_name(self.model.buses[1].name)
         for phase in self.model.phases:
             if phase != Phase.N:
                 self.opendss_dict["Bus1"] += self.phase_map[phase]

src/ditto/writers/opendss/components/distribution_bus.py

@@ -14,7 +14,7 @@ def __init__(self, model: Component, system: DistributionSystem):
     opendss_file = OpenDSSFileTypes.COORDINATE_FILE.value
 
     def map_name(self):
-        self.opendss_dict["Name"] = self.model.name
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
 
     def map_coordinate(self):
         if hasattr(self.model.coordinate, "x"):

src/ditto/writers/opendss/components/distribution_capacitor.py

@@ -5,6 +5,7 @@
 
 from ditto.writers.opendss.opendss_mapper import OpenDSSMapper
 from ditto.enumerations import OpenDSSFileTypes
+from ditto.constants import LL_LN_CONVERSION_FACTOR
 
 
 class DistributionCapacitorMapper(OpenDSSMapper):
@@ -19,16 +20,18 @@ def map_in_service(self):
         self.opendss_dict["enabled"] = self.model.in_service
 
     def map_name(self):
-        self.opendss_dict["Name"] = self.model.name
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
 
     def map_bus(self):
-        self.opendss_dict["Bus1"] = self.model.bus.name
+        self.opendss_dict["Bus1"] = self.get_opendss_safe_name(self.model.bus.name)
         num_phases = len(self.model.phases)
         for phase in self.model.phases:
             self.opendss_dict["Bus1"] += self.phase_map[phase]
         # TODO: Should we include the phases its connected to here?
         nom_voltage = self.model.bus.rated_voltage.to("kV").magnitude
-        self.opendss_dict["kV"] = nom_voltage if num_phases == 1 else nom_voltage * 1.732
+        self.opendss_dict["kV"] = (
+            nom_voltage if num_phases == 1 else nom_voltage * LL_LN_CONVERSION_FACTOR
+        )
 
     def map_phases(self):
         if (

src/ditto/writers/opendss/components/distribution_load.py

@@ -6,6 +6,7 @@
 
 from ditto.writers.opendss.opendss_mapper import OpenDSSMapper
 from ditto.enumerations import OpenDSSFileTypes
+from ditto.constants import LL_LN_CONVERSION_FACTOR
 
 
 class DistributionLoadMapper(OpenDSSMapper):
@@ -17,23 +18,25 @@ def __init__(self, model: Component, system: DistributionSystem):
     opendss_file = OpenDSSFileTypes.LOADS_FILE.value
 
     def map_in_service(self):
-        self.opendss_dict["enabled"] = self.model.in_service
+        self.opendss_dict["Enabled"] = self.model.in_service
 
     def map_name(self):
-        self.opendss_dict["Name"] = self.model.name
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
 
         profile_name = self.get_profile_name(self.model)
         if profile_name:
             self.opendss_dict["Yearly"] = profile_name
 
     def map_bus(self):
         num_phases = len(self.model.phases)
-        self.opendss_dict["Bus1"] = self.model.bus.name
+        self.opendss_dict["Bus1"] = self.get_opendss_safe_name(self.model.bus.name)
         for phase in self.model.phases:
             self.opendss_dict["Bus1"] += self.phase_map[phase]
         # TODO: Should we include the phases its connected to here?
         nom_voltage = self.model.bus.rated_voltage.to("kV").magnitude
-        self.opendss_dict["kV"] = nom_voltage if num_phases == 1 else nom_voltage * 1.732
+        self.opendss_dict["kV"] = (
+            nom_voltage if num_phases == 1 else nom_voltage * LL_LN_CONVERSION_FACTOR
+        )
 
     def map_phases(self):
         if (

src/ditto/writers/opendss/components/distribution_regulator.py

@@ -14,10 +14,10 @@ def __init__(self, model: Component, system: DistributionSystem):
     opendss_file = OpenDSSFileTypes.TRANSFORMERS_FILE.value
 
     def map_in_service(self):
-        self.opendss_dict["enabled"] = self.model.in_service
+        self.opendss_dict["Enabled"] = self.model.in_service
 
     def map_name(self):
-        self.opendss_dict["Name"] = self.model.name
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
 
     def map_buses(self):
         buses = []
@@ -27,7 +27,7 @@ def map_buses(self):
         if is_center_tapped:
             for i in range(len(self.model.buses)):
                 bus = self.model.buses[i]
-                buses.append(bus.name)
+                buses.append(self.get_opendss_safe_name(bus.name))
             dss_phases = ""
             for phase in self.model.winding_phases[0]:
                 dss_phases += self.phase_map[phase]
@@ -37,7 +37,7 @@ def map_buses(self):
 
         else:
             for bus in self.model.buses:
-                buses.append(bus.name)
+                buses.append(self.get_opendss_safe_name(bus.name))
             for winding_phases in self.model.winding_phases:
                 dss_phases = ""
                 for phase in winding_phases:
@@ -54,7 +54,7 @@ def map_winding_phases(self):
 
     def map_equipment(self):
         equipment = self.model.equipment
-        self.opendss_dict["XfmrCode"] = equipment.name
+        self.opendss_dict["XfmrCode"] = self.get_opendss_safe_name(equipment.name)
 
     def map_controllers(self):
         ...

src/ditto/writers/opendss/components/distribution_solar.py

@@ -4,6 +4,7 @@
 
 from ditto.writers.opendss.opendss_mapper import OpenDSSMapper
 from ditto.enumerations import OpenDSSFileTypes
+from ditto.constants import LL_LN_CONVERSION_FACTOR
 
 
 class DistributionSolarMapper(OpenDSSMapper):
@@ -15,23 +16,25 @@ def __init__(self, model: DistributionSolar, system: DistributionSystem):
     opendss_file = OpenDSSFileTypes.SOLAR_FILE.value
 
     def map_in_service(self):
-        self.opendss_dict["enabled"] = self.model.in_service
+        self.opendss_dict["Enabled"] = self.model.in_service
 
     def map_name(self):
-        self.opendss_dict["Name"] = self.model.name
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
 
         profile_name = self.get_profile_name(self.model)
         if profile_name:
             self.opendss_dict["Yearly"] = profile_name
 
     def map_bus(self):
         num_phases = len(self.model.phases)
-        self.opendss_dict["Bus1"] = self.model.bus.name
+        self.opendss_dict["Bus1"] = self.get_opendss_safe_name(self.model.bus.name)
         for phase in self.model.phases:
             self.opendss_dict["Bus1"] += self.phase_map[phase]
         # TODO: Should we include the phases its connected to here?
         nom_voltage = self.model.bus.rated_voltage.to("kV").magnitude
-        self.opendss_dict["kV"] = nom_voltage if num_phases == 1 else nom_voltage * 1.732
+        self.opendss_dict["kV"] = (
+            nom_voltage if num_phases == 1 else nom_voltage * LL_LN_CONVERSION_FACTOR
+        )
 
     def map_phases(self):
         self.opendss_dict["Phases"] = len(self.model.phases)

src/ditto/writers/opendss/components/distribution_transformer.py

@@ -15,10 +15,10 @@ def __init__(self, model: Component, system: DistributionSystem):
     opendss_file = OpenDSSFileTypes.TRANSFORMERS_FILE.value
 
     def map_in_service(self):
-        self.opendss_dict["enabled"] = self.model.in_service
+        self.opendss_dict["Enabled"] = self.model.in_service
 
     def map_name(self):
-        self.opendss_dict["Name"] = self.model.name
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
 
     def map_buses(self):
         buses = []
@@ -28,7 +28,7 @@ def map_buses(self):
         if is_center_tapped:
             for i in range(len(self.model.buses)):
                 bus = self.model.buses[i]
-                buses.append(bus.name)
+                buses.append(self.get_opendss_safe_name(bus.name))
             dss_phases = ""
             for phase in self.model.winding_phases[0]:
                 dss_phases += self.phase_map[phase]
@@ -38,7 +38,7 @@ def map_buses(self):
 
         else:
             for bus in self.model.buses:
-                buses.append(bus.name)
+                buses.append(self.get_opendss_safe_name(bus.name))
             for winding_phases in self.model.winding_phases:
                 dss_phases = ""
                 for phase in winding_phases:
@@ -55,4 +55,4 @@ def map_winding_phases(self):
 
     def map_equipment(self):
         equipment = self.model.equipment
-        self.opendss_dict["XfmrCode"] = equipment.name
+        self.opendss_dict["XfmrCode"] = self.get_opendss_safe_name(equipment.name)

src/ditto/writers/opendss/components/distribution_vsource.py

@@ -5,6 +5,7 @@
 
 from ditto.writers.opendss.opendss_mapper import OpenDSSMapper
 from ditto.enumerations import OpenDSSFileTypes
+from ditto.constants import LL_LN_CONVERSION_FACTOR
 
 
 class DistributionVoltageSourceMapper(OpenDSSMapper):
@@ -16,17 +17,17 @@ def __init__(self, model: Component, system: DistributionSystem):
     opendss_file = OpenDSSFileTypes.MASTER_FILE.value
 
     def map_in_service(self):
-        self.opendss_dict["enabled"] = self.model.in_service
+        self.opendss_dict["Enabled"] = self.model.in_service
 
     def map_name(self):
-        self.opendss_dict["Name"] = self.model.name
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
 
         profile_name = self.get_profile_name(self.model)
         if profile_name:
             self.opendss_dict["Yearly"] = profile_name
 
     def map_bus(self):
-        self.opendss_dict["Bus1"] = self.model.bus.name
+        self.opendss_dict["Bus1"] = self.get_opendss_safe_name(self.model.bus.name)
         for phase in self.model.phases:
             self.opendss_dict["Bus1"] += self.phase_map[phase]
 
@@ -64,14 +65,24 @@ def map_equipment(self):
             if num_phases == 1:
                 v_mag = voltage.magnitude
             else:
-                v_mag = voltage.magnitude * 1.732
+                v_mag = voltage.magnitude * LL_LN_CONVERSION_FACTOR
         else:
             if num_phases == 1:
-                v_mag = voltage.magnitude / 1.732
+                v_mag = voltage.magnitude / LL_LN_CONVERSION_FACTOR
             else:
                 v_mag = voltage.magnitude
 
-        v_nom = rated_voltage.magnitude if num_phases == 1 else rated_voltage.magnitude * 1.732
+        if self.model.bus.voltage_type == VoltageTypes.LINE_TO_GROUND:
+            if num_phases == 1:
+                v_nom = rated_voltage.magnitude
+            else:
+                v_nom = rated_voltage.magnitude * LL_LN_CONVERSION_FACTOR
+        else:
+            if num_phases == 1:
+                v_nom = rated_voltage.magnitude / LL_LN_CONVERSION_FACTOR
+            else:
+                v_nom = rated_voltage.magnitude
+
         self.opendss_dict["Angle"] = angle.magnitude
         self.opendss_dict["pu"] = v_mag / v_nom
         self.opendss_dict["BasekV"] = v_nom

src/ditto/writers/opendss/components/geometry_branch.py

@@ -14,8 +14,11 @@ def __init__(self, model: Component, system: DistributionSystem):
     altdss_composition_name = "Line"
     opendss_file = OpenDSSFileTypes.LINES_FILE.value
 
+    def map_name(self):
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
+
     def map_equipment(self):
-        self.opendss_dict["Geometry"] = self.model.equipment.name
+        self.opendss_dict["Geometry"] = self.get_opendss_safe_name(self.model.equipment.name)
 
     def map_in_service(self):
         self.opendss_dict["enabled"] = self.model.in_service

src/ditto/writers/opendss/components/matrix_impedance_branch.py

@@ -13,8 +13,11 @@ def __init__(self, model: Component, system: DistributionSystem):
     altdss_composition_name = "Line"
     opendss_file = OpenDSSFileTypes.LINES_FILE.value
 
+    def map_name(self):
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
+
     def map_equipment(self):
-        self.opendss_dict["LineCode"] = self.model.equipment.name
+        self.opendss_dict["LineCode"] = self.get_opendss_safe_name(self.model.equipment.name)
 
     def map_in_service(self):
         self.opendss_dict["enabled"] = self.model.in_service

src/ditto/writers/opendss/components/matrix_impedance_fuse.py

@@ -14,9 +14,16 @@ def __init__(self, model: Component, system: DistributionSystem):
     altdss_composition_name = "Line"
     opendss_file = OpenDSSFileTypes.FUSE_FILE.value
 
+    def map_name(self):
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
+
     def map_equipment(self):
-        self.opendss_dict["LineCode"] = self.model.equipment.name
+        self.opendss_dict["LineCode"] = self.get_opendss_safe_name(self.model.equipment.name)
 
     def map_is_closed(self):
         # Require every phase to be enabled for the OpenDSS line to be enabled.
-        self.opendss_dict["Switch"] = "true"
+        self.opendss_dict["Switch"] = True
+
+    def map_in_service(self):
+        if not self.model.in_service:
+            self.opendss_dict["Enabled"] = False

src/ditto/writers/opendss/components/matrix_impedance_recloser.py

@@ -0,0 +1,31 @@
+from gdm.distribution import DistributionSystem
+from infrasys import Component
+
+
+from ditto.writers.opendss.components.distribution_branch import DistributionBranchMapper
+from ditto.enumerations import OpenDSSFileTypes
+
+
+class MatrixImpedanceRecloserMapper(DistributionBranchMapper):
+    def __init__(self, model: Component, system: DistributionSystem):
+        super().__init__(model, system)
+
+    altdss_name = "Line_LineCode"
+    altdss_composition_name = "Line"
+    opendss_file = OpenDSSFileTypes.RECLOSER_FILE.value
+
+    def map_name(self):
+        self.opendss_dict["Name"] = self.get_opendss_safe_name(self.model.name)
+
+    def map_equipment(self):
+        self.opendss_dict["LineCode"] = self.get_opendss_safe_name(self.model.equipment.name)
+
+    def map_is_closed(self):
+        # Require every phase to be enabled for the OpenDSS line to be enabled.
+        self.opendss_dict["Switch"] = True
+
+    def map_in_service(self):
+        self.opendss_dict["Enabled"] = self.model.in_service
+
+    def map_controller(self):
+        pass