Merge pull request #88 from andr1976:validation-cases

Fix validation cases #87
andr1976 · Dec 26, 2024 · 1d66717 · 1d66717
2 parents cad991b + a58e4c5
commit 1d66717
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 26 deletions.
diff --git a/src/hyddown/__pycache__/hdclass.cpython-38.pyc b/src/hyddown/__pycache__/hdclass.cpython-38.pyc
diff --git a/src/hyddown/__pycache__/validator.cpython-38.pyc b/src/hyddown/__pycache__/validator.cpython-38.pyc
diff --git a/src/hyddown/hdclass.py b/src/hyddown/hdclass.py
@@ -827,26 +827,29 @@ def plot(self, filename=None, verbose=True):
         if filename != None:
             plt.savefig(filename + "_main.png")
 
-        if filename != None:
-            plt.figure(2, figsize=(12, 7), dpi=300)
-        else:
-            plt.figure(2)
-
-        self.fluid.build_phase_envelope("None")
-        PE = self.fluid.get_phase_envelope_data()
-
-        plt.plot(PE.T, PE.p, "-", label="HEOS Phase Envelope", color="g")
-        plt.plot(self.T_fluid, self.P, "-.", label="P/T fluid trajectory", color="b")
-        plt.plot(self.T_fluid[0], self.P[0], "o", label="Start", color="b")
-        plt.plot(self.T_fluid[-1], self.P[-1], ".", label="End", color="b")
-        plt.xlabel("Temperature [K]")
-        plt.ylabel("Pressure [Pa]")
-        plt.legend(loc="best")
-        plt.tight_layout()
-
-        if filename != None:
-            plt.savefig(filename + "_envelope.png")
+        try:
+            self.fluid.build_phase_envelope("None")
+            PE = self.fluid.get_phase_envelope_data()
+            if filename != None:
+                plt.figure(2, figsize=(12, 7), dpi=300)
+            else:
+                plt.figure(2)
 
+            plt.plot(PE.T, PE.p, "-", label="HEOS Phase Envelope", color="g")
+            plt.plot(
+                self.T_fluid, self.P, "-.", label="P/T fluid trajectory", color="b"
+            )
+            plt.plot(self.T_fluid[0], self.P[0], "o", label="Start", color="b")
+            plt.plot(self.T_fluid[-1], self.P[-1], ".", label="End", color="b")
+            plt.xlabel("Temperature [K]")
+            plt.ylabel("Pressure [Pa]")
+            plt.legend(loc="best")
+            plt.tight_layout()
+
+            if filename != None:
+                plt.savefig(filename + "_envelope.png")
+        except:
+            print("Failed to build and plot phase envelope.")
         if verbose:
             plt.show()
 

diff --git a/validation/Air_3-7kPa_21mm.yml b/validation/Air_3-7kPa_21mm.yml
@@ -13,7 +13,6 @@ calculation:
   type: "energybalance"
   time_step: 0.05
   end_time: 80.
-  eta: 1
 valve:
   flow: "filling"
   type: "orifice"

diff --git a/validation/Air_3-7kPa_271mm.yml b/validation/Air_3-7kPa_271mm.yml
@@ -13,7 +13,6 @@ calculation:
   type: "energybalance"
   time_step: 0.05
   end_time: 80.
-  eta: 1
 valve:
   flow: "filling"
   type: "orifice"

diff --git a/validation/Byrnes_run8.yml b/validation/Byrnes_run8.yml
@@ -13,7 +13,6 @@ calculation:
   type: "energybalance"
   time_step: 0.1
   end_time: 480.
-  eta: 1
 valve:
   flow: "discharge"
   type: "orifice"

diff --git a/validation/N2_Exp_I1.yml b/validation/N2_Exp_I1.yml
@@ -13,7 +13,6 @@ calculation:
   type: "energybalance"
   time_step: 0.05
   end_time: 100.
-  eta: 1
 valve:
   flow: "discharge"
   type: "orifice"

diff --git a/validation/Striednig_fillingH2.yml b/validation/Striednig_fillingH2.yml
@@ -13,7 +13,6 @@ calculation:
   type: "energybalance"
   time_step: 0.02
   end_time: 240.
-  eta: 1
 valve:
   flow: "filling"
   type: "orifice"

diff --git a/validation/dischargeH2_woodfield.yml b/validation/dischargeH2_woodfield.yml
@@ -13,7 +13,6 @@ calculation:
   type: "energybalance"
   time_step: 0.01
   end_time: 50.
-  eta: 1.0
 valve:
   flow: "discharge"
   type: "orifice"

diff --git a/validation/fillingH2_woodfield.yml b/validation/fillingH2_woodfield.yml
@@ -13,7 +13,6 @@ calculation:
   type: "energybalance"
   time_step: 0.1
   end_time: 50.
-  eta: 1
 valve:
   flow: "filling"
   type: "mdot"