diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh index 6b3f3507b840d005fc9c54874d0bb26da7b95cce..5f6917279214592bfb2890764b3fda857d7afecb 100644 --- a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh +++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh @@ -48,7 +48,7 @@ NEW_TYPE_TAG(LensOnePTwoCProblem, INHERITS_FROM(BoxOnePTwoC)); SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(LensOnePTwoCProblem, Problem, Dumux::LensOnePTwoCProblem); +SET_TYPE_PROP(LensOnePTwoCProblem, Problem, LensOnePTwoCProblem); // Set fluid configuration SET_PROP(LensOnePTwoCProblem, FluidSystem) @@ -56,11 +56,11 @@ SET_PROP(LensOnePTwoCProblem, FluidSystem) typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; static const bool useComplexRelations = false; public: - typedef Dumux::FluidSystems::H2ON2 type; + typedef FluidSystems::H2ON2 type; }; // Set the spatial parameters -SET_TYPE_PROP(LensOnePTwoCProblem, SpatialParams, Dumux::Lens1p2cSpatialParams); +SET_TYPE_PROP(LensOnePTwoCProblem, SpatialParams, Lens1p2cSpatialParams); // Enable partial reassembly of the jacobian matrix? SET_BOOL_PROP(LensOnePTwoCProblem, ImplicitEnablePartialReassemble, false); diff --git a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh index 3fc373284fd808284119788ab5471a4880749b76..946bfdaadc21651d6cfb1c7edfaa8c5f4c1f6177 100644 --- a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh +++ b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh @@ -48,7 +48,7 @@ NEW_TYPE_TAG(LensTwoPTwoCProblem, INHERITS_FROM(BoxTwoPTwoC, Lens2pSpatialParams SET_TYPE_PROP(LensTwoPTwoCProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(LensTwoPTwoCProblem, Problem, Dumux::LensTwoPTwoCProblem); +SET_TYPE_PROP(LensTwoPTwoCProblem, Problem, LensTwoPTwoCProblem); // Set fluid configuration SET_PROP(LensTwoPTwoCProblem, FluidSystem) @@ -56,7 +56,7 @@ SET_PROP(LensTwoPTwoCProblem, FluidSystem) typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; static const bool useComplexRelations = false; public: - typedef Dumux::FluidSystems::H2ON2 type; + typedef FluidSystems::H2ON2 type; }; // Enable gravity diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh index 5e739b9964864ca7c99b1042a61dd49926bf55a8..fa8606c1b5511c37989e4586b9e3032f6926a763 100644 --- a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh +++ b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh @@ -58,17 +58,17 @@ SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem); SET_PROP(LensTwoPProblem, WettingPhase) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; -public: typedef Dumux::FluidSystems::LiquidPhase > type; +public: typedef FluidSystems::LiquidPhase > type; }; // Set the non-wetting phase SET_PROP(LensTwoPProblem, NonwettingPhase) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; -public: typedef Dumux::GasPhase > type; +public: typedef FluidSystems::GasPhase > type; }; -SET_TYPE_PROP(LensTwoPProblem, FluidSystem, Dumux::TwoPImmiscibleFluidSystem); +SET_TYPE_PROP(LensTwoPProblem, FluidSystem, TwoPImmiscibleFluidSystem); // Enable partial reassembly of the jacobian matrix? SET_BOOL_PROP(LensTwoPProblem, ImplicitEnablePartialReassemble, false); diff --git a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh index 5002fb180ac5b7db9e9f6eb546c6654a9bd4e656..de91227a7f61ad3311d34ca663662e7eb37406e5 100644 --- a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh +++ b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh @@ -48,13 +48,13 @@ NEW_TYPE_TAG(LensOnePTwoCProblem, INHERITS_FROM(BoxOnePTwoC)); SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(LensOnePTwoCProblem, Problem, Dumux::LensOnePTwoCProblem); +SET_TYPE_PROP(LensOnePTwoCProblem, Problem, LensOnePTwoCProblem); // set fluid system -SET_TYPE_PROP(LensOnePTwoCProblem, FluidSystem, Dumux::H2ON2FluidSystem); +SET_TYPE_PROP(LensOnePTwoCProblem, FluidSystem, H2ON2FluidSystem); // Set the spatial parameters -SET_TYPE_PROP(LensOnePTwoCProblem, SpatialParams, Dumux::Lens1p2cSpatialParams); +SET_TYPE_PROP(LensOnePTwoCProblem, SpatialParams, Lens1p2cSpatialParams); // Enable partial reassembly of the jacobian matrix? SET_BOOL_PROP(LensOnePTwoCProblem, ImplicitEnablePartialReassemble, false); diff --git a/lecture/efm/1p2cvs2p/lens2pproblem.hh b/lecture/efm/1p2cvs2p/lens2pproblem.hh index a523f314e2d2f99a973c4e4df3849cd2075816d5..4912e25dd8703d19553fe63dfd1dcbbe27866aca 100644 --- a/lecture/efm/1p2cvs2p/lens2pproblem.hh +++ b/lecture/efm/1p2cvs2p/lens2pproblem.hh @@ -56,17 +56,17 @@ SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem); SET_PROP(LensTwoPProblem, WettingPhase) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; -public: typedef Dumux::FluidSystems::LiquidPhase > type; +public: typedef FluidSystems::LiquidPhase > type; }; // Set the non-wetting phase SET_PROP(LensTwoPProblem, NonwettingPhase) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; -public: typedef Dumux::FluidSystems::LiquidPhase > type; +public: typedef FluidSystems::LiquidPhase > type; }; -SET_TYPE_PROP(LensTwoPProblem, FluidSystem, Dumux::TwoPImmiscibleFluidSystem); +SET_TYPE_PROP(LensTwoPProblem, FluidSystem, TwoPImmiscibleFluidSystem); // Enable partial reassembly of the jacobian matrix? SET_BOOL_PROP(LensTwoPProblem, ImplicitEnablePartialReassemble, false); diff --git a/lecture/efm/2p/lens2pproblem.hh b/lecture/efm/2p/lens2pproblem.hh index 7164bf3788827c2a611d05f755d891ea5bf92f56..eb08a7a66856cd7342afe268f7856820c56ca356 100644 --- a/lecture/efm/2p/lens2pproblem.hh +++ b/lecture/efm/2p/lens2pproblem.hh @@ -57,17 +57,19 @@ SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem); SET_PROP(LensTwoPProblem, WettingPhase) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; -public: typedef Dumux::FluidSystems::LiquidPhase > type; + +public: typedef FluidSystems::LiquidPhase > type; }; // Set the non-wetting phase SET_PROP(LensTwoPProblem, NonwettingPhase) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; -public: typedef Dumux::FluidSystems::LiquidPhase > type; + +public: typedef FluidSystems::LiquidPhase > type; }; -SET_TYPE_PROP(LensTwoPProblem, FluidSystem, Dumux::TwoPImmiscibleFluidSystem); +SET_TYPE_PROP(LensTwoPProblem, FluidSystem, TwoPImmiscibleFluidSystem); // Enable gravity SET_BOOL_PROP(LensTwoPProblem, ProblemEnableGravity, true); diff --git a/lecture/mhs/groundwater/groundwaterproblem.hh b/lecture/mhs/groundwater/groundwaterproblem.hh index 55a5a7910d016f6e3b6cfbb6e1337bd69d8ea982..ff3aaf65ff14e32d0d7d8bc60ebaa69749e238df 100644 --- a/lecture/mhs/groundwater/groundwaterproblem.hh +++ b/lecture/mhs/groundwater/groundwaterproblem.hh @@ -54,7 +54,7 @@ SET_PROP(GroundwaterProblem, Fluid) private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; public: - typedef Dumux::FluidSystems::LiquidPhase > type; + typedef FluidSystems::LiquidPhase > type; }; // Set the spatial parameters diff --git a/lecture/mm/buckleyleverett/buckleyleverettproblem.hh b/lecture/mm/buckleyleverett/buckleyleverettproblem.hh index fb7b5708aee8df5b570001c783344cb3f2650254..1ccc3702095c2b8021899b1775d39e88721ed653 100644 --- a/lecture/mm/buckleyleverett/buckleyleverettproblem.hh +++ b/lecture/mm/buckleyleverett/buckleyleverettproblem.hh @@ -50,7 +50,7 @@ NEW_TYPE_TAG(BuckleyLeverettProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTw SET_TYPE_PROP(BuckleyLeverettProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(BuckleyLeverettProblem, Problem, Dumux::BuckleyLeverettProblem); +SET_TYPE_PROP(BuckleyLeverettProblem, Problem, BuckleyLeverettProblem); // Set the wetting phase SET_PROP(BuckleyLeverettProblem, WettingPhase) @@ -58,7 +58,7 @@ SET_PROP(BuckleyLeverettProblem, WettingPhase) private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; public: - typedef Dumux::FluidSystems::LiquidPhase > type; + typedef FluidSystems::LiquidPhase > type; }; // Set the non-wetting phase @@ -67,14 +67,14 @@ SET_PROP(BuckleyLeverettProblem, NonwettingPhase) private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; public: - typedef Dumux::FluidSystems::LiquidPhase > type; + typedef FluidSystems::LiquidPhase > type; }; // Disable gravity SET_BOOL_PROP(BuckleyLeverettProblem, ProblemEnableGravity, false); -SET_TYPE_PROP(BuckleyLeverettProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats); -SET_INT_PROP(BuckleyLeverettProblem, Formulation, SequentialTwoPCommonIndices::pwsw); +SET_TYPE_PROP(BuckleyLeverettProblem, EvalCflFluxFunction, EvalCflFluxCoats); +SET_INT_PROP(BuckleyLeverettProblem, Formulation, DecoupledTwoPCommonIndices::pwsw); SET_SCALAR_PROP(BuckleyLeverettProblem, ImpetCFLFactor, 0.95); } diff --git a/lecture/mm/co2plume/co2plumeshapeproblem.hh b/lecture/mm/co2plume/co2plumeshapeproblem.hh index 92095f7a0b25536e02687504375b6e8bc755da74..7e47f565afd38f81ce393f4436e5b35a333fb9e1 100644 --- a/lecture/mm/co2plume/co2plumeshapeproblem.hh +++ b/lecture/mm/co2plume/co2plumeshapeproblem.hh @@ -54,13 +54,13 @@ NEW_TYPE_TAG(PlumeShapeProblem, INHERITS_FROM(BoxTwoPTwoCNI, PlumeShapeSpatialPa SET_TYPE_PROP(PlumeShapeProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(PlumeShapeProblem, Problem, Dumux::PlumeShapeProblem); +SET_TYPE_PROP(PlumeShapeProblem, Problem, PlumeShapeProblem); // Set fluid configuration -SET_TYPE_PROP(PlumeShapeProblem, FluidSystem, Dumux::BrineCO2FluidSystem); +SET_TYPE_PROP(PlumeShapeProblem, FluidSystem, BrineCO2FluidSystem); // Set the CO2 table to be used; in this case not the the default table -SET_TYPE_PROP(PlumeShapeProblem, CO2Table, Dumux::CO2TablesBenchmarkThree::CO2Tables); +SET_TYPE_PROP(PlumeShapeProblem, CO2Table, CO2TablesBenchmarkThree::CO2Tables); // Set the salinity mass fraction of the brine in the reservoir SET_SCALAR_PROP(PlumeShapeProblem, ProblemSalinity, 1e-1); diff --git a/lecture/mm/columnxylene/columnxyleneproblem.hh b/lecture/mm/columnxylene/columnxyleneproblem.hh index 0085062a5442dd1a2070baf9e90ffb908677a2e2..911a6078fb467b961d1e49a58bad5311544fdf23 100644 --- a/lecture/mm/columnxylene/columnxyleneproblem.hh +++ b/lecture/mm/columnxylene/columnxyleneproblem.hh @@ -48,12 +48,12 @@ NEW_TYPE_TAG(ColumnProblem, INHERITS_FROM(BoxThreePThreeCNI, ColumnSpatialParams SET_TYPE_PROP(ColumnProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(ColumnProblem, Problem, Dumux::ColumnProblem); +SET_TYPE_PROP(ColumnProblem, Problem, ColumnProblem); // Set the fluid system SET_TYPE_PROP(ColumnProblem, FluidSystem, - Dumux::FluidSystems::H2OAirXylene); + FluidSystems::H2OAirXylene); // Enable gravity SET_BOOL_PROP(ColumnProblem, ProblemEnableGravity, true); diff --git a/lecture/mm/convectivemixing/convmixproblem.hh b/lecture/mm/convectivemixing/convmixproblem.hh index c3ce7727b915966a0b18a2932e18838e1ea2f436..42e6ad7e75f7a96a15294067e66fa52018ee1e6e 100644 --- a/lecture/mm/convectivemixing/convmixproblem.hh +++ b/lecture/mm/convectivemixing/convmixproblem.hh @@ -43,10 +43,10 @@ NEW_TYPE_TAG(ConvectiveMixingProblem, INHERITS_FROM(BoxOnePTwoC, ConvMixSpatialP SET_TYPE_PROP(ConvectiveMixingProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(ConvectiveMixingProblem, Problem, Dumux::ConvectiveMixingProblem); +SET_TYPE_PROP(ConvectiveMixingProblem, Problem, ConvectiveMixingProblem); // Set fluid configuration -SET_TYPE_PROP(ConvectiveMixingProblem, FluidSystem,Dumux::BrineCO2FluidSystem); +SET_TYPE_PROP(ConvectiveMixingProblem, FluidSystem,BrineCO2FluidSystem); //! The constant tau function is used for the effective diffusivity SET_PROP(ConvectiveMixingProblem, EffectiveDiffusivityModel) @@ -58,7 +58,7 @@ public: }; // Set the CO2 table to be used; in this case not the the default table -SET_TYPE_PROP(ConvectiveMixingProblem, CO2Table, Dumux::CO2TablesBenchmarkThree::CO2Tables); +SET_TYPE_PROP(ConvectiveMixingProblem, CO2Table, CO2TablesBenchmarkThree::CO2Tables); //Define whether mole(true) or mass (false) fractions are used SET_BOOL_PROP(ConvectiveMixingProblem, UseMoles, false); diff --git a/lecture/mm/fuelcell/fuelcellproblem.hh b/lecture/mm/fuelcell/fuelcellproblem.hh index 9dd1fa35d615f565a1dc73b1fd2fc1de17af4901..05c468a8bbca44e2d73a49bc27717b0d9b87ae2e 100644 --- a/lecture/mm/fuelcell/fuelcellproblem.hh +++ b/lecture/mm/fuelcell/fuelcellproblem.hh @@ -56,7 +56,7 @@ NEW_TYPE_TAG(FuelCellLectureProblem, INHERITS_FROM(BoxTwoPNCNI, FuelCellLectureS SET_TYPE_PROP(FuelCellLectureProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(FuelCellLectureProblem, Problem, Dumux::FuelCellLectureProblem); +SET_TYPE_PROP(FuelCellLectureProblem, Problem, FuelCellLectureProblem); // Set the primary variable combination for the 2pnc model SET_INT_PROP(FuelCellLectureProblem, Formulation, TwoPNCFormulation::pgSl); @@ -67,7 +67,7 @@ SET_PROP(FuelCellLectureProblem, FluidSystem) typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; static const bool useComplexRelations = true; public: - typedef Dumux::FluidSystems::H2ON2O2 type; + typedef FluidSystems::H2ON2O2 type; }; //define which component balance equation gets replaced by total balance {0,1,2,..,numComponents(none)} diff --git a/lecture/mm/heatpipe/heatpipeproblem.hh b/lecture/mm/heatpipe/heatpipeproblem.hh index 32bb72c0ade0d6f7d5421f7cbe2b4ca8894441e9..0a5abe98d1288427161663b207dd65ecfd021fc1 100644 --- a/lecture/mm/heatpipe/heatpipeproblem.hh +++ b/lecture/mm/heatpipe/heatpipeproblem.hh @@ -46,10 +46,10 @@ NEW_TYPE_TAG(HeatpipeProblem, INHERITS_FROM(BoxTwoPTwoCNI, HeatpipeSpatialParams SET_TYPE_PROP(HeatpipeProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(HeatpipeProblem, Problem, Dumux::HeatpipeProblem); +SET_TYPE_PROP(HeatpipeProblem, Problem, HeatpipeProblem); // Set the fluid system -SET_TYPE_PROP(HeatpipeProblem, FluidSystem, Dumux::FluidSystems::H2OAir); +SET_TYPE_PROP(HeatpipeProblem, FluidSystem, FluidSystems::H2OAir); // Disable gravity SET_BOOL_PROP(HeatpipeProblem, ProblemEnableGravity, false); diff --git a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh index dd72d7e2ef215f26ce89229f91c77aec7cb6ffbc..0e022aa244e2169fea819eebc217a6c0a988b7f7 100644 --- a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh +++ b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh @@ -44,14 +44,14 @@ NEW_TYPE_TAG(Henry1p2cProblem, INHERITS_FROM(BoxOnePTwoC)); SET_TYPE_PROP(Henry1p2cProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(Henry1p2cProblem, Problem, Dumux::Henry1p2cProblem); +SET_TYPE_PROP(Henry1p2cProblem, Problem, Henry1p2cProblem); SET_TYPE_PROP(Henry1p2cProblem, FluidSystem, WaterSaltFluidSystem); // Set the spatial parameters SET_TYPE_PROP(Henry1p2cProblem, SpatialParams, - Dumux::Henry1p2cSpatialParams); + Henry1p2cSpatialParams); //Define whether mole(true) or mass (false) fractions are used SET_BOOL_PROP(Henry1p2cProblem, UseMoles, false); diff --git a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh index bc1609e10e07dda06e82abc3a3890bcc40d71eae..c3ff0bd30c8bcb92cfc2f5cf1dee1e543094efbe 100644 --- a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh +++ b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh @@ -53,7 +53,7 @@ NEW_TYPE_TAG(Henry2pProblem, INHERITS_FROM(BoxTwoP, Henry2pSpatialParams)); SET_TYPE_PROP(Henry2pProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(Henry2pProblem, Problem, Dumux::Henry2pProblem); +SET_TYPE_PROP(Henry2pProblem, Problem, Henry2pProblem); // TODO: remove this macro switch #if 1 @@ -72,7 +72,7 @@ SET_PROP(Henry2pProblem, NonwettingPhase) private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; public: - typedef Dumux::FluidSystems::LiquidPhase > type; + typedef FluidSystems::LiquidPhase > type; }; #else // OR: set the fluid system diff --git a/lecture/mm/mcwhorter/mcwhorterproblem.hh b/lecture/mm/mcwhorter/mcwhorterproblem.hh index 63c52b512c84f55351fe94a0236c27e66716ae6c..32d2b97877f600f45bcd81da829266eb137b4be0 100644 --- a/lecture/mm/mcwhorter/mcwhorterproblem.hh +++ b/lecture/mm/mcwhorter/mcwhorterproblem.hh @@ -49,7 +49,7 @@ NEW_TYPE_TAG(McWhorterProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IM SET_TYPE_PROP(McWhorterProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(McWhorterProblem, Problem, Dumux::McWhorterProblem); +SET_TYPE_PROP(McWhorterProblem, Problem, McWhorterProblem); SET_INT_PROP(McWhorterProblem, Formulation, SequentialTwoPCommonIndices::pnsw); @@ -59,7 +59,7 @@ SET_PROP(McWhorterProblem, WettingPhase) private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; public: - typedef Dumux::FluidSystems::LiquidPhase > type; + typedef FluidSystems::LiquidPhase > type; }; // Set the non-wetting phase @@ -68,7 +68,7 @@ SET_PROP(McWhorterProblem, NonwettingPhase) private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; public: - typedef Dumux::FluidSystems::LiquidPhase > type; + typedef FluidSystems::LiquidPhase > type; }; // Disable gravity diff --git a/lecture/mm/naplinfiltration/3p/problem.hh b/lecture/mm/naplinfiltration/3p/problem.hh index b837ef0e55c4ba105e5640542d419e6100e157a9..a802dee6ed14830002ab08ffa4697721669693d8 100644 --- a/lecture/mm/naplinfiltration/3p/problem.hh +++ b/lecture/mm/naplinfiltration/3p/problem.hh @@ -49,7 +49,7 @@ SET_TYPE_PROP(InfiltrationProblem, Problem, Dumux::InfiltrationProblem) // Set the fluid system SET_TYPE_PROP(InfiltrationProblem, FluidSystem, - Dumux::FluidSystems::H2OAirNAPL); + FluidSystems::H2OAirNAPL); // Enable gravity? SET_BOOL_PROP(InfiltrationProblem, ProblemEnableGravity, true); diff --git a/lecture/mm/naplinfiltration/3p3c/problem.hh b/lecture/mm/naplinfiltration/3p3c/problem.hh index 774c17998ad0f0b79a4246393c8db79ba64f0873..ab87f6c1c230766daee37c6deec28127f0920907 100644 --- a/lecture/mm/naplinfiltration/3p3c/problem.hh +++ b/lecture/mm/naplinfiltration/3p3c/problem.hh @@ -44,12 +44,12 @@ NEW_TYPE_TAG(InfiltrationProblem, INHERITS_FROM(BoxThreePThreeC, InfiltrationSpa SET_TYPE_PROP(InfiltrationProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(InfiltrationProblem, Problem, Dumux::InfiltrationProblem); +SET_TYPE_PROP(InfiltrationProblem, Problem, InfiltrationProblem); // Set the fluid system SET_TYPE_PROP(InfiltrationProblem, FluidSystem, - Dumux::FluidSystems::H2OAirNAPL); + FluidSystems::H2OAirNAPL); // Enable gravity? SET_BOOL_PROP(InfiltrationProblem, ProblemEnableGravity, true); diff --git a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh index d3ca4a583a6a00f1d0426243305063291057f8e4..035d2761c113377c7e2974225733fd15e3169b29 100644 --- a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh +++ b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh @@ -50,12 +50,12 @@ NEW_TYPE_TAG(KuevetteProblem, INHERITS_FROM(BoxThreePThreeCNI, KuevetteSpatialPa SET_TYPE_PROP(KuevetteProblem, Grid, Dune::YaspGrid<2>); // Set the problem property -SET_TYPE_PROP(KuevetteProblem, Problem,Dumux::KuevetteProblem); +SET_TYPE_PROP(KuevetteProblem, Problem,KuevetteProblem); // Set the fluid system SET_TYPE_PROP(KuevetteProblem, FluidSystem, - Dumux::FluidSystems::H2OAirMesitylene); + FluidSystems::H2OAirMesitylene); // Enable gravity SET_BOOL_PROP(KuevetteProblem, ProblemEnableGravity, true);