From ab732823896a25cdd92b35cd6a2a5e89bb793045 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Mon, 7 Sep 2015 08:56:16 +0200 Subject: [PATCH] Disable vapour pressure for MITSW, should solve the remaining issues with #775 --- .../CPIncomp/SolutionFluids.py | 32 ++++++------ dev/incompressible_liquids/json/MITSW.json | 50 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dev/incompressible_liquids/CPIncomp/SolutionFluids.py b/dev/incompressible_liquids/CPIncomp/SolutionFluids.py index 2421de8b..47db67b3 100644 --- a/dev/incompressible_liquids/CPIncomp/SolutionFluids.py +++ b/dev/incompressible_liquids/CPIncomp/SolutionFluids.py @@ -173,25 +173,25 @@ class MITSeaWater(SolutionData): [0.682, 0.681, 0.681, 0.681, 0.680, 0.680, 0.680, 0.679, 0.679, 0.679, 0.679, 0.678, 0.678]]).T #, W/m-K - self.saturation_pressure.source = self.saturation_pressure.SOURCE_EQUATION - self.saturation_pressure.data = np.array([ - [ 0.611, 0.608, 0.604, 0.601, 0.597, 0.593, 0.590, 0.586, 0.582, 0.578, 0.575, 0.571, 0.567], - [ 1.228, 1.221, 1.214, 1.207, 1.199, 1.192, 1.185, 1.177, 1.170, 1.162, 1.154, 1.147, 1.139], - [ 2.339, 2.325, 2.312, 2.298, 2.284, 2.270, 2.256, 2.242, 2.228, 2.213, 2.199, 2.184, 2.169], - [ 4.247, 4.222, 4.197, 4.172, 4.147, 4.122, 4.096, 4.070, 4.044, 4.018, 3.992, 3.965, 3.938], - [ 7.384, 7.341, 7.298, 7.255, 7.211, 7.167, 7.123, 7.078, 7.033, 6.987, 6.941, 6.895, 6.848], - [ 12.351, 12.279, 12.207, 12.135, 12.062, 11.988, 11.914, 11.839, 11.763, 11.687, 11.610, 11.532, 11.454], - [ 19.946, 19.829, 19.713, 19.596, 19.478, 19.359, 19.239, 19.118, 18.996, 18.873, 18.749, 18.624, 18.497], - [ 31.201, 31.018, 30.837, 30.654, 30.470, 30.284, 30.096, 29.907, 29.716, 29.523, 29.329, 29.133, 28.935], - [ 47.415, 47.139, 46.863, 46.585, 46.305, 46.022, 45.737, 45.449, 45.159, 44.866, 44.571, 44.273, 43.972], - [ 70.182, 69.776, 69.368, 68.957, 68.542, 68.124, 67.701, 67.276, 66.846, 66.413, 65.975, 65.534, 65.089], - [101.418, 100.835, 100.245, 99.651, 99.052, 98.447, 97.837, 97.221, 96.601, 95.974, 95.343, 94.705, 94.062], - [143.376, 142.558, 141.725, 140.884, 140.037, 139.182, 138.320, 137.450, 136.572, 135.687, 134.793, 133.892, 132.982], - [198.665, 197.541, 196.386, 195.222, 194.048, 192.863, 191.668, 190.463, 189.246, 188.019, 186.782, 185.533, 184.272]]).T * 1e3 #, Pa +# self.saturation_pressure.source = self.saturation_pressure.SOURCE_EQUATION +# self.saturation_pressure.data = np.array([ +# [ 0.611, 0.608, 0.604, 0.601, 0.597, 0.593, 0.590, 0.586, 0.582, 0.578, 0.575, 0.571, 0.567], +# [ 1.228, 1.221, 1.214, 1.207, 1.199, 1.192, 1.185, 1.177, 1.170, 1.162, 1.154, 1.147, 1.139], +# [ 2.339, 2.325, 2.312, 2.298, 2.284, 2.270, 2.256, 2.242, 2.228, 2.213, 2.199, 2.184, 2.169], +# [ 4.247, 4.222, 4.197, 4.172, 4.147, 4.122, 4.096, 4.070, 4.044, 4.018, 3.992, 3.965, 3.938], +# [ 7.384, 7.341, 7.298, 7.255, 7.211, 7.167, 7.123, 7.078, 7.033, 6.987, 6.941, 6.895, 6.848], +# [ 12.351, 12.279, 12.207, 12.135, 12.062, 11.988, 11.914, 11.839, 11.763, 11.687, 11.610, 11.532, 11.454], +# [ 19.946, 19.829, 19.713, 19.596, 19.478, 19.359, 19.239, 19.118, 18.996, 18.873, 18.749, 18.624, 18.497], +# [ 31.201, 31.018, 30.837, 30.654, 30.470, 30.284, 30.096, 29.907, 29.716, 29.523, 29.329, 29.133, 28.935], +# [ 47.415, 47.139, 46.863, 46.585, 46.305, 46.022, 45.737, 45.449, 45.159, 44.866, 44.571, 44.273, 43.972], +# [ 70.182, 69.776, 69.368, 68.957, 68.542, 68.124, 67.701, 67.276, 66.846, 66.413, 65.975, 65.534, 65.089], +# [101.418, 100.835, 100.245, 99.651, 99.052, 98.447, 97.837, 97.221, 96.601, 95.974, 95.343, 94.705, 94.062], +# [143.376, 142.558, 141.725, 140.884, 140.037, 139.182, 138.320, 137.450, 136.572, 135.687, 134.793, 133.892, 132.982], +# [198.665, 197.541, 196.386, 195.222, 194.048, 192.863, 191.668, 190.463, 189.246, 188.019, 186.782, 185.533, 184.272]]).T * 1e3 #, Pa self.Tmax = np.max(self.temperature.data) self.Tmin = np.min(self.temperature.data) self.xmax = np.max(self.concentration.data) self.xmin = np.min(self.concentration.data) self.xid = self.ifrac_mass - self.TminPsat = self.Tmin + self.TminPsat = self.Tmax diff --git a/dev/incompressible_liquids/json/MITSW.json b/dev/incompressible_liquids/json/MITSW.json index d849d493..c2bfbe93 100644 --- a/dev/incompressible_liquids/json/MITSW.json +++ b/dev/incompressible_liquids/json/MITSW.json @@ -11,7 +11,7 @@ "Tbase": 3.331500e+02, "Tmax": 3.931500e+02, "Tmin": 2.731500e+02, - "TminPsat": 2.731500e+02, + "TminPsat": 3.931500e+02, "conductivity": { "NRMS": 2.358910e-03, "coeffs": [ @@ -102,36 +102,36 @@ "name": "MITSW", "reference": "Sharqawy2010", "saturation_pressure": { - "NRMS": 2.448730e-05, + "NRMS": null, "coeffs": [ [ - 9.864693e+00, - 4.628367e+01, - -1.589456e+02, - 5.154409e+02, - -1.615084e+03, - 4.664031e+03 - ], - [ - -6.249735e-04, - 3.944437e-05, - -1.630565e-03, - -5.064071e-03, - 1.354204e-01, - 0.000000e+00 - ], - [ - -4.592459e-07, - -1.353636e-07, - -1.907873e-06, - -4.651794e-05, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, 0.000000e+00, 0.000000e+00 ], [ - -9.872754e-10, - -1.073931e-08, - 5.749459e-07, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00 + ], + [ + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00 + ], + [ + 0.000000e+00, + 0.000000e+00, + 0.000000e+00, 0.000000e+00, 0.000000e+00, 0.000000e+00