Commit 5d84e7ab authored by Natalie Schroeder's avatar Natalie Schroeder
Browse files

[dim vs dimWorld]

changing dim-vectors to dimWorld-vectors, needed for dim!=dimWorld grids

reviewed by A.Kissinger



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13375 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent e4b41878
......@@ -118,7 +118,7 @@ public:
*
* \param phaseIdx index of the phase
*/
DimVector velocity(const unsigned int phaseIdx) const
GlobalPosition velocity(const unsigned int phaseIdx) const
{ return velocity_[phaseIdx] ; }
/*!
......@@ -314,10 +314,10 @@ protected:
const bool onBoundary_; //!< Specifying whether we are currently on the boundary of the simulation domain
unsigned int upstreamIdx_[numPhases] , downstreamIdx_[numPhases]; //!< local index of the upstream / downstream vertex
Scalar volumeFlux_[numPhases] ; //!< Velocity multiplied with normal (magnitude=area)
DimVector velocity_[numPhases] ; //!< The velocity as determined by Darcy's law or by the Forchheimer relation
GlobalPosition velocity_[numPhases] ; //!< The velocity as determined by Darcy's law or by the Forchheimer relation
Scalar kGradPNormal_[numPhases] ; //!< Permeability multiplied with gradient in potential, multiplied with normal (magnitude=area)
DimVector kGradP_[numPhases] ; //!< Permeability multiplied with gradient in potential
DimVector potentialGrad_[numPhases] ; //!< Gradient of potential, which drives flow
GlobalPosition kGradP_[numPhases] ; //!< Permeability multiplied with gradient in potential
GlobalPosition potentialGrad_[numPhases] ; //!< Gradient of potential, which drives flow
Scalar mobilityUpwindWeight_; //!< Upwind weight for mobility. Set to one for full upstream weighting
};
......
......@@ -115,7 +115,7 @@ public:
* This is discretization independent interface. By default it
* just calls gravity().
*/
const DimVector &gravityAtPos(const GlobalPosition &globalPos) const
const GlobalPosition &gravityAtPos(const GlobalPosition &pos) const
{ return asImp_().gravity(); }
/*!
......@@ -127,7 +127,7 @@ public:
* property is true, \f$\boldsymbol{g} = ( 0,\dots,\ -9.81)^T \f$ holds,
* else \f$\boldsymbol{g} = ( 0,\dots, 0)^T \f$.
*/
const DimVector &gravity() const
const GlobalPosition &gravity() const
{ return gravity_; }
/*!
......@@ -152,7 +152,7 @@ protected:
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
DimVector gravity_;
GlobalPosition gravity_;
// fluids and material properties
Dune::shared_ptr<SpatialParams> spatialParams_;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment