Commit bbde927d authored Aug 05, 2021 by Henderson, Shane

Update to few data entries

parent c30ec36b

python/src/CMakeLists.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -15,13 +15,6 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
		SET(HEADERS "SalinePy.hh")
		SET(SOURCES "SalinePy.cc")

		SET(SWIG_RUNTIME swigpyrun.h)
		ADD_CUSTOM_COMMAND(
		OUTPUT ${SWIG_RUNTIME}
		COMMAND ${SWIG_EXECUTABLE} -python -external-runtime
		)
		LIST(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_RUNTIME})

		TRIBITS_ADD_LIBRARY(SalinePy
		SHARED
		HEADERS ${HEADERS}

src/default_data.hh

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ static const char* default_data_rk = R"ORNL_format(
		//Pure Salts
		//System , Mol Frac , Mol Mass , Melt(K) , Var(%) , Reference , Boil(K) , Var(%) , Reference , rho_a , rho_b , range(K) , Var(%) , Reference , mu1_a , mu2_b , mu2_a , mu2_b , mu2_c , range(K) , Var(%) , Reference , k_a , k_b , range(K) , Var(%) , Reference , cp_a , cp_b , cp_c , cp_d , Var(%) , Reference
		LiF , 1.0 , 25.9390 , 1121.20 , 1.00 , Douglas1954 , 1943.00 , 0.00 , Ruff1922 , 2.370575E+00 , 5.000000E-04 , 1123.6-1367.5 , 1.00 , Hill1967 , 1.149400E-01 , 2.699400E+04 , 0.0 , 0.0 , 0.0 , 1133-1772 , 1.00 , Abe1981 , 1.882142E+00 , -3.990000E-04 , 1118.5-1900 , 20.00 , Gheribi2014 , 6.489400E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 1.50 , Douglas1954
		NaF , 1.0 , 41.9882 , 1268.00 , 0.50 , Cantor1961 , 1978.00 , 0.00 , Ruff1922 , 2.755000E+00 , 6.360000E-04 , 1273-1373 , 0.20 , Paucirova1970 , 1.195700E+00 , 2.648600E+04 , 0.0 , 0.0 , 0.0 , 1273-1373 , 1.00 , Brockner1979 , 1.258950E+00 , -2.800000E-04 , 1268.15-1800 , 20.00 , Gheribi2014 , 6.861760E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 0.10 , O'Brien1957
		NaF , 1.0 , 41.9882 , 1268.00 , 0.50 , Cantor1961 , 1978.00 , 0.00 , Ruff1922 , 2.755000E+00 , 6.360000E-04 , 1273-1373 , 0.20 , Paucirova1970 , 1.195700E-01 , 2.648600E+04 , 0.0 , 0.0 , 0.0 , 1273-1373 , 1.00 , Brockner1979 , 1.258950E+00 , -2.800000E-04 , 1268.15-1800 , 20.00 , Gheribi2014 , 6.861760E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 0.10 , O'Brien1957
		KF , 1.0 , 58.0967 , 1131.20 , 0.50 , Johnson1958 , 1771.00 , 0.00 , Ruff1922 , 2.646400E+00 , 6.515000E-04 , 1154.2-1310.2 , 1.00 , Yaffe1956 , 1.068000E-01 , 2.377800E+04 , 0.0 , 0.0 , 0.0 , 1141.2-1327.6 , 2.00 , Janz1988 , 8.552041E-01 , -2.540000E-04 , 1129.15-1800 , 20.00 , Gheribi2014 , 7.060000E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 18.00 , Beilmann2013
		MgF2 , 1.0 , 62.3018 , 1534.20 , 1.00 , Kojima1968 , 2512.00 , 0.00 , Ruff1928 , 3.235000E+00 , 5.240000E-04 , 1650-2100 , 0.07 , Kirshenbaum1960 , 1.868950E-01 , 3.207993E+04 , 0.0 , 0.0 , 0.0 , 1514.7-1853.2 , 3.00 , Takeda2015 , 8.666971E-01 , -1.410000E-04 , 1536.15-2512 , 20.00 , Gheribi2014 , 9.443000E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 2.00 , Naylor1945
		CaF2 , 1.0 , 78.0700 , 1692.00 , 1.00 , Mukerji1965 , 2724.00 , 0.00 , Ruff1928 , 3.179000E+00 , 3.910000E-04 , 1640-2300 , 0.07 , Kirshenbaum1960 , 1.002276E-01 , 4.757886E+04 , 0.0 , 0.0 , 0.0 , 1703.3-1868.1 , 3.00 , Takeda2015 , 6.671455E-01 , -6.040000E-05 , 1691.15-2500 , 20.00 , Gheribi2014 , 9.991400E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 2.00 , Naylor1945
		@@ -144,7 +144,7 @@ ThF4 , UCl3 , -7.205900E-01 , 5.188100E-04 , 0.000000E+00 , 0.000000E+00

		static const char* default_data = R"ORNL_format(
		LiF , Pure Salt , 0.0 , 1121.20 , 1.00 , Douglas1954 , 1943.00 , 0.0 , Ruff1922 , 2.370575E+00 , 5.000000E-04 , 1123.6-1367.5 , 1.00 , Hill1967 , 1.149400E-01 , 2.699400E+04 , 0.0 , 0.0 , 0.0 , 1133-1772 , 1.00 , Abe1981 , 1.882142E+00 , -3.990000E-04 , 1118.5-1900 , 20.00 , Gheribi2014 , 6.489400E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 1.50 , Douglas1954
		NaF , Pure Salt , 0.0 , 1268.00 , 0.50 , Cantor1961 , 1978.00 , 0.0 , Ruff1922 , 2.755000E+00 , 6.360000E-04 , 1273-1373 , 0.20 , Paucirova1970 , 1.195700E+00 , 2.648600E+04 , 0.0 , 0.0 , 0.0 , 1273-1373 , 1.00 , Brockner1979 , 1.258950E+00 , -2.800000E-04 , 1268.15-1800 , 20.00 , Gheribi2014 , 6.861760E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 0.10 , O'Brien1957
		NaF , Pure Salt , 0.0 , 1268.00 , 0.50 , Cantor1961 , 1978.00 , 0.0 , Ruff1922 , 2.755000E+00 , 6.360000E-04 , 1273-1373 , 0.20 , Paucirova1970 , 1.195700E-01 , 2.648600E+04 , 0.0 , 0.0 , 0.0 , 1273-1373 , 1.00 , Brockner1979 , 1.258950E+00 , -2.800000E-04 , 1268.15-1800 , 20.00 , Gheribi2014 , 6.861760E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 0.10 , O'Brien1957
		KF , Pure Salt , 0.0 , 1131.20 , 0.50 , Johnson1958 , 1771.00 , 0.0 , Ruff1922 , 2.646400E+00 , 6.515000E-04 , 1154.2-1310.2 , 1.00 , Yaffe1956 , 1.068000E-01 , 2.377800E+04 , 0.0 , 0.0 , 0.0 , 1141.2-1327.6 , 2.00 , Janz1988 , 8.552041E-01 , -2.540000E-04 , 1129.15-1800 , 20.00 , Gheribi2014 , 7.060000E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 18.00 , Beilmann2013
		MgF2 , Pure Salt , 0.0 , 1534.20 , 1.00 , Kojima1968 , 2512.00 , 0.0 , Ruff1928 , 3.235000E+00 , 5.240000E-04 , 1650-2100 , 0.07 , Kirshenbaum1960 , 1.868950E-01 , 3.207993E+04 , 0.0 , 0.0 , 0.0 , 1514.7-1853.2 , 3.00 , Takeda2015 , 8.666971E-01 , -1.410000E-04 , 1536.15-2512 , 20.00 , Gheribi2014 , 9.443000E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 2.00 , Naylor1945
		CaF2 , Pure Salt , 0.0 , 1692.00 , 1.00 , Mukerji1965 , 2724.00 , 0.0 , Ruff1928 , 3.179000E+00 , 3.910000E-04 , 1640-2300 , 0.07 , Kirshenbaum1960 , 1.002276E-01 , 4.757886E+04 , 0.0 , 0.0 , 0.0 , 1703.3-1868.1 , 3.00 , Takeda2015 , 6.671455E-01 , -6.040000E-05 , 1691.15-2500 , 20.00 , Gheribi2014 , 9.991400E+01 , 0.000000E+00 , 0.000000E+00 , 0.000000E+00 , 2.00 , Naylor1945