Commit 38216873 authored by Markus Wolff's avatar Markus Wolff
Browse files

adaptions necessary for new implementations of finite volume models



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7411 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent d44e31cc
......@@ -64,6 +64,9 @@ NEW_PROP_TAG( AdaptiveGrid); //!< Defines if the grid is h-adaptive
NEW_PROP_TAG( Problem); //!< The type of the problem
NEW_PROP_TAG( Model); //!< The type of the discretizations
NEW_PROP_TAG( PressureModel ); //!< The type of the discretization of a pressure model
NEW_PROP_TAG( TransportModel ); //!< The type of the discretization of a transport model
NEW_PROP_TAG( Velocity ); //!< The type velocity reconstruction
NEW_PROP_TAG( NumEq ); //!< Number of equations in the system of PDEs
NEW_PROP_TAG( NumPhases); //!< Number of phases in the system
NEW_PROP_TAG( NumComponents); //!< Number of components in the system
......
......@@ -411,8 +411,7 @@ public:
void timeIntegration()
{
// allocate temporary vectors for the updates
TransportSolutionType updateVector
= transportModel().transportedQuantity();
TransportSolutionType updateVector;//(this->transportModel().solutionSize());
Scalar t = timeManager().time();
Scalar dt = 1e100;
......
......@@ -64,9 +64,6 @@ NEW_TYPE_TAG(IMPET, INHERITS_FROM(DecoupledModel));
// Property tags
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG(PressureModel); //!< The type of the discretization
NEW_PROP_TAG(TransportModel); //!< The type of the discretization
NEW_PROP_TAG(CFLFactor); //!< Scalar factor for additional scaling of the time step
NEW_PROP_TAG(IterationFlag); //!< Flag to switch the iteration type of the IMPET scheme
NEW_PROP_TAG(IterationNumber); //!< Number of iterations if IMPET iterations are enabled by the IterationFlags
......
......@@ -585,7 +585,7 @@ public:
timeManager().serialize(res);
resultWriter().serialize(res);
model().serialize(res);
res.template deserializeEntities<0> (model(), gridView_);
res.serializeEnd();
}
......@@ -606,7 +606,7 @@ public:
timeManager().deserialize(res);
resultWriter().deserialize(res);
model().deserialize(res);
res.template deserializeEntities<0> (model(), gridView_);
res.deserializeEnd();
};
......
......@@ -79,7 +79,6 @@ private:
const GridView& gridView_;
ElementMapper elementMapper_;
VertexMapper vertexMapper_;
const int codim_;
CellDataVector cellDataVector_;
public:
......@@ -89,10 +88,10 @@ public:
* @param codim codimension of the entity of which data has to be strored
* @param initialVel initial value for the velocity (only necessary if only transport part is solved)
*/
VariableClass(const GridView& gridView, int codim = 0) :
gridView_(gridView), elementMapper_(gridView), vertexMapper_(gridView), codim_(codim)
VariableClass(const GridView& gridView) :
gridView_(gridView), elementMapper_(gridView), vertexMapper_(gridView)
{
cellDataVector_.resize(gridView.size(codim));
cellDataVector_.resize(gridView.size(0));
}
......
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