OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Aquifer Model: Add Initialization from Restart Data

Browse Source 
This commit adds a new member function,

    initFromRestart()

to the EclBaseAquiferModel and the BlackoilAquiferModel.  The former
does nothing, the latter calls AquiferInterface::initFromRestart()
on the contained analytic aquifer objects.
This commit is contained in:
Bård Skaflestad
2019-11-28 18:21:45 +01:00
parent df86d01486
commit 4c4a893781
3 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/simulators/aquifers/BlackoilAquiferModel.hpp
View File

@@ -29,11 +29,17 @@
#include <opm/parser/eclipse/EclipseState/AquiferCT.hpp>
#include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
#include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp>
#include <opm/output/data/Aquifer.hpp>
#include <opm/simulators/aquifers/AquiferCarterTracy.hpp>
#include <opm/simulators/aquifers/AquiferFetkovich.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp>
#include <opm/material/densead/Math.hpp>
#include <vector>
namespace Opm {
/// Class for handling the blackoil well model.
@@ -47,6 +53,8 @@ namespace Opm {
explicit BlackoilAquiferModel(Simulator& simulator);
void initialSolutionApplied();
void initFromRestart(const std::vector<data::AquiferData>& aquiferSoln);
void beginEpisode();
void beginTimeStep();
void beginIteration();

20
opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
View File

@@ -29,6 +29,26 @@ namespace Opm {
}
}
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::initFromRestart(const std::vector<data::AquiferData>& aquiferSoln)
{
if(aquiferCarterTracyActive())
{
for (auto& aquifer : aquifers_CarterTracy)
{
aquifer.initFromRestart(aquiferSoln);
}
}
if(aquiferFetkovichActive())
{
for (auto& aquifer : aquifers_Fetkovich)
{
aquifer.initFromRestart(aquiferSoln);
}
}
}
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::beginEpisode()