Revert "Merge branch 'fix/debug_sequential_2p_models_for_bcleverett_and_mcwhorter' into 'master'"

This reverts merge request !2608

test/porousmediumflow/sequential/2p/CMakeLists.txt

@@ -89,28 +89,6 @@ dumux_add_test(NAME test_mpfal2padaptive
                                ${CMAKE_CURRENT_BINARY_DIR}/test_mpfal2padaptive-00006.vtu
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfa2p -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_mpfa2p.input -Problem.Name test_mpfal2padaptive -ModelType MPFALAdaptive")
 
-dumux_add_test(NAME test_mpfal2p_bcleverett
-              SOURCES test_mpfa2p.cc
-              COMPILE_DEFINITIONS PROBLEM=0
-              LABELS porousmediumflow 2p sequential
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS  --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfal2p_bcleverett
-                                   -ParameterFile test_mpfa2p.input
-                                   -Problem.Name test_mpfal2p_bcleverett
-                                   -Problem.EnableGravity false
-                                   -Grid.File grids/test_mpfa2p.dgf -ModelType MPFAL")
-
-dumux_add_test(NAME test_mpfao2p_mcwhorter
-              SOURCES test_mpfa2p.cc
-              COMPILE_DEFINITIONS PROBLEM=1
-              LABELS porousmediumflow 2p sequential
-              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-              CMD_ARGS  --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpfao2p_mcwhorter
-                                   -ParameterFile test_mpfa2p.input
-                                   -Problem.Name test_mpfao2p_mcwhorter
-                                   -Problem.EnableGravity false
-                                   -Grid.File grids/test_mpfa2p.dgf -ModelType MPFAO")
-
 # 3d tests
 dumux_add_test(NAME test_3d2pfv
               LABELS porousmediumflow 2p sequential

test/porousmediumflow/sequential/2p/buckleyleverettanalyticsolution.hh

@@ -87,10 +87,10 @@ private:
     void prepareAnalytic()
     {
         const auto& dummyElement = *problem_.gridView().template begin<0>();
-        const auto& fluidMatrixInteraction = problem_.spatialParams().fluidMatrixInteractionAtPos(dummyElement.geometry().center());
+        const auto& fluidMatrixInteraction = problem_->spatialParams().fluidMatrixInteractionAtPos(dummyElement.geometry().center());
 
-        swr_ = fluidMatrixInteraction.pcSwCurve().effToAbsParams().swr();
-        snr_ = fluidMatrixInteraction.pcSwCurve().effToAbsParams().snr();
+        swr_ = fluidMatrixInteraction.effToAbsParams().swr();
+        snr_ = fluidMatrixInteraction.effToAbsParams().snr();
         Scalar porosity = problem_.spatialParams().porosity(dummyElement);
 
         FluidState fluidState;

test/porousmediumflow/sequential/2p/mcwhorteranalyticsolution.hh

@@ -131,10 +131,10 @@ private:
     void prepareAnalytic()
     {
         const auto& dummyElement = *problem_.gridView().template begin<0>();
-        const auto& fluidMatrixInteraction = problem_.spatialParams().fluidMatrixInteractionAtPos(dummyElement.geometry().center());
+        const auto& fluidMatrixInteraction = problem_->spatialParams().fluidMatrixInteractionAtPos(dummyElement.geometry().center());
 
-        swr_ = fluidMatrixInteraction.pcSwCurve().effToAbsParams().swr();
-        snr_ = fluidMatrixInteraction.pcSwCurve().effToAbsParams().snr();
+        swr_ = fluidMatrixInteraction.effToAbsParams().swr();
+        snr_ = fluidMatrixInteraction.effToAbsParams().snr();
         porosity_ = problem_.spatialParams().porosity(dummyElement);
         permeability_ = problem_.spatialParams().intrinsicPermeability(dummyElement)[0][0];
         PrimaryVariables initVec;

test/porousmediumflow/sequential/2p/test_mpfa2p.cc

@@ -19,9 +19,7 @@
  *
  * \brief Test for the sequential 2p models
  */
-#ifndef PROBLEM
 #define PROBLEM 2 // 0 = Buckley-Leverett, 1 = McWhorter, 2 = 2D Lense problem
-#endif
 
 #include <config.h>