OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-21 16:57:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename "bbox" to "boundingBox"

Browse Source
This commit is contained in:
Andreas Lauser 2013-12-27 18:25:54 +01:00
parent 3278f66be5
commit 29926a7d06
18 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/problems/co2injectionproblem.hh
View File

@ -577,7 +577,7 @@ private:
{ return pos[0] < eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onInlet_(const GlobalPosition &pos) const
{ return onRightBoundary_(pos) && (5 < pos[1]) && (pos[1] < 15); }

4
examples/problems/cuvetteproblem.hh
View File

@ -460,13 +460,13 @@ private:
{ return pos[0] < eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
bool isContaminated_(const GlobalPosition &pos) const
{

2
examples/problems/diffusionproblem.hh
View File

@ -294,7 +294,7 @@ public:
private:
bool onLeftSide_(const GlobalPosition &pos) const
{ return pos[0] < (this->bboxMin()[0] + this->bboxMax()[0]) / 2; }
{ return pos[0] < (this->boundingBoxMin()[0] + this->boundingBoxMax()[0]) / 2; }
void setupInitialFluidStates_()
{

12
examples/problems/fingerproblem.hh
View File

@ -431,21 +431,21 @@ public:
private:
bool onLeftBoundary_(const GlobalPosition &pos) const
{ return pos[0] < this->bboxMin()[0] + eps_; }
{ return pos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < this->bboxMin()[1] + eps_; }
{ return pos[1] < this->boundingBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
bool onInlet_(const GlobalPosition &pos) const
{
Scalar width = this->bboxMax()[0] - this->bboxMin()[0];
Scalar lambda = (this->bboxMax()[0] - pos[0]) / width;
Scalar width = this->boundingBoxMax()[0] - this->boundingBoxMin()[0];
Scalar lambda = (this->boundingBoxMax()[0] - pos[0]) / width;
if (!onUpperBoundary_(pos))
return false;

8
examples/problems/fractureproblem.hh
View File

@ -536,16 +536,16 @@ public:
private:
bool onLeftBoundary_(const GlobalPosition &pos) const
{ return pos[0] < this->bboxMin()[0] + eps_; }
{ return pos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < this->bboxMin()[1] + eps_; }
{ return pos[1] < this->boundingBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
void computeHeatCondParams_(HeatConductionLawParams &params, Scalar poro)
{

2
examples/problems/groundwaterproblem.hh
View File

@ -334,7 +334,7 @@ private:
{ return pos[dim - 1] < eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[dim - 1] > this->bboxMax()[dim - 1] - eps_; }
{ return pos[dim - 1] > this->boundingBoxMax()[dim - 1] - eps_; }
bool isInLens_(const GlobalPosition &pos) const
{

4
examples/problems/infiltrationproblem.hh
View File

@ -387,13 +387,13 @@ private:
{ return pos[0] < eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
bool onInlet_(const GlobalPosition &pos) const
{ return onUpperBoundary_(pos) && 50 < pos[0] && pos[0] < 75; }

20
examples/problems/lensproblem.hh
View File

@ -409,8 +409,8 @@ public:
// set wetting phase pressure and saturation
if (onLeftBoundary_(pos)) {
Scalar height = this->bboxMax()[1] - this->bboxMin()[1];
Scalar depth = this->bboxMax()[1] - pos[1];
Scalar height = this->boundingBoxMax()[1] - this->boundingBoxMin()[1];
Scalar depth = this->boundingBoxMax()[1] - pos[1];
Scalar alpha = (1 + 1.5 / height);
// hydrostatic pressure scaled by alpha
@ -418,7 +418,7 @@ public:
Sw = 1.0;
}
else {
Scalar depth = this->bboxMax()[1] - pos[1];
Scalar depth = this->boundingBoxMax()[1] - pos[1];
// hydrostatic pressure
pw = 1e5 - densityW * this->gravity()[1] * depth;
@ -472,7 +472,7 @@ public:
int timeIdx) const
{
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);
Scalar depth = this->bboxMax()[1] - pos[1];
Scalar depth = this->boundingBoxMax()[1] - pos[1];
Opm::ImmiscibleFluidState<Scalar, FluidSystem> fs;
fs.setPressure(wPhaseIdx, /*pressure=*/1e5);
@ -529,21 +529,21 @@ private:
}
bool onLeftBoundary_(const GlobalPosition &pos) const
{ return pos[0] < this->bboxMin()[0] + eps_; }
{ return pos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < this->bboxMin()[1] + eps_; }
{ return pos[1] < this->boundingBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
bool onInlet_(const GlobalPosition &pos) const
{
Scalar width = this->bboxMax()[0] - this->bboxMin()[0];
Scalar lambda = (this->bboxMax()[0] - pos[0]) / width;
Scalar width = this->boundingBoxMax()[0] - this->boundingBoxMin()[0];
Scalar lambda = (this->boundingBoxMax()[0] - pos[0]) / width;
return onUpperBoundary_(pos) && 0.5 < lambda && lambda < 2.0 / 3.0;
}

8
examples/problems/navierstokestestproblem.hh
View File

@ -244,16 +244,16 @@ private:
}
bool onLeftBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[0] < this->bboxMin()[0] + eps_; }
{ return globalPos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[0] > this->bboxMax()[0] - eps_; }
{ return globalPos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[1] < this->bboxMin()[1] + eps_; }
{ return globalPos[1] < this->boundingBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[1] > this->bboxMax()[1] - eps_; }
{ return globalPos[1] > this->boundingBoxMax()[1] - eps_; }
Scalar eps_;
};

6
examples/problems/outflowproblem.hh
View File

@ -291,7 +291,7 @@ private:
{ return pos[0] < eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
template <class FluidState, class Context>
void initialFluidState_(FluidState &fs, const Context &context,
@ -300,9 +300,9 @@ private:
Scalar T = temperature(context, spaceIdx, timeIdx);
// Scalar rho = FluidSystem::H2O::liquidDensity(T, /*pressure=*/1.5e5);
// Scalar z = context.pos(spaceIdx, timeIdx)[dim - 1] -
// this->bboxMax()[dim - 1];
// this->boundingBoxMax()[dim - 1];
// Scalar z = context.pos(spaceIdx, timeIdx)[dim - 1] -
// this->bboxMax()[dim - 1];
// this->boundingBoxMax()[dim - 1];
fs.setSaturation(/*phaseIdx=*/0, 1.0);
fs.setPressure(/*phaseIdx=*/0, 1e5 /* + rho*z */);

4
examples/problems/powerinjectionproblem.hh
View File

@ -361,10 +361,10 @@ public:
private:
bool onLeftBoundary_(const GlobalPosition &pos) const
{ return pos[0] < this->bboxMin()[0] + eps_; }
{ return pos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
void setupInitialFluidState_()
{

10
examples/problems/reservoirproblem.hh
View File

@ -424,10 +424,10 @@ public:
int spaceIdx, int timeIdx) const
{
const auto &pos = context.pos(spaceIdx, timeIdx);
Scalar x = pos[0] - this->bboxMin()[0];
Scalar y = pos[dim - 1] - this->bboxMin()[dim - 1];
Scalar height = this->bboxMax()[dim - 1] - this->bboxMin()[dim - 1];
Scalar width = this->bboxMax()[0] - this->bboxMin()[0];
Scalar x = pos[0] - this->boundingBoxMin()[0];
Scalar y = pos[dim - 1] - this->boundingBoxMin()[dim - 1];
Scalar height = this->boundingBoxMax()[dim - 1] - this->boundingBoxMin()[dim - 1];
Scalar width = this->boundingBoxMax()[0] - this->boundingBoxMin()[0];
if ((onLeftBoundary_(pos) || onRightBoundary_(pos)) && y < height / 2) {
// injectors
auto fs = initialFluidState_;
@ -566,7 +566,7 @@ private:
{ return pos[0] < eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onInlet_(const GlobalPosition &pos) const
{ return onRightBoundary_(pos) && (5 < pos[1]) && (pos[1] < 15); }

12
examples/problems/richardslensproblem.hh
View File

@ -371,21 +371,21 @@ public:
private:
bool onLeftBoundary_(const GlobalPosition &pos) const
{ return pos[0] < this->bboxMin()[0] + eps_; }
{ return pos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < this->bboxMin()[1] + eps_; }
{ return pos[1] < this->boundingBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
bool onInlet_(const GlobalPosition &pos) const
{
Scalar width = this->bboxMax()[0] - this->bboxMin()[0];
Scalar lambda = (this->bboxMax()[0] - pos[0]) / width;
Scalar width = this->boundingBoxMax()[0] - this->boundingBoxMin()[0];
Scalar lambda = (this->boundingBoxMax()[0] - pos[0]) / width;
return onUpperBoundary_(pos) && 0.5 < lambda && lambda < 2.0 / 3.0;
}

16
examples/problems/stokes2ctestproblem.hh
View File

@ -214,10 +214,10 @@ public:
// parabolic profile
const Scalar v1 = 1.0;
values[velocity0Idx + 1]
= -v1 * (globalPos[0] - this->bboxMin()[0])
* (this->bboxMax()[0] - globalPos[0])
/ (0.25 * (this->bboxMax()[0] - this->bboxMin()[0])
* (this->bboxMax()[0] - this->bboxMin()[0]));
= -v1 * (globalPos[0] - this->boundingBoxMin()[0])
* (this->boundingBoxMax()[0] - globalPos[0])
/ (0.25 * (this->boundingBoxMax()[0] - this->boundingBoxMin()[0])
* (this->boundingBoxMax()[0] - this->boundingBoxMin()[0]));
Scalar moleFrac[numComponents];
if (onUpperBoundary_(globalPos))
@ -273,16 +273,16 @@ public:
private:
bool onLeftBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[0] < this->bboxMin()[0] + eps_; }
{ return globalPos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[0] > this->bboxMax()[0] - eps_; }
{ return globalPos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[1] < this->bboxMin()[1] + eps_; }
{ return globalPos[1] < this->boundingBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &globalPos) const
{ return globalPos[1] > this->bboxMax()[1] - eps_; }
{ return globalPos[1] > this->boundingBoxMax()[1] - eps_; }
Scalar eps_;
};

14
examples/problems/stokesnitestproblem.hh
View File

@ -213,9 +213,9 @@ public:
moleFrac[AirIdx] = 1 - moleFrac[H2OIdx];
// parabolic velocity profile
Scalar y = this->bboxMax()[1] - pos[1];
Scalar x = pos[0] - this->bboxMin()[0];
Scalar width = this->bboxMax()[0] - this->bboxMin()[0];
Scalar y = this->boundingBoxMax()[1] - pos[1];
Scalar x = pos[0] - this->boundingBoxMin()[0];
Scalar width = this->boundingBoxMax()[0] - this->boundingBoxMin()[0];
// parabolic velocity profile
const Scalar maxVelocity = 1.0;
@ -285,16 +285,16 @@ public:
private:
bool onLeftBoundary_(const GlobalPosition &pos) const
{ return pos[0] < this->bboxMin()[0] + eps_; }
{ return pos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < this->bboxMin()[1] + eps_; }
{ return pos[1] < this->boundingBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
bool onBoundary_(const GlobalPosition &pos) const
{

16
examples/problems/stokestestproblem.hh
View File

@ -180,8 +180,8 @@ public:
{
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);
Scalar y = pos[1] - this->bboxMin()[1];
Scalar height = this->bboxMax()[1] - this->bboxMin()[1];
Scalar y = pos[1] - this->boundingBoxMin()[1];
Scalar height = this->boundingBoxMax()[1] - this->boundingBoxMin()[1];
// parabolic velocity profile
const Scalar maxVelocity = 1.0;
@ -221,8 +221,8 @@ public:
{
const auto &pos = context.pos(spaceIdx, timeIdx);
Scalar y = pos[1] - this->bboxMin()[1];
Scalar height = this->bboxMax()[1] - this->bboxMin()[1];
Scalar y = pos[1] - this->boundingBoxMin()[1];
Scalar height = this->boundingBoxMax()[1] - this->boundingBoxMin()[1];
// parabolic velocity profile on boundaries
const Scalar maxVelocity = 1.0;
@ -280,16 +280,16 @@ public:
private:
bool onLeftBoundary_(const GlobalPosition &pos) const
{ return pos[0] < this->bboxMin()[0] + eps_; }
{ return pos[0] < this->boundingBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < this->bboxMin()[1] + eps_; }
{ return pos[1] < this->boundingBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
bool onBoundary_(const GlobalPosition &pos) const
{

4
examples/problems/waterairproblem.hh
View File

@ -444,13 +444,13 @@ private:
{ return pos[0] < eps_; }
bool onRightBoundary_(const GlobalPosition &pos) const
{ return pos[0] > this->bboxMax()[0] - eps_; }
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &pos) const
{ return pos[1] < eps_; }
bool onUpperBoundary_(const GlobalPosition &pos) const
{ return pos[1] > this->bboxMax()[1] - eps_; }
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
bool onInlet_(const GlobalPosition &pos) const
{ return onLowerBoundary_(pos) && (15.0 < pos[0]) && (pos[0] < 25.0); }

2
examples/tutorial1problem.hh
View File

@ -244,7 +244,7 @@ public:
values.setFreeFlow(context, spaceIdx, timeIdx, fs);
}
else if (pos[0] > this->bboxMax()[0] - eps_) {
else if (pos[0] > this->boundingBoxMax()[0] - eps_) {
// forced outflow at the right boundary
RateVector massRate(0.0);