Merge pull request #53 from chmarti1/issue52

Modifications in response to issue #52 to go back to original call si…
chmarti1 · Oct 10, 2022 · e79e03a · e79e03a
2 parents d65cb2c + 1615c51
commit e79e03a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 26 deletions.
diff --git a/src/pyromat/registry/ig.py b/src/pyromat/registry/ig.py
@@ -1776,25 +1776,25 @@ def state(self, *varg, **kwarg):
 
 
 
-    def T_s(self,s,*varg, **kwarg):
+    def T_s(self,s,p=None, **kwarg):
         """Temperature as a function of entropy
 ** Depreciated - use T() **
         
     T = T_s(s)
         or
     T = T_s(s,p)
-        or
-    T = T_s(s,d)
 
 Accepts unit_energy / unit_matter / unit_temperature
         unit_pressure
         unit_matter / unit_volume
 Returns unit_temperature
 """
-        return self.T(*varg, s=s, **kwarg)
+        if p is not None:
+            return self.T(s=s, p=p)
+        return self.T(s=s, **kwarg)
 
 
-    def T_h(self,h,*varg,**kwarg):
+    def T_h(self,h,p=None,**kwarg):
         """Temperature as a function of enthalpy
 ** Depreciated - use T() **
 
@@ -1810,8 +1810,9 @@ def T_h(self,h,*varg,**kwarg):
         unit_pressure
 Returns unit_temperature
 """
-        # Convert the 
-        return self.T(*varg, h=h, **kwarg)
+        if p is not None:
+            return self.T(h=h, p=p)
+        return self.T(h=h, **kwarg)
 
 
     def p_s(self,s,*varg, **kwarg):

diff --git a/src/pyromat/registry/ig2.py b/src/pyromat/registry/ig2.py
@@ -1245,25 +1245,25 @@ def state(self, *varg, **kwarg):
         return out
 
 
-    def T_s(self,s,*varg, **kwarg):
+    def T_s(self,s,p=None, **kwarg):
         """Temperature as a function of entropy
 ** Depreciated - use T() **
         
-    T = T_s(s)
+   T = T_s(s)
         or
     T = T_s(s,p)
-        or
-    T = T_s(s,d)
 
 Accepts unit_energy / unit_matter / unit_temperature
         unit_pressure
         unit_matter / unit_volume
 Returns unit_temperature
 """
-        return self.T(*varg, s=s, **kwarg)
+        if p is not None:
+            return self.T(s=s, p=p)
+        return self.T(s=s, **kwarg)
 
 
-    def T_h(self,h,*varg,**kwarg):
+    def T_h(self,h,p=None,**kwarg):
         """Temperature as a function of enthalpy
 ** Depreciated - use T() **
 
@@ -1279,8 +1279,9 @@ def T_h(self,h,*varg,**kwarg):
         unit_pressure
 Returns unit_temperature
 """
-        # Convert the 
-        return self.T(*varg, h=h, **kwarg)
+        if p is not None:
+            return self.T(h=h, p=p)
+        return self.T(h=h, **kwarg)
 
 
     def p_s(self,s,*varg, **kwarg):

diff --git a/src/pyromat/registry/igmix.py b/src/pyromat/registry/igmix.py
@@ -1032,24 +1032,24 @@ def Y(self):
         return self._y.copy()
 
 
-    def T_s(self,s,*varg,**kwarg):
+    def T_s(self,s,p=None,**kwarg):
         """Temperature as a function of entropy
 ** Depreciated - use T() **
     T = T_s(s)
         or
     T = T_s(s,p)
-        or
-    T = T_s(s,d)
 
 Accepts unit_energy / unit_matter / unit_temperature
         unit_pressure
         unit_matter / unit_volume
 Returns unit_temperature
 """
-        return self.T(s=s, *varg, **kwarg)
+        if p is not None:
+            return self.T(s=s, p=p)
+        return self.T(s=s, **kwarg)
 
 
-    def T_h(self,h, *varg, **kwarg):
+    def T_h(self,h, p=None, **kwarg):
         """Temperature as a function of enthalpy
 ** Depreciated - use T() **
     T = T_h(h)
@@ -1062,7 +1062,9 @@ def T_h(self,h, *varg, **kwarg):
         unit_pressure
 Returns unit_temperature
 """
-        return self.T(h=h, *varg, **kwarg)
+        if p is not None:
+            return self.T(h=h, p=p)
+        return self.T(h=h, **kwarg)
 
 
     def p_s(self, s, *varg, **kwarg):

diff --git a/src/pyromat/registry/mp1.py b/src/pyromat/registry/mp1.py
@@ -4138,7 +4138,7 @@ def gam(self, *varg, quality=False, **kwarg):
         return cp/cv
 
 
-    def T_s(self, s, *varg, quality=False, **kwarg):
+    def T_s(self, s, p=None, quality=False, **kwarg):
         """Temperature from entropy
 ** Depreciated - use T() **
 
@@ -4154,7 +4154,10 @@ def T_s(self, s, *varg, quality=False, **kwarg):
 
     T,x = T_s(s, p=p, quality=True)
 """
-        T,_,_,x,_ = self._argparse(*varg, s=s, **kwarg)
+        if p is not None:
+            T,_,_,x,_ = self._argparse(s=s, p=p)
+        else:
+            T,_,_,x,_ = self._argparse(s=s, **kwarg)
         if quality:
             return T,x
         return T
@@ -4182,7 +4185,7 @@ def d_s(self, s, *varg, quality=False, **kwarg):
 
 
 
-    def T_h(self, h, *varg, quality=False, **kwarg):
+    def T_h(self, h, p=None, quality=False, **kwarg):
         """Temperature from entropy
 ** Depreciated - use T() **
 
@@ -4198,8 +4201,10 @@ def T_h(self, h, *varg, quality=False, **kwarg):
 
     T,x = T_s(s, p=p, quality=True)
 """
-        T,_,_,x,_ = self._argparse(*varg, h=h, **kwarg)
-
+        if p is not None:
+            T,_,_,x,_ = self._argparse(h=h, p=p)
+        else:
+            T,_,_,x,_ = self._argparse(h=h, **kwarg)
         if quality:
             return T,x
         return T