improve CYME reader and DSS writer

.gitignore

@@ -128,6 +128,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+testenv/
 
 # Spyder project settings
 .spyderproject

.pre-commit-config.yaml

@@ -14,4 +14,3 @@ repos:
       entry: python -m black
       types: [python]
       args: [--line-length=88, --safe]
-      python_version: python3.6

ditto/consistency/check_transformer_phase_path.py

@@ -54,6 +54,8 @@ def check_transformer_phase_path(model,needs_transformers=False,verbose=True):
         source_name = source.connecting_element
         all_paths = nx.single_source_shortest_path(ditto_graph.graph,source_name)
         break_load = False
+        msgs = []
+
         for load in all_loads:
             load_connection = load.connecting_element
             if load_connection in all_paths:
@@ -75,7 +77,7 @@ def check_transformer_phase_path(model,needs_transformers=False,verbose=True):
                         transformer_low_side = path[i-1]
 
                 ### Check that the low side of the transformer is connected to a line that leads to a load
-                if num_transformers ==1:
+                if num_transformers == 1:
                     load_transformer_map[load.name] = element['name']
                     if model[transformer_names[0]].to_element != transformer_low_side:
                         if verbose:
@@ -121,18 +123,24 @@ def check_transformer_phase_path(model,needs_transformers=False,verbose=True):
                         if element['equipment'] == 'PowerTransformer' and not element['is_substation']:
                             break
                         if element['equipment'] == 'Line':
-                            line_phases = [wire.phase for wire in element['wires'] if wire.phase != 'N'] #Neutral phases not included in the transformer
-                            if not set(high_phases).issubset(set(line_phases)): #MV phase line phase must be able to support transformer phase
-                                if verbose:
-                                    print('Load '+load.name+ ' has incorrect phases '+str(line_phases)+' '+str(high_phases)+' on high side of transformer for line '+element['name'])
-                                result = False
-                                break
-                            if len(line_phases) > len(prev_line_phases):
-                                if verbose:
-                                    print('Number of phases increases along line '+element['name'] +' from '+str(len(prev_line_phases))+' to '+str(len(line_phases)))
-                                result = False
-                                break
-                            prev_line_phases = line_phases
+                            if not "wires" in element.keys():
+                                msg = f"Warning: Line {element['equipment_name']} has no wires!"
+                                if not msg in msgs:
+                                    print(msg)
+                                    msgs.append(msg)
+                            else:
+                                line_phases = [wire.phase for wire in element['wires'] if wire.phase != 'N'] #Neutral phases not included in the transformer
+                                if not set(high_phases).issubset(set(line_phases)): #MV phase line phase must be able to support transformer phase
+                                    if verbose:
+                                        print('Load '+load.name+ ' has incorrect phases '+str(line_phases)+' '+str(high_phases)+' on high side of transformer for line '+element['name'])
+                                    result = False
+                                    break
+                                if len(line_phases) > len(prev_line_phases):
+                                    if verbose:
+                                        print('Number of phases increases along line '+element['name'] +' from '+str(len(prev_line_phases))+' to '+str(len(line_phases)))
+                                    result = False
+                                    break
+                                prev_line_phases = line_phases
                         elif element['equipment'] != 'Regulator':
                             print('Warning: element of type '+element['equipment'] +' found on path to load '+load.name)
 
@@ -143,13 +151,21 @@ def check_transformer_phase_path(model,needs_transformers=False,verbose=True):
                     for i in range(len(path)-1):
                         element = ditto_graph.graph[path[i]][path[i+1]]
                         if element['equipment'] == 'Line':
-                            line_phases = [wire.phase for wire in element['wires'] if wire.phase != 'N'] #Neutral phases not included in the transformer
-                            if len(line_phases) > len(prev_line_phases):
-                                if verbose:
-                                    print('Number of phases increases along line '+element['name'] +' from '+str(len(prev_line_phases))+' to '+str(len(line_phases)))
-                                result = False
-                                break
-                            prev_line_phases = line_phases
+                            if not "wires" in element.keys():
+                                msg = f"Warning: Line {element['equipment_name']} has no wires!"
+                                if not msg in msgs:
+                                    print(msg)
+                                    msgs.append(msg)
+                            else:
+                                line_phases = [wire.phase for wire in element['wires'] if wire.phase != 'N'] #Neutral phases not included in the transformer
+                                if len(line_phases) > len(prev_line_phases):
+                                    msg = 'Number of phases increases along line '+element['name'] +' from '+str(len(prev_line_phases))+' to '+str(len(line_phases))
+                                    if verbose and not msg in msgs:
+                                        print(msg)
+                                        msgs.append(msg)
+                                    result = False
+                                    break
+                                prev_line_phases = line_phases
                         elif element['equipment'] != 'Regulator' and element['equipment'] != 'PowerTransformer':
                             print('Warning: element of type '+element['equipment'] +' found on path to load '+load.name)
     return result

ditto/metrics/network_analysis.py

@@ -157,7 +157,7 @@ def __init__(self, model, compute_network=True, *args):
             self.edge_equipment_name = None
 
         modifier = system_structure_modifier(self.model, source)
-        modifier.set_nominal_voltages()
+        modifier.set_nominal_voltages_recur()
         # IMPORTANT: the following two parameters define what is LV and what is MV.
         # - Object is LV if object.nominal_voltage<=LV_threshold
         # - Object is MV if MV_threshold>=object.nominal_voltage>LV_threshold
@@ -205,12 +205,10 @@ def add_feeder_information(
         """
         Use this function to add the feeder information if available.
 
-        :param feeder_names: List of the feeder names
-        :type feeder_names: List(str)
-        :param feeder_nodes: List of lists containing feeder nodes
-        :type feeder_nodes: List of Lists of strings
-        :param feeder_types: List of feeder types.
-        :type feeder_types: List or string if all feeders have the same type
+        :param feeder_names: List(str) of the feeder names
+        :param feeder_nodes: List of lists of strings containing feeder nodes
+        :param substations: List(str) of the substations names
+        :param feeder_types: List(str) of feeder types or string if all feeders have the same type
         """
         if len(feeder_names) != len(feeder_nodes):
             raise ValueError(
@@ -465,7 +463,7 @@ def tag_objects(self):
                                 hasattr(prev_obj, "feeder_name")
                                 and hasattr(prev_obj, "name")
                                 and prev_obj.feeder_name is not None
-                                and prev_obj.feeder_name is not ""
+                                and prev_obj.feeder_name != ""
                                 and prev_obj.name
                                 in self.node_feeder_mapping  # In case a default value has been set for all feeder_name values
                             ):
@@ -498,7 +496,7 @@ def tag_objects(self):
                                 hasattr(prev_obj, "feeder_name")
                                 and hasattr(prev_obj, "name")
                                 and prev_obj.feeder_name is not None
-                                and prev_obj.feeder_name is not ""
+                                and prev_obj.feeder_name != ""
                                 and prev_obj.name
                                 in self.node_feeder_mapping  # In case a default value has been set for all feeder_name values
                             ):
@@ -525,7 +523,7 @@ def tag_objects(self):
                                 hasattr(prev_obj, "feeder_name")
                                 and hasattr(prev_obj, "name")
                                 and prev_obj.feeder_name is not None
-                                and prev_obj.feeder_name is not ""
+                                and prev_obj.feeder_name != ""
                                 and prev_obj.name
                                 in self.node_feeder_mapping  # In case a default value has been set for all feeder_name values
                             ):

ditto/models/base.py

@@ -2,7 +2,6 @@
 from __future__ import absolute_import, division, print_function
 from builtins import super, range, zip, round, map
 
-import warnings
 from traitlets.traitlets import (
     ObserveHandler,
     _deprecated_method,
@@ -29,9 +28,7 @@ def set_name(self, model):
         try:
             name = self.name
             if name in model.model_names:
-                warnings.warn("Duplicate name %s being set. Object overwritten." % name)
-                logger.debug("Duplicate name %s being set. Object overwritten." % name)
-                logger.debug(model.model_names[name], self)
+                logger.warn("Duplicate name %s being set. Object overwritten." % name)
             model.model_names[name] = self
         except AttributeError:
             pass

ditto/models/capacitor.py

@@ -122,6 +122,14 @@ class Capacitor(DiTToHasTraits):
         help="""Flag that indicates wheter the element is inside a substation or not.""",
         default_value=False,
     )
+    vmax = Float(
+        help="""Maximum voltage for control override OFF""", 
+        default_value=None
+    )
+    vmin = Float(
+        help="""Minimum voltage for control override ON""", 
+        default_value=None
+    )
 
     def build(self, model):
         self._model = model

ditto/models/winding.py

@@ -30,6 +30,9 @@ class Winding(DiTToHasTraits):
     nominal_voltage = Float(
         help="""The nominal voltage of the transformer winding""", default_value=None
     )
+    base_voltage = Float(
+        help="""The voltage basis for per unit calculations""", default_value=None
+    )
     voltage_limit = Float(
         help="""The maximum voltage allowed on the PT secondary.""", default_value=None
     )