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

Newton method: reduce extent of copy and paste programming

Browse Source 
now the generic part of the update of the solution vector is done in
the base class and the derived classes can chose to only do the update
of the primary variables of the individual DOFs.
This commit is contained in:
Andreas Lauser 2015-03-01 15:51:04 +01:00
parent a58fd3186e
commit d80fed167f
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
examples/problems/richardslensproblem.hh
View File

@ -147,6 +147,7 @@ class RichardsLensProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryRateVector) BoundaryRateVector; typedef typename GET_PROP_TYPE(TypeTag, BoundaryRateVector) BoundaryRateVector;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables; typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, Stencil) Stencil;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@ -181,7 +182,9 @@ public:
RichardsLensProblem(Simulator &simulator) RichardsLensProblem(Simulator &simulator)
: ParentType(simulator) : ParentType(simulator)
, pnRef_(1e5) , pnRef_(1e5)
{ } {
dofIsInLens_.resize(simulator.model().numGridDof());
}
/*! /*!
* \copydoc FvBaseProblem::finishInit * \copydoc FvBaseProblem::finishInit
@ -218,6 +221,19 @@ public:
lensK_ = this->toDimMatrix_(1e-12); lensK_ = this->toDimMatrix_(1e-12);
outerK_ = this->toDimMatrix_(5e-12); outerK_ = this->toDimMatrix_(5e-12);
// determine which degrees of freedom are in the lens
Stencil stencil(this->gridView());
auto elemIt = this->gridView().template begin</*codim=*/0>();
auto elemEndIt = this->gridView().template end</*codim=*/0>();
for (; elemIt != elemEndIt; ++elemIt) {
stencil.update(*elemIt);
for (int dofIdx = 0; dofIdx < stencil.numPrimaryDof(); ++ dofIdx) {
int globalDofIdx = stencil.globalSpaceIndex(dofIdx);
const auto& dofPos = stencil.subControlVolume(dofIdx).center();
dofIsInLens_[globalDofIdx] = isInLens_(dofPos);
}
}
} }
/*! /*!
@ -255,6 +271,9 @@ public:
*/ */
template <class Context> template <class Context>
Scalar temperature(const Context &context, int spaceIdx, int timeIdx) const Scalar temperature(const Context &context, int spaceIdx, int timeIdx) const
{ return temperature(context.globalSpaceIndex(spaceIdx, timeIdx), timeIdx); }
Scalar temperature(int globalSpaceIdx, int timeIdx) const
{ return 273.15 + 10; } // -> 10°C { return 273.15 + 10; } // -> 10°C
/*! /*!
@ -286,8 +305,13 @@ public:
int spaceIdx, int spaceIdx,
int timeIdx) const int timeIdx) const
{ {
const auto &pos = context.pos(spaceIdx, timeIdx); int globalSpaceIdx = context.globalSpaceIndex(spaceIdx, timeIdx);
if (isInLens_(pos)) return materialLawParams(globalSpaceIdx, timeIdx);
}
const MaterialLawParams& materialLawParams(int globalSpaceIdx, int timeIdx) const
{
if (dofIsInLens_[globalSpaceIdx])
return lensMaterialParams_; return lensMaterialParams_;
return outerMaterialParams_; return outerMaterialParams_;
} }
@ -301,6 +325,11 @@ public:
Scalar referencePressure(const Context &context, Scalar referencePressure(const Context &context,
int spaceIdx, int spaceIdx,
int timeIdx) const int timeIdx) const
{ return referencePressure(context.globalSpaceIndex(spaceIdx, timeIdx), timeIdx); };
// the Richards model does not have an element context available at all places
// where the reference pressure is required...
Scalar referencePressure(int globalSpaceIdx, int timeIdx) const
{ return pnRef_; } { return pnRef_; }
//! \} //! \}
@ -428,6 +457,8 @@ private:
MaterialLawParams lensMaterialParams_; MaterialLawParams lensMaterialParams_;
MaterialLawParams outerMaterialParams_; MaterialLawParams outerMaterialParams_;
std::vector<bool> dofIsInLens_;
Scalar eps_; Scalar eps_;
Scalar pnRef_; Scalar pnRef_;
}; };