Commit aa37f6a5 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

[update] update flow-over-step 2d case to DuMuX 3.4

parent 72c241c8
Pipeline #9674 failed with stages
in 5 seconds
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#define DUMUX_STOKES_SUBPROBLEM_HH #define DUMUX_STOKES_SUBPROBLEM_HH
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh> #include <dumux/common/timeloop.hh>
...@@ -58,7 +59,7 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag> ...@@ -58,7 +59,7 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>; using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
......
...@@ -154,7 +154,6 @@ int main(int argc, char **argv) ...@@ -154,7 +154,6 @@ int main(int argc, char **argv)
sol[darcyIdx].resize(darcyFvGridGeometry->numDofs()); sol[darcyIdx].resize(darcyFvGridGeometry->numDofs());
auto stokesSol = partial(sol, stokesFaceIdx, stokesCellCenterIdx); auto stokesSol = partial(sol, stokesFaceIdx, stokesCellCenterIdx);
auto stokesSolOld = stokesSol;
stokesProblem->applyInitialSolution(stokesSol); stokesProblem->applyInitialSolution(stokesSol);
darcyProblem->applyInitialSolution(sol[darcyIdx]); darcyProblem->applyInitialSolution(sol[darcyIdx]);
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define DUMUX_DARCY_SUBPROBLEM_HH #define DUMUX_DARCY_SUBPROBLEM_HH
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
...@@ -41,7 +42,7 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -41,7 +42,7 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
typename GetPropType<TypeTag, Properties::GridGeometry>::GridView; typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes< using BoundaryTypes = Dumux::BoundaryTypes<
GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
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