max/poet
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/poet.git synced 2025-12-16 04:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

load constant velocities at instantiation

Browse Source
This commit is contained in:
Max Lübke 2023-09-05 09:47:22 +02:00 committed by Max Lübke
parent 4f0a8f3742
commit 272f010047
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Transport/AdvectionModule.cpp
View File

@ -104,16 +104,17 @@ void AdvectionModule::simulate(double dt) {
// HACK: constant flux for this moment imported from R runtime
RInsidePOET &R = RInsidePOET::getInstance();
const auto flux_list =
Rcpp::as<Rcpp::DataFrame>(R.parseEval("mysetup$advection$const_flux"));
std::vector<std::vector<double>> flux(flux_list.size());
// auto parse_start = std::chrono::steady_clock::now();
// RInsidePOET &R = RInsidePOET::getInstance();
// const auto flux_list =
// Rcpp::as<Rcpp::DataFrame>(R.parseEval("mysetup$advection$const_flux"));
// std::vector<std::vector<double>> flux(flux_list.size());
// auto parse_end = std::chrono::steady_clock::now();
#pragma omp parallel for schedule(dynamic)
for (std::size_t i = 0; i < flux_list.size(); i++) {
const auto flux_2d = Rcpp::as<std::vector<double>>(flux_list[i]);
flux[i] = flux_2d;
}
// MSG("Parsing took " +
// std::to_string(std::chrono::duration_cast<std::chrono::milliseconds>(
// parse_end - parse_start)
// .count()));
MSG("Advection time step requested: " + std::to_string(dt));
@ -226,6 +227,16 @@ void AdvectionModule::initializeParams(RInsidePOET &R) {
}
this->t_field = Field(field_size, init_field, prop_names);
// FIXME: parse velocities in instantiation of class
const auto rcpp_flux_list =
Rcpp::as<Rcpp::DataFrame>(R.parseEval("mysetup$advection$const_flux"));
this->flux.resize(rcpp_flux_list.size());
for (std::size_t i = 0; i < rcpp_flux_list.size(); i++) {
const auto flux_2d = Rcpp::as<std::vector<double>>(rcpp_flux_list[i]);
this->flux[i] = flux_2d;
}
}
} // namespace poet

3
src/Transport/AdvectionModule.hpp
View File

@ -95,6 +95,9 @@ private:
std::map<std::uint32_t, std::vector<double>> inactive_cells;
std::vector<double> boundary_condition;
// FIXME: parse velocities in instantiation of class
std::vector<std::vector<double>> flux;
Field t_field;
/**