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

remove all trailing white space and replace all tabs by four spaces

Browse Source
This commit is contained in:
Andreas Lauser 2012-10-28 21:45:08 +01:00
parent bd2f9dda1f
commit 71c758a505
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
examples/tutorialproblem_coupled.hh
View File

@ -65,11 +65,11 @@ SET_TYPE_PROP(TutorialProblemCoupled, GridCreator, Dumux::CubeGridCreator<TypeTa
// Set the wetting phase /*@\label{tutorial-coupled:2p-system-start}@*/ // Set the wetting phase /*@\label{tutorial-coupled:2p-system-start}@*/
SET_TYPE_PROP(TutorialProblemCoupled, WettingPhase, /*@\label{tutorial-coupled:wettingPhase}@*/ SET_TYPE_PROP(TutorialProblemCoupled, WettingPhase, /*@\label{tutorial-coupled:wettingPhase}@*/
Dumux::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar), Dumux::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >); Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Set the non-wetting phase // Set the non-wetting phase
SET_TYPE_PROP(TutorialProblemCoupled, NonwettingPhase, /*@\label{tutorial-coupled:nonwettingPhase}@*/ SET_TYPE_PROP(TutorialProblemCoupled, NonwettingPhase, /*@\label{tutorial-coupled:nonwettingPhase}@*/
Dumux::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar), Dumux::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
Dumux::LNAPL<typename GET_PROP_TYPE(TypeTag, Scalar)> >); /*@\label{tutorial-coupled:2p-system-end}@*/ Dumux::LNAPL<typename GET_PROP_TYPE(TypeTag, Scalar)> >); /*@\label{tutorial-coupled:2p-system-end}@*/
// Set the material law // Set the material law
@ -153,9 +153,9 @@ public:
: ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView()) : ParentType(timeManager, GET_PROP_TYPE(TypeTag, GridCreator)::grid().leafView())
, eps_(3e-6) , eps_(3e-6)
{ {
// Use an isotropic and homogeneous intrinsic permeability // Use an isotropic and homogeneous intrinsic permeability
K_ = this->toDimMatrix_(1e-7); K_ = this->toDimMatrix_(1e-7);
// Parameters of the Brooks-Corey law // Parameters of the Brooks-Corey law
materialParams_.setPe(500.0); // entry pressure [Pa] /*@\label{tutorial-coupled:setLawParams}@*/ materialParams_.setPe(500.0); // entry pressure [Pa] /*@\label{tutorial-coupled:setLawParams}@*/
materialParams_.setLambda(2); // shape parameter materialParams_.setLambda(2); // shape parameter
@ -179,7 +179,7 @@ public:
const DimMatrix &intrinsicPermeability(const Context &context, /*@\label{tutorial-coupled:permeability}@*/ const DimMatrix &intrinsicPermeability(const Context &context, /*@\label{tutorial-coupled:permeability}@*/
int spaceIdx, int timeIdx) const int spaceIdx, int timeIdx) const
{ return K_; } { return K_; }
//! Defines the porosity [-] of the medium at a given position //! Defines the porosity [-] of the medium at a given position
template <class Context> template <class Context>
Scalar porosity(const Context &context, int spaceIdx, int timeIdx) const /*@\label{tutorial-coupled:porosity}@*/ Scalar porosity(const Context &context, int spaceIdx, int timeIdx) const /*@\label{tutorial-coupled:porosity}@*/
@ -193,20 +193,20 @@ public:
//! Evaluates the boundary conditions. //! Evaluates the boundary conditions.
template <class Context> template <class Context>
void boundary(BoundaryRateVector &values, void boundary(BoundaryRateVector &values,
const Context &context, int spaceIdx, int timeIdx) const const Context &context, int spaceIdx, int timeIdx) const
{ {
const auto &pos = context.pos(spaceIdx, timeIdx); const auto &pos = context.pos(spaceIdx, timeIdx);
if (pos[0] < eps_) { if (pos[0] < eps_) {
// Free-flow conditions on left boundary // Free-flow conditions on left boundary
const auto &materialParams = this->materialLawParams(context, spaceIdx, timeIdx); const auto &materialParams = this->materialLawParams(context, spaceIdx, timeIdx);
ImmiscibleFluidState<Scalar, FluidSystem> fs; ImmiscibleFluidState<Scalar, FluidSystem> fs;
Scalar Sw = 1.0; Scalar Sw = 1.0;
fs.setSaturation(wPhaseIdx, Sw); fs.setSaturation(wPhaseIdx, Sw);
fs.setSaturation(nPhaseIdx, 1.0 - Sw); fs.setSaturation(nPhaseIdx, 1.0 - Sw);
fs.setTemperature(temperature(context, spaceIdx, timeIdx)); fs.setTemperature(temperature(context, spaceIdx, timeIdx));
Scalar pC[numPhases]; Scalar pC[numPhases];
MaterialLaw::capillaryPressures(pC, materialParams, fs); MaterialLaw::capillaryPressures(pC, materialParams, fs);
fs.setPressure(wPhaseIdx, 200e3); fs.setPressure(wPhaseIdx, 200e3);
@ -250,13 +250,13 @@ public:
// the temperature is given by the temperature() method // the temperature is given by the temperature() method
fs.setTemperature(temperature(context, spaceIdx, timeIdx)); fs.setTemperature(temperature(context, spaceIdx, timeIdx));
// set pressure of the wetting phase to 200 kPa = 2 bar // set pressure of the wetting phase to 200 kPa = 2 bar
Scalar pC[numPhases]; Scalar pC[numPhases];
MaterialLaw::capillaryPressures(pC, materialLawParams(context, spaceIdx, timeIdx), fs); MaterialLaw::capillaryPressures(pC, materialLawParams(context, spaceIdx, timeIdx), fs);
fs.setPressure(wPhaseIdx, 200e3); fs.setPressure(wPhaseIdx, 200e3);
fs.setPressure(nPhaseIdx, 200e3 + pC[nPhaseIdx] - pC[nPhaseIdx]); fs.setPressure(nPhaseIdx, 200e3 + pC[nPhaseIdx] - pC[nPhaseIdx]);
values.assignNaive(fs); values.assignNaive(fs);
} }

2
examples/tutorialproblem_decoupled.hh
View File

@ -63,7 +63,7 @@ NEW_TYPE_TAG(TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransport
// Set the problem property // Set the problem property
SET_TYPE_PROP(TutorialProblemDecoupled, /*@\label{tutorial-decoupled:set-problem}@*/ SET_TYPE_PROP(TutorialProblemDecoupled, /*@\label{tutorial-decoupled:set-problem}@*/
Problem, Problem,
Dumux::TutorialProblemDecoupled<TypeTag>); Dumux::TutorialProblemDecoupled<TypeTag>);
// Set the grid type // Set the grid type