From 8a24044859aa5218ec79d49d193432070089d555 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Fri, 17 Nov 2017 12:48:27 +0100
Subject: [PATCH] [freeflow][test] Cleanp up cc files
---
test/freeflow/staggered/test_channel.cc | 21 ++------------------
test/freeflow/staggered/test_closedsystem.cc | 7 +++----
2 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/test/freeflow/staggered/test_channel.cc b/test/freeflow/staggered/test_channel.cc
index 79b8499aaa..7abdc98014 100644
--- a/test/freeflow/staggered/test_channel.cc
+++ b/test/freeflow/staggered/test_channel.cc
@@ -50,7 +50,7 @@
#include <dumux/discretization/methods.hh>
-#include <dumux/io/vtkoutputmodule.hh>
+#include <dumux/io/staggeredvtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -157,29 +157,12 @@ int main(int argc, char** argv) try
auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
gridVariables->init(x, xOld);
- // // get some time loop parameters
- // using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- // const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
- // const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
- // const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
- // auto dt = getParam<Scalar>("TimeLoop.DtInitial");
-
- // // check if we are about to restart a previously interrupted simulation
- // Scalar restartTime = 0;
- // if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
- // restartTime = getParam<Scalar>("TimeLoop.Restart");
-
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
- VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ StaggeredVtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
VtkOutputFields::init(vtkWriter); //! Add model specific output fields
vtkWriter.write(0.0);
- // // instantiate time loop
- // auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
- // timeLoop->setMaxTimeStepSize(maxDt);
- // problem->setTimeLoop(timeLoop);
-
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
diff --git a/test/freeflow/staggered/test_closedsystem.cc b/test/freeflow/staggered/test_closedsystem.cc
index a3d385e024..b1cfa45e03 100644
--- a/test/freeflow/staggered/test_closedsystem.cc
+++ b/test/freeflow/staggered/test_closedsystem.cc
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief test for the one-phase CC model
+ * \brief Test for the staggered grid Stokes model in a closed domain
*/
#include <config.h>
@@ -32,7 +32,6 @@
#include <dune/grid/io/file/vtk.hh>
#include <dune/istl/io.hh>
-
#include "closedsystemtestproblem.hh"
#include <dumux/common/propertysystem.hh>
@@ -51,7 +50,7 @@
#include <dumux/discretization/methods.hh>
-#include <dumux/io/vtkoutputmodule.hh>
+#include <dumux/io/staggeredvtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -155,7 +154,7 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
- VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ StaggeredVtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
VtkOutputFields::init(vtkWriter); //! Add model specific output fields
vtkWriter.write(0.0);
--
GitLab