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

shorten all lines to at most 100 characters

Browse Source 
well, if there is no good way to do so, accept a slightly larger
number. Anyway, the longest line is now at 104 characters...
This commit is contained in:
Andreas Lauser
2014-02-11 00:22:06 +01:00
parent 9f3aa104bb
commit b39910eb34
7 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/co2injection_immiscible_ecfv.cpp
View File

@@ -32,8 +32,11 @@
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(Co2InjectionImmiscibleEcfvProblem, INHERITS_FROM(ImmiscibleModel, Co2InjectionBaseProblem));
SET_TAG_PROP(Co2InjectionImmiscibleEcfvProblem, SpatialDiscretizationSplice, EcfvDiscretization);
NEW_TYPE_TAG(Co2InjectionImmiscibleEcfvProblem,
INHERITS_FROM(ImmiscibleModel,
Co2InjectionBaseProblem));
SET_TAG_PROP(Co2InjectionImmiscibleEcfvProblem, SpatialDiscretizationSplice,
EcfvDiscretization);
}}
////////////////////////

6
examples/co2injection_immiscible_ni_ecfv.cpp
View File

@@ -31,8 +31,10 @@
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(Co2InjectionImmiscibleNiEcfvProblem, INHERITS_FROM(ImmiscibleModel, Co2InjectionBaseProblem));
SET_TAG_PROP(Co2InjectionImmiscibleNiEcfvProblem, SpatialDiscretizationSplice, EcfvDiscretization);
NEW_TYPE_TAG(Co2InjectionImmiscibleNiEcfvProblem, INHERITS_FROM(ImmiscibleModel,
Co2InjectionBaseProblem));
SET_TAG_PROP(Co2InjectionImmiscibleNiEcfvProblem, SpatialDiscretizationSplice,
EcfvDiscretization);
SET_BOOL_PROP(Co2InjectionImmiscibleNiEcfvProblem, EnableEnergy, true);
}}

3
examples/co2injection_immiscible_ni_vcfv.cpp
View File

@@ -31,7 +31,8 @@
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(Co2InjectionImmiscibleNiVcfvProblem, INHERITS_FROM(ImmiscibleModel, Co2InjectionBaseProblem));
NEW_TYPE_TAG(Co2InjectionImmiscibleNiVcfvProblem, INHERITS_FROM(ImmiscibleModel,
Co2InjectionBaseProblem));
SET_TAG_PROP(Co2InjectionImmiscibleNiVcfvProblem, SpatialDiscretizationSplice, VcfvDiscretization);
SET_BOOL_PROP(Co2InjectionImmiscibleNiVcfvProblem, EnableEnergy, true);

3
examples/co2injection_immiscible_vcfv.cpp
View File

@@ -32,7 +32,8 @@
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(Co2InjectionImmiscibleVcfvProblem, INHERITS_FROM(ImmiscibleModel, Co2InjectionBaseProblem));
NEW_TYPE_TAG(Co2InjectionImmiscibleVcfvProblem, INHERITS_FROM(ImmiscibleModel,
Co2InjectionBaseProblem));
SET_TAG_PROP(Co2InjectionImmiscibleVcfvProblem, SpatialDiscretizationSplice, VcfvDiscretization);
}}

11
examples/problems/waterairproblem.hh
View File

@@ -299,7 +299,9 @@ public:
* \copydoc FvBaseMultiPhaseProblem::materialLawParams
*/
template <class Context>
const MaterialLawParams& materialLawParams(const Context &context, int spaceIdx, int timeIdx) const
const MaterialLawParams& materialLawParams(const Context &context,
int spaceIdx,
int timeIdx) const
{
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);
if (isFineMaterial_(pos))
@@ -368,8 +370,6 @@ public:
values.setMassRate(massRate);
}
else if (onLeftBoundary_(pos) || onRightBoundary_(pos)) {
//int globalIdx = context.elementContext().globalSpaceIndex(context.insideScvIndex(spaceIdx,timeIdx), timeIdx);
Opm::CompositionalFluidState<Scalar, FluidSystem> fs;
initialFluidState_(fs, context, spaceIdx, timeIdx);
@@ -457,7 +457,10 @@ private:
{ return (20 < pos[0]) && (pos[0] < 30) && (pos[1] < 30); }
template <class Context, class FluidState>
void initialFluidState_(FluidState &fs, const Context &context, int spaceIdx, int timeIdx) const
void initialFluidState_(FluidState &fs,
const Context &context,
int spaceIdx,
int timeIdx) const
{
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);