[richardsnc] Cleanup

dumux/porousmediumflow/richardsnc/implicit/properties.hh

@@ -108,7 +108,7 @@ SET_TYPE_PROP(RichardsNC, VolumeVariables, RichardsNCVolumeVariables<TypeTag>);
 SET_PROP(RichardsNC, FluidSystem)
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
-    using type = FluidSystems::LiquidPhaseTwoC<TypeTag, SimpleH2O<Scalar>, Constant<TypeTag, Scalar>>;
+    using type = FluidSystems::LiquidPhaseTwoC<TypeTag, SimpleH2O<Scalar>, Components::Constant<1, Scalar>>;
 };
 
 /*!
@@ -124,12 +124,6 @@ SET_PROP(RichardsNC, FluidState)
     using type = CompositionalFluidState<Scalar, FluidSystem>;
 };
 SET_TYPE_PROP(RichardsNC, VtkOutputFields, RichardsNCVtkOutputFields<TypeTag>);           //! Set the vtk output fields specific to the twop model
-/*!
- * \brief Set type of the parameter objects for the material law
- *
- * By default this is just retrieved from the material law.
- */
-SET_TYPE_PROP(RichardsNC, MaterialLawParams, typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
 
 //! Set the indices used
 SET_TYPE_PROP(RichardsNC, Indices, RichardsNCIndices<TypeTag>);

test/porousmediumflow/richardsnc/implicit/CMakeLists.txt

 add_input_file_links()
 
 dune_add_test(SOURCES test_richardsnc_fv.cc
-              NAME test_boxrichardsnc
+              NAME test_richardsnc_box
               COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBoxProblem
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/richardswelltracerbox-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsnc-00035.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsnc test_richardsnc.input -Problem.Name test_boxrichardsnc")
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box-00035.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box test_richardsnc.input -Problem.Name test_richardsnc_box")
 
 dune_add_test(SOURCES test_richardsnc_fv.cc
-              NAME test_ccrichardsnc
+              NAME test_richardsnc_tpfa
               COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCCProblem
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/richardswelltracercc-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsnc-00033.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsnc test_richardsnc.input -Problem.Name test_ccrichardsnc")
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa-00033.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa test_richardsnc.input -Problem.Name test_richardsnc_tpfa")
 
 #install sources
 install(FILES

test/porousmediumflow/richardsnc/implicit/test_richardsnc.input

@@ -7,11 +7,10 @@ UpperRight = 3 1
 Cells = 50 20
 
 [Problem]
-Name = richardswelltracerbox
+Name = richardswelltracer
 EnableGravity = true
 ContaminantMoleFraction = 1e-10
 PumpRate = 0.015 # kg/s
-MolarMass = 20e-3 # in kg/mol, molar mass heavy water D2O
 
 LensLowerLeft = 0.8 0.2
 LensUpperRight = 1.2 0.8
@@ -19,9 +18,10 @@ LensUpperRight = 1.2 0.8
 [Component]
 LiquidDiffusionCoefficient = 2.3e-9
 Name = "D2O"
+MolarMass = 20e-3 # in kg/mol, molar mass heavy water D2O
 
 [Vtk]
 AddVelocity = true
 
 [Newton]
-EnableChop = false  # chop for better convergence
+EnableChop = false