[3p][properties] add the new properties and delete deprecated ones

dumux/porousmediumflow/3p/implicit/properties.hh

@@ -28,7 +28,7 @@
 #define DUMUX_3P_PROPERTIES_HH
 
 #include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
+#include <dumux/implicit/cellcentered/tpfa/properties.hh>
 #include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
 
 namespace Dumux
@@ -42,12 +42,12 @@ namespace Properties
 //! The type tags for the implicit isothermal one-phase two-component problems
 NEW_TYPE_TAG(ThreeP);
 NEW_TYPE_TAG(BoxThreeP, INHERITS_FROM(BoxModel, ThreeP));
-NEW_TYPE_TAG(CCThreeP, INHERITS_FROM(CCModel, ThreeP));
+NEW_TYPE_TAG(CCThreeP, INHERITS_FROM(CCTpfaModel, ThreeP));
 
 //! The type tags for the corresponding non-isothermal problems
 NEW_TYPE_TAG(ThreePNI, INHERITS_FROM(ThreeP, NonIsothermal));
 NEW_TYPE_TAG(BoxThreePNI, INHERITS_FROM(BoxModel, ThreePNI));
-NEW_TYPE_TAG(CCThreePNI, INHERITS_FROM(CCModel, ThreePNI));
+NEW_TYPE_TAG(CCThreePNI, INHERITS_FROM(CCTpfaModel, ThreePNI));
 
 
 //////////////////////////////////////////////////////////////////
@@ -66,7 +66,6 @@ NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extrac
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
 NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
 NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
-NEW_PROP_TAG(BaseFluxVariables); //! The base flux variables
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
 NEW_PROP_TAG(VtkAddVelocity); //!< Returns whether velocity vectors are written into the vtk output
 }

dumux/porousmediumflow/3p/implicit/propertydefaults.hh

@@ -80,15 +80,21 @@ SET_TYPE_PROP(ThreeP, MaterialLawParams, typename GET_PROP_TYPE(TypeTag, Materia
 //! The local residual function of the conservation equations
 SET_TYPE_PROP(ThreeP, LocalResidual, ThreePLocalResidual<TypeTag>);
 
+//! Enable advection
+SET_BOOL_PROP(ThreeP, EnableAdvection, true);
+
+//! disable molecular diffusion for the 3p model
+SET_BOOL_PROP(ThreeP, EnableMolecularDiffusion, false);
+
+//! Isothermal model by default
+SET_BOOL_PROP(ThreeP, EnableEnergyBalance, false);
+
 //! the Model property
 SET_TYPE_PROP(ThreeP, Model, ThreePModel<TypeTag>);
 
 //! the VolumeVariables property
 SET_TYPE_PROP(ThreeP, VolumeVariables, ThreePVolumeVariables<TypeTag>);
 
-//! the FluxVariables property
-SET_TYPE_PROP(ThreeP, FluxVariables, ImplicitDarcyFluxVariables<TypeTag>);
-
 //! the upwind factor for the mobility.
 SET_SCALAR_PROP(ThreeP, ImplicitMassUpwindWeight, 1.0);
 
@@ -137,9 +143,6 @@ SET_BOOL_PROP(ThreePNI, NiOutputLevel, 0);
 // set isothermal Model
 SET_TYPE_PROP(ThreePNI, IsothermalModel, ThreePModel<TypeTag>);
 
-// set isothermal FluxVariables
-SET_TYPE_PROP(ThreePNI, IsothermalFluxVariables, ImplicitDarcyFluxVariables<TypeTag>);
-
 //set isothermal VolumeVariables
 SET_TYPE_PROP(ThreePNI, IsothermalVolumeVariables, ThreePVolumeVariables<TypeTag>);