diff --git a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
index 8fbd853d653282d7ef61d288495e7fce8510b2b8..c06de2c142b98be20083b45d31db79c14fe8b7a1 100644
--- a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
@@ -1,4 +1,4 @@
-dune_symlink_to_source_files(FILES "params.input" "grids")
+dune_symlink_to_source_files(FILES "params.input" "grids" "dt")
# tests without gravity
dumux_add_test(NAME test_2p_fracture_box
@@ -10,7 +10,7 @@ dumux_add_test(NAME test_2p_fracture_box
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_box-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_box")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_box -TimeLoop.TimeStepSizeFile dt/test_2p_fracture_box_dt-reference.dat")
dumux_add_test(NAME test_2p_fracture_tpfa
LABELS porousmediumflow 2p
@@ -21,7 +21,7 @@ dumux_add_test(NAME test_2p_fracture_tpfa
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_tpfa-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_tpfa")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_tpfa -TimeLoop.TimeStepSizeFile dt/test_2p_fracture_tpfa_dt-reference.dat")
dumux_add_test(NAME test_2p_fracture_mpfa
LABELS porousmediumflow 2p
@@ -33,7 +33,7 @@ dumux_add_test(NAME test_2p_fracture_mpfa
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_mpfa-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa params.input -Problem.Name test_2p_fracture_mpfa")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa params.input -Problem.Name test_2p_fracture_mpfa -TimeLoop.TimeStepSizeFile dt/test_2p_fracture_mpfa_dt-reference.dat")
# tests with gravity
dumux_add_test(NAME test_2p_fracture_gravity_box
@@ -44,7 +44,7 @@ dumux_add_test(NAME test_2p_fracture_gravity_box
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_gravity_box-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_gravity_box-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_gravity_box -Problem.EnableGravity true")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_gravity_box -Problem.EnableGravity true -Newton.MaxRelativeShift 1e-12 -TimeLoop.TimeStepSizeFile dt/test_2p_fracture_gravity_box_dt-reference.dat")
dumux_add_test(NAME test_2p_fracture_gravity_tpfa
TARGET test_2p_fracture_tpfa
@@ -54,7 +54,7 @@ dumux_add_test(NAME test_2p_fracture_gravity_tpfa
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_gravity_tpfa-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_gravity_tpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_gravity_tpfa -Problem.EnableGravity true")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_gravity_tpfa -Problem.EnableGravity true -TimeLoop.TimeStepSizeFile dt/test_2p_fracture_gravity_tpfa_dt-reference.dat")
dumux_add_test(NAME test_2p_fracture_gravity_mpfa
TARGET test_2p_fracture_mpfa
@@ -65,4 +65,4 @@ dumux_add_test(NAME test_2p_fracture_gravity_mpfa
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2p_fracture_gravity_mpfa-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_gravity_mpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa params.input -Problem.Name test_2p_fracture_gravity_mpfa -Problem.EnableGravity true")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa params.input -Problem.Name test_2p_fracture_gravity_mpfa -Problem.EnableGravity true -TimeLoop.TimeStepSizeFile dt/test_2p_fracture_gravity_mpfa_dt-reference.dat")
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_box_dt-reference.dat b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_box_dt-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..0ec47cd2b91750838d7aac4d90c484dbe3a4d03b
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_box_dt-reference.dat
@@ -0,0 +1,43 @@
+2.500000000000000e+02
+2.708333333333333e+02
+3.611111111111111e+02
+4.814814814814816e+02
+6.419753086419755e+02
+8.559670781893008e+02
+1.069958847736626e+03
+1.337448559670783e+03
+1.671810699588478e+03
+2.089763374485598e+03
+2.612204218106997e+03
+3.265255272633746e+03
+3.809464484739371e+03
+4.761830605924214e+03
+5.555469040244917e+03
+6.944336300306146e+03
+8.101725683690504e+03
+9.452013297638923e+03
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+6.467351302476483e+03
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_box_dt-reference.dat b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_box_dt-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..038dc93a2d1d809da7a56b76d71cad06395861d6
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_box_dt-reference.dat
@@ -0,0 +1,51 @@
+2.500000000000000e+02
+2.272727272727273e+02
+2.840909090909091e+02
+2.840909090909091e+02
+3.551136363636363e+02
+3.228305785123966e+02
+3.766356749311294e+02
+4.394082874196510e+02
+4.760256447046219e+02
+5.553632521553922e+02
+6.479237941812909e+02
+7.019174436963984e+02
+7.604105640044315e+02
+8.237781110048007e+02
+1.029722638756001e+03
+1.115532858652334e+03
+1.115532858652334e+03
+1.301455001761057e+03
+1.735273335681409e+03
+2.313697780908546e+03
+3.084930374544728e+03
+4.113240499392971e+03
+5.484320665857295e+03
+7.312427554476395e+03
+9.749903405968527e+03
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+5.139101492920076e+03
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_mpfa_dt-reference.dat b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_mpfa_dt-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..1a9a4da49f77f60556dcd3fe0d861c83d5f5dbf3
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_mpfa_dt-reference.dat
@@ -0,0 +1,64 @@
+1.250000000000000e+02
+1.354166666666667e+02
+1.805555555555556e+02
+2.106481481481482e+02
+2.282021604938272e+02
+2.472190072016461e+02
+2.678205911351166e+02
+2.060158393347051e+02
+2.575197991683813e+02
+2.575197991683813e+02
+3.218997489604766e+02
+3.487247280405163e+02
+3.777851220438927e+02
+3.777851220438927e+02
+4.092672155475504e+02
+3.720611050432276e+02
+3.100509208693563e+02
+3.875636510866954e+02
+3.875636510866954e+02
+4.198606220105867e+02
+5.248257775132333e+02
+6.122967404321056e+02
+7.143461971707899e+02
+7.143461971707899e+02
+7.738750469350223e+02
+8.383646341796074e+02
+5.988318815568624e+02
+4.990265679640520e+02
+6.653687572854028e+02
+8.871583430472039e+02
+1.182877790729605e+03
+1.675743536866941e+03
+2.373970010561500e+03
+3.363124181628792e+03
+4.203905227035990e+03
+5.254881533794987e+03
+7.006508711726650e+03
+9.342011615635534e+03
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+2.940057795159635e+03
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_tpfa_dt-reference.dat b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_tpfa_dt-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..a2f829b0436edbe35f9b91e90c0b8218729732d4
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_gravity_tpfa_dt-reference.dat
@@ -0,0 +1,62 @@
+2.500000000000000e+02
+1.666666666666667e+02
+2.222222222222222e+02
+2.407407407407407e+02
+2.407407407407407e+02
+2.407407407407407e+02
+2.608024691358024e+02
+2.825360082304526e+02
+2.825360082304526e+02
+3.060806755829903e+02
+3.570941215134887e+02
+4.166098084324035e+02
+4.513272924684371e+02
+4.889379001741401e+02
+4.889379001741401e+02
+4.074482501451168e+02
+4.414022709905432e+02
+4.414022709905432e+02
+4.781857935730884e+02
+5.180346097041790e+02
+4.709405542765264e+02
+5.494306466559475e+02
+4.578588722132896e+02
+4.162353383757178e+02
+3.201810295197829e+02
+4.269080393597106e+02
+5.692107191462809e+02
+8.063818521238979e+02
+1.142374290508855e+03
+1.618363578220879e+03
+2.292681735812911e+03
+3.056908981083882e+03
+4.075878641445177e+03
+5.774161408714001e+03
+8.180061995678167e+03
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+2.859975826408074e+03
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_mpfa_dt-reference.dat b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_mpfa_dt-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..4a6d6df6f97b0bbb745d7b5db5f8f795a95211c7
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_mpfa_dt-reference.dat
@@ -0,0 +1,51 @@
+2.500000000000000e+02
+2.500000000000000e+02
+3.333333333333334e+02
+4.166666666666667e+02
+5.208333333333335e+02
+6.510416666666669e+02
+7.595486111111114e+02
+8.861400462962968e+02
+8.861400462962968e+02
+1.107675057870371e+03
+1.199981312692902e+03
+1.499976640866127e+03
+1.749972747677148e+03
+2.041634872290007e+03
+2.381907351005008e+03
+2.580399630255425e+03
+3.010466235297996e+03
+3.261338421572829e+03
+3.533116623370565e+03
+3.827543008651445e+03
+4.146504926039065e+03
+4.492047003208987e+03
+4.866384253476403e+03
+5.271916274599435e+03
+5.711242630816055e+03
+5.711242630816055e+03
+7.614990174421408e+03
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.037956501369074e+03
diff --git a/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_tpfa_dt-reference.dat b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_tpfa_dt-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..27035f49e8ec26706f41a112e727c6e4d0e1737f
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/dt/test_2p_fracture_tpfa_dt-reference.dat
@@ -0,0 +1,49 @@
+2.500000000000000e+02
+2.500000000000000e+02
+3.333333333333334e+02
+4.166666666666667e+02
+5.208333333333335e+02
+6.510416666666669e+02
+8.138020833333336e+02
+9.494357638888893e+02
+1.107675057870371e+03
+1.292287567515433e+03
+1.615359459394291e+03
+1.884586035960006e+03
+2.198683708620008e+03
+2.565130993390009e+03
+2.778891909505843e+03
+3.010466235297996e+03
+3.261338421572829e+03
+3.533116623370565e+03
+4.121969393932326e+03
+4.465466843426686e+03
+4.837589080378910e+03
+5.240721503743818e+03
+5.677448295722469e+03
+6.150568987032674e+03
+7.175663818204787e+03
+9.567551757606385e+03
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+1.000000000000000e+04
+5.330371460232360e+03
diff --git a/test/porousmediumflow/2p/implicit/fracture/main.cc b/test/porousmediumflow/2p/implicit/fracture/main.cc
index 3ed9166071ac425de3ae9ceaa345175278be8058..d0b46a8500511bec45f0ecc25e8536109fe7a0d6 100644
--- a/test/porousmediumflow/2p/implicit/fracture/main.cc
+++ b/test/porousmediumflow/2p/implicit/fracture/main.cc
@@ -23,44 +23,27 @@
*/
#include <config.h>
-#include <ctime>
+#include <limits>
+#include <numeric>
#include <iostream>
#include <dune/common/parallel/mpihelper.hh>
-#include <dune/common/timer.hh>
#include <dune/grid/io/file/dgfparser/dgfexception.hh>
-#include <dune/grid/io/file/vtk.hh>
-#include <dune/istl/io.hh>
-
-#include "problem.hh"
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/valgrind.hh>
#include <dumux/common/dumuxmessage.hh>
+#include <dumux/io/container.hh>
#include <dumux/linear/amgbackend.hh>
#include <dumux/linear/linearsolvertraits.hh>
#include <dumux/nonlinear/newtonsolver.hh>
-
#include <dumux/assembly/fvassembler.hh>
-#include <dumux/assembly/diffmethod.hh>
-
-#include <dumux/discretization/method.hh>
#include <dumux/io/vtkoutputmodule.hh>
-#include <dumux/io/grid/gridmanager.hh>
+#include <dumux/io/grid/gridmanager_foam.hh>
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{}
+#include "problem.hh"
////////////////////////
// the main function
@@ -80,7 +63,7 @@ int main(int argc, char** argv) try
DumuxMessage::print(/*firstCall=*/true);
// parse command line arguments and input file
- Parameters::init(argc, argv, usage);
+ Parameters::init(argc, argv);
// try to create a grid (from the given grid file or the input file)
GridManager<GetPropType<TypeTag, Properties::Grid>> gridManager;
@@ -104,7 +87,7 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(gridGeometry->numDofs());
+ SolutionVector x;
problem->applyInitialSolution(x);
auto xOld = x;
@@ -113,12 +96,6 @@ int main(int argc, char** argv) try
auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
- // get some time loop parameters
- using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
- const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
- auto dt = getParam<Scalar>("TimeLoop.DtInitial");
-
// intialize the vtk output module
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
@@ -127,10 +104,26 @@ int main(int argc, char** argv) try
IOFields::initOutputModule(vtkWriter); // Add model specific output fields
vtkWriter.write(0.0);
- // instantiate time loop
- auto timeLoop = std::make_shared<CheckPointTimeLoop<Scalar>>(0, dt, tEnd);
- timeLoop->setMaxTimeStepSize(maxDt);
- timeLoop->setPeriodicCheckPoint(getParam<Scalar>("TimeLoop.PeriodicCheckPoint"));
+ // get some time loop parameters
+ std::shared_ptr<CheckPointTimeLoop<double>> timeLoop;
+ const bool hasTimeStepSizeFile = hasParam("TimeLoop.TimeStepSizeFile");
+ std::vector<double> timeStepSizes;
+
+ if (hasTimeStepSizeFile)
+ {
+ timeStepSizes = readFileToContainer<std::vector<double>>(getParam<std::string>("TimeLoop.TimeStepSizeFile"));
+ const auto dtInit = timeStepSizes[0];
+ const auto tEnd = std::accumulate(timeStepSizes.begin(), timeStepSizes.end(), 0.0);
+ timeLoop = std::make_shared<CheckPointTimeLoop<double>>(0, dtInit, tEnd);
+ }
+ else
+ {
+ const auto dtInit = getParam<double>("TimeLoop.DtInitial");
+ const auto tEnd = getParam<double>("TimeLoop.TEnd");
+ const auto maxDt = getParam<double>("TimeLoop.MaxTimeStepSize");
+ timeLoop = std::make_shared<CheckPointTimeLoop<double>>(0, dtInit, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+ }
// the assembler with time loop for instationary problem
using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
@@ -150,6 +143,13 @@ int main(int argc, char** argv) try
// solve the non-linear system with time step control
nonLinearSolver.solve(x, *timeLoop);
+ // if the time step sizes are not read from file
+ // save the succeeded time step size in the time step size vector
+ // we write that to file below to that it can be used on the next run
+ // to reproduce exactly the same time step sizes
+ if (!hasTimeStepSizeFile)
+ timeStepSizes.push_back(timeLoop->timeStepSize());
+
// make the new solution the old solution
xOld = x;
gridVariables->advanceTimeStep();
@@ -165,7 +165,10 @@ int main(int argc, char** argv) try
timeLoop->reportTimeStep();
// set new dt as suggested by the newton solver
- timeLoop->setTimeStepSize(nonLinearSolver.suggestTimeStepSize(timeLoop->timeStepSize()));
+ if (hasTimeStepSizeFile)
+ timeLoop->setTimeStepSize(timeStepSizes[timeLoop->timeStepIndex()]);
+ else
+ timeLoop->setTimeStepSize(nonLinearSolver.suggestTimeStepSize(timeLoop->timeStepSize()));
} while (!timeLoop->finished());
@@ -178,18 +181,23 @@ int main(int argc, char** argv) try
// print dumux end message
if (mpiHelper.rank() == 0)
{
+ // write out the exact time steps this program used to produce a well-reproducible test
+ if (!hasTimeStepSizeFile)
+ writeContainerToFile(timeStepSizes, "dt/" + problem->name() + "_dt-reference.dat",
+ std::numeric_limits<double>::digits10);
+
Parameters::print();
DumuxMessage::print(/*firstCall=*/false);
}
return 0;
} // end main
-catch (Dumux::ParameterException &e)
+catch (const Dumux::ParameterException &e)
{
std::cerr << std::endl << e << " ---> Abort!" << std::endl;
return 1;
}
-catch (Dune::DGFException & e)
+catch (const Dune::DGFException & e)
{
std::cerr << "DGF exception thrown (" << e <<
"). Most likely, the DGF file name is wrong "
@@ -198,13 +206,8 @@ catch (Dune::DGFException & e)
<< " ---> Abort!" << std::endl;
return 2;
}
-catch (Dune::Exception &e)
+catch (const Dune::Exception &e)
{
std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
return 3;
}
-catch (...)
-{
- std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
- return 4;
-}
diff --git a/test/porousmediumflow/2p/implicit/fracture/params.input b/test/porousmediumflow/2p/implicit/fracture/params.input
index 1ac9b6907b7652eed123d3ca94f47d6e4c7e114c..666a5013f64e734a5995588299c5700a3ff22ca4 100644
--- a/test/porousmediumflow/2p/implicit/fracture/params.input
+++ b/test/porousmediumflow/2p/implicit/fracture/params.input
@@ -2,7 +2,6 @@
DtInitial = 250 # [s]
TEnd = 300000 # [s]
MaxTimeStepSize = 10000 # [s]
-PeriodicCheckPoint = 300000 # [s]
[Grid]
File = grids/fracture.msh
diff --git a/test/references/test_2p_fracture_gravity_mpfa-reference.vtu b/test/references/test_2p_fracture_gravity_mpfa-reference.vtu
index a74ee8b44bb1b366c02cd5c7b874449684180854..0654f6c74e16e349451ab4d81e37dde622f9965e 100644
--- a/test/references/test_2p_fracture_gravity_mpfa-reference.vtu
+++ b/test/references/test_2p_fracture_gravity_mpfa-reference.vtu
@@ -4,26 +4,26 @@
<Piece NumberOfCells="1670" NumberOfPoints="911">
<CellData Scalars="S_aq">
<DataArray type="Float32" Name="S_aq" NumberOfComponents="1" format="ascii">
- 0.999881 0.0660784 0.0629164 0.116881 1 0.0748197 0.830084 1 0.996925 0.999998 0.984197 1
+ 0.999881 0.0660786 0.0629166 0.116881 1 0.0748199 0.830084 1 0.996925 0.999998 0.984197 1
0.998386 1 0.948177 1 1 0.970457 0.987002 1 1 0.933354 1 1
- 0.9919 1 0.618293 1 1 0.692604 1 1 0.0639102 0.724668 1 0.0676677
+ 0.9919 1 0.618293 1 1 0.692604 1 1 0.0639105 0.724668 1 0.067668
1 0.872374 1 1 0.996904 0.998315 0.997646 0.9984 1 0.998328 0.953061 1
- 0.8123 1 0.0808166 1 1 0.0630757 1 0.167231 0.736855 1 0.0654406 1
- 0.998685 1 1 0.0675191 0.69914 0.0771577 1 0.208677 1 1 1 0.119234
- 0.860626 0.999589 1 0.993979 0.994618 1 1 0.163841 0.998235 0.914226 1 1
- 0.951357 0.994349 1 1 0.658304 1 1 0.0627685 1 0.633463 1 1
- 0.0658675 0.999109 0.098485 0.782179 1 0.074107 1 1 1 0.90972 0.566952 1
- 0.0781936 0.31945 0.998461 0.0627074 0.0752211 0.843759 1 0.76708 1 0.066509 1 1
- 1 0.0767569 0.774052 0.0658916 0.0698131 0.368173 1 0.840192 1 0.0811396 0.997921 0.129362
+ 0.8123 1 0.0808168 1 1 0.063076 1 0.167231 0.736855 1 0.0654408 1
+ 0.998685 1 1 0.0675195 0.69914 0.077158 1 0.208677 1 1 1 0.119234
+ 0.860626 0.999589 1 0.993979 0.994618 1 1 0.16384 0.998235 0.914226 1 1
+ 0.951357 0.994349 1 1 0.658304 1 1 0.0627688 1 0.633463 1 1
+ 0.0658679 0.999109 0.0984851 0.782179 1 0.0741073 1 1 1 0.90972 0.566952 1
+ 0.078194 0.31945 0.998461 0.0627077 0.0752214 0.843759 1 0.76708 1 0.0665093 1 1
+ 1 0.0767573 0.774052 0.0658919 0.0698134 0.368173 1 0.840192 1 0.0811398 0.997921 0.129363
1 0.991456 0.992343 0.985355 0.98928 1 1 1 1 1 0.15031 1
- 0.11784 0.865822 0.846139 1 1 1 1 0.0883873 1 1 0.0696628 0.816025
- 1 0.065252 0.742548 0.0688879 1 0.646883 0.426904 0.106674 0.952011 0.956546 0.826865 1
- 0.948113 0.936549 1 0.25853 1 0.997477 1 0.998609 0.823043 1 0.070169 0.0948058
+ 0.11784 0.865822 0.846139 1 1 1 1 0.0883874 1 1 0.0696631 0.816025
+ 1 0.0652524 0.742548 0.0688884 1 0.646883 0.426904 0.106674 0.952011 0.956546 0.826865 1
+ 0.948113 0.936549 1 0.25853 1 0.997477 1 0.998609 0.823043 1 0.0701694 0.0948059
1 0.995733 0.140491 0.901301 0.998532 1 1 0.319579 1 1 1 1
1 0.998696 1 0.998245 1 0.362339 0.999053 0.992996 0.994614 0.984558 0.931735 0.931283
- 0.606568 0.105638 0.0696939 1 0.0743085 1 0.489732 0.167569 0.905815 0.996999 0.999929 1
- 1 1 0.0648854 0.0688813 1 1 0.727232 0.657591 0.845184 1 0.0620687 1
- 0.565941 0.69254 1 0.0630828 1 1 0.41962 1 0.998693 0.998155 1 0.0767656
+ 0.606568 0.105638 0.0696942 1 0.0743088 1 0.489732 0.167569 0.905815 0.996999 0.999929 1
+ 1 1 0.0648858 0.0688817 1 1 0.727232 0.657591 0.845184 1 0.062069 1
+ 0.565941 0.69254 1 0.0630831 1 1 0.41962 1 0.998693 0.998155 1 0.076766
1 0.775762 0.26109 0.999803 0.999581 0.99999 1 1 1 1 1 1
0.108591 1 1 1 1 1 1 1 0.275065 0.36825 1 0.828356
0.809868 1 1 1 1 1 1 1 1 0.632007 1 1
@@ -430,27 +430,27 @@
1000 1000
</DataArray>
<DataArray type="Float32" Name="mob_aq" NumberOfComponents="1" format="ascii">
- 999.999 0.00254957 0.00130972 0.195633 1000 0.00955342 437.457 1000 999.085 1000 977.696 1000
+ 999.999 0.0025497 0.00130979 0.195633 1000 0.00955364 437.457 1000 999.085 1000 977.696 1000
999.746 1000 817.118 1000 1000 929.115 984.631 1000 1000 736.316 1000 1000
- 993.843 1000 149.371 1000 1000 224.23 1000 1000 0.00164097 264.162 1000 0.00339631
+ 993.843 1000 149.37 1000 1000 224.23 1000 1000 0.00164109 264.162 1000 0.0033965
1000 530.479 1000 1000 999.072 999.723 999.461 999.75 1000 999.727 843.63 1000
- 402.923 1000 0.0184596 1000 1000 0.00135948 1000 1.08634 280.72 1000 0.0022542 1000
- 999.831 1000 1000 0.00331014 231.962 0.0125644 1000 2.74756 1000 1000 1000 0.217395
- 502.955 999.983 1000 996.553 997.235 1000 1000 0.993039 999.696 646.123 1000 1000
- 834.447 996.957 1000 1000 186.829 1000 1000 0.00126464 1000 162.84 1000 1000
- 0.0024492 999.922 0.0733846 349.744 1000 0.00874282 1000 1000 1000 629.596 109.81 1000
- 0.0140808 14.0738 999.769 0.00124634 0.0100314 465.762 1000 325.373 1000 0.00276305 1000 1000
- 1000 0.0120086 336.447 0.00246053 0.00481323 23.6115 1000 458.224 1000 0.0190549 999.579 0.329748
- 1000 993.169 994.482 980.698 989.392 1000 1000 1000 1000 1000 0.674398 1000
- 0.204315 514.957 470.852 1000 1000 1000 1000 0.0360315 1000 1000 0.00470299 409.954
- 1000 0.00217149 288.73 0.00416149 1000 175.493 40.1544 0.118075 837.982 862.114 431.022 1000
- 816.772 753.417 1000 6.36873 1000 999.382 1000 999.811 423.488 1000 0.00508111 0.0577018
- 1000 998.25 0.492266 604.71 999.789 1000 1000 14.0947 1000 1000 1000 1000
- 1000 999.834 1000 999.7 1000 22.2863 999.912 995.365 997.232 978.652 727.794 725.432
- 139.54 0.111619 0.00472561 1000 0.00896713 1000 65.396 1.09596 617.26 999.128 1000 1000
- 1000 1000 0.00201656 0.00415701 1000 1000 267.58 186.105 468.803 1000 0.00106539 1000
- 109.118 224.155 1000 0.00136174 1000 1000 37.7629 1000 999.833 999.668 1000 0.0120205
- 1000 339.209 6.61302 999.996 999.983 1000 1000 1000 1000 1000 1000 1000
+ 402.923 1000 0.0184599 1000 1000 0.00135959 1000 1.08633 280.72 1000 0.00225431 1000
+ 999.831 1000 1000 0.0033104 231.962 0.0125649 1000 2.74756 1000 1000 1000 0.217395
+ 502.955 999.983 1000 996.553 997.235 1000 1000 0.993038 999.696 646.123 1000 1000
+ 834.447 996.957 1000 1000 186.829 1000 1000 0.00126475 1000 162.84 1000 1000
+ 0.00244938 999.922 0.0733848 349.744 1000 0.00874315 1000 1000 1000 629.596 109.81 1000
+ 0.0140813 14.0738 999.769 0.00124643 0.0100318 465.762 1000 325.373 1000 0.00276318 1000 1000
+ 1000 0.0120091 336.447 0.00246069 0.00481345 23.6115 1000 458.224 1000 0.0190553 999.579 0.329749
+ 1000 993.169 994.482 980.698 989.392 1000 1000 1000 1000 1000 0.674399 1000
+ 0.204315 514.957 470.852 1000 1000 1000 1000 0.0360319 1000 1000 0.0047032 409.954
+ 1000 0.00217167 288.73 0.0041618 1000 175.493 40.1544 0.118075 837.982 862.114 431.022 1000
+ 816.772 753.417 1000 6.36872 1000 999.382 1000 999.811 423.488 1000 0.00508142 0.0577022
+ 1000 998.25 0.492267 604.71 999.789 1000 1000 14.0947 1000 1000 1000 1000
+ 1000 999.834 1000 999.7 1000 22.2862 999.912 995.365 997.232 978.652 727.794 725.432
+ 139.539 0.111619 0.00472588 1000 0.00896751 1000 65.3959 1.09596 617.26 999.128 1000 1000
+ 1000 1000 0.00201674 0.00415732 1000 1000 267.58 186.105 468.803 1000 0.00106549 1000
+ 109.118 224.155 1000 0.00136182 1000 1000 37.7628 1000 999.833 999.668 1000 0.012021
+ 1000 339.209 6.61301 999.996 999.983 1000 1000 1000 1000 1000 1000 1000
0.130674 1000 1000 1000 1000 1000 1000 1000 8.06034 23.6293 1000 433.993
398.39 1000 1000 1000 1000 1000 1000 1000 1000 161.509 1000 1000
1000 1000 1000 59.8749 1000 1000 1000 1000 1000 1000 1000 1000
@@ -473,7 +473,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 191.97
998.536 1000 1000 999.633 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000 1000 1000 1000 9.83189 999.934 1000
- 1000 1000 994.765 1000 1000 1000 259.406 463.344 1000 141.724 1000 1000
+ 1000 1000 994.765 1000 1000 1000 259.406 463.343 1000 141.724 1000 1000
971.433 1000 1000 1000 1000 1000 635.701 74.0132 1000 1000 1000 1000
1000 999.94 1000 1000 1000 1000 1000 1000 14.9409 1000 1000 999.975
492.717 1000 1000 0.701238 1000 1000 1000 1000 1000 1000 1000 1000
@@ -488,7 +488,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 416.899 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
- 819.386 999.93 1000 275.921 1000 1000 1000 1000 1000 1000 5.12828 286.739
+ 819.387 999.93 1000 275.921 1000 1000 1000 1000 1000 1000 5.12828 286.739
376.556 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000 1000 1000 20.0781 1000 1000 1000
1000 1000 1000 1000 1000 985.177 1000 1000 1000 1000 1000 1000
@@ -501,7 +501,7 @@
999.992 26.9226 0.427758 1000 1000 1000 1000 999.715 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000 1000 1000 1000 86.4719 1000 1000
1000 1000 1000 180.688 1000 1000 1000 1000 1000 1000 1000 1000
- 202.802 1000 1000 1000 652.298 1000 1000 1000 1000 1000 1000 2.0654
+ 202.803 1000 1000 1000 652.298 1000 1000 1000 1000 1000 1000 2.0654
1000 1000 1000 1000 1000 1000 1000 1000 246.626 1000 999.602 1000
1000 0.781148 1000 1000 1000 999.909 1000 1000 1000 3.63322 1000 1000
1000 1000 1000 1000 132.277 1000 48.2314 1000 1000 1000 999.999 1000
@@ -572,32 +572,32 @@
1000 1000
</DataArray>
<DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
- 0.000119042 0.933922 0.937084 0.883119 0 0.92518 0.169916 0 0.00307496 1.55107e-06 0.015803 0
- 0.00161354 0 0.0518234 0 0 0.0295427 0.0129983 0 0 0.0666462 0 -0
- 0.00809995 0 0.381707 0 1.30369e-15 0.307396 0 0 0.93609 0.275332 0 0.932332
- 0 0.127626 3.00396e-29 0 0.00309634 0.00168473 0.00235403 0.00160021 1.56351e-09 0.00167175 0.0469389 2.42789e-09
- 0.1877 0 0.919183 0 0 0.936924 0 0.832769 0.263145 0 0.934559 0
- 0.0013147 0 0 0.932481 0.30086 0.922842 0 0.791323 0 0 0 0.880766
- 0.139374 0.000411212 0 0.00602118 0.00538237 0 0 0.836159 0.00176459 0.0857739 0 -0
- 0.0486426 0.00565129 0 0 0.341696 0 0 0.937232 0 0.366537 0 0
- 0.934133 0.000890825 0.901515 0.217821 0 0.925893 0 0 0 0.0902799 0.433048 0
- 0.921806 0.68055 0.00153894 0.937293 0.924779 0.156241 0 0.23292 0 0.933491 0 0
+ 0.00011913 0.933921 0.937083 0.883119 0 0.92518 0.169916 0 0.00307496 1.55454e-06 0.015803 0
+ 0.00161354 0 0.0518234 0 0 0.0295428 0.0129983 0 0 0.0666462 0 -0
+ 0.00809995 0 0.381707 0 1.29949e-15 0.307396 0 0 0.93609 0.275332 0 0.932332
+ 0 0.127626 3.29376e-29 0 0.00309634 0.00168473 0.00235403 0.00160021 1.57096e-09 0.00167175 0.0469389 2.42474e-09
+ 0.1877 0 0.919183 0 0 0.936924 0 0.83277 0.263145 0 0.934559 0
+ 0.0013147 0 0 0.93248 0.30086 0.922842 0 0.791323 0 0 0 0.880766
+ 0.139374 0.000411212 0 0.00602118 0.00538237 0 0 0.83616 0.00176459 0.0857739 0 -0
+ 0.0486426 0.00565129 0 0 0.341696 0 0 0.937231 0 0.366537 0 0
+ 0.934132 0.000890826 0.901515 0.217821 0 0.925893 0 0 0 0.0902799 0.433048 0
+ 0.921806 0.68055 0.00153894 0.937292 0.924779 0.156241 0 0.23292 0 0.933491 0 0
0 0.923243 0.225948 0.934108 0.930187 0.631827 0 0.159808 0 0.91886 0.00207912 0.870637
- 0 0.00854364 0.00765735 0.0146453 0.0107204 0 3.35534e-35 0 0 0 0.84969 0
+ 0 0.00854365 0.00765735 0.0146453 0.0107204 0 3.91219e-35 0 0 0 0.84969 0
0.88216 0.134178 0.153861 0 0 0 0 0.911613 0 0 0.930337 0.183975
0 0.934748 0.257452 0.931112 0 0.353117 0.573096 0.893326 0.0479886 0.0434535 0.173135 0
- 0.0518867 0.063451 0 0.74147 0 0.00252322 0 0.00139091 0.176957 0 0.929831 0.905194
+ 0.0518867 0.0634511 0 0.74147 0 0.00252322 0 0.00139092 0.176957 0 0.929831 0.905194
0 0.00426663 0.859509 0.0986986 0.00146778 0 0 0.680421 0 0 0 0
- 5.07882e-16 0.00130381 4.86243e-30 0.0017547 0 0.637661 0.000946552 0.00700354 0.00538551 0.0154424 0.0682651 0.0687175
- 0.393432 0.894362 0.930306 0 0.925691 0 0.510268 0.832431 0.0941854 0.00300129 7.05655e-05 0
- 0 0 0.935115 0.931119 0 0 0.272768 0.342409 0.154816 0 0.937931 0
+ 5.1299e-16 0.00130381 4.65197e-30 0.0017547 0 0.637661 0.000946553 0.00700354 0.00538551 0.0154424 0.0682651 0.0687175
+ 0.393432 0.894362 0.930306 0 0.925691 0 0.510268 0.832431 0.0941855 0.00300129 7.05623e-05 0
+ 0 0 0.935114 0.931118 0 0 0.272768 0.342409 0.154816 0 0.937931 0
0.434059 0.30746 0 0.936917 0 0 0.58038 0 0.00130673 0.00184513 0 0.923234
- 0 0.224238 0.73891 0.000197462 0.000418601 1.04737e-05 0 0 0 0 0 0
+ 0 0.224238 0.73891 0.000197478 0.000418603 1.04701e-05 0 0 0 0 0 0
0.891409 0 0 0 0 0 0 0 0.724935 0.63175 0 0.171644
0.190132 0 0 0 0 0 0 0 0 0.367993 0 0
0 0 0 0.522307 0 0 0 0 0 0 0 0
- 0.907145 0 1.07745e-07 0 0 0 0 0 0 0 0.208131 0
- 0.143905 0 0.854777 4.48763e-06 0 0 0 0 0 0.0189516 0 0
+ 0.907145 0 1.02221e-07 0 0 0 0 0 0 0 0.208131 0
+ 0.143905 0 0.854777 4.37408e-06 0 0 0 0 0 0.0189516 0 0
0 0 0 0 0 0 0 0 0 0 0 0.473406
0 0 0 0 0 0 0 0.273459 0 0 0 0
0 0 0.298189 0 0 0 0 0 0 0 0 0
@@ -615,15 +615,15 @@
0 0 0 0 0 0 0 0 0 0 0 0.336688
0.00389855 0 0 0.00194066 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0.709998 0.000820346 0
- 0 0 0.00745333 0 0 0 0.278944 0.157379 0 0.390775 0 0
- 0.0180165 0 0 0 0 0 0.0885403 0.492844 0 0 0 0
+ 0 0 0.00745334 0 0 0 0.278944 0.157379 0 0.390775 0 0
+ 0.0180165 0 0 0 0 0 0.0885404 0.492844 0 0 0 0
0 0.000781902 0 0 0 0 0 0 0.675311 0 0 0.000500183
0.143899 0 0 0.848401 0 0 0 0 0 0 0 0
0 0 0 0.315373 0 0 0 0.0727605 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0.0987725 0.00676285
0 0.311425 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0.151887 0 0 0 0 0
- 0.0994992 0 0 0 0 0 0 0 0 0 0 0
+ 0.0994991 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0.320607 0 0 0 0 0 0
@@ -646,7 +646,7 @@
0.32646 0 0 0 0.0842296 0 0 0 0 0 0 0.805415
0 0 0 0 0 0 0 0 0.288913 0 0.00202032 0
0 0.844751 0 0 0 0.000963088 0 0 0 0.776217 0 0
- 0 0 0 0 0.402491 0 0.550542 0 0 0 7.37143e-05 2.10675e-05
+ 0 0 0 0 0.402491 0 0.550542 0 0 0 7.37142e-05 2.10613e-05
0 0 0 0 0.539554 0 0 0 0 0 0 0
0 0.339608 0 0 0 0 0 0 0 0 0 0
0 0 0.431379 0.0049785 0 0.768194 0 0 0.036723 0 0 0
@@ -654,7 +654,7 @@
0.10109 0 0.205955 0 0 0 0 0.00909113 0.370295 0.281183 0.0254626 0
0.165736 0 0.0283495 0 0 0 0 0 0.0453483 0 0 0
0 0 0.907246 0 0 0.864959 0 0 0 0 0 0
- 0 0 0.220747 0 0 0.00138414 0.00545969 0 0.0653905 0 0.672461 0
+ 0 0 0.220747 0 0 0.00138413 0.00545969 0 0.0653904 0 0.672461 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0.874524 0.198969 0.0767869 0 0 0 0
0 0.569965 0 0.157259 0.0769855 0 0 0 0 0 0 0
@@ -998,32 +998,32 @@
1460 1460
</DataArray>
<DataArray type="Float32" Name="mob_napl" NumberOfComponents="1" format="ascii">
- 2.05622e-05 1743.1 1746.98 1611.93 0 1728.75 69.1091 0 0.0174672 2.5268e-09 0.519654 0
- 0.00458552 0 6.05501 0 0 1.89677 0.346709 0 0 10.1683 0 0
+ 2.0594e-05 1743.1 1746.98 1611.93 0 1728.75 69.1091 0 0.0174672 2.53853e-09 0.519654 0
+ 0.00458555 0 6.05501 0 0 1.89678 0.346709 0 0 10.1683 0 0
0.130119 0 349.414 0 4.37635e-28 227.879 0 0 1745.84 182.952 0 1740.88
- 0 38.5702 0 0 0.0177199 0.00501513 0.0100369 0.00450732 1.53589e-15 0.00493527 4.93649 3.82692e-15
+ 0 38.5702 0 0 0.01772 0.00501513 0.0100369 0.00450732 1.5511e-15 0.00493527 4.93649 3.81664e-15
84.5768 0 1716.19 0 0 1746.8 0 1464.97 167.107 0 1743.94 0
- 0.0029984 0 0 1741.09 218.343 1724.09 0 1349.37 0 0 0 1604.35
- 46.1668 0.00026907 0 0.0703641 0.0557661 0 0 1474.33 0.00552075 17.0848 0 0
+ 0.00299841 0 0 1741.09 218.343 1724.09 0 1349.37 0 0 0 1604.35
+ 46.1668 0.00026907 0 0.0703641 0.0557661 0 0 1474.33 0.00552076 17.0848 0 0
5.31334 0.0616977 0 0 281.019 0 0 1747.14 0 322.687 0 0
- 1743.38 0.00133743 1669.48 114.274 0 1730.1 0 0 0 18.9789 446.803 0
+ 1743.38 0.00133744 1669.48 114.274 0 1730.1 0 0 0 18.9789 446.803 0
1721.93 1041.36 0.00415673 1747.21 1727.97 58.268 0 130.798 0 1742.52 0 0
- 0 1724.91 123.033 1743.35 1737.59 911.13 0 61.0072 0 1715.46 0.00775783 1572.06
+ 0 1724.91 123.033 1743.35 1737.59 911.13 0 61.0072 0 1715.45 0.00775783 1572.06
0 0.145326 0.115814 0.443901 0.2326 0 0 0 0 0 1511.45 0
1608.84 42.7225 56.4753 0 0 0 0 1697.7 0 0 1737.83 81.2089
- 0 1744.19 159.942 1739.05 0 299.85 761.402 1644.48 5.16699 4.20975 71.7939 0
- 6.07027 9.1899 0 1209.58 0 0.0115907 0 0.00337015 75.0481 0 1737.02 1680.16
+ 0 1744.19 159.942 1739.05 0 299.85 761.402 1644.48 5.167 4.20975 71.7939 0
+ 6.07028 9.18993 0 1209.58 0 0.0115907 0 0.00337017 75.0482 0 1737.02 1680.16
0 0.03445 1538.5 22.7889 0.00376792 0 0 1041.01 0 0 0 0
5.2662e-29 0.00294711 0 0.00545678 0 926.465 0.00151682 0.0962534 0.0558336 0.495402 10.6833 10.8296
- 370.722 1647.72 1737.78 0 1729.72 0 612.094 1464.03 20.7025 0.0166104 6.94942e-06 0
+ 370.723 1647.72 1737.78 0 1729.72 0 612.094 1464.03 20.7025 0.0166104 6.94877e-06 0
0 0 1744.65 1739.06 0 0 179.562 282.179 57.1914 0 1747.89 0
- 448.827 227.973 0 1746.8 0 0 779.478 0 0.00296079 0.00605616 0 1724.9
- 0 121.164 1202.43 5.87483e-05 0.000279197 1.32823e-07 0 0 0 0 0 0
+ 448.827 227.973 0 1746.8 0 0 779.479 0 0.00296079 0.00605616 0 1724.9
+ 0 121.164 1202.43 5.87583e-05 0.000279199 1.32727e-07 0 0 0 0 0 0
1638.45 0 0 0 0 0 0 0 1163.49 910.929 0 70.5437
86.8118 0 0 0 0 0 0 0 0 325.212 0 0
0 0 0 639.741 0 0 0 0 0 0 0 0
- 1685.65 0 9.99658e-12 0 0 0 0 0 0 0 104.243 0
- 49.2797 0 1525.3 2.28927e-08 0 0 0 0 0 0.756996 0 0
+ 1685.65 0 8.96254e-12 0 0 0 0 0 0 0 104.243 0
+ 49.2797 0 1525.3 2.17074e-08 0 0 0 0 0 0.756996 0 0
0 0 0 0 0 0 0 0 0 0 0 530.512
0 0 0 0 0 0 0 180.472 0 0 0 0
0 0 214.502 0 0 0 0 0 0 0 0 0
@@ -1035,18 +1035,18 @@
0 0.00765185 0 0 0 0 0.0263057 0 0 0 0 0
0.00095288 0 1126.25 0 0 0 0 0 0 0 0 0
39.7874 0 0 0 0 0 0 0 0.000600701 0 0 265.8
- 0 0 0 0 0 0 0 1374.9 0 0 0.00386485 0
+ 0 0 0 0 0 0 0 1374.9 0 0 0.00386484 0
0 0 0 0 0 0 0 0 0 0 77.4398 0
0 0 0 0 0 0 0.00206693 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 272.94
0.0285722 0 0 0.00672458 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 1122.09 0.00112726 0
- 0 0 0.109509 0 0 0 187.78 59.1355 0 365.844 0 0
+ 0 0 0.109509 0 0 0 187.78 59.1356 0 365.844 0 0
0.681713 0 0 0 0 0 18.2357 572.945 0 0 0 0
0 0.00102044 0 0 0 0 0 0 1027.14 0 0 0.000403941
49.275 0 0 1507.93 0 0 0 0 0 0 0 0
0 0 0 239.775 0 0 0 12.1816 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 22.8239 0.0895224
+ 0 0 0 0 0 0 0 0 0 0 22.8239 0.0895225
0 233.852 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 55.0098 0 0 0 0 0
23.1695 0 0 0 0 0 0 0 0 0 0 0
@@ -1072,11 +1072,11 @@
256.776 0 0 0 16.4589 0 0 0 0 0 0 1388.85
0 0 0 0 0 0 0 0 201.412 0 0.00730975 0
0 1497.95 0 0 0 0.0015723 0 0 0 1306.97 0 0
- 0 0 0 0 387.569 0 706.405 0 0 0 7.60814e-06 5.6611e-07
+ 0 0 0 0 387.569 0 706.405 0 0 0 7.60812e-06 5.65765e-07
0 0 0 0 680.164 0 0 0 0 0 0 0
0 277.637 0 0 0 0 0 0 0 0 0 0
0 0 443.474 0.0474392 0 1284.45 0 0 2.97381 0 0 0
- 0 0 0 0 0.0376334 0 0 0 0 0 0 0
+ 0 0 0 0 0.0376333 0 0 0 0 0 0 0
23.9357 0 102.053 0 0 0 0 0.165291 329.219 190.802 1.39481 0
65.6977 0 1.74177 0 0 0 0 0 4.59746 0 0 0
0 0 1685.93 0 0 1554.57 0 0 0 0 0 0
@@ -1102,7 +1102,7 @@
0 111.875 0 0 0 0 0 0 0 0 0 0
0 0.00160217 0 0 0 0 0 0 0 0.634999 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 382.052 0 401.505 0.00485437 0.146822 0 487.662 0.0188561 0 0 0
+ 0 382.052 0 401.505 0.00485436 0.146822 0 487.662 0.0188561 0 0 0
0 0 0 0 0 0 0 0 0 1156.72 337.755 0.00504293
85.7616 0 0.472855 0 0 0 0 0 0.0323535 0 0 0
0 0 0 0 0 77.5524 0 0 0 0 0 0
@@ -1122,7 +1122,7 @@
0 1558.42 0 0 0 1309.89 0 0 0 0 0 0
0 0 0 0 0 0 0 63.2594 0 0 0 0
0 1648.41 0 1471.99 0 0 0 0 0 0 0 1173.09
- 0 0.00954254 0 0 0 0 0 0 0 0 0 0
+ 0 0.00954252 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
1591.49 0 0 0 0 0 0 0 1464.75 0 1000.8 0
0 0 0 0 0 0 0.00509003 0 0 0 9.03776 0
@@ -1140,32 +1140,32 @@
0 0
</DataArray>
<DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
- 2.66146 812.936 862.753 549.581 0 722.288 206.836 0 56.4312 0.0349399 119.442 0
- 32.7121 0 155.249 0 0 136.938 114.495 0 0 164.447 0 0
- 102.219 0 265.561 0 3.08802e-11 246.041 0 0 845.564 237.486 0 792.365
- 0 192.132 0 0 56.7391 33.9933 45.3987 32.4708 3.52235e-05 33.7606 151.814 5.46967e-05
- 212.454 0 680.8 0 0 859.886 0 468.46 234.179 0 821.927 0
- 27.1889 0 0 794.188 244.311 704.748 0 428.365 0 0 0 544.284
- 196.451 9.02221 0 89.2731 83.7028 0 0 472.467 35.4146 174.439 0 0
- 153.04 86.1455 0 0 255.061 0 0 865.453 0 261.573 0 0
- 815.858 18.9445 601.013 221.458 0 728.054 0 0 0 176.574 279.258 0
- 697.573 362.142 31.3555 866.58 719.132 202.317 0 225.786 0 807.116 0 0
- 0 707.616 223.8 815.522 768.035 341.75 0 203.515 0 678.859 40.8523 523.776
+ 2.66343 812.932 862.748 549.581 0 722.287 206.836 0 56.4312 0.035018 119.442 0
+ 32.7122 0 155.249 0 0 136.938 114.495 0 0 164.447 0 0
+ 102.219 0 265.561 0 3.08944e-11 246.041 0 0 845.559 237.486 0 792.361
+ 0 192.132 0 0 56.7392 33.9933 45.3987 32.4708 3.53913e-05 33.7606 151.814 5.46258e-05
+ 212.454 0 680.799 0 0 859.88 0 468.46 234.179 0 821.924 0
+ 27.1889 0 0 794.182 244.311 704.745 0 428.365 0 0 0 544.284
+ 196.451 9.02222 0 89.2731 83.7028 0 0 472.467 35.4147 174.439 0 0
+ 153.04 86.1455 0 0 255.061 0 0 865.447 0 261.573 0 0
+ 815.853 18.9445 601.013 221.458 0 728.051 0 0 0 176.574 279.258 0
+ 697.57 362.142 31.3555 866.574 719.13 202.317 0 225.786 0 807.112 0 0
+ 0 707.613 223.8 815.517 768.032 341.75 0 203.515 0 678.858 40.8523 523.776
0 104.051 100.082 117.489 109.832 0 0 0 0 0 490.017 0
- 547.395 194.567 201.511 0 0 0 0 640.985 0 0 769.629 211.298
- 0 824.676 232.621 778.098 0 258.054 320.74 575.56 152.573 149.203 207.872 0
- 155.292 162.594 0 393.763 0 48.1023 0 28.6199 209.092 0 764.321 614.261
- 0 71.977 504.653 180.385 30.0476 0 0 362.083 0 0 0 0
- 1.18661e-11 26.9831 0 35.2396 0 344.026 20.0562 96.3317 83.7321 118.846 165.362 165.615
- 268.657 578.519 769.298 0 726.402 0 301.06 468.068 178.369 55.3616 1.58257 0
- 0 0 830.146 778.173 0 0 236.793 255.248 201.835 0 878.793 0
- 279.532 246.058 0 859.759 0 0 323.184 0 27.0382 36.8312 0 707.553
- 0 223.31 392.244 4.39254 9.17995 0.235799 0 0 0 0 0 0
+ 547.395 194.567 201.511 0 0 0 0 640.984 0 0 769.626 211.298
+ 0 824.67 232.621 778.093 0 258.054 320.74 575.56 152.573 149.203 207.872 0
+ 155.292 162.594 0 393.763 0 48.1023 0 28.62 209.092 0 764.317 614.261
+ 0 71.9771 504.653 180.385 30.0476 0 0 362.083 0 0 0 0
+ 1.18803e-11 26.9831 0 35.2396 0 344.026 20.0562 96.3317 83.7321 118.846 165.362 165.615
+ 268.657 578.519 769.294 0 726.399 0 301.06 468.068 178.369 55.3616 1.5825 0
+ 0 0 830.139 778.168 0 0 236.793 255.248 201.835 0 878.786 0
+ 279.532 246.058 0 859.754 0 0 323.184 0 27.0382 36.8312 0 707.55
+ 0 223.31 392.244 4.3929 9.17999 0.235717 0 0 0 0 0 0
570.26 0 0 0 0 0 0 0 384.291 341.721 0 207.393
213.203 0 0 0 0 0 0 0 0 261.955 0 0
0 0 0 304.663 0 0 0 0 0 0 0 0
- 621.849 0 0.00242733 0 0 0 0 0 0 0 218.621 0
- 198.063 0 497.371 0.101071 0 0 0 0 0 124.251 0 0
+ 621.849 0 0.00230287 0 0 0 0 0 0 0 218.621 0
+ 198.063 0 497.371 0.0985139 0 0 0 0 0 124.251 0 0
0 0 0 0 0 0 0 0 0 0 0 290.409
0 0 0 0 0 0 0 236.98 0 0 0 0
0 0 243.602 0 0 0 0 0 0 0 0 0
@@ -1207,19 +1207,19 @@
140.595 0 211.434 0 0 540.749 0 0 0 0 0 0
0 0 0 212.247 0 0 0 0 0 0 0 0
0 0 0 139.387 0 0 0 0 0 0 0 0
- 0 8.09111 0 0 0 0 0 0 0 635.316 0 0
+ 0 8.0911 0 0 0 0 0 0 0 635.316 0 0
6.28004 336.577 511.292 0 0 0 0 34.4305 0 0 0 0
0 0 0 0 0 0 0 0 0 289.464 0 0
0 0 0 256.665 0 0 0 0 0 0 0 0
251.064 0 0 0 173.691 0 0 0 0 0 0 440.457
0 0 0 0 0 0 0 0 241.131 0 39.8551 0
0 483.297 0 0 0 20.3845 0 0 0 416.708 0 0
- 0 0 0 0 271.06 0 313.407 0 0 0 1.65286 0.473981
+ 0 0 0 0 271.06 0 313.407 0 0 0 1.65285 0.473842
0 0 0 0 309.952 0 0 0 0 0 0 0
0 254.514 0 0 0 0 0 0 0 0 0 0
0 0 278.805 79.7597 0 410.978 0 0 143.698 0 0 0
0 0 0 0 74.1132 0 0 0 0 0 0 0
- 181.431 0 217.977 0 0 0 0 105.905 262.56 239.061 132.533 0
+ 181.431 0 217.976 0 0 0 0 105.905 262.56 239.061 132.533 0
205.474 0 135.699 0 0 0 0 0 150.64 0 0 0
0 0 622.252 0 0 513.635 0 0 0 0 0 0
0 0 222.305 0 0 28.4933 84.4199 0 163.726 0 358.516 0
@@ -1244,7 +1244,7 @@
0 220.795 0 0 0 0 0 0 0 0 0 0
0 20.5584 0 0 0 0 0 0 0 121.978 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 270.277 0 273.02 33.5224 104.21 0 284.746 58.083 0 0 0
+ 0 270.277 0 273.02 33.5223 104.21 0 284.746 58.083 0 0 0
0 0 0 0 0 0 0 0 0 382.96 263.837 34.0738
212.853 0 118.268 0 0 0 0 0 70.4704 0 0 0
0 0 0 0 0 210.004 0 0 0 0 0 0
@@ -1264,7 +1264,7 @@
0 515.83 0 0 0 417.47 0 0 0 0 0 0
0 0 0 0 0 0 0 204.469 0 0 0 0
0 579.165 0 471.452 0 0 0 0 0 0 0 386.205
- 0 44.4777 0 0 0 0 0 0 0 0 0 0
+ 0 44.4776 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
535.769 0 0 0 0 0 0 0 468.366 0 355.506 0
0 0 0 0 0 0 34.2095 0 0 0 162.291 0