Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
8a240448
Commit
8a240448
authored
7 years ago
by
Kilian Weishaupt
Browse files
Options
Downloads
Patches
Plain Diff
[freeflow][test] Cleanp up cc files
parent
d6936451
No related branches found
No related tags found
3 merge requests
!617
[WIP] Next
,
!576
Feature/port staggered ff to next next
,
!571
Cleanup/next
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/freeflow/staggered/test_channel.cc
+2
-19
2 additions, 19 deletions
test/freeflow/staggered/test_channel.cc
test/freeflow/staggered/test_closedsystem.cc
+3
-4
3 additions, 4 deletions
test/freeflow/staggered/test_closedsystem.cc
with
5 additions
and
23 deletions
test/freeflow/staggered/test_channel.cc
+
2
−
19
View file @
8a240448
...
...
@@ -50,7 +50,7 @@
#include
<dumux/discretization/methods.hh>
#include
<dumux/io/vtkoutputmodule.hh>
#include
<dumux/io/
staggered
vtkoutputmodule.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
());
Staggered
VtkOutputModule
<
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
);
...
...
This diff is collapsed.
Click to expand it.
test/freeflow/staggered/test_closedsystem.cc
+
3
−
4
View file @
8a240448
...
...
@@ -19,7 +19,7 @@
/*!
* \file
*
* \brief
t
est for the
one-phase CC model
* \brief
T
est 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/
staggered
vtkoutputmodule.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
());
Staggered
VtkOutputModule
<
TypeTag
>
vtkWriter
(
*
problem
,
*
fvGridGeometry
,
*
gridVariables
,
x
,
problem
->
name
());
VtkOutputFields
::
init
(
vtkWriter
);
//! Add model specific output fields
vtkWriter
.
write
(
0.0
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment