Commit a77cc3e8 authored by Santiago Ospina's avatar Santiago Ospina

[Richards] Rename grid function variables

parent 7b74048a
......@@ -137,7 +137,7 @@ void RichardsSimulation<Traits>::operator_setup()
if constexpr (enable_fluxrc_st)
if (enable_fluxrc_dy)
waterfrgf = std::make_shared<GFWaterFluxReconstruction>(*go0);
flux_rec_gf = std::make_shared<GFWaterFluxReconstruction>(*go0);
}
template<typename Traits>
......@@ -213,7 +213,7 @@ void RichardsSimulation<Traits>::step()
if constexpr (enable_fluxrc_st)
if (enable_fluxrc_dy)
try {
waterfrgf->update(*u);
flux_rec_gf->update(*u);
} catch (Dune::Exception &e) {
this->_log->debug(" Flux Reconstruction failed");
this->_log->error(" Unexpected error in flux reconstruction: {}",
......@@ -260,11 +260,11 @@ void RichardsSimulation<Traits>::post_adapt_grid()
template<typename Traits>
void RichardsSimulation<Traits>::update_adapters () const
{
udgf = std::make_shared<GFMatricHead>(gfs, u);
fluxdgf = std::make_shared<GFWaterFlux>(gfs, u, fparam);
condgf = std::make_shared<GFConductivity>(gv, fparam);
waterdgf = std::make_shared<GFWaterContent>(udgf, gv, fparam);
satdgf = std::make_shared<GFSaturation>(udgf, gv, fparam);
matric_head_gf = std::make_shared<GFMatricHead>(gfs, u);
flux_gf = std::make_shared<GFWaterFlux>(gfs, u, fparam);
cond_gf = std::make_shared<GFConductivity>(gv, fparam);
water_cont_gf = std::make_shared<GFWaterContent>(matric_head_gf, gv, fparam);
sat_gf = std::make_shared<GFSaturation>(matric_head_gf, gv, fparam);
}
template<typename Traits>
......@@ -275,25 +275,25 @@ void RichardsSimulation<Traits>::write_data () const
update_adapters();
if (inifile.get<bool>("output.vertexData")) {
vtkwriter->template addVertexData<GFMatricHead>(udgf,"head");
vtkwriter->template addVertexData<GFWaterFlux>(fluxdgf,"flux");
vtkwriter->template addVertexData<GFConductivity>(condgf,"K_0");
vtkwriter->template addVertexData<GFWaterContent>(waterdgf,"theta_w");
vtkwriter->template addVertexData<GFSaturation>(satdgf,"Theta");
vtkwriter->template addVertexData<GFMatricHead>(matric_head_gf,"head");
vtkwriter->template addVertexData<GFWaterFlux>(flux_gf,"flux");
vtkwriter->template addVertexData<GFConductivity>(cond_gf,"K_0");
vtkwriter->template addVertexData<GFWaterContent>(water_cont_gf,"theta_w");
vtkwriter->template addVertexData<GFSaturation>(sat_gf,"Theta");
if constexpr (enable_fluxrc_st)
if (enable_fluxrc_dy)
vtkwriter->template addVertexData<GFWaterFluxReconstruction>
(waterfrgf,"flux RT" + std::to_string(flux_order));
(flux_rec_gf,"flux RT" + std::to_string(flux_order));
} else {
vtkwriter->template addCellData<GFMatricHead>(udgf,"head");
vtkwriter->template addCellData<GFWaterFlux>(fluxdgf,"flux");
vtkwriter->template addCellData<GFConductivity>(condgf,"K_0");
vtkwriter->template addCellData<GFWaterContent>(waterdgf,"theta_w");
vtkwriter->template addCellData<GFSaturation>(satdgf,"Theta");
vtkwriter->template addCellData<GFMatricHead>(matric_head_gf,"head");
vtkwriter->template addCellData<GFWaterFlux>(flux_gf,"flux");
vtkwriter->template addCellData<GFConductivity>(cond_gf,"K_0");
vtkwriter->template addCellData<GFWaterContent>(water_cont_gf,"theta_w");
vtkwriter->template addCellData<GFSaturation>(sat_gf,"Theta");
if constexpr (enable_fluxrc_st)
if (enable_fluxrc_dy)
vtkwriter->template addCellData<GFWaterFluxReconstruction>
(waterfrgf,"flux RT" + std::to_string(flux_order));
(flux_rec_gf,"flux RT" + std::to_string(flux_order));
}
try{
......
......@@ -274,12 +274,12 @@ protected:
std::shared_ptr<U> u;
mutable std::shared_ptr<GFMatricHead> udgf;
mutable std::shared_ptr<GFWaterFlux> fluxdgf;
mutable std::shared_ptr<GFConductivity> condgf;
mutable std::shared_ptr<GFWaterContent> waterdgf;
mutable std::shared_ptr<GFSaturation> satdgf;
mutable std::shared_ptr<GFWaterFluxReconstruction> waterfrgf;
mutable std::shared_ptr<GFMatricHead> matric_head_gf;
mutable std::shared_ptr<GFWaterFlux> flux_gf;
mutable std::shared_ptr<GFConductivity> cond_gf;
mutable std::shared_ptr<GFWaterContent> water_cont_gf;
mutable std::shared_ptr<GFSaturation> sat_gf;
mutable std::shared_ptr<GFWaterFluxReconstruction> flux_rec_gf;
std::unique_ptr<Writer> vtkwriter;
std::unique_ptr<AdaptivityHandler> adaptivity;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment