changed some SET_PROP to SET_TYPE_PROP. deleted commented code. review by beatrix

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13794 2fb0f335-1f38-0410-981e-8018bf24f1b0

test/common/generalproblem/generallensproblem.hh

@@ -56,6 +56,7 @@ class GeneralLensProblem;
 //////////
 namespace Properties
 {
+    
 //Set the general problem TypeTag which does not depend on the model
 NEW_TYPE_TAG(GeneralLensProblem, INHERITS_FROM(GeneralLensSpatialParams));
 
@@ -63,19 +64,13 @@ NEW_TYPE_TAG(GeneralLensProblem, INHERITS_FROM(GeneralLensSpatialParams));
 NEW_PROP_TAG(ProblemBaseClass);
 
 // Set the grid type
-SET_PROP(GeneralLensProblem, Grid)
-{
-    typedef Dune::YaspGrid<2> type;
-};
+SET_TYPE_PROP(GeneralLensProblem, Grid, Dune::YaspGrid<2>);
 
 // set the GridCreator property
 SET_TYPE_PROP(GeneralLensProblem, GridCreator, CubeGridCreator<TypeTag>);
 
 // Set the problem property
-SET_PROP(GeneralLensProblem, Problem)
-{
-    typedef Dumux::GeneralLensProblem<TypeTag> type;
-};
+SET_TYPE_PROP(GeneralLensProblem, Problem, Dumux::GeneralLensProblem<TypeTag>);
 
 // Set the wetting phase
 SET_PROP(GeneralLensProblem, WettingPhase)
@@ -104,18 +99,11 @@ SET_BOOL_PROP(GeneralLensProblem, ProblemEnableGravity, true);
 
 NEW_TYPE_TAG(BoxGeneralLensProblem, INHERITS_FROM(BoxTwoP, GeneralLensProblem));
 
-
 // Set the problem property
-SET_PROP(BoxGeneralLensProblem, ProblemBaseClass)
-{
-    typedef Dumux::ImplicitPorousMediaProblem<TypeTag> type;
-};
+SET_TYPE_PROP(BoxGeneralLensProblem, ProblemBaseClass, Dumux::ImplicitPorousMediaProblem<TypeTag>);
 
 // Set the problem property
-SET_PROP(BoxGeneralLensProblem, SpatialParamsBaseClass)
-{
-    typedef Dumux::ImplicitSpatialParams<TypeTag> type;
-};
+SET_TYPE_PROP(BoxGeneralLensProblem, SpatialParamsBaseClass,Dumux::ImplicitSpatialParams<TypeTag>);
 
 
 ///////////////////////////////////////////////////
@@ -124,18 +112,11 @@ SET_PROP(BoxGeneralLensProblem, SpatialParamsBaseClass)
 
 NEW_TYPE_TAG(DecoupledGeneralLensProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, GeneralLensProblem));
 
-
 // Set the problem property
-SET_PROP(DecoupledGeneralLensProblem, ProblemBaseClass)
-{
-    typedef Dumux::IMPESProblem2P<TypeTag> type;
-};
+SET_TYPE_PROP(DecoupledGeneralLensProblem, ProblemBaseClass, Dumux::IMPESProblem2P<TypeTag>);
 
 // Set the problem property
-SET_PROP(DecoupledGeneralLensProblem, SpatialParamsBaseClass)
-{
-    typedef Dumux::FVSpatialParams<TypeTag> type;
-};
+SET_TYPE_PROP(DecoupledGeneralLensProblem, SpatialParamsBaseClass, Dumux::FVSpatialParams<TypeTag>);
 
 SET_INT_PROP(DecoupledGeneralLensProblem, Formulation,
         DecoupledTwoPCommonIndices::pwsn);

test/decoupled/1p/test_1pproblem.hh

@@ -24,10 +24,6 @@
 #ifndef DUMUX_TEST_1P_PROBLEM_HH
 #define DUMUX_TEST_1P_PROBLEM_HH
 
-#if HAVE_UG
-#include <dune/grid/uggrid.hh>
-#endif
-
 #include <dune/grid/yaspgrid.hh>
 #include <dumux/io/cubegridcreator.hh>
 
@@ -57,10 +53,7 @@ NEW_TYPE_TAG(TestProblemOneP, INHERITS_FROM(FVPressureOneP));
 SET_TYPE_PROP(TestProblemOneP, GridCreator, CubeGridCreator<TypeTag>);
 
 // Set the grid type
-SET_PROP(TestProblemOneP, Grid)
-{
-        typedef Dune::YaspGrid<2> type;
-};
+SET_TYPE_PROP(TestProblemOneP, Grid, Dune::YaspGrid<2>);
 
 // Set the wetting phase
 SET_PROP(TestProblemOneP, Fluid)
@@ -187,11 +180,10 @@ public:
 
     //!source term [kg/(m^3 s)]
     void source(PrimaryVariables &values, const Element& element) const
-        {
+    {
         values = 0;
-
         values = integratedSource_(element, 4);
-        }
+    }
 
     /*!
     * \brief Returns the type of boundary condition.
@@ -214,9 +206,9 @@ public:
 
     //! return neumann condition  (flux, [kg/(m^2 s)])
     void neumann(PrimaryVariables &values, const Intersection& intersection) const
-        {
+    {
         values = 0;
-        }
+    }
 
 private:
     Scalar exact (const GlobalPosition& globalPos) const
@@ -227,14 +219,14 @@ private:
     }
 
     Dune::FieldVector<Scalar,dim> exactGrad (const GlobalPosition& globalPos) const
-        {
+    {
         Dune::FieldVector<Scalar,dim> grad(0);
         double pi = 4.0*atan(1.0);
         grad[0] = pi*cos(pi*globalPos[0])*sin(pi*globalPos[1]);
         grad[1] = pi*cos(pi*globalPos[1])*sin(pi*globalPos[0]);
 
         return grad;
-        }
+    }
 
     Scalar integratedSource_(const Element& element, int integrationPoints) const
     {

test/decoupled/1p/test_diffusionproblem.hh

@@ -52,11 +52,9 @@ namespace Properties
 //// set the types for the 2PFA FV method
 NEW_TYPE_TAG(FVVelocity2PTestProblem, INHERITS_FROM(FVPressureTwoP, TestDiffusionSpatialParams));
 SET_TYPE_PROP(FVVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TypeTag>);
+
 // Set the grid type
-SET_PROP(FVVelocity2PTestProblem, Grid)
-{
-    typedef Dune::YaspGrid<2> type;
-};
+SET_TYPE_PROP(FVVelocity2PTestProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the wetting phase
 SET_PROP(FVVelocity2PTestProblem, WettingPhase)
@@ -87,10 +85,7 @@ SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, Dumux::SSORBiCGSTABBac
 SET_INT_PROP(FVMPFAOVelocity2PTestProblem, LinearSolverPreconditionerIterations, 2);
 SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TypeTag>);
 // Set the grid type
-SET_PROP(FVMPFAOVelocity2PTestProblem, Grid)
-{
-    typedef Dune::YaspGrid<2> type;
-};
+SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the wetting phase
 SET_PROP(FVMPFAOVelocity2PTestProblem, WettingPhase)
@@ -118,10 +113,7 @@ NEW_TYPE_TAG(MimeticPressure2PTestProblem, INHERITS_FROM(MimeticPressureTwoP, Te
 SET_TYPE_PROP(MimeticPressure2PTestProblem, Problem, Dumux::TestDiffusionProblem<TypeTag>);
 
 // Set the grid type
-SET_PROP(MimeticPressure2PTestProblem, Grid)
-{
-    typedef Dune::YaspGrid<2> type;
-};
+SET_TYPE_PROP(MimeticPressure2PTestProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the wetting phase
 SET_PROP(MimeticPressure2PTestProblem, WettingPhase)

test/decoupled/1p/test_diffusionproblem3d.hh

@@ -260,7 +260,7 @@ public:
     }
 
     Dune::FieldVector<Scalar,dim> exactGrad (const GlobalPosition& globalPos) const
-        {
+    {
         Dune::FieldVector<Scalar,dim> grad(0);
         double pi = 4.0*atan(1.0);
         grad[0] = pi*cos(pi*globalPos[0])*sin(pi*(globalPos[1]+1.0/2.0))*sin(pi*(globalPos[2]+1.0/3.0));
@@ -268,7 +268,8 @@ public:
         grad[2] = pi*sin(pi*globalPos[0])*sin(pi*(globalPos[1]+1.0/2.0))*cos(pi*(globalPos[2]+1.0/3.0));
 
         return grad;
-        }
+    }
+    
 private:
     Dumux::FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
     static constexpr Scalar eps_ = 1e-4;

test/decoupled/2p/test_3d2pproblem.hh

@@ -47,8 +47,8 @@
 
 #include "test_3d2pspatialparams.hh"
 
-#include<dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
-#include<dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh>
+#include <dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
+#include <dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh>
 
 
 namespace Dumux
@@ -64,18 +64,10 @@ namespace Properties
 NEW_TYPE_TAG(ThreeDTwoPTestProblem, INHERITS_FROM(Test3d2pSpatialParams));
 
 // Set the grid type
-SET_PROP(ThreeDTwoPTestProblem, Grid)
-{
-//     typedef Dune::UGGrid<3> type;
-    typedef Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming> type;
-};
+SET_TYPE_PROP(ThreeDTwoPTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
 
 // Set the problem property
-SET_PROP(ThreeDTwoPTestProblem, Problem)
-{
-public:
-    typedef Dumux::Test3D2PProblem<TypeTag> type;
-};
+SET_TYPE_PROP(ThreeDTwoPTestProblem, Problem, Dumux::Test3D2PProblem<TypeTag>);
 
 // Set the wetting phase
 SET_PROP(ThreeDTwoPTestProblem, WettingPhase)

test/decoupled/2p/test_impesadaptiveproblem.hh

@@ -58,10 +58,7 @@ namespace Properties
 NEW_TYPE_TAG(TestIMPESAdaptiveProblem, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, TestIMPESAdaptiveSpatialParams));
 
 // Set the grid type
-SET_PROP(TestIMPESAdaptiveProblem, Grid)
-{
-    typedef Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming> type;
-};
+SET_TYPE_PROP(TestIMPESAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 
 // set the GridCreator property
 SET_TYPE_PROP(TestIMPESAdaptiveProblem, GridCreator, CubeGridCreator<TypeTag>);

test/decoupled/2p/test_impesproblem.hh

@@ -24,10 +24,6 @@
 #ifndef DUMUX_TEST_IMPES_PROBLEM_HH
 #define DUMUX_TEST_IMPES_PROBLEM_HH
 
-#if HAVE_UG
-#include <dune/grid/uggrid.hh>
-#endif
-
 #include <dune/grid/yaspgrid.hh>
 #include <dumux/io/cubegridcreator.hh>
 
@@ -68,14 +64,7 @@ NEW_TYPE_TAG(IMPESTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IM
 SET_TYPE_PROP(IMPESTestProblem, GridCreator, Dumux::CubeGridCreator<TypeTag>);
 
 // Set the grid type
-SET_PROP(IMPESTestProblem, Grid)
-{
-#if 0//HAVE_UG
-    typedef Dune::UGGrid<2> type;
-#else
-    typedef Dune::YaspGrid<2> type;
-#endif
-};
+SET_TYPE_PROP(IMPESTestProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
 SET_TYPE_PROP(IMPESTestProblem, Problem, Dumux::IMPESTestProblem<TypeTag>);

test/decoupled/2p/test_mpfa2pproblem.hh

@@ -45,8 +45,8 @@
 #include <dumux/decoupled/2p/impes/impesproblem2p.hh>
 
 
-#include<dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
-#include<dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh>
+#include <dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
+#include <dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh>
 
 #include "test_mpfa2pspatialparams.hh"
 #include "buckleyleverettanalyticsolution.hh"
@@ -67,10 +67,7 @@ namespace Properties
 NEW_TYPE_TAG(MPFATwoPTestProblem, INHERITS_FROM(Test2PSpatialParams));
 
 // Set the grid type
-SET_PROP(MPFATwoPTestProblem, Grid)
-{
-    typedef Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming> type;
-};
+SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 
 #if PROBLEM == 2
 //set the GridCreator property
@@ -79,11 +76,7 @@ SET_TYPE_PROP(MPFATwoPTestProblem, GridCreator, CubeGridCreator<TypeTag>);
 
 
 // Set the problem property
-SET_PROP(MPFATwoPTestProblem, Problem)
-{
-public:
-    typedef Dumux::MPFATwoPTestProblem<TypeTag> type;
-};
+SET_TYPE_PROP(MPFATwoPTestProblem, Problem, Dumux::MPFATwoPTestProblem<TypeTag>);
 
 // Set the wetting phase
 SET_PROP(MPFATwoPTestProblem, WettingPhase)

test/decoupled/2p/test_transportproblem.hh

@@ -24,6 +24,7 @@
 #ifndef DUMUX_TEST_TRANSPORT_PROBLEM_HH
 #define DUMUX_TEST_TRANSPORT_PROBLEM_HH
 
+#include <dune/grid/yaspgrid.hh>
 #include <dune/grid/io/file/dgfparser/dgfyasp.hh>
 
 #include <dumux/material/fluidsystems/liquidphase.hh>
@@ -49,17 +50,10 @@ NEW_TYPE_TAG(TransportTestProblem, INHERITS_FROM(FVTransportTwoP, TestTransportS
 
 
 // Set the grid type
-SET_PROP(TransportTestProblem, Grid)
-{
-    typedef Dune::YaspGrid<2> type;
-};
+SET_TYPE_PROP(TransportTestProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_PROP(TransportTestProblem, Problem)
-{
-public:
-    typedef Dumux::TestTransportProblem<TypeTag> type;
-};
+SET_TYPE_PROP(TransportTestProblem, Problem, Dumux::TestTransportProblem<TypeTag>);
 
 // Set the wetting phase
 SET_PROP(TransportTestProblem, WettingPhase)

test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh

@@ -53,31 +53,16 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c2d, INHERITS_FROM(DecoupledTwoPTwoCAdaptive,Test2P2CSpatialParams));
 
 // Set the grid type
-SET_PROP(Adaptive2p2c2d, Grid)
-{
-#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
-    typedef Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming> type;
-// #elseif HAVE_UG
-//     typedef Dune::UGGrid<2> type; //would need a DGF file to specify closure
-#endif
-    
-};
+SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
+
 // set the GridCreator property
 SET_TYPE_PROP(Adaptive2p2c2d, GridCreator, CubeGridCreator<TypeTag>);
 
 // Set the problem property
-SET_PROP(Adaptive2p2c2d, Problem)
-{
-    typedef Dumux::Adaptive2p2c2d<TTAG(Adaptive2p2c2d)> type;
-};
+SET_TYPE_PROP(Adaptive2p2c2d, Problem, Dumux::Adaptive2p2c2d<TTAG(Adaptive2p2c2d)>);
 
 // Select fluid system
-SET_PROP(Adaptive2p2c2d, FluidSystem)
-{
-    typedef Dumux::H2OAirFluidSystem<TypeTag> type;
-//    typedef Dumux::H2ON2FluidSystem<TypeTag> type;
-//    typedef Dumux::Brine_CO2_System<TypeTag, Dumux::Benchmark3::CO2Tables> type;
-};
+SET_TYPE_PROP(Adaptive2p2c2d, FluidSystem, Dumux::H2OAirFluidSystem<TypeTag>);
 
 // Set the 2d Transport and Pressure model (already set as default in properties file)
 SET_TYPE_PROP(Adaptive2p2c2d, TransportModel, FV2dTransport2P2CAdaptive<TypeTag>);
@@ -89,17 +74,16 @@ SET_BOOL_PROP(Adaptive2p2c2d, EnableComplicatedFluidSystem, true);
 SET_PROP(Adaptive2p2c2d, Components) : public GET_PROP(TypeTag, DefaultComponents)
 {
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-//    typedef Dumux::TabulatedComponent<Scalar, typename Dumux::H2O<Scalar> > H20;
-        typedef Dumux::H2O<Scalar> H2O;
+    typedef Dumux::H2O<Scalar> H2O;
 };
+
 // Specify indicator
 SET_TYPE_PROP(Adaptive2p2c2d, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
 
 // Enable gravity
 SET_BOOL_PROP(Adaptive2p2c2d, ProblemEnableGravity, true);
 SET_BOOL_PROP(Adaptive2p2c2d, EnableCapillarity, true);
-SET_INT_PROP(Adaptive2p2c2d, PressureFormulation,
-        GET_PROP_TYPE(TypeTag, Indices)::pressureN);
+SET_INT_PROP(Adaptive2p2c2d, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
 
 }
 
@@ -165,43 +149,8 @@ Adaptive2p2c2d(TimeManager &timeManager, const GridView& gridView) :
     std::string s = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, SimulationName);
     this->setName(s.c_str());
     this->setOutputInterval(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Problem, OutputInterval));
-    // initialize the tables of the fluid system
-//    WaterFormulation::init(273.15, 623.15, 100,
-//                            -10,   20e6, 200);
-//    FluidSystem::init();
 }
 
-//void preTimeStep()
-//{
-//    ParentType::preTimeStep();
-//            // use second writer
-//            debugWriter_.gridChanged();
-//            // write
-//            debugWriter_.beginWrite(this->timeManager().time());
-//            //write stuff out
-//            typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes))::ScalarSolution ScalarSolutionType;
-//            typedef typename GET_PROP_TYPE(TypeTag, PTAG(CellData)) CellData;
-//            int size = this->gridView().size(0);
-//            ScalarSolutionType *pressureW = debugWriter_.allocateManagedBuffer (size);
-//            ScalarSolutionType *pressureN = debugWriter_.allocateManagedBuffer (size);
-//            ScalarSolutionType *totalConcentration1 = debugWriter_.allocateManagedBuffer (size);
-//            ScalarSolutionType *totalConcentration2 = debugWriter_.allocateManagedBuffer (size);
-//            for (int i = 0; i < size; i++)
-//            {
-//                CellData& cellData = this->variables().cellData(i);
-//                (*pressureW)[i] = cellData.pressure(wPhaseIdx);
-//                (*pressureN)[i] = cellData.pressure(nPhaseIdx);
-//                (*totalConcentration1)[i] = cellData.massConcentration(wPhaseIdx);
-//                (*totalConcentration2)[i] = cellData.massConcentration(nPhaseIdx);
-//            }
-//            debugWriter_.attachCellData(*pressureW, "wetting pressure");
-//            debugWriter_.attachCellData(*pressureN, "nonwetting pressure");
-//            debugWriter_.attachCellData(*totalConcentration1, "C^w from cellData");
-//            debugWriter_.attachCellData(*totalConcentration2, "C^n from cellData");
-//            debugWriter_.endWrite();
-//            return;
-//}
-
 /*!
  * \name Problem parameters
  */

test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh

@@ -51,57 +51,21 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c3d, INHERITS_FROM(DecoupledTwoPTwoCAdaptive,Test2P2CSpatialParams, MPFAProperties));
 
 // Set the grid type
-SET_PROP(Adaptive2p2c3d, Grid)
-{
-    typedef  Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming> type;
-};
+SET_TYPE_PROP(Adaptive2p2c3d, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
+
 // set the GridCreator property
 SET_TYPE_PROP(Adaptive2p2c3d, GridCreator, CubeGridCreator<TypeTag>);
 
 // Set the problem property
-SET_PROP(Adaptive2p2c3d, Problem)
-{
-    typedef Dumux::Adaptive2p2c3d<TTAG(Adaptive2p2c3d)> type;
-};
+SET_TYPE_PROP(Adaptive2p2c3d, Problem, Dumux::Adaptive2p2c3d<TTAG(Adaptive2p2c3d)>);
 
 // Set the model properties
-SET_PROP(Adaptive2p2c3d, TransportModel)
-{
-    typedef Dumux::FV3dTransport2P2CAdaptive<TTAG(Adaptive2p2c3d)> type;
-};
+SET_TYPE_PROP(Adaptive2p2c3d, TransportModel, Dumux::FV3dTransport2P2CAdaptive<TTAG(Adaptive2p2c3d)>);
 
-SET_PROP(Adaptive2p2c3d, PressureModel)
-{
-    typedef Dumux::FV3dPressure2P2CAdaptive<TTAG(Adaptive2p2c3d)> type;
-};
-//// Set the default material law
-//SET_PROP(Adaptive2p2c3d, MaterialLaw)
-//{
-//private:
-//    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-//    typedef LinearMaterial<Scalar> RawMaterialLaw;
-//public:
-//    typedef EffToAbsLaw<RawMaterialLaw> type;
-//
-//    typedef typename type::Params MaterialLawParams;
-//    static MaterialLawParams *create(Dune::ParameterTree inputParameters)
-//    {
-//        static MaterialLawParams materialLawParams_;
-//        // residual saturations
-//        materialLawParams_.setSwr(inputParameters.template get<Scalar>("SpatialParameters.Swr", 0.));
-//        materialLawParams_.setSnr(inputParameters.template get<Scalar>("SpatialParameters.Snr", 0.));
-//
-//        materialLawParams_.setEntryPc(inputParameters.template get<Scalar>("SpatialParameters.EntryPC", 0.));
-//        materialLawParams_.setMaxPc(inputParameters.template get<Scalar>("SpatialParameters.MaxPC", 10000.));
-//        return &materialLawParams_;
-//    }
-//};
+SET_TYPE_PROP(Adaptive2p2c3d, PressureModel, Dumux::FV3dPressure2P2CAdaptive<TTAG(Adaptive2p2c3d)>);
 
 // Select fluid system
-SET_PROP(Adaptive2p2c3d, FluidSystem)
-{
-    typedef Dumux::H2OAirFluidSystem<TypeTag> type;
-};
+SET_TYPE_PROP(Adaptive2p2c3d, FluidSystem, Dumux::H2OAirFluidSystem<TypeTag>);
 
 SET_BOOL_PROP(Adaptive2p2c3d, EnableComplicatedFluidSystem, false);
 
@@ -109,8 +73,7 @@ SET_BOOL_PROP(Adaptive2p2c3d, EnableComplicatedFluidSystem, false);
 SET_PROP(Adaptive2p2c3d, Components) : public GET_PROP(TypeTag, DefaultComponents)
 {
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-//    typedef Dumux::TabulatedComponent<Scalar, typename Dumux::H2O<Scalar> > H20;
-        typedef Dumux::H2O<Scalar> H2O;
+    typedef Dumux::H2O<Scalar> H2O;
 };
 
 // Specify indicator
@@ -120,8 +83,8 @@ SET_TYPE_PROP(Adaptive2p2c3d, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag
 SET_BOOL_PROP(Adaptive2p2c3d, ProblemEnableGravity, true);
 SET_BOOL_PROP(Adaptive2p2c3d, EnableCapillarity, true);
 SET_BOOL_PROP(Adaptive2p2c3d, AdaptiveGrid, true);
-SET_INT_PROP(Adaptive2p2c3d, PressureFormulation,
-        GET_PROP_TYPE(TypeTag, Indices)::pressureN);
+SET_INT_PROP(Adaptive2p2c3d, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
+
 }
 
 /*!
@@ -184,51 +147,14 @@ Adaptive2p2c3d(TimeManager &timeManager, const GridView& gridView) :
     GridCreator::grid().globalRefine(GET_PARAM_FROM_GROUP(TypeTag, int, GridAdapt, MaxLevel));
     this->setGrid(GridCreator::grid());
 
-    /*** Process parameter file ********/
-
-    // b) Simulation Control
+    //Process parameter file 
+    //Simulation Control
     const int outputInterval = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Problem, OutputInterval);
     this->setOutputInterval(outputInterval);
 
     injectionrate_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, double, BoundaryConditions, Injectionrate);
-
-    // initialize the tables of the fluid system
-//    WaterFormulation::init(273.15, 623.15, 100,
-//                            -10,   20e6, 200);
-//    FluidSystem::init();
 }
 
-//void preTimeStep()
-//{
-//    ParentType::preTimeStep();
-//            // use second writer
-//            debugWriter_.gridChanged();
-//            // write
-//            debugWriter_.beginWrite(this->timeManager().time());
-//            //write stuff out
-//            typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes))::ScalarSolution ScalarSolutionType;
-//            typedef typename GET_PROP_TYPE(TypeTag, PTAG(CellData)) CellData;
-//            int size = this->gridView().size(0);
-//            ScalarSolutionType *pressureW = debugWriter_.allocateManagedBuffer (size);
-//            ScalarSolutionType *pressureN = debugWriter_.allocateManagedBuffer (size);
-//            ScalarSolutionType *totalConcentration1 = debugWriter_.allocateManagedBuffer (size);
-//            ScalarSolutionType *totalConcentration2 = debugWriter_.allocateManagedBuffer (size);
-//            for (int i = 0; i < size; i++)
-//            {
-//                CellData& cellData = this->variables().cellData(i);
-//                (*pressureW)[i] = cellData.pressure(wPhaseIdx);
-//                (*pressureN)[i] = cellData.pressure(nPhaseIdx);
-//                (*totalConcentration1)[i] = cellData.massConcentration(wPhaseIdx);
-//                (*totalConcentration2)[i] = cellData.massConcentration(nPhaseIdx);
-//            }
-//            debugWriter_.attachCellData(*pressureW, "wetting pressure");
-//            debugWriter_.attachCellData(*pressureN, "nonwetting pressure");
-//            debugWriter_.attachCellData(*totalConcentration1, "C^w from cellData");
-//            debugWriter_.attachCellData(*totalConcentration2, "C^n from cellData");
-//            debugWriter_.endWrite();
-//            return;
-//}
-
 /*!
  * \name Problem parameters
  */

test/decoupled/2p2c/test_dec2p2c_spatialparams.hh

@@ -27,7 +27,6 @@
 #include <dumux/decoupled/2p2c/2p2cproperties.hh>
 #include <dumux/material/spatialparams/fvspatialparams.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
-//#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
 namespace Dumux
@@ -49,7 +48,6 @@ SET_PROP(Test2P2CSpatialParams, MaterialLaw)
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-    //    typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw;
     typedef LinearMaterial<Scalar>         RawMaterialLaw;
 public:
     typedef EffToAbsLaw<RawMaterialLaw> type;
@@ -102,16 +100,6 @@ public:
         materialLawParams_.setSwr(0);
         materialLawParams_.setSnr(0);
 
-//        // parameters for the Brooks-Corey Law
-//        // entry pressures
-//        materialLawParams_.setPe(10000);
-//
-//        // Brooks-Corey shape parameters
-//        materialLawParams_.setLambda(2);
-
-        // parameters for the linear
-        // entry pressures function
-
         materialLawParams_.setEntryPc(0);
         materialLawParams_.setMaxPc(10000);
 

test/decoupled/2p2c/test_dec2p2cproblem.hh

@@ -32,7 +32,6 @@
 #include <dumux/decoupled/2p2c/fvtransport2p2c.hh>
 
 // fluid properties