Commit 256f706f authored by Timo Koch's avatar Timo Koch
Browse files

[cleanup] Fix #613 deprecation warnings from gridvars->init

parent 6baf4624
...@@ -145,7 +145,7 @@ int main(int argc, char** argv) try ...@@ -145,7 +145,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// intialize the vtk output module // intialize the vtk output module
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
......
...@@ -150,7 +150,7 @@ int main(int argc, char** argv) try ...@@ -150,7 +150,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// initialize the vtk output module // initialize the vtk output module
using IOFields = GetPropType<TypeTag, Properties::IOFields>; using IOFields = GetPropType<TypeTag, Properties::IOFields>;
......
...@@ -133,7 +133,7 @@ int main(int argc, char** argv) try ...@@ -133,7 +133,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// get some time loop parameters // get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
......
...@@ -144,7 +144,7 @@ int main(int argc, char** argv) try ...@@ -144,7 +144,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// intialize the vtk output module // intialize the vtk output module
using IOFields = GetPropType<TypeTag, Properties::IOFields>; using IOFields = GetPropType<TypeTag, Properties::IOFields>;
......
...@@ -143,7 +143,7 @@ int main(int argc, char** argv) try ...@@ -143,7 +143,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// intialize the vtk output module // intialize the vtk output module
using IOFields = GetPropType<TypeTag, Properties::IOFields>; using IOFields = GetPropType<TypeTag, Properties::IOFields>;
......
...@@ -143,7 +143,7 @@ int main(int argc, char** argv) try ...@@ -143,7 +143,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// intialize the vtk output module // intialize the vtk output module
using IOFields = GetPropType<TypeTag, Properties::IOFields>; using IOFields = GetPropType<TypeTag, Properties::IOFields>;
......
...@@ -139,7 +139,7 @@ int main(int argc, char** argv) try ...@@ -139,7 +139,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// intialize the vtk output module // intialize the vtk output module
using IOFields = GetPropType<TypeTag, Properties::IOFields>; using IOFields = GetPropType<TypeTag, Properties::IOFields>;
......
...@@ -135,7 +135,7 @@ int main(int argc, char** argv) try ...@@ -135,7 +135,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// intialize the vtk output module // intialize the vtk output module
using IOFields = GetPropType<TypeTag, Properties::IOFields>; using IOFields = GetPropType<TypeTag, Properties::IOFields>;
......
...@@ -226,8 +226,8 @@ int main(int argc, char** argv) try ...@@ -226,8 +226,8 @@ int main(int argc, char** argv) try
auto gridVariables0 = std::make_shared<GridVariables0>(problem0, fvGridGeometry0); auto gridVariables0 = std::make_shared<GridVariables0>(problem0, fvGridGeometry0);
using GridVariables1 = GetPropType<SubTypeTag1, Properties::GridVariables>; using GridVariables1 = GetPropType<SubTypeTag1, Properties::GridVariables>;
auto gridVariables1 = std::make_shared<GridVariables1>(problem1, fvGridGeometry1); auto gridVariables1 = std::make_shared<GridVariables1>(problem1, fvGridGeometry1);
gridVariables0->init(sol[domain0Idx], oldSol[domain0Idx]); gridVariables0->init(sol[domain0Idx]);
gridVariables1->init(sol[domain1Idx], oldSol[domain1Idx]); gridVariables1->init(sol[domain1Idx]);
// get some time loop parameters // get some time loop parameters
using Scalar = Traits::Scalar; using Scalar = Traits::Scalar;
......
...@@ -211,8 +211,8 @@ int main(int argc, char** argv) try ...@@ -211,8 +211,8 @@ int main(int argc, char** argv) try
auto gridVariables0 = std::make_shared<GridVariables0>(problem0, fvGridGeometry0); auto gridVariables0 = std::make_shared<GridVariables0>(problem0, fvGridGeometry0);
using GridVariables1 = GetPropType<SubTypeTag1, Properties::GridVariables>; using GridVariables1 = GetPropType<SubTypeTag1, Properties::GridVariables>;
auto gridVariables1 = std::make_shared<GridVariables1>(problem1, fvGridGeometry1); auto gridVariables1 = std::make_shared<GridVariables1>(problem1, fvGridGeometry1);
gridVariables0->init(sol[domain0Idx], oldSol[domain0Idx]); gridVariables0->init(sol[domain0Idx]);
gridVariables1->init(sol[domain1Idx], oldSol[domain1Idx]); gridVariables1->init(sol[domain1Idx]);
// get some time loop parameters // get some time loop parameters
using Scalar = Traits::Scalar; using Scalar = Traits::Scalar;
......
...@@ -179,10 +179,10 @@ int main(int argc, char** argv) try ...@@ -179,10 +179,10 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using StokesGridVariables = GetPropType<StokesTypeTag, Properties::GridVariables>; using StokesGridVariables = GetPropType<StokesTypeTag, Properties::GridVariables>;
auto stokesGridVariables = std::make_shared<StokesGridVariables>(stokesProblem, stokesFvGridGeometry); auto stokesGridVariables = std::make_shared<StokesGridVariables>(stokesProblem, stokesFvGridGeometry);
stokesGridVariables->init(stokesSol, solStokesOld); stokesGridVariables->init(stokesSol);
using DarcyGridVariables = GetPropType<DarcyTypeTag, Properties::GridVariables>; using DarcyGridVariables = GetPropType<DarcyTypeTag, Properties::GridVariables>;
auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry); auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
darcyGridVariables->init(sol[darcyIdx], solDarcyOld); darcyGridVariables->init(sol[darcyIdx]);
// intialize the vtk output module // intialize the vtk output module
StaggeredVtkOutputModule<StokesGridVariables, GetPropType<StokesTypeTag, Properties::SolutionVector>> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name()); StaggeredVtkOutputModule<StokesGridVariables, GetPropType<StokesTypeTag, Properties::SolutionVector>> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
......
...@@ -180,10 +180,10 @@ int main(int argc, char** argv) try ...@@ -180,10 +180,10 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using StokesGridVariables = GetPropType<StokesTypeTag, Properties::GridVariables>; using StokesGridVariables = GetPropType<StokesTypeTag, Properties::GridVariables>;
auto stokesGridVariables = std::make_shared<StokesGridVariables>(stokesProblem, stokesFvGridGeometry); auto stokesGridVariables = std::make_shared<StokesGridVariables>(stokesProblem, stokesFvGridGeometry);
stokesGridVariables->init(stokesSol, solStokesOld); stokesGridVariables->init(stokesSol);
using DarcyGridVariables = GetPropType<DarcyTypeTag, Properties::GridVariables>; using DarcyGridVariables = GetPropType<DarcyTypeTag, Properties::GridVariables>;
auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry); auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
darcyGridVariables->init(sol[darcyIdx], solDarcyOld); darcyGridVariables->init(sol[darcyIdx]);
// intialize the vtk output module // intialize the vtk output module
StaggeredVtkOutputModule<StokesGridVariables, GetPropType<StokesTypeTag, Properties::SolutionVector>> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name()); StaggeredVtkOutputModule<StokesGridVariables, GetPropType<StokesTypeTag, Properties::SolutionVector>> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
......
...@@ -172,10 +172,10 @@ int main(int argc, char** argv) try ...@@ -172,10 +172,10 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using StokesGridVariables = GetPropType<StokesTypeTag, Properties::GridVariables>; using StokesGridVariables = GetPropType<StokesTypeTag, Properties::GridVariables>;
auto stokesGridVariables = std::make_shared<StokesGridVariables>(stokesProblem, stokesFvGridGeometry); auto stokesGridVariables = std::make_shared<StokesGridVariables>(stokesProblem, stokesFvGridGeometry);
stokesGridVariables->init(stokesSol, solStokesOld); stokesGridVariables->init(stokesSol);
using DarcyGridVariables = GetPropType<DarcyTypeTag, Properties::GridVariables>; using DarcyGridVariables = GetPropType<DarcyTypeTag, Properties::GridVariables>;
auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry); auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
darcyGridVariables->init(sol[darcyIdx], solDarcyOld); darcyGridVariables->init(sol[darcyIdx]);
// intialize the vtk output module // intialize the vtk output module
StaggeredVtkOutputModule<StokesGridVariables, GetPropType<StokesTypeTag, Properties::SolutionVector>> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name()); StaggeredVtkOutputModule<StokesGridVariables, GetPropType<StokesTypeTag, Properties::SolutionVector>> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
......
...@@ -199,10 +199,10 @@ int main(int argc, char** argv) try ...@@ -199,10 +199,10 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using StokesGridVariables = GetPropType<StokesTypeTag, Properties::GridVariables>; using StokesGridVariables = GetPropType<StokesTypeTag, Properties::GridVariables>;
auto stokesGridVariables = std::make_shared<StokesGridVariables>(stokesProblem, stokesFvGridGeometry); auto stokesGridVariables = std::make_shared<StokesGridVariables>(stokesProblem, stokesFvGridGeometry);
stokesGridVariables->init(stokesSol, solStokesOld); stokesGridVariables->init(stokesSol);
using DarcyGridVariables = GetPropType<DarcyTypeTag, Properties::GridVariables>; using DarcyGridVariables = GetPropType<DarcyTypeTag, Properties::GridVariables>;
auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry); auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
darcyGridVariables->init(sol[darcyIdx], solDarcyOld); darcyGridVariables->init(sol[darcyIdx]);
// get some time loop parameters // get some time loop parameters
using Scalar = GetPropType<StokesTypeTag, Properties::Scalar>; using Scalar = GetPropType<StokesTypeTag, Properties::Scalar>;
......
...@@ -339,10 +339,10 @@ int main(int argc, char** argv) try ...@@ -339,10 +339,10 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using BulkGridVariables = GetPropType<BulkTypeTag, Properties::GridVariables>; using BulkGridVariables = GetPropType<BulkTypeTag, Properties::GridVariables>;
auto bulkGridVariables = std::make_shared<BulkGridVariables>(bulkProblem, bulkFvGridGeometry); auto bulkGridVariables = std::make_shared<BulkGridVariables>(bulkProblem, bulkFvGridGeometry);
bulkGridVariables->init(sol[bulkIdx], oldSol[bulkIdx]); bulkGridVariables->init(sol[bulkIdx]);
using LowDimGridVariables = GetPropType<LowDimTypeTag, Properties::GridVariables>; using LowDimGridVariables = GetPropType<LowDimTypeTag, Properties::GridVariables>;
auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry); auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry);
lowDimGridVariables->init(sol[lowDimIdx], oldSol[lowDimIdx]); lowDimGridVariables->init(sol[lowDimIdx]);
// get some time loop parameters // get some time loop parameters
using Scalar = Traits::Scalar; using Scalar = Traits::Scalar;
......
...@@ -159,10 +159,10 @@ int main(int argc, char** argv) try ...@@ -159,10 +159,10 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using BulkGridVariables = GetPropType<BulkTypeTag, Properties::GridVariables>; using BulkGridVariables = GetPropType<BulkTypeTag, Properties::GridVariables>;
auto bulkGridVariables = std::make_shared<BulkGridVariables>(bulkProblem, bulkFvGridGeometry); auto bulkGridVariables = std::make_shared<BulkGridVariables>(bulkProblem, bulkFvGridGeometry);
bulkGridVariables->init(sol[bulkIdx], oldSol[bulkIdx]); bulkGridVariables->init(sol[bulkIdx]);
using LowDimGridVariables = GetPropType<LowDimTypeTag, Properties::GridVariables>; using LowDimGridVariables = GetPropType<LowDimTypeTag, Properties::GridVariables>;
auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry); auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry);
lowDimGridVariables->init(sol[lowDimIdx], oldSol[lowDimIdx]); lowDimGridVariables->init(sol[lowDimIdx]);
// intialize the vtk output module // intialize the vtk output module
using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>; using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>;
......
...@@ -158,10 +158,10 @@ int main(int argc, char** argv) try ...@@ -158,10 +158,10 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using BulkGridVariables = GetPropType<BulkTypeTag, Properties::GridVariables>; using BulkGridVariables = GetPropType<BulkTypeTag, Properties::GridVariables>;
auto bulkGridVariables = std::make_shared<BulkGridVariables>(bulkProblem, bulkFvGridGeometry); auto bulkGridVariables = std::make_shared<BulkGridVariables>(bulkProblem, bulkFvGridGeometry);
bulkGridVariables->init(sol[bulkIdx], oldSol[bulkIdx]); bulkGridVariables->init(sol[bulkIdx]);
using LowDimGridVariables = GetPropType<LowDimTypeTag, Properties::GridVariables>; using LowDimGridVariables = GetPropType<LowDimTypeTag, Properties::GridVariables>;
auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry); auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry);
lowDimGridVariables->init(sol[lowDimIdx], oldSol[lowDimIdx]); lowDimGridVariables->init(sol[lowDimIdx]);
// get some time loop parameters // get some time loop parameters
using Scalar = Traits::Scalar; using Scalar = Traits::Scalar;
......
...@@ -209,10 +209,10 @@ int main(int argc, char** argv) try ...@@ -209,10 +209,10 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using BulkGridVariables = GetPropType<BulkTypeTag, Properties::GridVariables>; using BulkGridVariables = GetPropType<BulkTypeTag, Properties::GridVariables>;
auto bulkGridVariables = std::make_shared<BulkGridVariables>(bulkProblem, bulkFvGridGeometry); auto bulkGridVariables = std::make_shared<BulkGridVariables>(bulkProblem, bulkFvGridGeometry);
bulkGridVariables->init(sol[bulkIdx], oldSol[bulkIdx]); bulkGridVariables->init(sol[bulkIdx]);
using LowDimGridVariables = GetPropType<LowDimTypeTag, Properties::GridVariables>; using LowDimGridVariables = GetPropType<LowDimTypeTag, Properties::GridVariables>;
auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry); auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry);
lowDimGridVariables->init(sol[lowDimIdx], oldSol[lowDimIdx]); lowDimGridVariables->init(sol[lowDimIdx]);
// intialize the vtk output module // intialize the vtk output module
using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>; using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>;
......
...@@ -101,7 +101,7 @@ int main(int argc, char** argv) try ...@@ -101,7 +101,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// get some time loop parameters // get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
......
...@@ -122,7 +122,7 @@ int main(int argc, char** argv) try ...@@ -122,7 +122,7 @@ int main(int argc, char** argv) try
// the grid variables // the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry); auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld); gridVariables->init(x);
// get some time loop parameters // get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
......
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