diff --git a/test/implicit/1p/1pniconductionproblem.hh b/test/implicit/1p/1pniconductionproblem.hh index f09cce5e2b8c3edc7fc94021a9dfa00ea732feb9..ede80032a6a40cb5241056adb4946beeb9120481 100644 --- a/test/implicit/1p/1pniconductionproblem.hh +++ b/test/implicit/1p/1pniconductionproblem.hh @@ -65,11 +65,6 @@ SET_TYPE_PROP(OnePNIConductionProblem, SpatialParams, Dumux::OnePNISpatialParams<TypeTag>); -// Enable velocity output -SET_BOOL_PROP(OnePNIConductionProblem, VtkAddVelocity, true); - -// Disable gravity -SET_BOOL_PROP(OnePNIConductionProblem, ProblemEnableGravity, false); } diff --git a/test/implicit/1p/1pniconvectionproblem.hh b/test/implicit/1p/1pniconvectionproblem.hh index ae37529cb0ad8066dc84f467113f38473be939b9..2eac0b1a95e58cc7f932021c648d861a5c984967 100644 --- a/test/implicit/1p/1pniconvectionproblem.hh +++ b/test/implicit/1p/1pniconvectionproblem.hh @@ -64,11 +64,6 @@ SET_TYPE_PROP(OnePNIConvectionProblem, SpatialParams, Dumux::OnePNISpatialParams<TypeTag>); -// Enable velocity output -SET_BOOL_PROP(OnePNIConvectionProblem, VtkAddVelocity, true); - -// Disable gravity -SET_BOOL_PROP(OnePNIConvectionProblem, ProblemEnableGravity, false); } diff --git a/test/implicit/1p/1ptestproblem.hh b/test/implicit/1p/1ptestproblem.hh index 68f356322437a2c98c9ae78ce4a1e2591e5b386b..b5122861f4f03cfb616ae2baed375a0401807710 100644 --- a/test/implicit/1p/1ptestproblem.hh +++ b/test/implicit/1p/1ptestproblem.hh @@ -77,9 +77,6 @@ SET_TYPE_PROP(OnePTestProblem, SpatialParams, Dumux::OnePTestSpatialParams<TypeT // Linear solver settings SET_TYPE_PROP(OnePTestProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> ); -SET_INT_PROP(OnePTestProblem, LinearSolverVerbosity, 0); -SET_INT_PROP(OnePTestProblem, LinearSolverPreconditionerIterations, 1); -SET_SCALAR_PROP(OnePTestProblem, LinearSolverPreconditionerRelaxation, 1.0); NEW_TYPE_TAG(OnePTestBoxProblemWithAMG, INHERITS_FROM(OnePTestBoxProblem)); NEW_TYPE_TAG(OnePTestCCProblemWithAMG, INHERITS_FROM(OnePTestCCProblem)); diff --git a/test/implicit/1p/test_box1pniconduction.input b/test/implicit/1p/test_box1pniconduction.input index 1edecc07a48adf23f1c6c8971355a9f014734442..03c54a65084b02d0318d7d389489b91c2ffe93cb 100644 --- a/test/implicit/1p/test_box1pniconduction.input +++ b/test/implicit/1p/test_box1pniconduction.input @@ -9,4 +9,7 @@ File = ./grids/test_1pniconduction.dgf [Problem] Name = box1pniconduction # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity= 1 # enable velocity output diff --git a/test/implicit/1p/test_box1pniconvection.input b/test/implicit/1p/test_box1pniconvection.input index 5744f50b842c3e30a8932db941ed4e584bbc50a7..f8bd23eb1ea74c5b9c40e1aa6bb3e03041159252 100644 --- a/test/implicit/1p/test_box1pniconvection.input +++ b/test/implicit/1p/test_box1pniconvection.input @@ -10,4 +10,7 @@ File = ./grids/test_1pniconvection.dgf Name = box1pniconvection # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary +EnableGravity = 0 # Disable gravity +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/1p/test_cc1pniconduction.input b/test/implicit/1p/test_cc1pniconduction.input index 9ae9929d63ca33d58a1a3d40392968e9941186e1..d965cbe8148f720d2a5d9efbf1e9da9f4b37a6ac 100644 --- a/test/implicit/1p/test_cc1pniconduction.input +++ b/test/implicit/1p/test_cc1pniconduction.input @@ -9,4 +9,7 @@ File = ./grids/test_1pniconduction.dgf [Problem] Name = cc1pniconduction # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity= 1 # enable velocity output diff --git a/test/implicit/1p/test_cc1pniconvection.input b/test/implicit/1p/test_cc1pniconvection.input index 87d6601d15af064b07f5d75a72da26c5830a2a50..8978fe1f7a11e997ecfd51233f00fc2b79e3737a 100644 --- a/test/implicit/1p/test_cc1pniconvection.input +++ b/test/implicit/1p/test_cc1pniconvection.input @@ -10,4 +10,7 @@ File = ./grids/test_1pniconvection.dgf Name = cc1pniconvection # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary +EnableGravity = 0 # Disable gravity +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/1p2c/1p2cniconvectionproblem.hh b/test/implicit/1p2c/1p2cniconvectionproblem.hh index 101e73f5f18662219759cb361897149a6f4b3e29..3ddf018c7054c3ced5371e73a3dc432842f128ba 100644 --- a/test/implicit/1p2c/1p2cniconvectionproblem.hh +++ b/test/implicit/1p2c/1p2cniconvectionproblem.hh @@ -68,11 +68,6 @@ SET_TYPE_PROP(OnePTwoCNIConvectionProblem, // Define whether mole(true) or mass (false) fractions are used SET_BOOL_PROP(OnePTwoCNIConvectionProblem, UseMoles, true); -// Enable velocity output -SET_BOOL_PROP(OnePTwoCNIConvectionProblem, VtkAddVelocity, true); - -// Disable gravity -SET_BOOL_PROP(OnePTwoCNIConvectionProblem, ProblemEnableGravity, false); } diff --git a/test/implicit/1p2c/test_box1p2c.input b/test/implicit/1p2c/test_box1p2c.input index 081b7ccab66cc270d8541777fbf0ae08da9bd490..5b8a2f8f9e8b9d7eb22ab09209f7186165a7b0c7 100644 --- a/test/implicit/1p2c/test_box1p2c.input +++ b/test/implicit/1p2c/test_box1p2c.input @@ -7,4 +7,7 @@ File = ./grids/test_1p2c.dgf [Problem] Name = outflowbox # name passed to the output routines +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/1p2c/test_box1p2cniconduction.input b/test/implicit/1p2c/test_box1p2cniconduction.input index e9e6b43a860dca5412e51f3e0cdf2c2d98dae5ca..5d67364a7be997e135aadd9050b30776ae68c3a5 100644 --- a/test/implicit/1p2c/test_box1p2cniconduction.input +++ b/test/implicit/1p2c/test_box1p2cniconduction.input @@ -9,4 +9,7 @@ File = ./grids/test_1p2cniconduction.dgf [Problem] Name = box1p2cniconduction # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 # Enable velocity output diff --git a/test/implicit/1p2c/test_box1p2cniconvection.input b/test/implicit/1p2c/test_box1p2cniconvection.input index 7f53fce80599cb07cba28c8e364fe080eaee276c..fdf98dfecee93f5c2dbd466e39998a63a12c6370 100644 --- a/test/implicit/1p2c/test_box1p2cniconvection.input +++ b/test/implicit/1p2c/test_box1p2cniconvection.input @@ -10,4 +10,7 @@ File = ./grids/test_1p2cniconvection.dgf Name = box1p2cniconvection # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/1p2c/test_cc1p2c.input b/test/implicit/1p2c/test_cc1p2c.input index 86addd63f1a0df6cc51a94f89f95088dbd28a290..50d5b99098abe43241b427027af4b941cf1de484 100644 --- a/test/implicit/1p2c/test_cc1p2c.input +++ b/test/implicit/1p2c/test_cc1p2c.input @@ -7,4 +7,7 @@ File = ./grids/test_1p2c.dgf [Problem] Name = outflowcc # name passed to the output routines +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/1p2c/test_cc1p2cniconduction.input b/test/implicit/1p2c/test_cc1p2cniconduction.input index c9ddfcdfa5725106764fae34cd1336e7549c2642..7636c68a302a626e3580ef73b8ed750ab81b6902 100644 --- a/test/implicit/1p2c/test_cc1p2cniconduction.input +++ b/test/implicit/1p2c/test_cc1p2cniconduction.input @@ -9,4 +9,7 @@ File = ./grids/test_1p2cniconduction.dgf [Problem] Name = cc1p2cniconduction # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/1p2c/test_cc1p2cniconvection.input b/test/implicit/1p2c/test_cc1p2cniconvection.input index e39ca088af31cc959b7726b8de39d33b7b9885fa..eb25b226fd669a7721d064dc696531de7ce37cb9 100644 --- a/test/implicit/1p2c/test_cc1p2cniconvection.input +++ b/test/implicit/1p2c/test_cc1p2cniconvection.input @@ -10,4 +10,7 @@ File = ./grids/test_1p2cniconvection.dgf Name = cc1p2cniconvection # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/2p/injectionproblem2pni.hh b/test/implicit/2p/injectionproblem2pni.hh index ed52c635f70466e2274c5d877354582e2d936968..5497d6bb7ed113edf1a56351c4f38b835f17b69f 100644 --- a/test/implicit/2p/injectionproblem2pni.hh +++ b/test/implicit/2p/injectionproblem2pni.hh @@ -94,12 +94,6 @@ SET_TYPE_PROP(InjectionProblem2PNI, Dumux::GasPhase<GET_PROP_TYPE(TypeTag, Scalar) Scalar, Dumux::N2<GET_PROP_TYPE(TypeTag, Scalar) Scalar> >); #endif - -// Enable gravity -SET_BOOL_PROP(InjectionProblem2PNI, ProblemEnableGravity, true); - -// write convergence behaviour to disk? -SET_BOOL_PROP(InjectionProblem2PNI, NewtonWriteConvergence, true); } /*! diff --git a/test/implicit/2p/lensproblem.hh b/test/implicit/2p/lensproblem.hh index a18577dff4d5383b0bd3ec90b36410660c36ae91..97fa3f7dd684b2394200138a1a6388920a0580bc 100644 --- a/test/implicit/2p/lensproblem.hh +++ b/test/implicit/2p/lensproblem.hh @@ -83,26 +83,8 @@ public: typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type; }; -// Enable partial reassembly of the jacobian matrix? -SET_BOOL_PROP(LensProblem, ImplicitEnablePartialReassemble, true); - -// Enable reuse of jacobian matrices? -SET_BOOL_PROP(LensProblem, ImplicitEnableJacobianRecycling, true); - -// Write the solutions of individual newton iterations? -SET_BOOL_PROP(LensProblem, NewtonWriteConvergence, false); - -// Use forward differences instead of central differences -SET_INT_PROP(LensProblem, ImplicitNumericDifferenceMethod, +1); - // Linear solver settings SET_TYPE_PROP(LensProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> ); -SET_INT_PROP(LensProblem, LinearSolverVerbosity, 0); -SET_INT_PROP(LensProblem, LinearSolverPreconditionerIterations, 1); -SET_SCALAR_PROP(LensProblem, LinearSolverPreconditionerRelaxation, 1.0); - -// Enable gravity -SET_BOOL_PROP(LensProblem, ProblemEnableGravity, true); NEW_PROP_TAG(BaseProblem); SET_TYPE_PROP(LensBoxProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>); diff --git a/test/implicit/2p/test_box2p.input b/test/implicit/2p/test_box2p.input index 940a449ac05e71ee3fb9dbaea707ec96d78b4bc7..2dffa89db1e0d0c44856607db6dfdcb6eef9bff5 100644 --- a/test/implicit/2p/test_box2p.input +++ b/test/implicit/2p/test_box2p.input @@ -14,3 +14,6 @@ LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner [Problem] Name = lensbox # name passed to the output routines +[Implicit] +EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix? +EnableJacobianRecycling = 1 # Enable reuse of jacobian matrices? diff --git a/test/implicit/2p/test_box2pni.input b/test/implicit/2p/test_box2pni.input index 769bd34a4f9046103a166aaf18639db611e83c2c..932fccac0333578f42faa7425dd37573dd41f16d 100644 --- a/test/implicit/2p/test_box2pni.input +++ b/test/implicit/2p/test_box2pni.input @@ -12,3 +12,5 @@ UpperRightY = 40 # [m] height of the domain [Problem] Name = injection2pnibox +[Newton] +WriteConvergence = 1 # write convergence behaviour to disk? diff --git a/test/implicit/2p/test_cc2p.input b/test/implicit/2p/test_cc2p.input index 5338c37a7cb29df6f1de89a09e26e0ce9ba1ad2b..59fbf23e61b466818e4f6b7a1b4d5f7c7494174c 100644 --- a/test/implicit/2p/test_cc2p.input +++ b/test/implicit/2p/test_cc2p.input @@ -14,3 +14,6 @@ LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner [Problem] Name = lenscc # name passed to the output routines +[Implicit] +EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix? +EnableJacobianRecycling = 1 # Enable reuse of jacobian matrices? diff --git a/test/implicit/2p/test_cc2pni.input b/test/implicit/2p/test_cc2pni.input index 67824b76cbb155dd4dbd74b0a22ac0ccf2e04d38..3911aa42c4af3eb9a8037241a570d0f93b7ce7fa 100644 --- a/test/implicit/2p/test_cc2pni.input +++ b/test/implicit/2p/test_cc2pni.input @@ -12,3 +12,5 @@ UpperRightY = 40 # [m] height of the domain [Problem] Name = injection2pnicc +[Newton] +WriteConvergence = 1 # write convergence behaviour to disk? diff --git a/test/implicit/2p2c/injectionproblem.hh b/test/implicit/2p2c/injectionproblem.hh index 4724bf814d16bb5d9a0650e745769ad725bcf1a8..67fa03f2d9f8550c1b34b98d9cdc598195abe754 100644 --- a/test/implicit/2p2c/injectionproblem.hh +++ b/test/implicit/2p2c/injectionproblem.hh @@ -55,14 +55,8 @@ SET_TYPE_PROP(InjectionProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false /*useComplexRelations*/>); -// Enable gravity -SET_BOOL_PROP(InjectionProblem, ProblemEnableGravity, true); - // Define whether mole(true) or mass (false) fractions are used SET_BOOL_PROP(InjectionProblem, UseMoles, true); - -SET_BOOL_PROP(InjectionProblem, ImplicitEnableJacobianRecycling, true); -SET_BOOL_PROP(InjectionProblem, VtkAddVelocity, false); } diff --git a/test/implicit/2p2c/test_box2p2c.input b/test/implicit/2p2c/test_box2p2c.input index 5d68997ceef96a672cbc2cb56239f0cd33eed878..0742ff29ee6d89ada9d754cd1eb01fa11b6b9bb1 100644 --- a/test/implicit/2p2c/test_box2p2c.input +++ b/test/implicit/2p2c/test_box2p2c.input @@ -18,3 +18,5 @@ PressureHigh = 3e7 # [Pa] upper pressure limit for tabularization TemperatureLow = 312.15 # [Pa] lower temperature limit for tabularization TemperatureHigh = 314.15 # [Pa] upper temperature limit for tabularization +[Implicit] +EnableJacobianRecycling = 1 # diff --git a/test/implicit/2p2c/test_cc2p2c.input b/test/implicit/2p2c/test_cc2p2c.input index cf88bfc33042579ed2aa3d16c5136f11304ea6e1..ebfdbff3e2ed6281651a713d7268b8a0f754a965 100644 --- a/test/implicit/2p2c/test_cc2p2c.input +++ b/test/implicit/2p2c/test_cc2p2c.input @@ -18,3 +18,5 @@ PressureHigh = 3e7 # [Pa] upper pressure limit for tabularization TemperatureLow = 312.15 # [Pa] lower temperature limit for tabularization TemperatureHigh = 314.15 # [Pa] upper temperature limit for tabularization +[Implicit] +EnableJacobianRecycling = 1 # diff --git a/test/implicit/2p2c/waterairproblem.hh b/test/implicit/2p2c/waterairproblem.hh index 18904fdbce867ef05c1f2ed1c43091236d7b084a..dcfd8058fd157c843fc03eba7a4db9ad3554a001 100644 --- a/test/implicit/2p2c/waterairproblem.hh +++ b/test/implicit/2p2c/waterairproblem.hh @@ -56,15 +56,6 @@ SET_TYPE_PROP(WaterAirProblem, Problem, Dumux::WaterAirProblem<TypeTag>); // Set the wetting phase SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>); -// Enable gravity -SET_BOOL_PROP(WaterAirProblem, ProblemEnableGravity, true); - -// Use forward differences instead of central differences -SET_INT_PROP(WaterAirProblem, ImplicitNumericDifferenceMethod, +1); - -// Write newton convergence -SET_BOOL_PROP(WaterAirProblem, NewtonWriteConvergence, false); - // Define whether mole(true) or mass (false) fractions are used SET_BOOL_PROP(WaterAirProblem, UseMoles, true); } diff --git a/test/implicit/2pdfm/2pdfmtestproblem.hh b/test/implicit/2pdfm/2pdfmtestproblem.hh index 9f2302f24ad83295544d826d5a695d316d6494c4..e47fa525260cab0b3f7de5c20e65ee76c676306f 100644 --- a/test/implicit/2pdfm/2pdfmtestproblem.hh +++ b/test/implicit/2pdfm/2pdfmtestproblem.hh @@ -81,26 +81,9 @@ public: typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type; }; -// Enable partial reassembly of the jacobian matrix? -SET_BOOL_PROP(TwoPDFMTestProblem, ImplicitEnablePartialReassemble, true); - -// Enable reuse of jacobian matrices? -SET_BOOL_PROP(TwoPDFMTestProblem, ImplicitEnableJacobianRecycling, true); - -// Write the solutions of individual newton iterations? -SET_BOOL_PROP(TwoPDFMTestProblem, NewtonWriteConvergence, false); - -// Use forward differences instead of central differences -SET_INT_PROP(TwoPDFMTestProblem, ImplicitNumericDifferenceMethod, +1); - // Linear solver settings SET_TYPE_PROP(TwoPDFMTestProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag>); -SET_INT_PROP(TwoPDFMTestProblem, LinearSolverVerbosity, 0); -SET_INT_PROP(TwoPDFMTestProblem, LinearSolverPreconditionerIterations, 1); -SET_SCALAR_PROP(TwoPDFMTestProblem, LinearSolverPreconditionerRelaxation, 1.0); -// Enable gravity -SET_BOOL_PROP(TwoPDFMTestProblem, ProblemEnableGravity, false); } /*! diff --git a/test/implicit/2pdfm/test_2pdfm.input b/test/implicit/2pdfm/test_2pdfm.input index a9f8b4da9527fa8de192600bffcde55c24662d71..a6cba2aea3995b2759b589bd81a3f6d401400b2d 100644 --- a/test/implicit/2pdfm/test_2pdfm.input +++ b/test/implicit/2pdfm/test_2pdfm.input @@ -5,3 +5,9 @@ TEnd = 20 # [s] [Grid] File = ./grids/2pdfmartmesh.net +[Implicit] +EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix? +EnableJacobianRecycling = 1 # enable reuse of jacobian matrices? + +[Problem] + ProblemEnableGravity = 0 # enable gravity diff --git a/test/implicit/3p/3pniconductionproblem.hh b/test/implicit/3p/3pniconductionproblem.hh index e66a6816fc3ccbbd385d6923edc3031c25ed938f..86b822a8fe7bee93402ed4cbfac494a0e5614301 100644 --- a/test/implicit/3p/3pniconductionproblem.hh +++ b/test/implicit/3p/3pniconductionproblem.hh @@ -67,12 +67,6 @@ SET_TYPE_PROP(ThreePNIConductionProblem, SpatialParams, Dumux::ThreePNISpatialParams<TypeTag>); - -// Enable velocity output -SET_BOOL_PROP(ThreePNIConductionProblem, VtkAddVelocity, true); - -// Disable gravity -SET_BOOL_PROP(ThreePNIConductionProblem, ProblemEnableGravity, false); } diff --git a/test/implicit/3p/3pniconvectionproblem.hh b/test/implicit/3p/3pniconvectionproblem.hh index 2898c4f2649da9070eaff2778f43f6a0bf933a1c..44f59a3bf511cf33d60dc4ce6aa745dffcf5aaba 100644 --- a/test/implicit/3p/3pniconvectionproblem.hh +++ b/test/implicit/3p/3pniconvectionproblem.hh @@ -65,13 +65,6 @@ SET_TYPE_PROP(ThreePNIConvectionProblem, SET_TYPE_PROP(ThreePNIConvectionProblem, SpatialParams, Dumux::ThreePNISpatialParams<TypeTag>); - - -// Enable velocity output -SET_BOOL_PROP(ThreePNIConvectionProblem, VtkAddVelocity, true); - -// Disable gravity -SET_BOOL_PROP(ThreePNIConvectionProblem, ProblemEnableGravity, false); } diff --git a/test/implicit/3p/infiltration3pproblem.hh b/test/implicit/3p/infiltration3pproblem.hh index 377c20617fa7bdfba3f70c5680f3d8b9636007d7..15740d3ee42857ce9fd5eb96b81e81f0e871c5f7 100644 --- a/test/implicit/3p/infiltration3pproblem.hh +++ b/test/implicit/3p/infiltration3pproblem.hh @@ -56,17 +56,9 @@ SET_TYPE_PROP(InfiltrationThreePProblem, FluidSystem, Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>); -// Enable gravity? -SET_BOOL_PROP(InfiltrationThreePProblem, ProblemEnableGravity, true); - -// Write newton convergence? -SET_BOOL_PROP(InfiltrationThreePProblem, NewtonWriteConvergence, false); // Maximum tolerated relative error in the Newton method SET_SCALAR_PROP(InfiltrationThreePProblem, NewtonMaxRelativeShift, 1e-4); - -// -1 backward differences, 0: central differences, +1: forward differences -SET_INT_PROP(InfiltrationThreePProblem, ImplicitNumericDifferenceMethod, 1); } /*! diff --git a/test/implicit/3p/test_box3pniconduction.input b/test/implicit/3p/test_box3pniconduction.input index a5760cadf3a5c1856e8e84786a8d2ac78f954273..d0cf675dc5389bd4a43b0182424cffb0d5d5c0f6 100644 --- a/test/implicit/3p/test_box3pniconduction.input +++ b/test/implicit/3p/test_box3pniconduction.input @@ -9,4 +9,7 @@ File = ./grids/test_3pniconduction.dgf [Problem] Name = test_box3pniconduction # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 #Enable velocity output diff --git a/test/implicit/3p/test_box3pniconvection.input b/test/implicit/3p/test_box3pniconvection.input index 5443d7045911e0d85fd05670a6d63eafc0c9a7f1..736f1effdaed06dc43918b087e6d561886d14a8b 100644 --- a/test/implicit/3p/test_box3pniconvection.input +++ b/test/implicit/3p/test_box3pniconvection.input @@ -10,4 +10,7 @@ File = ./grids/test_3pniconvection.dgf Name = test_box3pniconvection # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 #Enable velocity output diff --git a/test/implicit/3p/test_cc3pniconduction.input b/test/implicit/3p/test_cc3pniconduction.input index 4a3ef029d46968b81ccc84ef64ff951f64a3b5a8..8112e4317a34ded9ebd574999d8767dae6032bb9 100644 --- a/test/implicit/3p/test_cc3pniconduction.input +++ b/test/implicit/3p/test_cc3pniconduction.input @@ -9,4 +9,7 @@ File = ./grids/test_3pniconduction.dgf [Problem] Name = test_cc3pniconduction # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 #Enable velocity output diff --git a/test/implicit/3p/test_cc3pniconvection.input b/test/implicit/3p/test_cc3pniconvection.input index 5a3274450c663725f57550e60e1c15cc2113ddb2..67f8a7067e7703f0bb4ee01d348078cc791c3ace 100644 --- a/test/implicit/3p/test_cc3pniconvection.input +++ b/test/implicit/3p/test_cc3pniconvection.input @@ -10,4 +10,7 @@ File = ./grids/test_3pniconvection.dgf Name = test_cc3pniconvection # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary +EnableGravity = 0 # disable gravity +[Vtk] +AddVelocity = 1 #Enable velocity output diff --git a/test/implicit/3p3c/columnxylolproblem.hh b/test/implicit/3p3c/columnxylolproblem.hh index 76a370c1bf9215ae0bd4ee5a91f994df56e0bf37..1b785172a6d1f70151511629f0f273cd40608fef 100644 --- a/test/implicit/3p3c/columnxylolproblem.hh +++ b/test/implicit/3p3c/columnxylolproblem.hh @@ -58,18 +58,6 @@ SET_TYPE_PROP(ColumnProblem, Problem, Dumux::ColumnProblem<TypeTag>); SET_TYPE_PROP(ColumnProblem, FluidSystem, Dumux::FluidSystems::H2OAirXylene<typename GET_PROP_TYPE(TypeTag, Scalar)>); - -// Enable gravity -SET_BOOL_PROP(ColumnProblem, ProblemEnableGravity, true); - -// Use forward differences instead of central differences -SET_INT_PROP(ColumnProblem, ImplicitNumericDifferenceMethod, 0); - -// Write newton convergence -SET_BOOL_PROP(ColumnProblem, NewtonWriteConvergence, false); - -// Set the maximum time step -SET_SCALAR_PROP(ColumnProblem, TimeManagerMaxTimeStepSize, 4.); } diff --git a/test/implicit/3p3c/infiltrationproblem.hh b/test/implicit/3p3c/infiltrationproblem.hh index 3244d3cc63c5687831350a2c737e48ff2b9dda4c..a9d8925d864d58a53637d3e584daeade8bb40f8e 100644 --- a/test/implicit/3p3c/infiltrationproblem.hh +++ b/test/implicit/3p3c/infiltrationproblem.hh @@ -57,11 +57,6 @@ SET_TYPE_PROP(InfiltrationProblem, FluidSystem, Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>); -// Enable gravity? -SET_BOOL_PROP(InfiltrationProblem, ProblemEnableGravity, true); - -// Write newton convergence? -SET_BOOL_PROP(InfiltrationProblem, NewtonWriteConvergence, false); // Maximum tolerated relative error in the Newton method SET_SCALAR_PROP(InfiltrationProblem, NewtonMaxRelativeShift, 1e-8); diff --git a/test/implicit/3p3c/kuevetteproblem.hh b/test/implicit/3p3c/kuevetteproblem.hh index 8de78f404a854b9d40a1f9e5838e22764a0e2230..e1a8872377bfa8ade7b55b76664a6359f4eeb242 100644 --- a/test/implicit/3p3c/kuevetteproblem.hh +++ b/test/implicit/3p3c/kuevetteproblem.hh @@ -60,15 +60,6 @@ SET_TYPE_PROP(KuevetteProblem, FluidSystem, Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>); -// Enable gravity -SET_BOOL_PROP(KuevetteProblem, ProblemEnableGravity, true); - -// Use central differences (backward -1, forward +1) -SET_INT_PROP(KuevetteProblem, ImplicitNumericDifferenceMethod, 0); - -// Set the maximum time step -SET_SCALAR_PROP(KuevetteProblem, TimeManagerMaxTimeStepSize, 60.); - // set newton relative tolerance SET_SCALAR_PROP(KuevetteProblem, NewtonMaxRelativeShift, 1e-6); } diff --git a/test/implicit/3p3c/test_box3p3c.input b/test/implicit/3p3c/test_box3p3c.input index 03b8005c3b6f76c4fd541899ee69be9cfd7c0250..5bc35023d2ec7eced124fbd571d8264cefbaed87 100644 --- a/test/implicit/3p3c/test_box3p3c.input +++ b/test/implicit/3p3c/test_box3p3c.input @@ -8,3 +8,6 @@ File = ./grids/test_3p3c.dgf [Problem] Name = infiltrationbox +[Implicit] +NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences + diff --git a/test/implicit/3p3c/test_box3p3c_reference.input b/test/implicit/3p3c/test_box3p3c_reference.input index 0f9acfdb649641f7fe258cddf4d50a0986c273ec..c31a525356208612d9e582a061c3a6af4c21dd20 100644 --- a/test/implicit/3p3c/test_box3p3c_reference.input +++ b/test/implicit/3p3c/test_box3p3c_reference.input @@ -8,3 +8,6 @@ File = ./grids/test_3p3c_coarse.dgf [Problem] Name = box3p3c +[Implicit] +NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences + diff --git a/test/implicit/3p3c/test_box3p3cnicolumnxylol.input b/test/implicit/3p3c/test_box3p3cnicolumnxylol.input index 2c2dbcf7bb0cb907a0a82a18340ae13855713c08..8c6853ac47e203d96d0c9aef14bab63417d2d1b2 100644 --- a/test/implicit/3p3c/test_box3p3cnicolumnxylol.input +++ b/test/implicit/3p3c/test_box3p3cnicolumnxylol.input @@ -8,3 +8,8 @@ File = ./grids/column.dgf [Problem] Name = columnxylolbox # name passed to the output routines +[Implicit] +NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences + +[TimeManager] +MaxTimeStepSize= 4. # Set the maximum time step diff --git a/test/implicit/3p3c/test_box3p3cnikuevette.input b/test/implicit/3p3c/test_box3p3cnikuevette.input index 35de8ffc9f9872a030ae52b6815194b5cdbe853a..80f709f6582a22e407e98dabe9fad08b54be5de0 100644 --- a/test/implicit/3p3c/test_box3p3cnikuevette.input +++ b/test/implicit/3p3c/test_box3p3cnikuevette.input @@ -8,3 +8,8 @@ File = ./grids/column.dgf [Problem] Name = kuevettebox # name passed to the output routines +[Implicit] +NumericDifferenceMethod = 0 # use central differences (backward -1, forward +1) + +[TimeManager] +MaxTimeStepSize = 60. # set the maximum time step diff --git a/test/implicit/3p3c/test_cc3p3c.input b/test/implicit/3p3c/test_cc3p3c.input index 0af272dfb0136ba5c793954b1bbda71c09e98ab6..07c896f8bc9f126d414b093a2337bd08c652bba3 100644 --- a/test/implicit/3p3c/test_cc3p3c.input +++ b/test/implicit/3p3c/test_cc3p3c.input @@ -8,3 +8,6 @@ File = ./grids/test_3p3c.dgf [Problem] Name = infiltrationcc +[Implicit] +NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences + diff --git a/test/implicit/3p3c/test_cc3p3c_reference.input b/test/implicit/3p3c/test_cc3p3c_reference.input index eff8dbd324daa84f7975ccdebc60c789fea0e594..7dd86952098e968c9da1805e913c23075c95b03a 100644 --- a/test/implicit/3p3c/test_cc3p3c_reference.input +++ b/test/implicit/3p3c/test_cc3p3c_reference.input @@ -8,3 +8,6 @@ File = ./grids/test_3p3c_coarse.dgf [Problem] Name = cc3p3c +[Implicit] +NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences + diff --git a/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input b/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input index eaa4c17d87448e4f6065a634576ed06f08cc5bad..c85cf38d3c40a61fa591ddd7d7b9ef6eecce786b 100644 --- a/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input +++ b/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input @@ -8,3 +8,8 @@ File = ./grids/column.dgf [Problem] Name = columnxylolcc # name passed to the output routines +[Implicit] +NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences + +[TimeManager] +MaxTimeStepSize= 4. # Set the maximum time step diff --git a/test/implicit/3p3c/test_cc3p3cnikuevette.input b/test/implicit/3p3c/test_cc3p3cnikuevette.input index 0edd470eb65fd54495fa634476969542e39eb6cd..23832a586be5cdef8e25b2b4f3953a7ad9f92ece 100644 --- a/test/implicit/3p3c/test_cc3p3cnikuevette.input +++ b/test/implicit/3p3c/test_cc3p3cnikuevette.input @@ -8,3 +8,8 @@ File = ./grids/column.dgf [Problem] Name = kuevettecc # name passed to the output routines +[Implicit] +NumericDifferenceMethod = 0 # use central differences (backward -1, forward +1) + +[TimeManager] +MaxTimeStepSize = 60. # set the maximum time step diff --git a/test/implicit/mpnc/combustionproblem1c.hh b/test/implicit/mpnc/combustionproblem1c.hh index c738e9f47d1baa41b9781781c5a08c8c2bbcca5b..8309fb09b47715cdc623625ffe043c4a49c293a7 100644 --- a/test/implicit/mpnc/combustionproblem1c.hh +++ b/test/implicit/mpnc/combustionproblem1c.hh @@ -100,24 +100,12 @@ SET_INT_PROP(CombustionProblemOneComponent, SET_TYPE_PROP(CombustionProblemOneComponent, Scalar, double ); // quad / double -// Enable gravity -SET_BOOL_PROP(CombustionProblemOneComponent, ProblemEnableGravity, true); - // Specify whether diffusion is enabled SET_BOOL_PROP(CombustionProblemOneComponent, EnableDiffusion, false); -// do not use smooth upwinding -SET_BOOL_PROP(CombustionProblemOneComponent, ImplicitEnableSmoothUpwinding, false); - // do not use a chopped newton method in the beginning SET_BOOL_PROP(CombustionProblemOneComponent, NewtonEnableChop, false); -// use forward differences instead of central ones -SET_INT_PROP(CombustionProblemOneComponent, ImplicitNumericDifferenceMethod, +1); - -// disable partial jacobian matrix reassembly -SET_BOOL_PROP(CombustionProblemOneComponent, ImplicitEnablePartialReassemble, false); - // Enable the re-use of the jacobian matrix whenever possible? SET_BOOL_PROP(CombustionProblemOneComponent, ImplicitEnableJacobianRecycling, true); diff --git a/test/implicit/mpnc/evaporationatmosphereproblem.hh b/test/implicit/mpnc/evaporationatmosphereproblem.hh index cae13aa452572c4a14bc66bfacaf29820219a061..491b201ae21467942761d0997c38e4f0827cbf9e 100644 --- a/test/implicit/mpnc/evaporationatmosphereproblem.hh +++ b/test/implicit/mpnc/evaporationatmosphereproblem.hh @@ -120,35 +120,16 @@ SET_INT_PROP(EvaporationAtmosphereProblem, // Set the type used for scalar values SET_TYPE_PROP(EvaporationAtmosphereProblem, Scalar, double); -// Enable gravity -SET_BOOL_PROP(EvaporationAtmosphereProblem, ProblemEnableGravity, true); // Specify whether diffusion is enabled SET_BOOL_PROP(EvaporationAtmosphereProblem, EnableDiffusion, true); -// do not use smooth upwinding -SET_BOOL_PROP(EvaporationAtmosphereProblem, ImplicitEnableSmoothUpwinding, false); - // do not use a chopped newton method in the beginning SET_BOOL_PROP(EvaporationAtmosphereProblem, NewtonEnableChop, false); -// use forward differences instead of central ones -SET_INT_PROP(EvaporationAtmosphereProblem, ImplicitNumericDifferenceMethod, +1 ); - -// disable partial jacobian matrix reassembly -SET_BOOL_PROP(EvaporationAtmosphereProblem, ImplicitEnablePartialReassemble, false); - - -SET_SCALAR_PROP(EvaporationAtmosphereProblem,ImplicitMassUpwindWeight, 1); -SET_SCALAR_PROP(EvaporationAtmosphereProblem,ImplicitMobilityUpwindWeight, 1); - // Enable the re-use of the jacobian matrix whenever possible? SET_BOOL_PROP(EvaporationAtmosphereProblem, ImplicitEnableJacobianRecycling, true); -// Specify whether the convergence rate ought to be written out by the -// newton method -SET_BOOL_PROP(EvaporationAtmosphereProblem, NewtonWriteConvergence, false); - //################# // Which Code to compile // Specify whether there is any energy equation diff --git a/test/implicit/mpnc/forchheimer1pproblem.hh b/test/implicit/mpnc/forchheimer1pproblem.hh index 04ba9a5f3b2be780f8aa77a060dff8d5bd3eb9ae..c315059f1bdbd985688d2339617d89006fcd1fc6 100644 --- a/test/implicit/mpnc/forchheimer1pproblem.hh +++ b/test/implicit/mpnc/forchheimer1pproblem.hh @@ -65,33 +65,12 @@ public: typedef Dumux::FluidSystems::H2OAir<Scalar, Dumux::SimpleH2O<Scalar>, /*useComplexRelations=*/false> type; }; -// Enable smooth upwinding? -SET_BOOL_PROP(Forchheimer1pProblem, ImplicitEnableSmoothUpwinding, false); - // Enable molecular diffusion of the components? SET_BOOL_PROP(Forchheimer1pProblem, EnableDiffusion, false); -// Use the chopped Newton method? -SET_BOOL_PROP(Forchheimer1pProblem, NewtonEnableChop, true); - // Enable gravity SET_BOOL_PROP(Forchheimer1pProblem, ProblemEnableGravity, false); -// Write Newton convergence to disk? -SET_BOOL_PROP(Forchheimer1pProblem, NewtonWriteConvergence, false); - -// Use the line search strategy for the Newton update? -SET_BOOL_PROP(Forchheimer1pProblem, NewtonUseLineSearch, false); - -// Enable the re-use of the jacobian matrix whenever possible? -SET_BOOL_PROP(Forchheimer1pProblem, ImplicitEnableJacobianRecycling, true); - -// Reassemble the jacobian matrix only where it changed? -SET_BOOL_PROP(Forchheimer1pProblem, ImplicitEnablePartialReassemble, false); - -// use forward diffferences to approximate the partial derivatives -SET_INT_PROP(Forchheimer1pProblem, ImplicitNumericDifferenceMethod, +1); - // decide which type to use for floating values (double / quad) SET_TYPE_PROP(Forchheimer1pProblem, Scalar, double); diff --git a/test/implicit/mpnc/forchheimer2pproblem.hh b/test/implicit/mpnc/forchheimer2pproblem.hh index 29475d8b2658126b3ed842095b010c0e7485eec3..e770a9e12c479ae933f57a47af968fe3a2546ac7 100644 --- a/test/implicit/mpnc/forchheimer2pproblem.hh +++ b/test/implicit/mpnc/forchheimer2pproblem.hh @@ -63,33 +63,16 @@ public: typedef Dumux::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type; }; -// Enable smooth upwinding? -SET_BOOL_PROP(Forchheimer2pProblem, ImplicitEnableSmoothUpwinding, false); // Enable molecular diffusion of the components? SET_BOOL_PROP(Forchheimer2pProblem, EnableDiffusion, false); -// Use the chopped Newton method? -SET_BOOL_PROP(Forchheimer2pProblem, NewtonEnableChop, true); - // Enable gravity SET_BOOL_PROP(Forchheimer2pProblem, ProblemEnableGravity, true); -// Write Newton convergence to disk? -SET_BOOL_PROP(Forchheimer2pProblem, NewtonWriteConvergence, false); - -// Use the line search strategy for the Newton update? -SET_BOOL_PROP(Forchheimer2pProblem, NewtonUseLineSearch, false); - // Enable the re-use of the jacobian matrix whenever possible? SET_BOOL_PROP(Forchheimer2pProblem, ImplicitEnableJacobianRecycling, true); -// Reassemble the jacobian matrix only where it changed? -SET_BOOL_PROP(Forchheimer2pProblem, ImplicitEnablePartialReassemble, false); - -// use forward diffferences to approximate the partial derivatives -SET_INT_PROP(Forchheimer2pProblem, ImplicitNumericDifferenceMethod, +1); - // decide which type to use for floating values (double / quad) SET_TYPE_PROP(Forchheimer2pProblem, Scalar, double); diff --git a/test/implicit/mpnc/obstacleproblem.hh b/test/implicit/mpnc/obstacleproblem.hh index 28ae7571e049a23023f68285740edd7b058f4e7b..8c4bc9626cbecbff595144c00c14da8a05f05213 100644 --- a/test/implicit/mpnc/obstacleproblem.hh +++ b/test/implicit/mpnc/obstacleproblem.hh @@ -72,27 +72,12 @@ SET_BOOL_PROP(ObstacleProblem, ImplicitEnableSmoothUpwinding, true); // Enable molecular diffusion of the components? SET_BOOL_PROP(ObstacleProblem, EnableDiffusion, true); -// Use the chopped Newton method? -SET_BOOL_PROP(ObstacleProblem, NewtonEnableChop, true); - -// Enable gravity -SET_BOOL_PROP(ObstacleProblem, ProblemEnableGravity, true); - -// Write Newton convergence to disk? -SET_BOOL_PROP(ObstacleProblem, NewtonWriteConvergence, false); - -// Use the line search strategy for the Newton update? -SET_BOOL_PROP(ObstacleProblem, NewtonUseLineSearch, false); - // Enable the re-use of the jacobian matrix whenever possible? SET_BOOL_PROP(ObstacleProblem, ImplicitEnableJacobianRecycling, true); // Reassemble the jacobian matrix only where it changed? SET_BOOL_PROP(ObstacleProblem, ImplicitEnablePartialReassemble, true); -// use forward diffferences to approximate the partial derivatives -SET_INT_PROP(ObstacleProblem, ImplicitNumericDifferenceMethod, +1); - // decide which type to use for floating values (double / quad) SET_TYPE_PROP(ObstacleProblem, Scalar, double); } diff --git a/test/implicit/richards/richardslensproblem.hh b/test/implicit/richards/richardslensproblem.hh index f691edfdd6eed368390a88b49c1cad3b89310c4d..e6e24b436d3b8c791a72d9caafecc00d647796ea 100644 --- a/test/implicit/richards/richardslensproblem.hh +++ b/test/implicit/richards/richardslensproblem.hh @@ -63,26 +63,8 @@ public: typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type; }; -// Enable gravity -SET_BOOL_PROP(RichardsLensProblem, ProblemEnableGravity, true); - -// Enable partial reassembly of the Jacobian matrix -SET_BOOL_PROP(RichardsLensProblem, ImplicitEnablePartialReassemble, true); - -// Enable re-use of the Jacobian matrix for the first iteration of a time step -SET_BOOL_PROP(RichardsLensProblem, ImplicitEnableJacobianRecycling, true); - -// Use forward differences to approximate the Jacobian matrix -SET_INT_PROP(RichardsLensProblem, ImplicitNumericDifferenceMethod, +1); - // Set the maximum number of newton iterations of a time step SET_INT_PROP(RichardsLensProblem, NewtonMaxSteps, 28); - -// Set the "desireable" number of newton iterations of a time step -SET_INT_PROP(RichardsLensProblem, NewtonTargetSteps, 18); - -// Do not write the intermediate results of the newton method -SET_BOOL_PROP(RichardsLensProblem, NewtonWriteConvergence, false); } /*! diff --git a/test/implicit/richards/richardsniconductionproblem.hh b/test/implicit/richards/richardsniconductionproblem.hh index 7d2f50e951e2a8206a2483e5233b6e09b3def2b9..1f22e6a126efdd7051599207b46a49536a02be40 100644 --- a/test/implicit/richards/richardsniconductionproblem.hh +++ b/test/implicit/richards/richardsniconductionproblem.hh @@ -62,12 +62,6 @@ SET_TYPE_PROP(RichardsNIConductionProblem, FluidSystem, FluidSystems::H2ON2<type SET_TYPE_PROP(RichardsNIConductionProblem, SpatialParams, Dumux::RichardsNISpatialParams<TypeTag>); - -// Enable velocity output -SET_BOOL_PROP(RichardsNIConductionProblem, VtkAddVelocity, true); - -// Disable gravity -SET_BOOL_PROP(RichardsNIConductionProblem, ProblemEnableGravity, false); } /*! diff --git a/test/implicit/richards/richardsniconvectionproblem.hh b/test/implicit/richards/richardsniconvectionproblem.hh index 36717bfc29cdfe55dd935dbfe0bb922da484d166..094697ba5dae206d8ef59bf6b39f6dac75fd1529 100644 --- a/test/implicit/richards/richardsniconvectionproblem.hh +++ b/test/implicit/richards/richardsniconvectionproblem.hh @@ -63,12 +63,6 @@ SET_TYPE_PROP(RichardsNIConvectionProblem, FluidSystem, FluidSystems::H2ON2<type SET_TYPE_PROP(RichardsNIConvectionProblem, SpatialParams, Dumux::RichardsNISpatialParams<TypeTag>); - -// Enable velocity output -SET_BOOL_PROP(RichardsNIConvectionProblem, VtkAddVelocity, true); - -// Disable gravity -SET_BOOL_PROP(RichardsNIConvectionProblem, ProblemEnableGravity, false); } diff --git a/test/implicit/richards/test_boxrichards.input b/test/implicit/richards/test_boxrichards.input index e908c30cf9ef83be2fb510839f8fb944e5beca12..75e7ee9e4daeaeac863b065541343ac9242e9af5 100644 --- a/test/implicit/richards/test_boxrichards.input +++ b/test/implicit/richards/test_boxrichards.input @@ -8,3 +8,9 @@ File = ./grids/richardslens-24x16.dgf [Problem] Name = richardslensbox +[Implicit] +EnablePartialReassemble = 1 # enable partial reassembly of the Jacobian matrix +EnableJacobianRecycling = 1 # + +[Newton] +TargetSteps = 18 # set the "desireable" number of newton iterations of a time step diff --git a/test/implicit/richards/test_boxrichardsniconduction.input b/test/implicit/richards/test_boxrichardsniconduction.input index 72b6557d8aacce4b6972416cd8e7409ffb72eadb..da1e6086d3d803d9ec3418c96b3cbcf3cd2ae0c3 100644 --- a/test/implicit/richards/test_boxrichardsniconduction.input +++ b/test/implicit/richards/test_boxrichardsniconduction.input @@ -9,4 +9,7 @@ File = ./grids/test_richardsniconduction.dgf [Problem] Name = test_boxrichardsniconduction # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written +EnableGravity= 0 # disable gravity +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/richards/test_boxrichardsniconvection.input b/test/implicit/richards/test_boxrichardsniconvection.input index 47aa414db3df6d59a5dd2ad5e66a27c7eac386e1..e7a20189f86fc372638d671b25c5e08b7c1944cc 100644 --- a/test/implicit/richards/test_boxrichardsniconvection.input +++ b/test/implicit/richards/test_boxrichardsniconvection.input @@ -10,3 +10,7 @@ File = ./grids/test_richardsniconvection.dgf Name = test_boxrichardsniconvection # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary +EnableGravity = 0 # disable gravity + +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/richards/test_ccrichards.input b/test/implicit/richards/test_ccrichards.input index 5f4435d8267da417d067d2cc7c2be68eafc9576a..3eba8d73925b7c0af4daaee666467f56c5f55188 100644 --- a/test/implicit/richards/test_ccrichards.input +++ b/test/implicit/richards/test_ccrichards.input @@ -8,3 +8,9 @@ File = ./grids/richardslens-24x16.dgf [Problem] Name = richardslenscc +[Implicit] +EnablePartialReassemble = 1 # enable partial reassembly of the Jacobian matrix +EnableJacobianRecycling = 1 # + +[Newton] +TargetSteps = 18 # set the "desireable" number of newton iterations of a time step diff --git a/test/implicit/richards/test_ccrichardsniconduction.input b/test/implicit/richards/test_ccrichardsniconduction.input index 096dc3a55959dd9108fb59d35e343d1044407dc2..77fc39cc96ebe7cdff9bcf55a0e9ef9ba2e44e20 100644 --- a/test/implicit/richards/test_ccrichardsniconduction.input +++ b/test/implicit/richards/test_ccrichardsniconduction.input @@ -9,3 +9,7 @@ File = ./grids/test_richardsniconduction.dgf [Problem] Name = test_ccrichardsniconduction # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written +EnableGravity= 0 # disable gravity + +[Vtk] +AddVelocity = 1 # enable velocity output diff --git a/test/implicit/richards/test_ccrichardsniconvection.input b/test/implicit/richards/test_ccrichardsniconvection.input index 0bed72d6000594f8537b72c052285b487460a251..c7e7eec25d3b9a6faf286e9912a8e631f189e9cb 100644 --- a/test/implicit/richards/test_ccrichardsniconvection.input +++ b/test/implicit/richards/test_ccrichardsniconvection.input @@ -10,3 +10,7 @@ File = ./grids/test_richardsniconvection.dgf Name = test_ccrichardsniconvection # name passed to the output routines OutputInterval = 5 # every 5th timestep an output file is written DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary +EnableGravity = 0 # disable gravity + +[Vtk] +AddVelocity = 1 # enable velocity output