[generalproblem] add CC version for the general problem

reviewed gruenich

test/common/generalproblem/CMakeLists.txt

 add_input_file_links()
 
-add_dumux_test(test_general_box test_general_box test_generalproblem2p.cc
+add_dumux_test(test_general_box test_general test_generalproblem2p.cc
                python ${CMAKE_SOURCE_DIR}/bin/runtest.py
                  --script fuzzy
                  --files ${CMAKE_SOURCE_DIR}/test/references/generallens_box-reference.vtu
                          ${CMAKE_CURRENT_BINARY_DIR}/generallens_box-00003.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_general_box
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_general
                             -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_generalproblem2p_reference.input
                             -ModelType Box")
 
-add_dumux_test(test_general_dec test_general_dec test_generalproblem2p.cc
+add_dumux_test(test_general_cc test_general test_generalproblem2p.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                 --script fuzzy
+                 --files ${CMAKE_SOURCE_DIR}/test/references/generallens_cc-reference.vtu
+                         ${CMAKE_CURRENT_BINARY_DIR}/generallens_cc-00003.vtu
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_general
+                            -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_generalproblem2p_reference.input
+                            -ModelType CC")
+
+add_dumux_test(test_general_dec test_general test_generalproblem2p.cc
                python ${CMAKE_SOURCE_DIR}/bin/runtest.py
                  --script fuzzy
                  --files ${CMAKE_SOURCE_DIR}/test/references/generallens_decoupled-reference.vtu
                          ${CMAKE_CURRENT_BINARY_DIR}/generallens_decoupled-00003.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_general_dec
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_general
                             -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_generalproblem2p_reference.input
                             -ModelType Decoupled")
 

test/common/generalproblem/generallensproblem.hh

@@ -103,6 +103,19 @@ SET_TYPE_PROP(BoxGeneralLensProblem, ProblemBaseClass, Dumux::ImplicitPorousMedi
 SET_TYPE_PROP(BoxGeneralLensProblem, SpatialParamsBaseClass,Dumux::ImplicitSpatialParams<TypeTag>);
 
 
+///////////////////////////////////////////////////
+// CC model TypeTag
+//////////////////////////////////////////////////
+
+NEW_TYPE_TAG(CCGeneralLensProblem, INHERITS_FROM(CCTwoP, GeneralLensProblem));
+
+// Set the problem property
+SET_TYPE_PROP(CCGeneralLensProblem, ProblemBaseClass, Dumux::ImplicitPorousMediaProblem<TypeTag>);
+
+// Set the problem property
+SET_TYPE_PROP(CCGeneralLensProblem, SpatialParamsBaseClass,Dumux::ImplicitSpatialParams<TypeTag>);
+
+
 ///////////////////////////////////////////////////
 // Deoupled model TypeTag
 //////////////////////////////////////////////////

test/common/generalproblem/test_generalproblem2p.cc

@@ -72,6 +72,18 @@ int main(int argc, char** argv)
                 std::cout<<"Used box 2p model\n";
                 return startReturn;
             }
+            else if (modelType == "CC")
+            {
+                typedef TTAG(CCGeneralLensProblem) ProblemTypeTag;
+                typedef GET_PROP(ProblemTypeTag, ParameterTree) ParamTree;
+                Dune::ParameterTree &rt = ParamTree::runTimeParams();
+                rt["ModelType"]=modelType;
+                ParamTree::tree()["Problem.OutputfileName"] = "generallens_cc";
+                int startReturn =  Dumux::start<ProblemTypeTag>(argc, argv, usage);
+                std::cout<<"######################################################\n";
+                std::cout<<"Used cc 2p model\n";
+                return startReturn;
+            }
             else if (modelType == "Decoupled")
             {
                 typedef TTAG(DecoupledGeneralLensProblem) ProblemTypeTag;