Merge pull request #12 from epri-dev/develop_req_SQA

V2.1.5

Author: EPRI-SQA

CHANGELOG.rst

@@ -1,6 +1,12 @@
 
 Changelog
 =========
+2.1.5 (2024-06-12)
+------------------
+* Fixed a FutureWarning for pandas version 2.2.
+* Fixed bugs for single phase model.
+* Fixed a bug for negative sequence performance for Momentary Cessation
+
 2.1.4 (2024-03-29)
 ------------------
 * Added a setting to enable and disable momentary cessation (MC_ENABLE)

setup.py

@@ -38,7 +38,7 @@ def read(*names, **kwargs):
 
 setup(
     name='opender',
-    version='2.1.4',
+    version='2.1.5',
     license='BSD',
     description='Open-source Distributed Energy Resources (DER) Model that represents IEEE Standard 1547-2018 '
                 'requirements for steady-state and dynamic analyses',

src/opender/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.1.4'
+__version__ = '2.1.5'
 
 from .common_file_format import DERCommonFileFormat
 from .common_file_format import DERCommonFileFormatBESS

src/opender/common_file_format/common_file_format.py

@@ -94,8 +94,14 @@ def __init__(self,
         df = pd.concat(frames)
         df = df.reindex(index=self._get_parameter_list())
 
+        def convert_to_numeric(value):
+            try:
+                return pd.to_numeric(value)
+            except ValueError:
+                return value
+
         df["New Index"] = self._get_parameter_list()
-        self.param_inputs = df.reset_index().set_index("New Index")["VALUE"].apply(pd.to_numeric, errors="ignore")
+        self.param_inputs = df.reset_index().set_index("New Index")["VALUE"].apply(convert_to_numeric)
 
         # Nameplate Variables with default values
         self._NP_NORMAL_OP_CAT = "CAT_B"
@@ -973,7 +979,6 @@ def NP_PHASE(self, NP_PHASE):
                 self._NP_PHASE = 'SINGLE'
             else:
                 self._NP_PHASE = 'THREE'
-            raise ValueError("NP_PHASE should be either 'SINGLE' or 'THREE'")
 
     @property
     def NP_TYPE(self):

src/opender/der.py

@@ -140,8 +140,11 @@ def _update_der_input_v_f(self, v: Union[List[float], float] = None, theta: Unio
                 self.der_input.v = v_pu * self.der_file.NP_AC_V_NOM
 
         if theta is not None:
-            if isinstance(theta,(int,float,np.floating,np.int_)):
-                self.der_input.theta = theta
+            if self.der_file.NP_PHASE == "SINGLE":
+                if isinstance(theta,(int,float,np.floating,np.int_)):
+                    self.der_input.theta = theta
+                elif isinstance(theta, list):
+                    self.der_input.theta = theta[0]
             else:
                 self.der_input.theta_a = theta[0]
                 self.der_input.theta_b = theta[1]

src/opender/rt_perf.py

@@ -216,7 +216,7 @@ def calculate_i_block(self):
 
         self.i_pos_pu = (self.i_pos_d_ref_pu + self.i_pos_q_ref_pu * 1j) * np.exp(1j * self.der_input.v_angle)
 
-        self.i_neg_pu = 1j * self.der_input.v_neg_pu * self.der_file.NP_AC_V_NOM * \
+        self.i_neg_pu = -1j * self.der_input.v_neg_pu * self.der_file.NP_AC_V_NOM * \
                                     self.der_file.NP_REACTIVE_SUSCEPTANCE / (
                                             self.der_file.NP_VA_MAX / self.der_file.NP_AC_V_NOM)