OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-09 12:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

decoupled: finish the SpatialParameters -> SpatialParams frenzy

Browse Source 
I also removed the deprecation stuff, as IMO it is more confusing than
helpful. (Ever tried to set the
SpatialParameters instead of SpatialParams in your problem?)

Also move the decoupled spatial parameters from dumux/material to
dumux/decoupled because they are specific to the decoupled models.
This commit is contained in:
Andreas Lauser
2012-07-12 21:25:16 +02:00
committed by Andreas Lauser
parent ed2bf12c5f
commit 13d9867500
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/tutorialproblem_decoupled.hh
+2 -2
View File
@@ -30,7 +30,7 @@
#define DUMUX_TUTORIALPROBLEM_DECOUPLED_HH // guardian macro /*@\label{tutorial-decoupled:guardian2}@*/
// assign parameters dependent on space (e.g. spatial parameters)
#include "tutorialspatialparameters_decoupled.hh" /*@\label{tutorial-decoupled:spatialparameters}@*/
#include "tutorialspatialparams_decoupled.hh" /*@\label{tutorial-decoupled:spatialparameters}@*/
// dumux 2p-decoupled environment
#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
@@ -63,7 +63,7 @@ class TutorialProblemDecoupled;
namespace Properties
{
// create a new type tag for the problem
NEW_TYPE_TAG(TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TutorialSpatialParametersDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/
NEW_TYPE_TAG(TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TutorialSpatialParamsDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/
// Set the problem property
SET_PROP(TutorialProblemDecoupled, Problem) /*@\label{tutorial-decoupled:set-problem}@*/
examples/tutorialspatialparameters_decoupled.hh → examples/tutorialspatialparams_decoupled.hh
+9 -9
View File
@@ -27,7 +27,7 @@
#ifndef DUMUX_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
#define DUMUX_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
#include <dumux/material/spatialparameters/fvspatialparameters.hh>
#include <dumux/decoupled/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
@@ -40,19 +40,19 @@ namespace Dumux
//forward declaration
template<class TypeTag>
class TutorialSpatialParametersDecoupled;
class TutorialSpatialParamsDecoupled;
namespace Properties
{
// The spatial parameters TypeTag
NEW_TYPE_TAG(TutorialSpatialParametersDecoupled);
NEW_TYPE_TAG(TutorialSpatialParamsDecoupled);
// Set the spatial parameters
SET_TYPE_PROP(TutorialSpatialParametersDecoupled, SpatialParams,
Dumux::TutorialSpatialParametersDecoupled<TypeTag>); /*@\label{tutorial-decoupled:set-spatialparameters}@*/
SET_TYPE_PROP(TutorialSpatialParamsDecoupled, SpatialParams,
Dumux::TutorialSpatialParamsDecoupled<TypeTag>); /*@\label{tutorial-decoupled:set-spatialparameters}@*/
// Set the material law
SET_PROP(TutorialSpatialParametersDecoupled, MaterialLaw)
SET_PROP(TutorialSpatialParamsDecoupled, MaterialLaw)
{
private:
// material law typedefs
@@ -66,9 +66,9 @@ public:
//! Definition of the spatial parameters for the decoupled tutorial
template<class TypeTag>
class TutorialSpatialParametersDecoupled: public FVSpatialParameters<TypeTag>
class TutorialSpatialParamsDecoupled: public FVSpatialParams<TypeTag>
{
typedef FVSpatialParameters<TypeTag> ParentType;
typedef FVSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -127,7 +127,7 @@ public:
}
//! Constructor
TutorialSpatialParametersDecoupled(const GridView& gridView)
TutorialSpatialParamsDecoupled(const GridView& gridView)
: ParentType(gridView), K_(0)
{
for (int i = 0; i < dim; i++)