OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 18:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
7f942c7100
opm-simulators/examples/problems/fingerproblem.hh

480 lines
15 KiB
C++
Raw Normal View History

replace in-file copyright notices by OPM the standard one
2013-12-02 08:48:04 -06:00
/*
update the in-file copyright holder statements this patch is quite large as there were various bug fixes to the script which generates these statements
2013-12-02 09:39:42 -06:00
Copyright (C) 2008-2013 by Andreas Lauser
replace in-file copyright notices by OPM the standard one
2013-12-02 08:48:04 -06:00
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
/*!
* \file
*
* \copydoc Ewoms::FingerProblem
*/
#ifndef EWOMS_FINGER_PROBLEM_HH
#define EWOMS_FINGER_PROBLEM_HH
refactoring: rename GridCreator to GridManager because "manager" sounds less religious than "creator" and the GridCreators did all kinds of other stuff besides creating the grid. this patch also gets rid of the static function inside these classes, which should make them easier to understand...
2014-04-24 05:24:51 -05:00
#include "fingergridmanager.hh"
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
adapt to the changes in opm-material
2013-11-06 07:50:01 -06:00
#include <opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp>
#include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp>
#include <opm/material/fluidmatrixinteractions/ParkerLenhard.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
clean up the richards model and follow the recent renames of opm-material
2014-05-08 09:52:24 -05:00
#include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Air.hpp>
#include <ewoms/models/immiscible/immiscibleproperties.hh>
fix some dune 2.3 deprecation warnings also use the actual grid headers for grids, not the corresponding DGF parser header.
2013-12-01 04:51:05 -06:00
#include <dune/common/version.hh>
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <vector>
#include <string>
namespace Ewoms {
template <class TypeTag>
class FingerProblem;
namespace Properties {
refactoring: rename GridCreator to GridManager because "manager" sounds less religious than "creator" and the GridCreators did all kinds of other stuff besides creating the grid. this patch also gets rid of the static function inside these classes, which should make them easier to understand...
2014-04-24 05:24:51 -05:00
NEW_TYPE_TAG(FingerBaseProblem, INHERITS_FROM(FingerGridManager));
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
refactoring: extend the TimeManager to become the Simulator this also comes with moving responsibilities around and some smaller cleanups for the grid creation. (although grid creation could be possibly done by the simulator now, the GridCreator concept has not been abandoned, yet...)
2014-04-14 13:32:30 -05:00
// declare the properties used by the finger problem
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
NEW_PROP_TAG(InitialWaterSaturation);
// Set the problem property
SET_TYPE_PROP(FingerBaseProblem, Problem, Ewoms::FingerProblem<TypeTag>);
// Set the wetting phase
SET_PROP(FingerBaseProblem, WettingPhase)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
public:
typedef Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
SET_PROP(FingerBaseProblem, NonwettingPhase)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
public:
typedef Opm::GasPhase<Scalar, Opm::Air<Scalar> > type;
};
// Set the material Law
SET_PROP(FingerBaseProblem, MaterialLaw)
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
adapt to the changes in opm-material
2013-11-06 07:50:01 -06:00
typedef Opm::TwoPhaseMaterialTraits<Scalar,
adapt to the recent renames of the phase indices in opm-material
2014-04-03 09:59:48 -05:00
/*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
refactoring: extend the TimeManager to become the Simulator this also comes with moving responsibilities around and some smaller cleanups for the grid creation. (although grid creation could be possibly done by the simulator now, the GridCreator concept has not been abandoned, yet...)
2014-04-14 13:32:30 -05:00
/*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx> Traits;
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
adapt to the changes in opm-material
2013-11-06 07:50:01 -06:00
// use the parker-lenhard hysteresis law
typedef Opm::ParkerLenhard<Traits> ParkerLenhard;
typedef ParkerLenhard type;
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
};
// Write the solutions of individual newton iterations?
SET_BOOL_PROP(FingerBaseProblem, NewtonWriteConvergence, false);
// Use forward differences instead of central differences
SET_INT_PROP(FingerBaseProblem, NumericDifferenceMethod, +1);
// Enable constraints
SET_INT_PROP(FingerBaseProblem, EnableConstraints, true);
// Enable gravity
SET_BOOL_PROP(FingerBaseProblem, EnableGravity, true);
// define the properties specific for the finger problem
SET_SCALAR_PROP(FingerBaseProblem, DomainSizeX, 0.1);
SET_SCALAR_PROP(FingerBaseProblem, DomainSizeY, 0.3);
SET_SCALAR_PROP(FingerBaseProblem, DomainSizeZ, 0.1);
SET_SCALAR_PROP(FingerBaseProblem, InitialWaterSaturation, 0.01);
SET_INT_PROP(FingerBaseProblem, CellsX, 20);
SET_INT_PROP(FingerBaseProblem, CellsY, 70);
SET_INT_PROP(FingerBaseProblem, CellsZ, 1);
// The default for the end time of the simulation
some smallish parallel ctest improvements the goal is to make it faster on computers with many cores: The easiest way to do this is to ensure that the longest running tests are not taking too much time and that they need about the same time. Thus this patch contains the following changes which limits the CPU time taken by each test to about two minutes in debug mode on my machine: - the water-air problem using the non-isothermal primary variable switching model now uses an 16x16 instead of a 32x32 grid. as a compensation it now runs for a year instead of 5000 seconds and the global grid refinement is now tested. - the end time of the lens problem ctests is now 3000 instead of 30000 seconds. The binary itself does not change at all. - sort the tests in the CMakeLists.txt roughly in the order of their required time. (this will cause ctest not having to wait for long running test which were started late for too long.)
2014-09-03 05:03:58 -05:00
SET_SCALAR_PROP(FingerBaseProblem, EndTime, 215);
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
// The default for the initial time step size of the simulation
SET_SCALAR_PROP(FingerBaseProblem, InitialTimeStepSize, 10);
some minor fixes i.e., removing redundant namespace open- and closings due to the fact that the property system now resides in the 'Ewoms' namspace instead of in 'Opm', and making the headercheck work for all headers.
2015-05-21 09:19:13 -05:00
} // namespace Properties
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
/*!
refactoring: extend the TimeManager to become the Simulator this also comes with moving responsibilities around and some smaller cleanups for the grid creation. (although grid creation could be possibly done by the simulator now, the GridCreator concept has not been abandoned, yet...)
2014-04-14 13:32:30 -05:00
* \ingroup TestProblems
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*
* \brief Two-phase problem featuring some gravity-driven saturation
* fingers.
*
* The domain of this problem is sized 10cm times 1m and is initially
* dry. Water is then injected at three locations on the top of the
* domain which leads to gravity fingering. The boundary conditions
* used are no-flow for the left and right and top of the domain and
* free-flow at the bottom. This problem uses the Parker-Lenhard
* hystersis model which might lead to non-monotonic saturation in the
* fingers if the right material parameters is chosen and the spatial
* discretization is fine enough.
*/
template <class TypeTag>
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
class FingerProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
{
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
//!\cond SKIP_THIS
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
typedef typename GET_PROP_TYPE(TypeTag, BaseProblem) ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
refactoring: extend the TimeManager to become the Simulator this also comes with moving responsibilities around and some smaller cleanups for the grid creation. (although grid creation could be possibly done by the simulator now, the GridCreator concept has not been abandoned, yet...)
2014-04-14 13:32:30 -05:00
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
typedef typename GET_PROP_TYPE(TypeTag, Constraints) Constraints;
problems: make the name() methods static this allows to retrieve the name of the problem before it is instantiated. this is required to be able to print the "Initializing problem" message at the correct point (i.e., before instantiating the problem).
2014-03-07 04:34:55 -06:00
typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
enum {
// number of phases
// phase indices
adapt to the recent renames of the phase indices in opm-material
2014-04-03 09:59:48 -05:00
wettingPhaseIdx = FluidSystem::wettingPhaseIdx,
nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx,
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
// equation indices
adapt to the recent renames of the phase indices in opm-material
2014-04-03 09:59:48 -05:00
contiWettingEqIdx = Indices::conti0EqIdx + wettingPhaseIdx,
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
// Grid and world dimension
dim = GridView::dimension,
dimWorld = GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
use the checkConservativeness() method in all appropriate test problems "appropriate" basically means "does not use constraints", as constraints do not care about the conservation quantities...
2014-07-22 05:41:56 -05:00
typedef typename GET_PROP_TYPE(TypeTag, EqVector) EqVector;
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
problems: make the name() methods static this allows to retrieve the name of the problem before it is instantiated. this is required to be able to print the "Initializing problem" message at the correct point (i.e., before instantiating the problem).
2014-03-07 04:34:55 -06:00
typedef typename GET_PROP_TYPE(TypeTag, BoundaryRateVector) BoundaryRateVector;
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
typedef typename GET_PROP(TypeTag, MaterialLaw)::ParkerLenhard ParkerLenhard;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
//!\endcond
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
public:
/*!
* \copydoc Doxygen::defaultProblemConstructor
*/
refactoring: extend the TimeManager to become the Simulator this also comes with moving responsibilities around and some smaller cleanups for the grid creation. (although grid creation could be possibly done by the simulator now, the GridCreator concept has not been abandoned, yet...)
2014-04-14 13:32:30 -05:00
FingerProblem(Simulator &simulator)
: ParentType(simulator)
use finishInit() properly for all problems this means that all code which could potentially throw an exception is moved to this method(). (In particular FluidSystem::init() proved troublesome in the past.) Besides avoiding segmentation the faults which stem from exceptions thrown in constructors, this also has the advantage that simulations which spend a noticable amount of time to initialize stop at the "correct" place, i.e. after the "Finish init of the problem" message was printed by the simulator...
2014-08-06 09:31:48 -05:00
{ }
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
/*!
* \name Auxiliary methods
*/
//! \{
/*!
replace a few now-incorrect "Vcfv" prefixes in the comments
2014-07-17 10:24:48 -05:00
* \copydoc FvBaseProblem::name
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
make the name() method of problems non-static again this allows to easily specify the problem name at runtime.
2014-04-25 10:22:28 -05:00
std::string name() const
problems: make the name() methods static this allows to retrieve the name of the problem before it is instantiated. this is required to be able to print the "Initializing problem" message at the correct point (i.e., before instantiating the problem).
2014-03-07 04:34:55 -06:00
{ return std::string("finger_") + Model::name(); }
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
/*!
Implement the element centered finite volume spatial discretization This makes eWoms multi-discretization capable. Along the way, this fixes some bugs and does a medium sized reorganization of the source tree. This is a squashed patch of the following commits: -------- 1st commit message: add initial version of the element centered finite volume discretization currently, it is a misnomer as it is just a copy of the vertex centered discretization plus some renames... -------- 2nd commit message: rename [VE]cfvModel -> [VE]cfvDiscretization -------- 3rd commit message: ecfv: prelimary changes required to make it compile but not work yet... -------- 4th commit message: Rename *FvElementGeometry to *Stencil "Stencil" seems to be the standard expression for this concept... (also, it is not specific to finite volume methods and is shorter.) -------- 5th commit message: refactor the stencil class for the element centered finite volume discretization -------- 6th commit message: ECFV: some work on the stencil class -------- 7th commit message: ECFV: make the boundary handling code compile -------- 8th commit message: rename elemContext() to elementContext() -------- 9th commit message: ECFV: make the VTK output modules compile -------- 10th commit message: stencil: introduce the concept of primary DOFs also save an vector of all element pointers in the stencil. -------- 11th commit message: ECFV: try to fix assembly; add missing timeIdx arguments to the num*() methods -------- 12th commit message: ECFV: fix stupid mistake in the assembler -------- 13th commit message: ECFV: remove a few implicit DOF == vertex assumptions the black-oil example now runs without valgrind complaints until it encounters a negative oil mole fraction. -------- 14th commit message: VCFV: make everything compile again all vertex centered FV examples should now work again... -------- 15th commit message: rename [ev]cfvmodel.hh to [ev]cfvdiscretization.hh the classes have already been renamed. -------- 16th commit message: ECFV: make it work to the point where it can write out the initial solution. -------- 17th commit message: ECFV: make it work the local residual/jacobian needed some work in distinguishing primary and secondary DOFs and there was an minor issue with the serialization code. for some reason, it seems still not correct. (-> convergence is too slow.) -------- 18th commit message: VCFV: make it compile for the black oil model again -------- 19th commit message: VCFV: make it compile with the remaining models again -------- 20th commit message: flash model: make it work with ECFV although this breaks its compatibility with VCFV. (-> next commit) -------- 21st commit message: adapt the VCFV to make it compatible with the flash model again -------- 22nd commit message: make all models compile with VCFV again -------- 23rd commit message: VCFV: more cleanups of the stencil VcfvStencil now does not have any public attributes anymore. TODO: do not export attributes in the SubControlVolume and SubControlVolumeFace classes. -------- 24th commit message: VCFV: actually update the element pointer -------- 25th commit message: change the blackoil model back to ECFV -------- 26th commit message: immiscible model: make it compatible with the ECFV discretization -------- 27th commit message: PVS model: make it work with ECFV -------- 28th commit message: NCP model: make it work with ECFV -------- 29th commit message: rename Vcfv*VelocityModule to *VelocityModule -------- 30th commit message: richards model: make it work with ECFV -------- 31st commit message: unify the ECFV and the VCFV VTK output modules and other cleanups -------- 32nd commit message: unify the common code of the VCFV and the ECFV disctretizations -------- 33rd commit message: unify the element contexts between element and vertex centered finite volumes -------- 34th commit message: unify the local jacobian class of the finite volume discretizations -------- 35th commit message: replace [VE]vcf(LocalResidual|ElementContext|BoundaryContext|ConstraintsContext) by generic code -------- 36th commit message: replace the [EV]cfvLocalResidual by generic code -------- 37th commit message: unify the MultiPhaseProblem and Problem classes, introduce NullBorderListCreator -------- 38th commit message: remove the discretization specific boundary context -------- 39th commit message: unify the [EV]cfvDiscretization classes -------- 40th commit message: Unify [EV]cfvMultiPhaseFluxVariables -------- 41st commit message: Unify the [EC]cfvNewton* classes -------- 42nd commit message: Unify [EV]cfvVolumeVariables -------- 43rd commit message: unify [EV]cfvAssembler -------- 44th commit message: unified flux variables: fix stupid mistake when calculating pressure gradients -------- 45th commit message: unify what's to unify for the [EV]CFV properties -------- 46th commit message: make the method to calculate gradients and values at flux approximation points changeable Currently, this is used by the vertex centered finite volume method to be able to use P1-finite element gradients instead of two-point ones... -------- 47th commit message: make the restart code work correctly, use the correct DofMapper for VCFV -------- 48th commit message: actually use the gradient calculator in a model the immiscible model in this case -------- 49th commit message: move some files around to where they belong, use the new gradient calculation code in all models TODO: proper handling of boundary gradients -------- 50th commit message: fix the stokes model currently it only works with the vertex centered finite volume discretization, but the plan is to soon move it to a staggered grid scheme anyway... -------- 51st commit message: move all models back to using the vertex centered finite volume discretization by default -------- 52nd commit message: models: some variable renames and documentation fixes - scv -> dof - vert -> dof - vertex -> dof - replace 'VCFV' - fix some typos -------- 53rd commit message: don't expect UG anymore since it is quite non-free and hard to get. we now use ALUGrid instead! -------- 54th commit message: temporarily disable jacobian recycling -------- 55th commit message: fix writing/reading restart files using the generic code -------- 56th commit message: fix bug where fluxes were only counted once in the stencil this only affected the vertex centered finite volumes discretization... -------- 57th commit message: boundary gradients: use the center of the sub-control volume adjacent to a boundary segment -------- 58th commit message: make it compile on GCC -------- 59th commit message: get rid of most hacks for this, partial reassemble and jacobian recycling was brought back. For the this and the remaining stuff the main trick is the introduction of the GridCommHandleFactory concept which constructs communication handles suited for the respective spatial discretization... -------- 60th commit message: fix a few annoying bugs first, default the convergence criterion for the linear solver did not honor the initial residual which lead to linear solver breakdowns, then some debugging code was left in the discrete fracture model and then there was a bug in the TP gradient approximation class... this has the consequence that we need a new reference solution for the discrete fracture problem... -------- 61st commit message: iterative linear solver: remove the code for the non-default convergence criteria -------- 62nd commit message: provide the FE cache instead of the local FE this fixes a segfault in the stokes model caused by the fact that the local FE was not initialized at this point. -------- 63rd commit message: (Navier-)Stokes: fix bug due to the transition to unit normals now, all tests pass for this branch. The only things which need to be fixed are some annoying performance regressions compared to master and some bug in the splices feature of the property system... -------- 64th commit message: some fix for the local residual of the immiscible model -------- 65th commit message: Navier-Stokes: implement SCV center gradients There seems to be a bug in the previous implementation (the jacobian inverse transposed is evaluated using the local, not the global geometry), so the reference solution for the stokes2c test problem has also been updated... -------- 66th commit message: remove the ALUGrid specialization of the LensGridCreator and the YaspGrid one for the fingerproblem using different grid seems to sometimes cause a different vertex order, which in turn causes the respective test to fail if the reference solution was computed using the other grid... -------- 67th commit message: VCFV: use the correct BorderListCreator this makes MPI parallel computations work again. apart from performance regressions, this branch does not exhibit any known regressions compared to master anymore... -------- 68th commit message: make verything compile with the element centered finite volume discretization except the Navier-Stokes and the two-phase DFM models, of course... -------- 69th commit message: minor fixes - make the navier-stokes model slighly more generic by using the proper (in,ex)teriorIndex() methods on sub-control volumes - make the signature of the calculateValue() template method of the common two-point gradient approximator match the one of the vertex centered finite volume one -------- 70th commit message: fix fallout from the Big Rebase -------- 71st commit message: ECFV: some bugs in the boundary -------- 72nd commit message: make computeFlux() compute area-specific quantities -------- 73rd commit message: fix more bugs in the element centered FV discretization now eWoms should match Dumux pretty closely... -------- 74th commit message: coalesce the common code of the multi phase porous medium models into "MultiPhaseBaseModel" -------- 75th commit message: update reference solutions these were changed because of the screw-up with the area of boundary segments... -------- 76th commit message: rename "ImplicitBase" to "FvBase" because in eWoms, everything is implicit and these are currently the base classes for all finite volume discretizations. -------- 77th commit message: make the spatial discretization selectable using a splice This requires an opm-core with a the patches from https://github.com/OPM/opm-core/pull/446 merged... -------- 78th commit message: rename the properties used for splices to *Splice -------- 79th commit message: move the files in 'tests/models' to 'tests' since 'tests' was empty except for the 'models' subdirectory... -------- 80th commit message: improve and fix the tutorial -------- 81st commit message: remove the -fno-strict-aliasing flag from the provided option files seems like recent versions of Dune have been adapted... -------- 82nd commit message: also compile all CO2 injection simulations using the element centered finite volume discretization -------- 83rd commit message: PVS model: make it work properly with the element-centered finite volume discretiation because DOF != number of vertices
2013-12-12 05:52:44 -06:00
* \copydoc FvBaseMultiPhaseProblem::registerParameters
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
static void registerParameters()
{
ParentType::registerParameters();
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
EWOMS_REGISTER_PARAM(TypeTag, Scalar, InitialWaterSaturation,
"The initial saturation in the domain [] of the "
"wetting phase");
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
}
/*!
rework the model and problem initialization procedure basically the init() method was split into a finishInit() method which fills the data structures allocated in the constructor with meaningful data and into applyInitialSolution() which does just that (and no more!)
2014-07-11 13:01:54 -05:00
* \copydoc FvBaseProblem::finishInit()
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
rework the model and problem initialization procedure basically the init() method was split into a finishInit() method which fills the data structures allocated in the constructor with meaningful data and into applyInitialSolution() which does just that (and no more!)
2014-07-11 13:01:54 -05:00
void finishInit()
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
{
rework the model and problem initialization procedure basically the init() method was split into a finishInit() method which fills the data structures allocated in the constructor with meaningful data and into applyInitialSolution() which does just that (and no more!)
2014-07-11 13:01:54 -05:00
ParentType::finishInit();
use finishInit() properly for all problems this means that all code which could potentially throw an exception is moved to this method(). (In particular FluidSystem::init() proved troublesome in the past.) Besides avoiding segmentation the faults which stem from exceptions thrown in constructors, this also has the advantage that simulations which spend a noticable amount of time to initialize stop at the "correct" place, i.e. after the "Finish init of the problem" message was printed by the simulator...
2014-08-06 09:31:48 -05:00
eps_ = 3e-6;
temperature_ = 273.15 + 20; // -> 20°C
rework the model and problem initialization procedure basically the init() method was split into a finishInit() method which fills the data structures allocated in the constructor with meaningful data and into applyInitialSolution() which does just that (and no more!)
2014-07-11 13:01:54 -05:00
FluidSystem::init();
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
// parameters for the Van Genuchten law of the main imbibition
// and the main drainage curves.
micParams_.setVgAlpha(0.0037);
micParams_.setVgN(4.7);
adapt to the changes in opm-material
2013-11-06 07:50:01 -06:00
micParams_.finalize();
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
mdcParams_.setVgAlpha(0.0037);
mdcParams_.setVgN(4.7);
adapt to the changes in opm-material
2013-11-06 07:50:01 -06:00
mdcParams_.finalize();
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
// initialize the material parameter objects of the individual
// finite volumes
add the general framework for specifying auxiliary equations. this does not disrupt the block nature of the linearized matrix (i.e. Dune::BCRSMatrix is still used), but if the number of auxiliary equations is smaller than that of the "main" discretization, the superfluous equations are padded. if the number of additional equations are larger than that of the equation, additional DOFs are added.
2014-10-06 09:23:21 -05:00
int n = this->model().numGridDof();
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
materialParams_.resize(n);
for (int i = 0; i < n; ++i) {
materialParams_[i].setMicParams(&micParams_);
materialParams_[i].setMdcParams(&mdcParams_);
materialParams_[i].setSwr(0.0);
materialParams_[i].setSnr(0.1);
adapt to the changes in opm-material
2013-11-06 07:50:01 -06:00
materialParams_[i].finalize();
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
ParkerLenhard::reset(materialParams_[i]);
}
K_ = this->toDimMatrix_(4.6e-10);
setupInitialFluidState_();
}
/*!
replace a few now-incorrect "Vcfv" prefixes in the comments
2014-07-17 10:24:48 -05:00
* \copydoc FvBaseProblem::endTimeStep
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
problems: fix some rename-fallout for the postTimeStep() to endTimeStep() drive
2014-07-17 09:54:05 -05:00
void endTimeStep()
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
{
use the checkConservativeness() method in all appropriate test problems "appropriate" basically means "does not use constraints", as constraints do not care about the conservation quantities...
2014-07-22 05:41:56 -05:00
#ifndef NDEBUG
// checkConservativeness() does not include the effect of constraints, so we
// disable it for this problem...
//this->model().checkConservativeness();
// Calculate storage terms
EqVector storage;
this->model().globalStorage(storage);
// Write mass balance information for rank 0
if (this->gridView().comm().rank() == 0) {
std::cout << "Storage: " << storage << std::endl << std::flush;
}
#endif // NDEBUG
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
// update the history of the hysteresis law
refactoring: extend the TimeManager to become the Simulator this also comes with moving responsibilities around and some smaller cleanups for the grid creation. (although grid creation could be possibly done by the simulator now, the GridCreator concept has not been abandoned, yet...)
2014-04-14 13:32:30 -05:00
ElementContext elemCtx(this->simulator());
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
auto elemIt = this->gridView().template begin<0>();
const auto &elemEndIt = this->gridView().template end<0>();
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
for (; elemIt != elemEndIt; ++elemIt) {
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
elemCtx.updateAll(*elemIt);
Implement the element centered finite volume spatial discretization This makes eWoms multi-discretization capable. Along the way, this fixes some bugs and does a medium sized reorganization of the source tree. This is a squashed patch of the following commits: -------- 1st commit message: add initial version of the element centered finite volume discretization currently, it is a misnomer as it is just a copy of the vertex centered discretization plus some renames... -------- 2nd commit message: rename [VE]cfvModel -> [VE]cfvDiscretization -------- 3rd commit message: ecfv: prelimary changes required to make it compile but not work yet... -------- 4th commit message: Rename *FvElementGeometry to *Stencil "Stencil" seems to be the standard expression for this concept... (also, it is not specific to finite volume methods and is shorter.) -------- 5th commit message: refactor the stencil class for the element centered finite volume discretization -------- 6th commit message: ECFV: some work on the stencil class -------- 7th commit message: ECFV: make the boundary handling code compile -------- 8th commit message: rename elemContext() to elementContext() -------- 9th commit message: ECFV: make the VTK output modules compile -------- 10th commit message: stencil: introduce the concept of primary DOFs also save an vector of all element pointers in the stencil. -------- 11th commit message: ECFV: try to fix assembly; add missing timeIdx arguments to the num*() methods -------- 12th commit message: ECFV: fix stupid mistake in the assembler -------- 13th commit message: ECFV: remove a few implicit DOF == vertex assumptions the black-oil example now runs without valgrind complaints until it encounters a negative oil mole fraction. -------- 14th commit message: VCFV: make everything compile again all vertex centered FV examples should now work again... -------- 15th commit message: rename [ev]cfvmodel.hh to [ev]cfvdiscretization.hh the classes have already been renamed. -------- 16th commit message: ECFV: make it work to the point where it can write out the initial solution. -------- 17th commit message: ECFV: make it work the local residual/jacobian needed some work in distinguishing primary and secondary DOFs and there was an minor issue with the serialization code. for some reason, it seems still not correct. (-> convergence is too slow.) -------- 18th commit message: VCFV: make it compile for the black oil model again -------- 19th commit message: VCFV: make it compile with the remaining models again -------- 20th commit message: flash model: make it work with ECFV although this breaks its compatibility with VCFV. (-> next commit) -------- 21st commit message: adapt the VCFV to make it compatible with the flash model again -------- 22nd commit message: make all models compile with VCFV again -------- 23rd commit message: VCFV: more cleanups of the stencil VcfvStencil now does not have any public attributes anymore. TODO: do not export attributes in the SubControlVolume and SubControlVolumeFace classes. -------- 24th commit message: VCFV: actually update the element pointer -------- 25th commit message: change the blackoil model back to ECFV -------- 26th commit message: immiscible model: make it compatible with the ECFV discretization -------- 27th commit message: PVS model: make it work with ECFV -------- 28th commit message: NCP model: make it work with ECFV -------- 29th commit message: rename Vcfv*VelocityModule to *VelocityModule -------- 30th commit message: richards model: make it work with ECFV -------- 31st commit message: unify the ECFV and the VCFV VTK output modules and other cleanups -------- 32nd commit message: unify the common code of the VCFV and the ECFV disctretizations -------- 33rd commit message: unify the element contexts between element and vertex centered finite volumes -------- 34th commit message: unify the local jacobian class of the finite volume discretizations -------- 35th commit message: replace [VE]vcf(LocalResidual|ElementContext|BoundaryContext|ConstraintsContext) by generic code -------- 36th commit message: replace the [EV]cfvLocalResidual by generic code -------- 37th commit message: unify the MultiPhaseProblem and Problem classes, introduce NullBorderListCreator -------- 38th commit message: remove the discretization specific boundary context -------- 39th commit message: unify the [EV]cfvDiscretization classes -------- 40th commit message: Unify [EV]cfvMultiPhaseFluxVariables -------- 41st commit message: Unify the [EC]cfvNewton* classes -------- 42nd commit message: Unify [EV]cfvVolumeVariables -------- 43rd commit message: unify [EV]cfvAssembler -------- 44th commit message: unified flux variables: fix stupid mistake when calculating pressure gradients -------- 45th commit message: unify what's to unify for the [EV]CFV properties -------- 46th commit message: make the method to calculate gradients and values at flux approximation points changeable Currently, this is used by the vertex centered finite volume method to be able to use P1-finite element gradients instead of two-point ones... -------- 47th commit message: make the restart code work correctly, use the correct DofMapper for VCFV -------- 48th commit message: actually use the gradient calculator in a model the immiscible model in this case -------- 49th commit message: move some files around to where they belong, use the new gradient calculation code in all models TODO: proper handling of boundary gradients -------- 50th commit message: fix the stokes model currently it only works with the vertex centered finite volume discretization, but the plan is to soon move it to a staggered grid scheme anyway... -------- 51st commit message: move all models back to using the vertex centered finite volume discretization by default -------- 52nd commit message: models: some variable renames and documentation fixes - scv -> dof - vert -> dof - vertex -> dof - replace 'VCFV' - fix some typos -------- 53rd commit message: don't expect UG anymore since it is quite non-free and hard to get. we now use ALUGrid instead! -------- 54th commit message: temporarily disable jacobian recycling -------- 55th commit message: fix writing/reading restart files using the generic code -------- 56th commit message: fix bug where fluxes were only counted once in the stencil this only affected the vertex centered finite volumes discretization... -------- 57th commit message: boundary gradients: use the center of the sub-control volume adjacent to a boundary segment -------- 58th commit message: make it compile on GCC -------- 59th commit message: get rid of most hacks for this, partial reassemble and jacobian recycling was brought back. For the this and the remaining stuff the main trick is the introduction of the GridCommHandleFactory concept which constructs communication handles suited for the respective spatial discretization... -------- 60th commit message: fix a few annoying bugs first, default the convergence criterion for the linear solver did not honor the initial residual which lead to linear solver breakdowns, then some debugging code was left in the discrete fracture model and then there was a bug in the TP gradient approximation class... this has the consequence that we need a new reference solution for the discrete fracture problem... -------- 61st commit message: iterative linear solver: remove the code for the non-default convergence criteria -------- 62nd commit message: provide the FE cache instead of the local FE this fixes a segfault in the stokes model caused by the fact that the local FE was not initialized at this point. -------- 63rd commit message: (Navier-)Stokes: fix bug due to the transition to unit normals now, all tests pass for this branch. The only things which need to be fixed are some annoying performance regressions compared to master and some bug in the splices feature of the property system... -------- 64th commit message: some fix for the local residual of the immiscible model -------- 65th commit message: Navier-Stokes: implement SCV center gradients There seems to be a bug in the previous implementation (the jacobian inverse transposed is evaluated using the local, not the global geometry), so the reference solution for the stokes2c test problem has also been updated... -------- 66th commit message: remove the ALUGrid specialization of the LensGridCreator and the YaspGrid one for the fingerproblem using different grid seems to sometimes cause a different vertex order, which in turn causes the respective test to fail if the reference solution was computed using the other grid... -------- 67th commit message: VCFV: use the correct BorderListCreator this makes MPI parallel computations work again. apart from performance regressions, this branch does not exhibit any known regressions compared to master anymore... -------- 68th commit message: make verything compile with the element centered finite volume discretization except the Navier-Stokes and the two-phase DFM models, of course... -------- 69th commit message: minor fixes - make the navier-stokes model slighly more generic by using the proper (in,ex)teriorIndex() methods on sub-control volumes - make the signature of the calculateValue() template method of the common two-point gradient approximator match the one of the vertex centered finite volume one -------- 70th commit message: fix fallout from the Big Rebase -------- 71st commit message: ECFV: some bugs in the boundary -------- 72nd commit message: make computeFlux() compute area-specific quantities -------- 73rd commit message: fix more bugs in the element centered FV discretization now eWoms should match Dumux pretty closely... -------- 74th commit message: coalesce the common code of the multi phase porous medium models into "MultiPhaseBaseModel" -------- 75th commit message: update reference solutions these were changed because of the screw-up with the area of boundary segments... -------- 76th commit message: rename "ImplicitBase" to "FvBase" because in eWoms, everything is implicit and these are currently the base classes for all finite volume discretizations. -------- 77th commit message: make the spatial discretization selectable using a splice This requires an opm-core with a the patches from https://github.com/OPM/opm-core/pull/446 merged... -------- 78th commit message: rename the properties used for splices to *Splice -------- 79th commit message: move the files in 'tests/models' to 'tests' since 'tests' was empty except for the 'models' subdirectory... -------- 80th commit message: improve and fix the tutorial -------- 81st commit message: remove the -fno-strict-aliasing flag from the provided option files seems like recent versions of Dune have been adapted... -------- 82nd commit message: also compile all CO2 injection simulations using the element centered finite volume discretization -------- 83rd commit message: PVS model: make it work properly with the element-centered finite volume discretiation because DOF != number of vertices
2013-12-12 05:52:44 -06:00
for (int scvIdx = 0; scvIdx < elemCtx.numDof(/*timeIdx=*/0); ++scvIdx) {
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
int globalIdx = elemCtx.globalSpaceIndex(scvIdx, /*timeIdx=*/0);
rename "(Volume|Flux)Variables" to "(In|Ex)tensiveQuantities" "intensive" means that the value of these quantities at a given spatial location does not depend on any value of the neighboring intensive quantities. In contrast, "extensive" quantities depend in the intensive quantities of the environment of the spatial location. this change is necessary is because the previous nomenclature was very specific to finite volume discretizations, but the models themselves were already rather generic. (i.e., "volume variables" are the intensive quantities of finite volume methods and "flux variables" are the extensive ones.)
2014-06-24 07:54:32 -05:00
const auto &fs = elemCtx.intensiveQuantities(scvIdx, /*timeIdx=*/0).fluidState();
adapt to the changes in opm-material
2013-11-06 07:50:01 -06:00
ParkerLenhard::update(materialParams_[globalIdx], fs);
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
}
}
}
//! \}
/*!
* \name Soil parameters
*/
//! \{
/*!
Implement the element centered finite volume spatial discretization This makes eWoms multi-discretization capable. Along the way, this fixes some bugs and does a medium sized reorganization of the source tree. This is a squashed patch of the following commits: -------- 1st commit message: add initial version of the element centered finite volume discretization currently, it is a misnomer as it is just a copy of the vertex centered discretization plus some renames... -------- 2nd commit message: rename [VE]cfvModel -> [VE]cfvDiscretization -------- 3rd commit message: ecfv: prelimary changes required to make it compile but not work yet... -------- 4th commit message: Rename *FvElementGeometry to *Stencil "Stencil" seems to be the standard expression for this concept... (also, it is not specific to finite volume methods and is shorter.) -------- 5th commit message: refactor the stencil class for the element centered finite volume discretization -------- 6th commit message: ECFV: some work on the stencil class -------- 7th commit message: ECFV: make the boundary handling code compile -------- 8th commit message: rename elemContext() to elementContext() -------- 9th commit message: ECFV: make the VTK output modules compile -------- 10th commit message: stencil: introduce the concept of primary DOFs also save an vector of all element pointers in the stencil. -------- 11th commit message: ECFV: try to fix assembly; add missing timeIdx arguments to the num*() methods -------- 12th commit message: ECFV: fix stupid mistake in the assembler -------- 13th commit message: ECFV: remove a few implicit DOF == vertex assumptions the black-oil example now runs without valgrind complaints until it encounters a negative oil mole fraction. -------- 14th commit message: VCFV: make everything compile again all vertex centered FV examples should now work again... -------- 15th commit message: rename [ev]cfvmodel.hh to [ev]cfvdiscretization.hh the classes have already been renamed. -------- 16th commit message: ECFV: make it work to the point where it can write out the initial solution. -------- 17th commit message: ECFV: make it work the local residual/jacobian needed some work in distinguishing primary and secondary DOFs and there was an minor issue with the serialization code. for some reason, it seems still not correct. (-> convergence is too slow.) -------- 18th commit message: VCFV: make it compile for the black oil model again -------- 19th commit message: VCFV: make it compile with the remaining models again -------- 20th commit message: flash model: make it work with ECFV although this breaks its compatibility with VCFV. (-> next commit) -------- 21st commit message: adapt the VCFV to make it compatible with the flash model again -------- 22nd commit message: make all models compile with VCFV again -------- 23rd commit message: VCFV: more cleanups of the stencil VcfvStencil now does not have any public attributes anymore. TODO: do not export attributes in the SubControlVolume and SubControlVolumeFace classes. -------- 24th commit message: VCFV: actually update the element pointer -------- 25th commit message: change the blackoil model back to ECFV -------- 26th commit message: immiscible model: make it compatible with the ECFV discretization -------- 27th commit message: PVS model: make it work with ECFV -------- 28th commit message: NCP model: make it work with ECFV -------- 29th commit message: rename Vcfv*VelocityModule to *VelocityModule -------- 30th commit message: richards model: make it work with ECFV -------- 31st commit message: unify the ECFV and the VCFV VTK output modules and other cleanups -------- 32nd commit message: unify the common code of the VCFV and the ECFV disctretizations -------- 33rd commit message: unify the element contexts between element and vertex centered finite volumes -------- 34th commit message: unify the local jacobian class of the finite volume discretizations -------- 35th commit message: replace [VE]vcf(LocalResidual|ElementContext|BoundaryContext|ConstraintsContext) by generic code -------- 36th commit message: replace the [EV]cfvLocalResidual by generic code -------- 37th commit message: unify the MultiPhaseProblem and Problem classes, introduce NullBorderListCreator -------- 38th commit message: remove the discretization specific boundary context -------- 39th commit message: unify the [EV]cfvDiscretization classes -------- 40th commit message: Unify [EV]cfvMultiPhaseFluxVariables -------- 41st commit message: Unify the [EC]cfvNewton* classes -------- 42nd commit message: Unify [EV]cfvVolumeVariables -------- 43rd commit message: unify [EV]cfvAssembler -------- 44th commit message: unified flux variables: fix stupid mistake when calculating pressure gradients -------- 45th commit message: unify what's to unify for the [EV]CFV properties -------- 46th commit message: make the method to calculate gradients and values at flux approximation points changeable Currently, this is used by the vertex centered finite volume method to be able to use P1-finite element gradients instead of two-point ones... -------- 47th commit message: make the restart code work correctly, use the correct DofMapper for VCFV -------- 48th commit message: actually use the gradient calculator in a model the immiscible model in this case -------- 49th commit message: move some files around to where they belong, use the new gradient calculation code in all models TODO: proper handling of boundary gradients -------- 50th commit message: fix the stokes model currently it only works with the vertex centered finite volume discretization, but the plan is to soon move it to a staggered grid scheme anyway... -------- 51st commit message: move all models back to using the vertex centered finite volume discretization by default -------- 52nd commit message: models: some variable renames and documentation fixes - scv -> dof - vert -> dof - vertex -> dof - replace 'VCFV' - fix some typos -------- 53rd commit message: don't expect UG anymore since it is quite non-free and hard to get. we now use ALUGrid instead! -------- 54th commit message: temporarily disable jacobian recycling -------- 55th commit message: fix writing/reading restart files using the generic code -------- 56th commit message: fix bug where fluxes were only counted once in the stencil this only affected the vertex centered finite volumes discretization... -------- 57th commit message: boundary gradients: use the center of the sub-control volume adjacent to a boundary segment -------- 58th commit message: make it compile on GCC -------- 59th commit message: get rid of most hacks for this, partial reassemble and jacobian recycling was brought back. For the this and the remaining stuff the main trick is the introduction of the GridCommHandleFactory concept which constructs communication handles suited for the respective spatial discretization... -------- 60th commit message: fix a few annoying bugs first, default the convergence criterion for the linear solver did not honor the initial residual which lead to linear solver breakdowns, then some debugging code was left in the discrete fracture model and then there was a bug in the TP gradient approximation class... this has the consequence that we need a new reference solution for the discrete fracture problem... -------- 61st commit message: iterative linear solver: remove the code for the non-default convergence criteria -------- 62nd commit message: provide the FE cache instead of the local FE this fixes a segfault in the stokes model caused by the fact that the local FE was not initialized at this point. -------- 63rd commit message: (Navier-)Stokes: fix bug due to the transition to unit normals now, all tests pass for this branch. The only things which need to be fixed are some annoying performance regressions compared to master and some bug in the splices feature of the property system... -------- 64th commit message: some fix for the local residual of the immiscible model -------- 65th commit message: Navier-Stokes: implement SCV center gradients There seems to be a bug in the previous implementation (the jacobian inverse transposed is evaluated using the local, not the global geometry), so the reference solution for the stokes2c test problem has also been updated... -------- 66th commit message: remove the ALUGrid specialization of the LensGridCreator and the YaspGrid one for the fingerproblem using different grid seems to sometimes cause a different vertex order, which in turn causes the respective test to fail if the reference solution was computed using the other grid... -------- 67th commit message: VCFV: use the correct BorderListCreator this makes MPI parallel computations work again. apart from performance regressions, this branch does not exhibit any known regressions compared to master anymore... -------- 68th commit message: make verything compile with the element centered finite volume discretization except the Navier-Stokes and the two-phase DFM models, of course... -------- 69th commit message: minor fixes - make the navier-stokes model slighly more generic by using the proper (in,ex)teriorIndex() methods on sub-control volumes - make the signature of the calculateValue() template method of the common two-point gradient approximator match the one of the vertex centered finite volume one -------- 70th commit message: fix fallout from the Big Rebase -------- 71st commit message: ECFV: some bugs in the boundary -------- 72nd commit message: make computeFlux() compute area-specific quantities -------- 73rd commit message: fix more bugs in the element centered FV discretization now eWoms should match Dumux pretty closely... -------- 74th commit message: coalesce the common code of the multi phase porous medium models into "MultiPhaseBaseModel" -------- 75th commit message: update reference solutions these were changed because of the screw-up with the area of boundary segments... -------- 76th commit message: rename "ImplicitBase" to "FvBase" because in eWoms, everything is implicit and these are currently the base classes for all finite volume discretizations. -------- 77th commit message: make the spatial discretization selectable using a splice This requires an opm-core with a the patches from https://github.com/OPM/opm-core/pull/446 merged... -------- 78th commit message: rename the properties used for splices to *Splice -------- 79th commit message: move the files in 'tests/models' to 'tests' since 'tests' was empty except for the 'models' subdirectory... -------- 80th commit message: improve and fix the tutorial -------- 81st commit message: remove the -fno-strict-aliasing flag from the provided option files seems like recent versions of Dune have been adapted... -------- 82nd commit message: also compile all CO2 injection simulations using the element centered finite volume discretization -------- 83rd commit message: PVS model: make it work properly with the element-centered finite volume discretiation because DOF != number of vertices
2013-12-12 05:52:44 -06:00
* \copydoc FvBaseMultiPhaseProblem::temperature
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
template <class Context>
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
Scalar temperature(const Context &context, int spaceIdx, int timeIdx) const
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
{ return temperature_; }
/*!
Implement the element centered finite volume spatial discretization This makes eWoms multi-discretization capable. Along the way, this fixes some bugs and does a medium sized reorganization of the source tree. This is a squashed patch of the following commits: -------- 1st commit message: add initial version of the element centered finite volume discretization currently, it is a misnomer as it is just a copy of the vertex centered discretization plus some renames... -------- 2nd commit message: rename [VE]cfvModel -> [VE]cfvDiscretization -------- 3rd commit message: ecfv: prelimary changes required to make it compile but not work yet... -------- 4th commit message: Rename *FvElementGeometry to *Stencil "Stencil" seems to be the standard expression for this concept... (also, it is not specific to finite volume methods and is shorter.) -------- 5th commit message: refactor the stencil class for the element centered finite volume discretization -------- 6th commit message: ECFV: some work on the stencil class -------- 7th commit message: ECFV: make the boundary handling code compile -------- 8th commit message: rename elemContext() to elementContext() -------- 9th commit message: ECFV: make the VTK output modules compile -------- 10th commit message: stencil: introduce the concept of primary DOFs also save an vector of all element pointers in the stencil. -------- 11th commit message: ECFV: try to fix assembly; add missing timeIdx arguments to the num*() methods -------- 12th commit message: ECFV: fix stupid mistake in the assembler -------- 13th commit message: ECFV: remove a few implicit DOF == vertex assumptions the black-oil example now runs without valgrind complaints until it encounters a negative oil mole fraction. -------- 14th commit message: VCFV: make everything compile again all vertex centered FV examples should now work again... -------- 15th commit message: rename [ev]cfvmodel.hh to [ev]cfvdiscretization.hh the classes have already been renamed. -------- 16th commit message: ECFV: make it work to the point where it can write out the initial solution. -------- 17th commit message: ECFV: make it work the local residual/jacobian needed some work in distinguishing primary and secondary DOFs and there was an minor issue with the serialization code. for some reason, it seems still not correct. (-> convergence is too slow.) -------- 18th commit message: VCFV: make it compile for the black oil model again -------- 19th commit message: VCFV: make it compile with the remaining models again -------- 20th commit message: flash model: make it work with ECFV although this breaks its compatibility with VCFV. (-> next commit) -------- 21st commit message: adapt the VCFV to make it compatible with the flash model again -------- 22nd commit message: make all models compile with VCFV again -------- 23rd commit message: VCFV: more cleanups of the stencil VcfvStencil now does not have any public attributes anymore. TODO: do not export attributes in the SubControlVolume and SubControlVolumeFace classes. -------- 24th commit message: VCFV: actually update the element pointer -------- 25th commit message: change the blackoil model back to ECFV -------- 26th commit message: immiscible model: make it compatible with the ECFV discretization -------- 27th commit message: PVS model: make it work with ECFV -------- 28th commit message: NCP model: make it work with ECFV -------- 29th commit message: rename Vcfv*VelocityModule to *VelocityModule -------- 30th commit message: richards model: make it work with ECFV -------- 31st commit message: unify the ECFV and the VCFV VTK output modules and other cleanups -------- 32nd commit message: unify the common code of the VCFV and the ECFV disctretizations -------- 33rd commit message: unify the element contexts between element and vertex centered finite volumes -------- 34th commit message: unify the local jacobian class of the finite volume discretizations -------- 35th commit message: replace [VE]vcf(LocalResidual|ElementContext|BoundaryContext|ConstraintsContext) by generic code -------- 36th commit message: replace the [EV]cfvLocalResidual by generic code -------- 37th commit message: unify the MultiPhaseProblem and Problem classes, introduce NullBorderListCreator -------- 38th commit message: remove the discretization specific boundary context -------- 39th commit message: unify the [EV]cfvDiscretization classes -------- 40th commit message: Unify [EV]cfvMultiPhaseFluxVariables -------- 41st commit message: Unify the [EC]cfvNewton* classes -------- 42nd commit message: Unify [EV]cfvVolumeVariables -------- 43rd commit message: unify [EV]cfvAssembler -------- 44th commit message: unified flux variables: fix stupid mistake when calculating pressure gradients -------- 45th commit message: unify what's to unify for the [EV]CFV properties -------- 46th commit message: make the method to calculate gradients and values at flux approximation points changeable Currently, this is used by the vertex centered finite volume method to be able to use P1-finite element gradients instead of two-point ones... -------- 47th commit message: make the restart code work correctly, use the correct DofMapper for VCFV -------- 48th commit message: actually use the gradient calculator in a model the immiscible model in this case -------- 49th commit message: move some files around to where they belong, use the new gradient calculation code in all models TODO: proper handling of boundary gradients -------- 50th commit message: fix the stokes model currently it only works with the vertex centered finite volume discretization, but the plan is to soon move it to a staggered grid scheme anyway... -------- 51st commit message: move all models back to using the vertex centered finite volume discretization by default -------- 52nd commit message: models: some variable renames and documentation fixes - scv -> dof - vert -> dof - vertex -> dof - replace 'VCFV' - fix some typos -------- 53rd commit message: don't expect UG anymore since it is quite non-free and hard to get. we now use ALUGrid instead! -------- 54th commit message: temporarily disable jacobian recycling -------- 55th commit message: fix writing/reading restart files using the generic code -------- 56th commit message: fix bug where fluxes were only counted once in the stencil this only affected the vertex centered finite volumes discretization... -------- 57th commit message: boundary gradients: use the center of the sub-control volume adjacent to a boundary segment -------- 58th commit message: make it compile on GCC -------- 59th commit message: get rid of most hacks for this, partial reassemble and jacobian recycling was brought back. For the this and the remaining stuff the main trick is the introduction of the GridCommHandleFactory concept which constructs communication handles suited for the respective spatial discretization... -------- 60th commit message: fix a few annoying bugs first, default the convergence criterion for the linear solver did not honor the initial residual which lead to linear solver breakdowns, then some debugging code was left in the discrete fracture model and then there was a bug in the TP gradient approximation class... this has the consequence that we need a new reference solution for the discrete fracture problem... -------- 61st commit message: iterative linear solver: remove the code for the non-default convergence criteria -------- 62nd commit message: provide the FE cache instead of the local FE this fixes a segfault in the stokes model caused by the fact that the local FE was not initialized at this point. -------- 63rd commit message: (Navier-)Stokes: fix bug due to the transition to unit normals now, all tests pass for this branch. The only things which need to be fixed are some annoying performance regressions compared to master and some bug in the splices feature of the property system... -------- 64th commit message: some fix for the local residual of the immiscible model -------- 65th commit message: Navier-Stokes: implement SCV center gradients There seems to be a bug in the previous implementation (the jacobian inverse transposed is evaluated using the local, not the global geometry), so the reference solution for the stokes2c test problem has also been updated... -------- 66th commit message: remove the ALUGrid specialization of the LensGridCreator and the YaspGrid one for the fingerproblem using different grid seems to sometimes cause a different vertex order, which in turn causes the respective test to fail if the reference solution was computed using the other grid... -------- 67th commit message: VCFV: use the correct BorderListCreator this makes MPI parallel computations work again. apart from performance regressions, this branch does not exhibit any known regressions compared to master anymore... -------- 68th commit message: make verything compile with the element centered finite volume discretization except the Navier-Stokes and the two-phase DFM models, of course... -------- 69th commit message: minor fixes - make the navier-stokes model slighly more generic by using the proper (in,ex)teriorIndex() methods on sub-control volumes - make the signature of the calculateValue() template method of the common two-point gradient approximator match the one of the vertex centered finite volume one -------- 70th commit message: fix fallout from the Big Rebase -------- 71st commit message: ECFV: some bugs in the boundary -------- 72nd commit message: make computeFlux() compute area-specific quantities -------- 73rd commit message: fix more bugs in the element centered FV discretization now eWoms should match Dumux pretty closely... -------- 74th commit message: coalesce the common code of the multi phase porous medium models into "MultiPhaseBaseModel" -------- 75th commit message: update reference solutions these were changed because of the screw-up with the area of boundary segments... -------- 76th commit message: rename "ImplicitBase" to "FvBase" because in eWoms, everything is implicit and these are currently the base classes for all finite volume discretizations. -------- 77th commit message: make the spatial discretization selectable using a splice This requires an opm-core with a the patches from https://github.com/OPM/opm-core/pull/446 merged... -------- 78th commit message: rename the properties used for splices to *Splice -------- 79th commit message: move the files in 'tests/models' to 'tests' since 'tests' was empty except for the 'models' subdirectory... -------- 80th commit message: improve and fix the tutorial -------- 81st commit message: remove the -fno-strict-aliasing flag from the provided option files seems like recent versions of Dune have been adapted... -------- 82nd commit message: also compile all CO2 injection simulations using the element centered finite volume discretization -------- 83rd commit message: PVS model: make it work properly with the element-centered finite volume discretiation because DOF != number of vertices
2013-12-12 05:52:44 -06:00
* \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
template <class Context>
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
const DimMatrix &intrinsicPermeability(const Context &context, int spaceIdx,
int timeIdx) const
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
{ return K_; }
/*!
Implement the element centered finite volume spatial discretization This makes eWoms multi-discretization capable. Along the way, this fixes some bugs and does a medium sized reorganization of the source tree. This is a squashed patch of the following commits: -------- 1st commit message: add initial version of the element centered finite volume discretization currently, it is a misnomer as it is just a copy of the vertex centered discretization plus some renames... -------- 2nd commit message: rename [VE]cfvModel -> [VE]cfvDiscretization -------- 3rd commit message: ecfv: prelimary changes required to make it compile but not work yet... -------- 4th commit message: Rename *FvElementGeometry to *Stencil "Stencil" seems to be the standard expression for this concept... (also, it is not specific to finite volume methods and is shorter.) -------- 5th commit message: refactor the stencil class for the element centered finite volume discretization -------- 6th commit message: ECFV: some work on the stencil class -------- 7th commit message: ECFV: make the boundary handling code compile -------- 8th commit message: rename elemContext() to elementContext() -------- 9th commit message: ECFV: make the VTK output modules compile -------- 10th commit message: stencil: introduce the concept of primary DOFs also save an vector of all element pointers in the stencil. -------- 11th commit message: ECFV: try to fix assembly; add missing timeIdx arguments to the num*() methods -------- 12th commit message: ECFV: fix stupid mistake in the assembler -------- 13th commit message: ECFV: remove a few implicit DOF == vertex assumptions the black-oil example now runs without valgrind complaints until it encounters a negative oil mole fraction. -------- 14th commit message: VCFV: make everything compile again all vertex centered FV examples should now work again... -------- 15th commit message: rename [ev]cfvmodel.hh to [ev]cfvdiscretization.hh the classes have already been renamed. -------- 16th commit message: ECFV: make it work to the point where it can write out the initial solution. -------- 17th commit message: ECFV: make it work the local residual/jacobian needed some work in distinguishing primary and secondary DOFs and there was an minor issue with the serialization code. for some reason, it seems still not correct. (-> convergence is too slow.) -------- 18th commit message: VCFV: make it compile for the black oil model again -------- 19th commit message: VCFV: make it compile with the remaining models again -------- 20th commit message: flash model: make it work with ECFV although this breaks its compatibility with VCFV. (-> next commit) -------- 21st commit message: adapt the VCFV to make it compatible with the flash model again -------- 22nd commit message: make all models compile with VCFV again -------- 23rd commit message: VCFV: more cleanups of the stencil VcfvStencil now does not have any public attributes anymore. TODO: do not export attributes in the SubControlVolume and SubControlVolumeFace classes. -------- 24th commit message: VCFV: actually update the element pointer -------- 25th commit message: change the blackoil model back to ECFV -------- 26th commit message: immiscible model: make it compatible with the ECFV discretization -------- 27th commit message: PVS model: make it work with ECFV -------- 28th commit message: NCP model: make it work with ECFV -------- 29th commit message: rename Vcfv*VelocityModule to *VelocityModule -------- 30th commit message: richards model: make it work with ECFV -------- 31st commit message: unify the ECFV and the VCFV VTK output modules and other cleanups -------- 32nd commit message: unify the common code of the VCFV and the ECFV disctretizations -------- 33rd commit message: unify the element contexts between element and vertex centered finite volumes -------- 34th commit message: unify the local jacobian class of the finite volume discretizations -------- 35th commit message: replace [VE]vcf(LocalResidual|ElementContext|BoundaryContext|ConstraintsContext) by generic code -------- 36th commit message: replace the [EV]cfvLocalResidual by generic code -------- 37th commit message: unify the MultiPhaseProblem and Problem classes, introduce NullBorderListCreator -------- 38th commit message: remove the discretization specific boundary context -------- 39th commit message: unify the [EV]cfvDiscretization classes -------- 40th commit message: Unify [EV]cfvMultiPhaseFluxVariables -------- 41st commit message: Unify the [EC]cfvNewton* classes -------- 42nd commit message: Unify [EV]cfvVolumeVariables -------- 43rd commit message: unify [EV]cfvAssembler -------- 44th commit message: unified flux variables: fix stupid mistake when calculating pressure gradients -------- 45th commit message: unify what's to unify for the [EV]CFV properties -------- 46th commit message: make the method to calculate gradients and values at flux approximation points changeable Currently, this is used by the vertex centered finite volume method to be able to use P1-finite element gradients instead of two-point ones... -------- 47th commit message: make the restart code work correctly, use the correct DofMapper for VCFV -------- 48th commit message: actually use the gradient calculator in a model the immiscible model in this case -------- 49th commit message: move some files around to where they belong, use the new gradient calculation code in all models TODO: proper handling of boundary gradients -------- 50th commit message: fix the stokes model currently it only works with the vertex centered finite volume discretization, but the plan is to soon move it to a staggered grid scheme anyway... -------- 51st commit message: move all models back to using the vertex centered finite volume discretization by default -------- 52nd commit message: models: some variable renames and documentation fixes - scv -> dof - vert -> dof - vertex -> dof - replace 'VCFV' - fix some typos -------- 53rd commit message: don't expect UG anymore since it is quite non-free and hard to get. we now use ALUGrid instead! -------- 54th commit message: temporarily disable jacobian recycling -------- 55th commit message: fix writing/reading restart files using the generic code -------- 56th commit message: fix bug where fluxes were only counted once in the stencil this only affected the vertex centered finite volumes discretization... -------- 57th commit message: boundary gradients: use the center of the sub-control volume adjacent to a boundary segment -------- 58th commit message: make it compile on GCC -------- 59th commit message: get rid of most hacks for this, partial reassemble and jacobian recycling was brought back. For the this and the remaining stuff the main trick is the introduction of the GridCommHandleFactory concept which constructs communication handles suited for the respective spatial discretization... -------- 60th commit message: fix a few annoying bugs first, default the convergence criterion for the linear solver did not honor the initial residual which lead to linear solver breakdowns, then some debugging code was left in the discrete fracture model and then there was a bug in the TP gradient approximation class... this has the consequence that we need a new reference solution for the discrete fracture problem... -------- 61st commit message: iterative linear solver: remove the code for the non-default convergence criteria -------- 62nd commit message: provide the FE cache instead of the local FE this fixes a segfault in the stokes model caused by the fact that the local FE was not initialized at this point. -------- 63rd commit message: (Navier-)Stokes: fix bug due to the transition to unit normals now, all tests pass for this branch. The only things which need to be fixed are some annoying performance regressions compared to master and some bug in the splices feature of the property system... -------- 64th commit message: some fix for the local residual of the immiscible model -------- 65th commit message: Navier-Stokes: implement SCV center gradients There seems to be a bug in the previous implementation (the jacobian inverse transposed is evaluated using the local, not the global geometry), so the reference solution for the stokes2c test problem has also been updated... -------- 66th commit message: remove the ALUGrid specialization of the LensGridCreator and the YaspGrid one for the fingerproblem using different grid seems to sometimes cause a different vertex order, which in turn causes the respective test to fail if the reference solution was computed using the other grid... -------- 67th commit message: VCFV: use the correct BorderListCreator this makes MPI parallel computations work again. apart from performance regressions, this branch does not exhibit any known regressions compared to master anymore... -------- 68th commit message: make verything compile with the element centered finite volume discretization except the Navier-Stokes and the two-phase DFM models, of course... -------- 69th commit message: minor fixes - make the navier-stokes model slighly more generic by using the proper (in,ex)teriorIndex() methods on sub-control volumes - make the signature of the calculateValue() template method of the common two-point gradient approximator match the one of the vertex centered finite volume one -------- 70th commit message: fix fallout from the Big Rebase -------- 71st commit message: ECFV: some bugs in the boundary -------- 72nd commit message: make computeFlux() compute area-specific quantities -------- 73rd commit message: fix more bugs in the element centered FV discretization now eWoms should match Dumux pretty closely... -------- 74th commit message: coalesce the common code of the multi phase porous medium models into "MultiPhaseBaseModel" -------- 75th commit message: update reference solutions these were changed because of the screw-up with the area of boundary segments... -------- 76th commit message: rename "ImplicitBase" to "FvBase" because in eWoms, everything is implicit and these are currently the base classes for all finite volume discretizations. -------- 77th commit message: make the spatial discretization selectable using a splice This requires an opm-core with a the patches from https://github.com/OPM/opm-core/pull/446 merged... -------- 78th commit message: rename the properties used for splices to *Splice -------- 79th commit message: move the files in 'tests/models' to 'tests' since 'tests' was empty except for the 'models' subdirectory... -------- 80th commit message: improve and fix the tutorial -------- 81st commit message: remove the -fno-strict-aliasing flag from the provided option files seems like recent versions of Dune have been adapted... -------- 82nd commit message: also compile all CO2 injection simulations using the element centered finite volume discretization -------- 83rd commit message: PVS model: make it work properly with the element-centered finite volume discretiation because DOF != number of vertices
2013-12-12 05:52:44 -06:00
* \copydoc FvBaseMultiPhaseProblem::porosity
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
template <class Context>
Scalar porosity(const Context &context, int spaceIdx, int timeIdx) const
{ return 0.4; }
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
/*!
Implement the element centered finite volume spatial discretization This makes eWoms multi-discretization capable. Along the way, this fixes some bugs and does a medium sized reorganization of the source tree. This is a squashed patch of the following commits: -------- 1st commit message: add initial version of the element centered finite volume discretization currently, it is a misnomer as it is just a copy of the vertex centered discretization plus some renames... -------- 2nd commit message: rename [VE]cfvModel -> [VE]cfvDiscretization -------- 3rd commit message: ecfv: prelimary changes required to make it compile but not work yet... -------- 4th commit message: Rename *FvElementGeometry to *Stencil "Stencil" seems to be the standard expression for this concept... (also, it is not specific to finite volume methods and is shorter.) -------- 5th commit message: refactor the stencil class for the element centered finite volume discretization -------- 6th commit message: ECFV: some work on the stencil class -------- 7th commit message: ECFV: make the boundary handling code compile -------- 8th commit message: rename elemContext() to elementContext() -------- 9th commit message: ECFV: make the VTK output modules compile -------- 10th commit message: stencil: introduce the concept of primary DOFs also save an vector of all element pointers in the stencil. -------- 11th commit message: ECFV: try to fix assembly; add missing timeIdx arguments to the num*() methods -------- 12th commit message: ECFV: fix stupid mistake in the assembler -------- 13th commit message: ECFV: remove a few implicit DOF == vertex assumptions the black-oil example now runs without valgrind complaints until it encounters a negative oil mole fraction. -------- 14th commit message: VCFV: make everything compile again all vertex centered FV examples should now work again... -------- 15th commit message: rename [ev]cfvmodel.hh to [ev]cfvdiscretization.hh the classes have already been renamed. -------- 16th commit message: ECFV: make it work to the point where it can write out the initial solution. -------- 17th commit message: ECFV: make it work the local residual/jacobian needed some work in distinguishing primary and secondary DOFs and there was an minor issue with the serialization code. for some reason, it seems still not correct. (-> convergence is too slow.) -------- 18th commit message: VCFV: make it compile for the black oil model again -------- 19th commit message: VCFV: make it compile with the remaining models again -------- 20th commit message: flash model: make it work with ECFV although this breaks its compatibility with VCFV. (-> next commit) -------- 21st commit message: adapt the VCFV to make it compatible with the flash model again -------- 22nd commit message: make all models compile with VCFV again -------- 23rd commit message: VCFV: more cleanups of the stencil VcfvStencil now does not have any public attributes anymore. TODO: do not export attributes in the SubControlVolume and SubControlVolumeFace classes. -------- 24th commit message: VCFV: actually update the element pointer -------- 25th commit message: change the blackoil model back to ECFV -------- 26th commit message: immiscible model: make it compatible with the ECFV discretization -------- 27th commit message: PVS model: make it work with ECFV -------- 28th commit message: NCP model: make it work with ECFV -------- 29th commit message: rename Vcfv*VelocityModule to *VelocityModule -------- 30th commit message: richards model: make it work with ECFV -------- 31st commit message: unify the ECFV and the VCFV VTK output modules and other cleanups -------- 32nd commit message: unify the common code of the VCFV and the ECFV disctretizations -------- 33rd commit message: unify the element contexts between element and vertex centered finite volumes -------- 34th commit message: unify the local jacobian class of the finite volume discretizations -------- 35th commit message: replace [VE]vcf(LocalResidual|ElementContext|BoundaryContext|ConstraintsContext) by generic code -------- 36th commit message: replace the [EV]cfvLocalResidual by generic code -------- 37th commit message: unify the MultiPhaseProblem and Problem classes, introduce NullBorderListCreator -------- 38th commit message: remove the discretization specific boundary context -------- 39th commit message: unify the [EV]cfvDiscretization classes -------- 40th commit message: Unify [EV]cfvMultiPhaseFluxVariables -------- 41st commit message: Unify the [EC]cfvNewton* classes -------- 42nd commit message: Unify [EV]cfvVolumeVariables -------- 43rd commit message: unify [EV]cfvAssembler -------- 44th commit message: unified flux variables: fix stupid mistake when calculating pressure gradients -------- 45th commit message: unify what's to unify for the [EV]CFV properties -------- 46th commit message: make the method to calculate gradients and values at flux approximation points changeable Currently, this is used by the vertex centered finite volume method to be able to use P1-finite element gradients instead of two-point ones... -------- 47th commit message: make the restart code work correctly, use the correct DofMapper for VCFV -------- 48th commit message: actually use the gradient calculator in a model the immiscible model in this case -------- 49th commit message: move some files around to where they belong, use the new gradient calculation code in all models TODO: proper handling of boundary gradients -------- 50th commit message: fix the stokes model currently it only works with the vertex centered finite volume discretization, but the plan is to soon move it to a staggered grid scheme anyway... -------- 51st commit message: move all models back to using the vertex centered finite volume discretization by default -------- 52nd commit message: models: some variable renames and documentation fixes - scv -> dof - vert -> dof - vertex -> dof - replace 'VCFV' - fix some typos -------- 53rd commit message: don't expect UG anymore since it is quite non-free and hard to get. we now use ALUGrid instead! -------- 54th commit message: temporarily disable jacobian recycling -------- 55th commit message: fix writing/reading restart files using the generic code -------- 56th commit message: fix bug where fluxes were only counted once in the stencil this only affected the vertex centered finite volumes discretization... -------- 57th commit message: boundary gradients: use the center of the sub-control volume adjacent to a boundary segment -------- 58th commit message: make it compile on GCC -------- 59th commit message: get rid of most hacks for this, partial reassemble and jacobian recycling was brought back. For the this and the remaining stuff the main trick is the introduction of the GridCommHandleFactory concept which constructs communication handles suited for the respective spatial discretization... -------- 60th commit message: fix a few annoying bugs first, default the convergence criterion for the linear solver did not honor the initial residual which lead to linear solver breakdowns, then some debugging code was left in the discrete fracture model and then there was a bug in the TP gradient approximation class... this has the consequence that we need a new reference solution for the discrete fracture problem... -------- 61st commit message: iterative linear solver: remove the code for the non-default convergence criteria -------- 62nd commit message: provide the FE cache instead of the local FE this fixes a segfault in the stokes model caused by the fact that the local FE was not initialized at this point. -------- 63rd commit message: (Navier-)Stokes: fix bug due to the transition to unit normals now, all tests pass for this branch. The only things which need to be fixed are some annoying performance regressions compared to master and some bug in the splices feature of the property system... -------- 64th commit message: some fix for the local residual of the immiscible model -------- 65th commit message: Navier-Stokes: implement SCV center gradients There seems to be a bug in the previous implementation (the jacobian inverse transposed is evaluated using the local, not the global geometry), so the reference solution for the stokes2c test problem has also been updated... -------- 66th commit message: remove the ALUGrid specialization of the LensGridCreator and the YaspGrid one for the fingerproblem using different grid seems to sometimes cause a different vertex order, which in turn causes the respective test to fail if the reference solution was computed using the other grid... -------- 67th commit message: VCFV: use the correct BorderListCreator this makes MPI parallel computations work again. apart from performance regressions, this branch does not exhibit any known regressions compared to master anymore... -------- 68th commit message: make verything compile with the element centered finite volume discretization except the Navier-Stokes and the two-phase DFM models, of course... -------- 69th commit message: minor fixes - make the navier-stokes model slighly more generic by using the proper (in,ex)teriorIndex() methods on sub-control volumes - make the signature of the calculateValue() template method of the common two-point gradient approximator match the one of the vertex centered finite volume one -------- 70th commit message: fix fallout from the Big Rebase -------- 71st commit message: ECFV: some bugs in the boundary -------- 72nd commit message: make computeFlux() compute area-specific quantities -------- 73rd commit message: fix more bugs in the element centered FV discretization now eWoms should match Dumux pretty closely... -------- 74th commit message: coalesce the common code of the multi phase porous medium models into "MultiPhaseBaseModel" -------- 75th commit message: update reference solutions these were changed because of the screw-up with the area of boundary segments... -------- 76th commit message: rename "ImplicitBase" to "FvBase" because in eWoms, everything is implicit and these are currently the base classes for all finite volume discretizations. -------- 77th commit message: make the spatial discretization selectable using a splice This requires an opm-core with a the patches from https://github.com/OPM/opm-core/pull/446 merged... -------- 78th commit message: rename the properties used for splices to *Splice -------- 79th commit message: move the files in 'tests/models' to 'tests' since 'tests' was empty except for the 'models' subdirectory... -------- 80th commit message: improve and fix the tutorial -------- 81st commit message: remove the -fno-strict-aliasing flag from the provided option files seems like recent versions of Dune have been adapted... -------- 82nd commit message: also compile all CO2 injection simulations using the element centered finite volume discretization -------- 83rd commit message: PVS model: make it work properly with the element-centered finite volume discretiation because DOF != number of vertices
2013-12-12 05:52:44 -06:00
* \copydoc FvBaseMultiPhaseProblem::materialLawParams
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
template <class Context>
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
const MaterialLawParams &materialLawParams(const Context &context,
int spaceIdx, int timeIdx) const
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
{
int globalSpaceIdx = context.globalSpaceIndex(spaceIdx, timeIdx);
return materialParams_[globalSpaceIdx];
}
//! \}
/*!
* \name Boundary conditions
*/
//! \{
/*!
replace a few now-incorrect "Vcfv" prefixes in the comments
2014-07-17 10:24:48 -05:00
* \copydoc FvBaseProblem::boundary
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
template <class Context>
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
void boundary(BoundaryRateVector &values, const Context &context,
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
int spaceIdx, int timeIdx) const
{
const GlobalPosition &pos = context.cvCenter(spaceIdx, timeIdx);
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
if (onLeftBoundary_(pos) || onRightBoundary_(pos)
|| onLowerBoundary_(pos)) {
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
values.setNoFlow();
}
else {
assert(onUpperBoundary_(pos));
values.setFreeFlow(context, spaceIdx, timeIdx, initialFluidState_);
remove most spurious semicolons hopefully "most" means "all of them"...
2014-08-11 09:45:34 -05:00
}
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
// override the value for the liquid phase by forced
// imbibition of water on inlet boundary segments
if (onInlet_(pos)) {
adapt to the recent renames of the phase indices in opm-material
2014-04-03 09:59:48 -05:00
values[contiWettingEqIdx] = -0.001; // [kg/(m^2 s)]
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
}
}
//! \}
/*!
rename "(Volume|Flux)Variables" to "(In|Ex)tensiveQuantities" "intensive" means that the value of these quantities at a given spatial location does not depend on any value of the neighboring intensive quantities. In contrast, "extensive" quantities depend in the intensive quantities of the environment of the spatial location. this change is necessary is because the previous nomenclature was very specific to finite volume discretizations, but the models themselves were already rather generic. (i.e., "volume variables" are the intensive quantities of finite volume methods and "flux variables" are the extensive ones.)
2014-06-24 07:54:32 -05:00
* \name Volumetric terms
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
//! \{
/*!
replace a few now-incorrect "Vcfv" prefixes in the comments
2014-07-17 10:24:48 -05:00
* \copydoc FvBaseProblem::initial
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
template <class Context>
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
void initial(PrimaryVariables &values, const Context &context, int spaceIdx,
int timeIdx) const
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
{
// assign the primary variables
values.assignNaive(initialFluidState_);
}
/*!
replace a few now-incorrect "Vcfv" prefixes in the comments
2014-07-17 10:24:48 -05:00
* \copydoc FvBaseProblem::constraints
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*/
template <class Context>
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
void constraints(Constraints &constraints, const Context &context,
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
int spaceIdx, int timeIdx) const
{
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);
if (onUpperBoundary_(pos) && !onInlet_(pos)) {
constraints.setAllConstraint();
constraints.assignNaive(initialFluidState_);
}
else if (onLowerBoundary_(pos)) {
constraints.setAllConstraint();
constraints.assignNaive(initialFluidState_);
}
}
/*!
replace a few now-incorrect "Vcfv" prefixes in the comments
2014-07-17 10:24:48 -05:00
* \copydoc FvBaseProblem::source
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
*
* For this problem, the source term of all components is 0
* everywhere.
*/
template <class Context>
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
void source(RateVector &rate, const Context &context, int spaceIdx,
int timeIdx) const
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
{ rate = Scalar(0.0); }
//! \}
private:
bool onLeftBoundary_(const GlobalPosition &pos) const
rename "bbox" to "boundingBox"
2013-12-27 11:25:54 -06:00
{ return pos[0] < this->boundingBoxMin()[0] + eps_; }
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
bool onRightBoundary_(const GlobalPosition &pos) const
rename "bbox" to "boundingBox"
2013-12-27 11:25:54 -06:00
{ return pos[0] > this->boundingBoxMax()[0] - eps_; }
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
bool onLowerBoundary_(const GlobalPosition &pos) const
rename "bbox" to "boundingBox"
2013-12-27 11:25:54 -06:00
{ return pos[1] < this->boundingBoxMin()[1] + eps_; }
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
bool onUpperBoundary_(const GlobalPosition &pos) const
rename "bbox" to "boundingBox"
2013-12-27 11:25:54 -06:00
{ return pos[1] > this->boundingBoxMax()[1] - eps_; }
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
bool onInlet_(const GlobalPosition &pos) const
{
rename "bbox" to "boundingBox"
2013-12-27 11:25:54 -06:00
Scalar width = this->boundingBoxMax()[0] - this->boundingBoxMin()[0];
Scalar lambda = (this->boundingBoxMax()[0] - pos[0]) / width;
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
if (!onUpperBoundary_(pos))
return false;
Scalar xInject[] = { 0.25, 0.75 };
Scalar injectLen[] = { 0.1, 0.1 };
reformat the source code this was done semi-automatically. The line length has been set to 80 characters, but with a quite low penalty for crossing this limit.
2013-11-29 09:33:46 -06:00
for (unsigned i = 0; i < sizeof(xInject) / sizeof(Scalar); ++i) {
if (xInject[i] - injectLen[i] / 2 < lambda
&& lambda < xInject[i] + injectLen[i] / 2)
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
return true;
}
return false;
}
void setupInitialFluidState_()
{
auto &fs = initialFluidState_;
adapt to the recent renames of the phase indices in opm-material
2014-04-03 09:59:48 -05:00
fs.setPressure(wettingPhaseIdx, /*pressure=*/1e5);
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
use opm property system, improvments to the parameter system
2013-09-23 13:25:58 -05:00
Scalar Sw = EWOMS_GET_PARAM(TypeTag, Scalar, InitialWaterSaturation);
adapt to the recent renames of the phase indices in opm-material
2014-04-03 09:59:48 -05:00
fs.setSaturation(wettingPhaseIdx, Sw);
fs.setSaturation(nonWettingPhaseIdx, 1 - Sw);
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
fs.setTemperature(temperature_);
// set the absolute pressures
Scalar pn = 1e5;
adapt to the recent renames of the phase indices in opm-material
2014-04-03 09:59:48 -05:00
fs.setPressure(nonWettingPhaseIdx, pn);
fs.setPressure(wettingPhaseIdx, pn);
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
}
DimMatrix K_;
typename MaterialLawParams::VanGenuchtenParams micParams_;
typename MaterialLawParams::VanGenuchtenParams mdcParams_;
std::vector<MaterialLawParams> materialParams_;
Opm::ImmiscibleFluidState<Scalar, FluidSystem> initialFluidState_;
Scalar temperature_;
Scalar eps_;
};
fix the end of namespace comments this was done semi-automatically by a python script
2013-11-04 07:17:32 -06:00
} // namespace Ewoms
some renames to draw the eWoms directory structure nearer to the the one of the remaining OPM modules this renames the 'test' directory to 'tests' and 'test/implicit' to 'tests/models'. the latter change reflects the fact that in eWoms all models are implicit since the IMPET models have been removed.
2013-09-23 11:56:30 -05:00
#endif
Reference in New Issue Copy Permalink