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

BlackoilAquiferModel: move the function bodies to the _impl.hpp file

Browse Source 
... to make it more consistent with the existing code.
This commit is contained in:
Andreas Lauser 2018-11-01 15:19:33 +01:00
parent 6a929ca797
commit 848a65c1c8
2 changed files with 68 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
opm/autodiff/BlackoilAquiferModel.hpp
View File

@ -44,50 +44,19 @@ namespace Opm {
public: public:
explicit BlackoilAquiferModel(Simulator& simulator); explicit BlackoilAquiferModel(Simulator& simulator);
void initialSolutionApplied() void initialSolutionApplied();
{ void beginEpisode();
for (auto aquifer = aquifers_.begin(); aquifer != aquifers_.end(); ++aquifer) { void beginTimeStep();
aquifer->initialSolutionApplied(); void beginIteration();
}
}
void beginEpisode()
{ }
void beginTimeStep()
{
for (auto aquifer = aquifers_.begin(); aquifer != aquifers_.end(); ++aquifer) {
aquifer->beginTimeStep();
}
}
void beginIteration()
{ }
// add the water rate due to aquifers to the source term. // add the water rate due to aquifers to the source term.
template <class Context> template <class Context>
void addToSource(RateVector& rates, void addToSource(RateVector& rates,
const Context& context, const Context& context,
unsigned spaceIdx, unsigned spaceIdx,
unsigned timeIdx) const unsigned timeIdx) const;
{ void endIteration();
for (auto& aquifer: aquifers_) { void endTimeStep();
aquifer.addToSource(rates, context, spaceIdx, timeIdx); void endEpisode();
}
}
void endIteration()
{ }
void endTimeStep()
{
for (auto aquifer = aquifers_.begin(); aquifer != aquifers_.end(); ++aquifer) {
aquifer->endTimeStep();
}
}
void endEpisode()
{ }
protected: protected:
// --------- Types --------- // --------- Types ---------

60
opm/autodiff/BlackoilAquiferModel_impl.hpp
View File

@ -9,6 +9,66 @@ namespace Opm {
init(); init();
} }
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::initialSolutionApplied()
{
for (auto aquifer = aquifers_.begin(); aquifer != aquifers_.end(); ++aquifer) {
aquifer->initialSolutionApplied();
}
}
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::beginEpisode()
{ }
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::beginTimeStep()
{
for (auto aquifer = aquifers_.begin(); aquifer != aquifers_.end(); ++aquifer) {
aquifer->beginTimeStep();
}
}
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::beginIteration()
{ }
template<typename TypeTag>
template <class Context>
void
BlackoilAquiferModel<TypeTag>::addToSource(RateVector& rates,
const Context& context,
unsigned spaceIdx,
unsigned timeIdx) const
{
for (auto& aquifer: aquifers_) {
aquifer.addToSource(rates, context, spaceIdx, timeIdx);
}
}
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::endIteration()
{ }
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::endTimeStep()
{
for (auto aquifer = aquifers_.begin(); aquifer != aquifers_.end(); ++aquifer) {
aquifer->endTimeStep();
}
}
template<typename TypeTag>
void
BlackoilAquiferModel<TypeTag>::endEpisode()
{ }
// Initialize the aquifers in the deck // Initialize the aquifers in the deck
template<typename TypeTag> template<typename TypeTag>
void void