diff --git a/dev/incompressible_liquids/CPIncomp/SolutionFluids.py b/dev/incompressible_liquids/CPIncomp/SolutionFluids.py index 53f21321..2421de8b 100644 --- a/dev/incompressible_liquids/CPIncomp/SolutionFluids.py +++ b/dev/incompressible_liquids/CPIncomp/SolutionFluids.py @@ -141,7 +141,7 @@ class MITSeaWater(SolutionData): [4246.1, 4194.7, 4144.2, 4094.6, 4045.9, 3998.2, 3951.3, 3905.4, 3860.3, 3816.2, 3773.0, 3730.7, 3689.4]]).T #, J/kg-K self.viscosity.source = self.viscosity.SOURCE_EQUATION - self.viscosity= np.array([ + self.viscosity.data = np.array([ [1.791, 1.820, 1.852, 1.887, 1.925, 1.965, 2.008, 2.055, 2.104, 2.156, 2.210, 2.268, 2.328], [1.306, 1.330, 1.355, 1.382, 1.412, 1.443, 1.476, 1.511, 1.548, 1.586, 1.627, 1.669, 1.714], [1.002, 1.021, 1.043, 1.065, 1.089, 1.114, 1.140, 1.168, 1.197, 1.227, 1.259, 1.292, 1.326], @@ -157,7 +157,7 @@ class MITSeaWater(SolutionData): [0.232, 0.238, 0.245, 0.251, 0.258, 0.265, 0.273, 0.280, 0.288, 0.297, 0.305, 0.314, 0.323]]).T / 1e3 #, Pa-s self.conductivity.source = self.conductivity.SOURCE_EQUATION - self.conductivity= np.array([ + self.conductivity.data = np.array([ [0.572, 0.571, 0.570, 0.570, 0.569, 0.569, 0.568, 0.568, 0.567, 0.566, 0.566, 0.565, 0.565], [0.588, 0.588, 0.587, 0.587, 0.586, 0.585, 0.585, 0.584, 0.584, 0.583, 0.583, 0.582, 0.582], [0.604, 0.603, 0.602, 0.602, 0.601, 0.601, 0.600, 0.600, 0.599, 0.599, 0.598, 0.598, 0.597], diff --git a/dev/incompressible_liquids/json/MITSW.json b/dev/incompressible_liquids/json/MITSW.json new file mode 100644 index 00000000..d849d493 --- /dev/null +++ b/dev/incompressible_liquids/json/MITSW.json @@ -0,0 +1,227 @@ +{ + "T_freeze": { + "NRMS": null, + "coeffs": [ + 7.000000e+02, + -6.000000e+01, + 1.000000e+01 + ], + "type": "exponential" + }, + "Tbase": 3.331500e+02, + "Tmax": 3.931500e+02, + "Tmin": 2.731500e+02, + "TminPsat": 2.731500e+02, + "conductivity": { + "NRMS": 2.358910e-03, + "coeffs": [ + [ + 6.474713e-01, + 9.034135e-01, + -6.575087e+00, + 1.050114e+01, + 7.251422e+00, + -8.411649e+02 + ], + [ + -4.656026e-05, + 2.518681e-04, + 2.800376e-03, + -1.376828e-02, + -4.962986e-01, + 0.000000e+00 + ], + [ + 4.331329e-09, + -8.571182e-07, + 1.117764e-05, + 1.979373e-04, + 0.000000e+00, + 0.000000e+00 + ], + [ + 5.991033e-10, + 5.763241e-09, + -3.318357e-07, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00 + ] + ], + "type": "polynomial" + }, + "density": { + "NRMS": 2.231013e-04, + "coeffs": [ + [ + 1.027382e+03, + -5.339120e+02, + -2.416132e+03, + 9.175649e+03, + -4.840654e+04, + 1.044205e+05 + ], + [ + 7.362204e-01, + -3.162167e-01, + 1.065659e+01, + -3.347614e+01, + 1.224737e+02, + 0.000000e+00 + ], + [ + 2.818855e-06, + -1.739207e-04, + 1.005491e-03, + 6.331082e-02, + 0.000000e+00, + 0.000000e+00 + ], + [ + -1.471253e-07, + 1.008651e-06, + 4.584574e-05, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00 + ] + ], + "type": "polynomial" + }, + "description": "MIT Seawater", + "mass2input": { + "NRMS": null, + "coeffs": "null", + "type": "notdefined" + }, + "mole2input": { + "NRMS": null, + "coeffs": "null", + "type": "notdefined" + }, + "name": "MITSW", + "reference": "Sharqawy2010", + "saturation_pressure": { + "NRMS": 2.448730e-05, + "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 + ], + [ + -9.872754e-10, + -1.073931e-08, + 5.749459e-07, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00 + ] + ], + "type": "exppolynomial" + }, + "specific_heat": { + "NRMS": 4.542784e-05, + "coeffs": [ + [ + 3.901967e+03, + 5.277491e+02, + 3.736964e+02, + 7.560919e+04, + -1.160227e+03, + 1.087713e+04 + ], + [ + -4.410490e+00, + 5.299712e-01, + -1.314752e+02, + 9.824470e+02, + -1.506789e+01, + 0.000000e+00 + ], + [ + 4.460665e-03, + -4.748945e-02, + 1.085775e+00, + -4.434086e+00, + 0.000000e+00, + 0.000000e+00 + ], + [ + -7.113113e-08, + 4.322592e-07, + 5.719805e-05, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "NRMS": 2.880870e-04, + "coeffs": [ + [ + -7.519744e+00, + -1.472187e+01, + 7.087103e+01, + -4.083864e+02, + 4.276865e+03, + -3.485400e+04 + ], + [ + 2.591398e-03, + 4.295507e-03, + -2.947742e-02, + 6.443482e-02, + 1.168881e+00, + 0.000000e+00 + ], + [ + 1.044961e-06, + -2.976453e-05, + 5.298162e-04, + 8.257514e-04, + 0.000000e+00, + 0.000000e+00 + ], + [ + -5.591003e-09, + 5.635957e-08, + -8.049592e-07, + 0.000000e+00, + 0.000000e+00, + 0.000000e+00 + ] + ], + "type": "exppolynomial" + }, + "volume2input": { + "NRMS": null, + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 6.000000e-02, + "xid": "mass", + "xmax": 1.200000e-01, + "xmin": 0.000000e+00 +} \ No newline at end of file