Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
ea8ea5f2
Commit
ea8ea5f2
authored
Jul 30, 2018
by
Timo Koch
Browse files
[cleanup] Remove unused restart code in main files
parent
3af77937
Changes
41
Hide whitespace changes
Inline
Side-by-side
test/freeflow/navierstokes/test_angeli.cc
View file @
ea8ea5f2
...
...
@@ -121,15 +121,10 @@ int main(int argc, char** argv) try
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
const
auto
tEnd
=
getParam
<
Scalar
>
(
"TimeLoop.TEnd"
);
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"
);
auto
dt
=
getParam
<
Scalar
>
(
"TimeLoop.DtInitial"
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the problem (initial and boundary conditions)
...
...
test/freeflow/navierstokes/test_closedsystem.cc
View file @
ea8ea5f2
...
...
@@ -141,11 +141,6 @@ int main(int argc, char** argv) try
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
);
StaggeredVtkOutputModule
<
GridVariables
,
SolutionVector
>
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
...
...
@@ -153,7 +148,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/freeflow/navierstokesnc/test_channel.cc
View file @
ea8ea5f2
...
...
@@ -126,13 +126,8 @@ int main(int argc, char** argv) try
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"
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
problem
->
setTimeLoop
(
timeLoop
);
...
...
test/freeflow/navierstokesnc/test_densitydrivenflow.cc
View file @
ea8ea5f2
...
...
@@ -126,13 +126,8 @@ int main(int argc, char** argv) try
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"
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the solution vector
...
...
test/freeflow/navierstokesnc/test_msfreeflow.cc
View file @
ea8ea5f2
...
...
@@ -126,13 +126,8 @@ int main(int argc, char** argv) try
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"
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the solution vector
...
...
test/freeflow/rans/test_pipe_laufer.cc
View file @
ea8ea5f2
...
...
@@ -119,13 +119,8 @@ int main(int argc, char** argv) try
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"
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
problem
->
setTimeLoop
(
timeLoop
);
...
...
test/freeflow/ransnc/test_flatplate.cc
View file @
ea8ea5f2
...
...
@@ -115,13 +115,8 @@ int main(int argc, char** argv) try
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"
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
problem
->
setTimeLoop
(
timeLoop
);
...
...
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
View file @
ea8ea5f2
...
...
@@ -136,13 +136,8 @@ int main(int argc, char** argv) try
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"
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// control the injection period
...
...
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
View file @
ea8ea5f2
...
...
@@ -127,11 +127,6 @@ int main(int argc, char** argv) try
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"
);
const
bool
isDiffusionProblem
=
getParam
<
bool
>
(
"Problem.OnlyDiffusion"
,
false
);
// the problem (initial and boundary conditions)
...
...
@@ -144,7 +139,7 @@ int main(int argc, char** argv) try
GET_PROP_TYPE
(
StokesTypeTag
,
FluidSystem
)
::
init
();
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
CheckPointTimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
if
(
!
isDiffusionProblem
)
...
...
test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
View file @
ea8ea5f2
...
...
@@ -136,13 +136,8 @@ int main(int argc, char** argv) try
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"
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
stokesProblem
->
setTimeLoop
(
timeLoop
);
// needed for boundary value variations
...
...
test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
View file @
ea8ea5f2
...
...
@@ -206,11 +206,6 @@ int main(int argc, char** argv) try
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
const
auto
stokesName
=
getParam
<
std
::
string
>
(
"Problem.Name"
)
+
"_"
+
stokesProblem
->
name
();
const
auto
darcyName
=
getParam
<
std
::
string
>
(
"Problem.Name"
)
+
"_"
+
darcyProblem
->
name
();
...
...
@@ -226,7 +221,7 @@ int main(int argc, char** argv) try
darcyVtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.cc
View file @
ea8ea5f2
...
...
@@ -106,11 +106,6 @@ int main(int argc, char** argv) try
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
<
GridVariables
,
SolutionVector
>
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
...
...
@@ -120,7 +115,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources_timedependent.cc
View file @
ea8ea5f2
...
...
@@ -106,11 +106,6 @@ int main(int argc, char** argv) try
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
<
GridVariables
,
SolutionVector
>
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
...
...
@@ -120,7 +115,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/porousmediumflow/1p/implicit/test_1pfv.cc
View file @
ea8ea5f2
...
...
@@ -136,11 +136,6 @@ int main(int argc, char** argv) try
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
<
GridVariables
,
SolutionVector
>
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
...
...
@@ -155,7 +150,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc
View file @
ea8ea5f2
...
...
@@ -130,11 +130,6 @@ int main(int argc, char** argv) try
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
<
GridVariables
,
SolutionVector
>
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
...
...
@@ -144,7 +139,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc
View file @
ea8ea5f2
...
...
@@ -130,11 +130,6 @@ int main(int argc, char** argv) try
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
<
GridVariables
,
SolutionVector
>
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
...
...
@@ -144,7 +139,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
View file @
ea8ea5f2
...
...
@@ -182,11 +182,6 @@ int main(int argc, char** argv) try
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
(
hasParam
(
"Restart"
)
||
hasParam
(
"TimeLoop.Restart"
))
restartTime
=
getParam
<
Scalar
>
(
"TimeLoop.Restart"
);
// intialize the vtk output module
using
VtkOutputFields
=
typename
GET_PROP_TYPE
(
TypeTag
,
VtkOutputFields
);
VtkOutputModule
<
GridVariables
,
SolutionVector
>
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
...
...
@@ -196,7 +191,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
@@ -215,7 +210,7 @@ int main(int argc, char** argv) try
timeLoop
->
start
();
do
{
// refine/coarsen only after first time step
if
(
timeLoop
->
time
()
>
restartTime
)
if
(
timeLoop
->
time
()
>
0
)
{
// compute refinement indicator
indicator
.
calculate
(
x
,
refineTol
,
coarsenTol
);
...
...
test/porousmediumflow/2p/implicit/boxdfm/test_2pboxdfm.cc
View file @
ea8ea5f2
...
...
@@ -165,11 +165,6 @@ int main(int argc, char** argv) try
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
);
using
FractureGrid
=
FRACTUREGRIDTYPE
;
...
...
@@ -178,7 +173,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/porousmediumflow/2p/implicit/cornerpoint/test_2p_cornerpoint.cc
View file @
ea8ea5f2
...
...
@@ -145,11 +145,6 @@ int main(int argc, char** argv) try
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
);
...
...
@@ -163,7 +158,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc
View file @
ea8ea5f2
...
...
@@ -119,11 +119,6 @@ int main(int argc, char** argv) try
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
<
GridVariables
,
SolutionVector
>
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
...
...
@@ -133,7 +128,7 @@ int main(int argc, char** argv) try
vtkWriter
.
write
(
0.0
);
// instantiate time loop
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
restartTime
,
dt
,
tEnd
);
auto
timeLoop
=
std
::
make_shared
<
TimeLoop
<
Scalar
>>
(
0
,
dt
,
tEnd
);
timeLoop
->
setMaxTimeStepSize
(
maxDt
);
// the assembler with time loop for instationary problem
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment