From 5297d57acec46de81cb62b9d916f370a8d863c59 Mon Sep 17 00:00:00 2001 From: Katharina Heck Date: Tue, 26 Jul 2016 12:25:39 +0200 Subject: [PATCH] [cleanup/removeDumuxPrefix] removes unnecessary DUMUX:: prefix in problems --- lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh | 6 +++--- lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh | 4 ++-- lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh | 6 +++--- lecture/efm/1p2cvs2p/lens1p2cproblem.hh | 6 +++--- lecture/efm/1p2cvs2p/lens2pproblem.hh | 6 +++--- lecture/efm/2p/lens2pproblem.hh | 8 +++++--- lecture/mhs/groundwater/groundwaterproblem.hh | 2 +- lecture/mm/buckleyleverett/buckleyleverettproblem.hh | 10 +++++----- lecture/mm/co2plume/co2plumeshapeproblem.hh | 6 +++--- lecture/mm/columnxylene/columnxyleneproblem.hh | 4 ++-- lecture/mm/convectivemixing/convmixproblem.hh | 6 +++--- lecture/mm/fuelcell/fuelcellproblem.hh | 4 ++-- lecture/mm/heatpipe/heatpipeproblem.hh | 4 ++-- lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh | 4 ++-- lecture/mm/henryproblem/henry2p/henry2pproblem.hh | 4 ++-- lecture/mm/mcwhorter/mcwhorterproblem.hh | 6 +++--- lecture/mm/naplinfiltration/3p/problem.hh | 2 +- lecture/mm/naplinfiltration/3p3c/problem.hh | 4 ++-- .../remediationscenariosproblem.hh | 4 ++-- 19 files changed, 49 insertions(+), 47 deletions(-) diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh index 6b3f350..5f69172 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 3fc3732..946bfda 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 5e739b9..fa8606c 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 5002fb1..de91227 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 a523f31..4912e25 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 7164bf3..eb08a7a 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 55a5a79..ff3aaf6 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 fb7b570..1ccc370 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 92095f7..7e47f56 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 0085062..911a607 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 c3ce772..42e6ad7 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 9dd1fa3..05c468a 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 32bb72c..0a5abe9 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 dd72d7e..0e022aa 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 bc1609e..c3ff0bd 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 63c52b5..32d2b97 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 b837ef0..a802dee 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 774c179..ab87f6c 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 d3ca4a5..035d276 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); -- GitLab