GridCalEngine 5.1.55__tar.gz → 5.1.57__tar.gz

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/DataStructures/__init__.py

@@ -27,3 +27,4 @@ from GridCalEngine.DataStructures.fluid_turbine_data import FluidTurbineData
 from GridCalEngine.DataStructures.fluid_pump_data import FluidPumpData
 from GridCalEngine.DataStructures.fluid_p2x_data import FluidP2XData
 from GridCalEngine.DataStructures.fluid_path_data import FluidPathData
+from GridCalEngine.DataStructures.numerical_circuit import compile_numerical_circuit_at, NumericalCircuit

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/Devices/Aggregation/area.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+from __future__ import annotations
 
 from typing import Union
 from GridCalEngine.Devices.Parents.editable_device import EditableDevice, DeviceType
@@ -23,7 +23,7 @@ from GridCalEngine.Devices.Parents.editable_device import EditableDevice, Device
 class GenericAreaGroup(EditableDevice):
 
     def __init__(self, name='', code='', idtag: Union[str, None] = None,
-                 device_type=DeviceType.GenericArea, latitude=0.0, longitude=0.0):
+                 device_type=DeviceType.GenericArea, latitude=0.0, longitude=0.0, color: str | None = None):
         """
 
         :param name:
@@ -41,8 +41,11 @@ class GenericAreaGroup(EditableDevice):
         self.latitude = latitude
         self.longitude = longitude
 
+        self.color = color if color is not None else self.rnd_color()
+
         self.register(key='longitude', units='deg', tpe=float, definition='longitude.', profile_name='')
         self.register(key='latitude', units='deg', tpe=float, definition='latitude.', profile_name='')
+        self.register(key='color', units='', tpe=str, definition='Color to paint the SE in the map diagram')
 
 
 class Area(GenericAreaGroup):

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/Devices/Branches/tap_changer.py

@@ -385,7 +385,7 @@ class TapChanger:
 
         if self._negative_low:
             self.asymmetry_angle = float(asymmetry_angle)  # assymetry angle (Theta)
-            self._total_positions = int(high-low+1)  # total number of positions
+            self._total_positions = int(high - low + 1)  # total number of positions
             self.dV = float(stepVoltageIncrement / 100)  # voltage increment in p.u.
             self.neutral_position = int(neutral - low + 1)  # neutral position
             self.normal_position = int(normal - low + 1)  # normal position
@@ -394,7 +394,7 @@ class TapChanger:
 
         else:
             self.asymmetry_angle = float(asymmetry_angle)  # assymetry angle (Theta)
-            self._total_positions = int(high-low+1)  # total number of positions
+            self._total_positions = int(high - low + 1)  # total number of positions
             self.dV = float(stepVoltageIncrement / 100)  # voltage increment in p.u.
             self.neutral_position = int(neutral)  # neutral position
             self.normal_position = int(normal)  # normal position
@@ -424,7 +424,7 @@ class TapChanger:
             step = self.tap_position + low - 1
         else:
             low = 0
-            high = self.total_positions-1
+            high = self.total_positions - 1
             normal = self.normal_position
             neutral = self.neutral_position
             sVI = self.dV * 100

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/Devices/Fluid/fluid_injection_template.py

@@ -14,11 +14,15 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
 
 from typing import Union
+import numpy as np
 from GridCalEngine.Devices.Parents.physical_device import PhysicalDevice
 from GridCalEngine.Devices.Fluid.fluid_node import FluidNode
 from GridCalEngine.Devices.Injections.generator import Generator
+from GridCalEngine.Devices.profile import Profile
+from GridCalEngine.Devices.Aggregation.facility import Facility
 from GridCalEngine.enumerations import BuildStatus, DeviceType
 
 
@@ -52,12 +56,19 @@ class FluidInjectionTemplate(PhysicalDevice):
                                 code=code,
                                 device_type=device_type)
 
+        self.active = True
+        self._active_prof = Profile(default_value=self.active, data_type=bool)
+
         self.efficiency = float(efficiency)  # MWh/m3
         self.max_flow_rate = float(max_flow_rate)  # m3/s
         self._plant: FluidNode = plant
         self._generator: Generator = generator
         self.build_status = build_status
 
+        self.facility: Facility | None = None
+
+        self.register(key='active', units='', tpe=bool, definition='Is the load active?', profile_name='active_prof')
+
         self.register(key='efficiency', units="MWh/m3", tpe=float,
                       definition="Power plant energy production per fluid unit")
         self.register(key='max_flow_rate', units="m3/s", tpe=float, definition="maximum fluid flow")
@@ -68,6 +79,9 @@ class FluidInjectionTemplate(PhysicalDevice):
         self.register(key='build_status', units='', tpe=BuildStatus,
                       definition='Branch build status. Used in expansion planning.')
 
+        self.register(key='facility', units='', tpe=DeviceType.FacilityDevice,
+                      definition='Facility where this is located', editable=True)
+
     @property
     def plant(self) -> FluidNode:
         """
@@ -102,3 +116,20 @@ class FluidInjectionTemplate(PhysicalDevice):
         """
         if isinstance(val, Generator):
             self._generator = val
+
+    @property
+    def active_prof(self) -> Profile:
+        """
+        Cost profile
+        :return: Profile
+        """
+        return self._active_prof
+
+    @active_prof.setter
+    def active_prof(self, val: Union[Profile, np.ndarray]):
+        if isinstance(val, Profile):
+            self._active_prof = val
+        elif isinstance(val, np.ndarray):
+            self._active_prof.set(arr=val)
+        else:
+            raise Exception(str(type(val)) + 'not supported to be set into a active_prof')

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/Devices/Fluid/fluid_node.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
 
 from typing import Union
 import numpy as np
@@ -38,7 +39,8 @@ class FluidNode(PhysicalDevice):
                  spillage_cost: float = 1000.0,
                  inflow: float = 0.0,
                  bus: Union[None, Bus] = None,
-                 build_status: BuildStatus = BuildStatus.Commissioned):
+                 build_status: BuildStatus = BuildStatus.Commissioned,
+                 color: str | None = None):
         """
         FluidNode
         :param name: name of the node
@@ -68,6 +70,8 @@ class FluidNode(PhysicalDevice):
         self._bus: Bus = bus
         self.build_status = build_status
 
+        self.color = color if color is not None else "#00aad4"  # nice blue color
+
         self._inflow_prof = Profile(default_value=self.inflow, data_type=float)  # m3/s
         self._spillage_cost_prof = Profile(default_value=self.spillage_cost, data_type=float)  # e/(m3/s)
 
@@ -105,6 +109,8 @@ class FluidNode(PhysicalDevice):
                       definition='Flow of fluid coming from the rain',
                       profile_name='inflow_prof')
 
+        self.register(key='color', units='', tpe=str, definition='Color to paint the device in the map diagram')
+
     @property
     def spillage_cost_prof(self) -> Profile:
         """

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/Devices/Fluid/fluid_path.py

@@ -36,7 +36,8 @@ class FluidPath(PhysicalDevice):
                  source: FluidNode = None,
                  target: FluidNode = None,
                  min_flow: float = 0.0,
-                 max_flow: float = 0.0):
+                 max_flow: float = 0.0,
+                 color: str | None = None):
         """
         Fluid path
         :param name:Name of the fluid transporter
@@ -46,6 +47,7 @@ class FluidPath(PhysicalDevice):
         :param target: target for the fluid (direction matters)
         :param min_flow: minimum flow (m3/s)
         :param max_flow: maximum flow (m3/s)
+        :param color: color of the fluid
         """
         PhysicalDevice.__init__(self,
                                 name=name,
@@ -58,6 +60,8 @@ class FluidPath(PhysicalDevice):
         self.min_flow = float(min_flow)
         self.max_flow = float(max_flow)
 
+        self.color = color if color is not None else "#00aad4"  # nice blue color
+
         # Line locations
         self._locations: LineLocations = LineLocations()
 
@@ -66,6 +70,7 @@ class FluidPath(PhysicalDevice):
         self.register(key='min_flow', units="m3/s", tpe=float, definition="Minimum flow")
         self.register(key='max_flow', units="m3/s", tpe=float, definition="Maximum flow")
         self.register(key='locations', units='', tpe=SubObjectType.LineLocations, definition='Locations', editable=False)
+        self.register(key='color', units='', tpe=str, definition='Color to paint the device in the map diagram')
 
     def copy(self):
         """

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/Devices/Substation/substation.py

@@ -73,7 +73,8 @@ class Substation(GenericAreaGroup):
                                   code=code,
                                   device_type=DeviceType.SubstationDevice,
                                   latitude=latitude,
-                                  longitude=longitude)
+                                  longitude=longitude,
+                                  color=color,)
 
         self._area: Union[Area, None] = area
         self._zone: Union[Zone, None] = zone
@@ -94,8 +95,6 @@ class Substation(GenericAreaGroup):
 
         self.terrain_roughness: float = float(terrain_roughness)
 
-        self.color = color if color is not None else "#3d7d95"
-
         self.register(key="area", units="", tpe=DeviceType.AreaDevice,
                       definition="Substation area, altenativelly this can be obtained from the zone")
 
@@ -137,8 +136,6 @@ class Substation(GenericAreaGroup):
                                  "Rough (forest, small houses): 1.0~1.5\n"
                                  "Very rough (Large buildings):1.0~4.0")
 
-        self.register(key='color', units='', tpe=str, definition='Color to paint the SE in the map diagram')
-
     @property
     def area(self) -> Union[Area, None]:
         """

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/Devices/assets.py

@@ -618,6 +618,9 @@ class Assets:
         """
         try:
             self._lines.remove(obj)
+
+            self.delete_groupings_with_object(obj=obj)
+
         except ValueError:
             pass
 
@@ -661,6 +664,7 @@ class Assets:
         """
         try:
             self._dc_lines.remove(obj)
+            self.delete_groupings_with_object(obj=obj)
         except ValueError:
             pass
 
@@ -718,6 +722,7 @@ class Assets:
         """
         try:
             self._transformers2w.remove(obj)
+            self.delete_groupings_with_object(obj=obj)
         except ValueError:
             pass
 
@@ -775,6 +780,7 @@ class Assets:
         """
         try:
             self._hvdc_lines.remove(obj)
+            self.delete_groupings_with_object(obj=obj)
         except ValueError:
             pass
 
@@ -825,6 +831,7 @@ class Assets:
         """
         try:
             self._vsc_devices.remove(obj)
+            self.delete_groupings_with_object(obj=obj)
         except ValueError:
             pass
 
@@ -868,6 +875,7 @@ class Assets:
         """
         try:
             self._upfc_devices.remove(obj)
+            self.delete_groupings_with_object(obj=obj)
         except ValueError:
             pass
 
@@ -920,6 +928,7 @@ class Assets:
         """
         try:
             self._switch_devices.remove(obj)
+            self.delete_groupings_with_object(obj=obj)
         except ValueError:
             pass
 
@@ -1056,6 +1065,7 @@ class Assets:
 
         try:
             self._windings.remove(obj)
+            self.delete_groupings_with_object(obj=obj)
         except ValueError:
             pass
 
@@ -3255,16 +3265,31 @@ class Assets:
         """
         self._contingencies.append(obj)
 
-    def delete_contingency(self, obj):
+    def delete_contingency(self, obj, del_group: bool = False):
         """
         Delete zone
         :param obj: index
+        :param del_group: Delete group if empty?
         """
         try:
             self._contingencies.remove(obj)
         except ValueError:
             pass
 
+        if del_group:
+            to_del = list()
+            for grp in self.contingency_groups:
+                found = False
+                for elm in self.contingencies:
+                    if elm.group == grp:
+                        found = True
+
+                if not found:
+                    to_del.append(grp)
+
+            for grp in to_del:
+                self.delete_contingency_group(grp)
+
     # ------------------------------------------------------------------------------------------------------------------
     # Contingency group
     # ------------------------------------------------------------------------------------------------------------------
@@ -3447,16 +3472,31 @@ class Assets:
         """
         self._investments.append(obj)
 
-    def delete_investment(self, obj: dev.Investment):
+    def delete_investment(self, obj: dev.Investment, del_group: bool = False):
         """
         Delete zone
         :param obj: index
+        :param del_group: delete the group?
         """
         try:
             self._investments.remove(obj)
         except ValueError:
             pass
 
+        if del_group:
+            to_del = list()
+            for grp in self.investments_groups:
+                found = False
+                for elm in self.investments:
+                    if elm.group == grp:
+                        found = True
+
+                if not found:
+                    to_del.append(grp)
+
+            for grp in to_del:
+                self.delete_investment_groups(grp)
+
     # ------------------------------------------------------------------------------------------------------------------
     # Remedial action
     # ------------------------------------------------------------------------------------------------------------------
@@ -3487,7 +3527,7 @@ class Assets:
         """
         self._remedial_actions.append(obj)
 
-    def delete_remedial_action(self, obj):
+    def delete_remedial_action(self, obj, del_group: bool = False):
         """
         Delete RemedialAction
         :param obj: index
@@ -3497,6 +3537,20 @@ class Assets:
         except ValueError:
             pass
 
+        if del_group:
+            to_del = list()
+            for grp in self.remedial_action_groups:
+                found = False
+                for elm in self.remedial_actions:
+                    if elm.group == grp:
+                        found = True
+
+                if not found:
+                    to_del.append(grp)
+
+            for grp in to_del:
+                self.delete_remedial_action_group(grp)
+
     # ------------------------------------------------------------------------------------------------------------------
     # Remedial Actions group
     # ------------------------------------------------------------------------------------------------------------------
@@ -3909,7 +3963,7 @@ class Assets:
         Delete area
         :param obj: Area
         """
-        for elm in self.injection_items():
+        for elm in self.get_injection_devices_iter():
             if elm.facility == obj:
                 elm.facility = None
 
@@ -4484,12 +4538,13 @@ class Assets:
         for branch_list in self.get_branch_lists():
             try:
                 branch_list.remove(obj)
+                self.delete_groupings_with_object(obj=obj)
             except ValueError:  # element not found ...
                 pass
 
     def get_branches_wo_hvdc(self) -> list[BRANCH_TYPES]:
         """
-        Return all the branch objects.
+        Return all the real branch objects.
         :return: lines + transformers 2w + hvdc
         """
         lst = list()
@@ -4497,6 +4552,15 @@ class Assets:
             lst += dev_list
         return lst
 
+    def get_branches_wo_hvdc_iter(self) -> Generator[BRANCH_TYPES, None, None]:
+        """
+        Iterator all the real branch objects.
+        :return: lines + transformers 2w + hvdc
+        """
+        for dev_list in self.get_branch_lists_wo_hvdc():
+            for elm in dev_list:
+                yield elm
+
     def get_branches_wo_hvdc_names(self) -> StrVec:
         """
         Get the non HVDC branches' names
@@ -4611,6 +4675,25 @@ class Assets:
             T[i] = bus_dict[elm.bus_to]
         return F, T
 
+    def delete_groupings_with_object(self, obj: BRANCH_TYPES, delete_groups: bool = True):
+        """
+        Delete the dependencies that may come with a branch
+        :param obj: branch object or any object
+        :param delete_groups: delete empty groups too?
+        :return:
+        """
+        for elm in self.contingencies:
+            if elm.device_idtag == obj.idtag:
+                self.delete_contingency(elm, del_group=delete_groups)
+
+        for elm in self.remedial_actions:
+            if elm.device_idtag == obj.idtag:
+                self.delete_remedial_action(elm, del_group=delete_groups)
+
+        for elm in self.investments:
+            if elm.device_idtag == obj.idtag:
+                self.delete_investment(elm, del_group=delete_groups)
+
     def get_hvdc_FT(self) -> Tuple[IntVec, IntVec]:
         """
         get the from and to arrays of indices of HVDC lines
@@ -4683,7 +4766,7 @@ class Assets:
             elms += lst
         return elms
 
-    def injection_items(self) -> Generator[INJECTION_DEVICE_TYPES, None, None]:
+    def get_injection_devices_iter(self) -> Generator[INJECTION_DEVICE_TYPES, None, None]:
         """
         Get a list of all devices that can inject or subtract power from a node
         :return: List of EditableDevice

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/Devices/multi_circuit.py

@@ -1426,7 +1426,7 @@ class MultiCircuit(Assets):
 
             devices_by_type = dict()
 
-            for elm in self.injection_items():
+            for elm in self.get_injection_devices_iter():
 
                 if elm.bus is not None:
                     if group_type == DeviceType.AreaDevice:
@@ -1621,7 +1621,7 @@ class MultiCircuit(Assets):
         val = np.zeros(self.get_bus_number(), dtype=complex)
         bus_dict = self.get_bus_index_dict()
 
-        for elm in self.get_injection_devices():
+        for elm in self.get_injection_devices_iter():
             k = bus_dict[elm.bus]
             val[k] = elm.get_S()
 
@@ -1636,7 +1636,7 @@ class MultiCircuit(Assets):
 
         bus_dict = self.get_bus_index_dict()
 
-        for elm in self.get_injection_devices():
+        for elm in self.get_injection_devices_iter():
             k = bus_dict[elm.bus]
             val[:, k] = elm.get_Sprof()
 
@@ -1850,6 +1850,7 @@ class MultiCircuit(Assets):
         :param grid2: MultiCircuit
         :param detailed_profile_comparison: if true, profiles are compared element-wise with the getters
         :param skip_internals: skip non visible properties
+        :param tolerance
         :return: equal?, Logger with the comparison information
         """
         logger = Logger()

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/IO/cim/cgmes/base.py

@@ -142,7 +142,11 @@ class Base:
         return len(self.references_to_me) > 0
 
     def parse_dict(self, data: Dict[str, str], logger: DataLogger):
+        """
 
+        :param data:
+        :param logger:
+        """
         self.parsed_properties = data
 
         for prop_name, prop_value in data.items():

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/IO/raw/gridcal_to_raw.py

@@ -226,16 +226,20 @@ def get_psse_transformer2w(transformer: dev.Transformer2W, bus_dict: Dict[dev.Bu
     psse_transformer.RATE1_1 = transformer.rate
 
     # i, j, ckt = transformer.code.split("_", 2)
-
     psse_transformer.I = bus_dict[transformer.bus_from]
     psse_transformer.J = bus_dict[transformer.bus_to]
     psse_transformer.CKT = ckt
 
     psse_transformer.CW = 1
     # WINDV1 is the Winding 1 off-nominal turns ratio in pu of Winding1 bus base voltage
-    psse_transformer.WINDV1 = transformer.tap_module
+    mf, mt = transformer.get_virtual_taps()
+    psse_transformer.WINDV1 = transformer.tap_module * mf / mt
     psse_transformer.WINDV2 = 1.0
 
+    V1, V2 = transformer.get_from_to_nominal_voltages()
+    psse_transformer.NOMV1 = V1
+    psse_transformer.NOMV2 = V2
+
     psse_transformer.CZ = 1
     # 1 for resistance and reactance in pu on system MVA base and winding voltage base
     # translating: impedances in the system base, do noting
@@ -247,6 +251,11 @@ def get_psse_transformer2w(transformer: dev.Transformer2W, bus_dict: Dict[dev.Bu
     psse_transformer.MAG1 = transformer.G
     psse_transformer.MAG2 = transformer.B
 
+    # tap changer values
+    psse_transformer.NTP1 = transformer.tap_changer.total_positions
+    psse_transformer.VMA1 = transformer.tap_changer.get_tap_module_max()
+    psse_transformer.VMI1 = transformer.tap_changer.get_tap_module_min()
+
     return psse_transformer
 
 

{GridCalEngine-5.1.55 → GridCalEngine-5.1.57}/GridCalEngine/IO/raw/raw_to_gridcal.py

@@ -19,25 +19,16 @@ from typing import Dict, List, Tuple, Union
 from GridCalEngine.basic_structures import Logger
 import GridCalEngine.Devices as dev
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
-from GridCalEngine.IO.raw.devices.area import RawArea
 from GridCalEngine.IO.raw.devices.branch import RawBranch
 from GridCalEngine.IO.raw.devices.bus import RawBus
 from GridCalEngine.IO.raw.devices.facts import RawFACTS
 from GridCalEngine.IO.raw.devices.generator import RawGenerator
-from GridCalEngine.IO.raw.devices.induction_machine import RawInductionMachine
-from GridCalEngine.IO.raw.devices.inter_area import RawInterArea
 from GridCalEngine.IO.raw.devices.load import RawLoad
 from GridCalEngine.IO.raw.devices.fixed_shunt import RawFixedShunt
 from GridCalEngine.IO.raw.devices.switched_shunt import RawSwitchedShunt
 from GridCalEngine.IO.raw.devices.transformer import RawTransformer
 from GridCalEngine.IO.raw.devices.two_terminal_dc_line import RawTwoTerminalDCLine
 from GridCalEngine.IO.raw.devices.vsc_dc_line import RawVscDCLine
-from GridCalEngine.IO.raw.devices.zone import RawZone
-from GridCalEngine.IO.raw.devices.owner import RawOwner
-from GridCalEngine.IO.raw.devices.substation import RawSubstation
-from GridCalEngine.IO.raw.devices.gne_device import RawGneDevice
-from GridCalEngine.IO.raw.devices.system_switching_device import RawSystemSwitchingDevice
-from GridCalEngine.IO.base.base_circuit import BaseCircuit
 from GridCalEngine.IO.raw.devices.psse_circuit import PsseCircuit
 from GridCalEngine.enumerations import TapChangerTypes
 
@@ -263,7 +254,7 @@ def get_gridcal_generator(psse_elm: RawGenerator, psse_bus_dict: Dict[int, dev.B
                         Pmax=psse_elm.PT,
                         Pmin=psse_elm.PB,
                         active=bool(psse_elm.STAT),
-                        power_factor=psse_elm.WPF)
+                        power_factor=psse_elm.WPF if psse_elm.WPF is not None else 0.8)
 
     if psse_elm.IREG > 0:
         if psse_elm.IREG != psse_elm.I:
@@ -350,31 +341,41 @@ def get_gridcal_transformer(psse_elm: RawTransformer,
             HV = V2
             LV = V1
 
-        elm = dev.Transformer2W(bus_from=bus_from,
-                                bus_to=bus_to,
-                                idtag=psse_elm.idtag,
-                                code=code,
-                                name=name,
-                                HV=HV,
-                                LV=LV,
-                                nominal_power=psse_elm.SBASE1_2,
-                                r=r,
-                                x=x,
-                                g=g,
-                                b=b,
-                                rate=psse_elm.RATE1_1,
-                                contingency_factor=round(contingency_factor, 6),
-                                tap_module=tap_module,
-                                tap_phase=tap_angle,
-                                active=bool(psse_elm.STAT),
-                                mttf=0,
-                                mttr=0)
+        elm = dev.Transformer2W(
+            bus_from=bus_from,
+            bus_to=bus_to,
+            idtag=psse_elm.idtag,
+            code=code,
+            name=name,
+            HV=HV,
+            LV=LV,
+            nominal_power=psse_elm.SBASE1_2,
+            r=r,
+            x=x,
+            g=g,
+            b=b,
+            rate=psse_elm.RATE1_1,
+            contingency_factor=round(contingency_factor, 6),
+            tap_module=1.0,  # it is modified afterwards to account for PSSe not having virtual taps
+            tap_phase=tap_angle,
+            active=bool(psse_elm.STAT),
+            mttf=0,
+            mttr=0
+        )
+
+        mf, mt = elm.get_virtual_taps()
+
+        # we need to discount that PSSe includes the virtual tap inside the normal tap
+        elm.tap_module = tap_module / mf * mt
 
         if psse_elm.COD1 == 0:
-            elm.tap_changer.total_positions = 2
-            elm.tap_changer.neutral_position = 0
-            elm.tap_changer.tap_position = -1
-            elm.tap_changer.dV = round(1 - tap_module, 6)
+            elm.tap_changer.total_positions = psse_elm.NTP1
+            elm.tap_changer.neutral_position = np.floor(psse_elm.NTP1 / 2)
+            elm.tap_changer.tap_position = elm.tap_changer.neutral_position
+            if (psse_elm.NTP1 - 1) > 0:
+                elm.tap_changer.dV = (psse_elm.VMA1 - psse_elm.VMI1) / (psse_elm.NTP1 - 1)
+            else:
+                elm.tap_changer.dV = 0.01
             elm.tap_changer.asymmetry_angle = 90.0
             elm.tap_changer.tc_type = TapChangerTypes.NoRegulation
         else: