Skip to content
Snippets Groups Projects
Commit 74840946 authored by Ian Bell's avatar Ian Bell
Browse files

Handling a few warnings

parent b1f36fa7
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ const double N_A = 6.02214076e23; ///< Avogadro's number ...@@ -5,7 +5,7 @@ const double N_A = 6.02214076e23; ///< Avogadro's number
///< Gas constant, according to CODATA 2019, in the given number type ///< Gas constant, according to CODATA 2019, in the given number type
template<typename NumType> template<typename NumType>
const auto get_R_gas() { const auto get_R_gas() {
const double k_B = 1.380649e-23; ///< Boltzmann constant const NumType k_B = 1.380649e-23; ///< Boltzmann constant
const double N_A = 6.02214076e23; ///< Avogadro's number const NumType N_A_ = 6.02214076e23; ///< Avogadro's number
return N_A*k_B; return static_cast<NumType>(N_A_*k_B);
}; };
\ No newline at end of file
...@@ -63,7 +63,7 @@ auto getbaseval(const T& expr) ...@@ -63,7 +63,7 @@ auto getbaseval(const T& expr)
auto toeig = [](const std::vector<double>& v) -> Eigen::ArrayXd { return Eigen::Map<const Eigen::ArrayXd>(&(v[0]), v.size()); }; auto toeig = [](const std::vector<double>& v) -> Eigen::ArrayXd { return Eigen::Map<const Eigen::ArrayXd>(&(v[0]), v.size()); };
auto all_same_length = [](const nlohmann::json& j, const std::vector<std::string>& ks) { auto all_same_length = [](const nlohmann::json& j, const std::vector<std::string>& ks) {
std::set<int> lengths; std::set<decltype(j[0].size())> lengths;
for (auto k : ks) { lengths.insert(j[k].size()); } for (auto k : ks) { lengths.insert(j[k].size()); }
return lengths.size() == 1; return lengths.size() == 1;
}; };
......
...@@ -28,19 +28,25 @@ int main() ...@@ -28,19 +28,25 @@ int main()
bool loaded_REFPROP = load_REFPROP(err, path, DLL_name); bool loaded_REFPROP = load_REFPROP(err, path, DLL_name);
printf("Loaded refprop: %s @ address %zu\n", loaded_REFPROP ? "true" : "false", REFPROP_address()); printf("Loaded refprop: %s @ address %zu\n", loaded_REFPROP ? "true" : "false", REFPROP_address());
if (!loaded_REFPROP) { return EXIT_FAILURE; } if (!loaded_REFPROP) { return EXIT_FAILURE; }
char hpath[256] = " ";
strcpy(hpath, const_cast<char*>(path.c_str())); {
SETPATHdll(hpath, 255); char hpath[256] = " ";
strcpy(hpath, const_cast<char*>(path.c_str()));
SETPATHdll(hpath, 255);
}
int ierr = 0, nc = 1; {
char herr[256], hfld[10001] = "PROPANE", hhmx[256] = "HMX.BNC", href[4] = "DEF"; int ierr = 0, nc = 1;
SETUPdll(nc, hfld, hhmx, href, ierr, herr, 10000, 255, 3, 255); char herr[256], hfld[10001] = "PROPANE", hhmx[256] = "HMX.BNC", href[4] = "DEF";
if (ierr != 0) { SETUPdll(nc, hfld, hhmx, href, ierr, herr, 10000, 255, 3, 255);
printf("This ierr: %d herr: %s\n", ierr, herr); if (ierr != 0) {
return EXIT_FAILURE; printf("This ierr: %d herr: %s\n", ierr, herr);
return EXIT_FAILURE;
}
} }
// Try to disable caching in REFPROP // Try to disable caching in REFPROP
{ {
int ierr = 0; char herr[256];
char hflag[256] = "Cache "; char hflag[256] = "Cache ";
int jFlag = 3, kFlag = -1; int jFlag = 3, kFlag = -1;
FLAGSdll(hflag, jFlag, kFlag, ierr, herr, 255, 255); FLAGSdll(hflag, jFlag, kFlag, ierr, herr, 255, 255);
...@@ -89,6 +95,7 @@ int main() ...@@ -89,6 +95,7 @@ int main()
std::valarray<double> z(20); z = 0.0; z[std::slice(0, Ncomp, 1)] = 1.0 / Ncomp; std::valarray<double> z(20); z = 0.0; z[std::slice(0, Ncomp, 1)] = 1.0 / Ncomp;
std::valarray<double> u(20); u = 0.0; std::valarray<double> u(20); u = 0.0;
auto usummer = 0.0; auto usummer = 0.0;
int ierr = 0; char herr[256];
auto tic = std::chrono::high_resolution_clock::now(); auto tic = std::chrono::high_resolution_clock::now();
for (auto j = 0; j < N; ++j) { for (auto j = 0; j < N; ++j) {
FUGCOFdll(T, D_moldm3, &(z[0]), &(u[0]), ierr, herr, 255); FUGCOFdll(T, D_moldm3, &(z[0]), &(u[0]), ierr, herr, 255);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment