Merge branch 'feature/limit-tests-to-one-minute' into 'master'

Feature/limit tests to one minute

Limit the tests in lecture to a maximum of 60 seconds to reduce computational effort for testing.

* [x] Fix fuelcell
* [x] Fix co2plume
* [x] Fix sagd
* [x] Fix convective mixing
* [ ] Fix naplinfiltrationexercise
* [x] Fix remediationscenariosexercise

See merge request !8

lecture/mm/convectivemixing/convmixco2tables.hh → lecture/common/co2tablesbenchmark3.hh

@@ -25,12 +25,11 @@
 #ifndef DUMUX_HETEROGENEOUS_CO2TABLES_HH
 #define DUMUX_HETEROGENEOUS_CO2TABLES_HH
 
-#include <cassert>
 #include <dumux/material/components/co2tablereader.hh>
 
 namespace Dumux
 {
-namespace ConvMixCO2Tables
+namespace CO2TablesBenchmarkThree
 {
 // the real work is done by some external program which provides
 // ready-to-use tables.

lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh

@@ -45,11 +45,7 @@ namespace Properties
 NEW_TYPE_TAG(LensOnePTwoCProblem, INHERITS_FROM(BoxOnePTwoC));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(LensOnePTwoCProblem, Problem, Dumux::LensOnePTwoCProblem<TypeTag>);

lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh

@@ -45,11 +45,7 @@ namespace Properties
 NEW_TYPE_TAG(LensTwoPTwoCProblem, INHERITS_FROM(BoxTwoPTwoC, Lens2pSpatialParams));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(LensTwoPTwoCProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(LensTwoPTwoCProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(LensTwoPTwoCProblem, Problem, Dumux::LensTwoPTwoCProblem<TypeTag>);

lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh

@@ -49,11 +49,7 @@ namespace Properties
 NEW_TYPE_TAG(LensTwoPProblem, INHERITS_FROM(BoxTwoP, Lens2pSpatialParams));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem<TypeTag>);
@@ -365,8 +361,8 @@ private:
      */
     bool isInitial_(const GlobalPosition &globalPos) const
     {
-        return (globalPos[1] > 1.0 && globalPos[1] < 1.25 && globalPos[0] > 1.7
-                && globalPos[0] < 2.3);
+        return (globalPos[1] > 1.0 + eps_ && globalPos[1] < 1.25 - eps_ && globalPos[0] > 1.7 + eps_
+                && globalPos[0] < 2.3 - eps_);
     }
 };
 } //end namespace

lecture/efm/1p2cvs2p/lens1p2cproblem.hh

@@ -45,11 +45,7 @@ namespace Properties
 NEW_TYPE_TAG(LensOnePTwoCProblem, INHERITS_FROM(BoxOnePTwoC));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(LensOnePTwoCProblem, Problem, Dumux::LensOnePTwoCProblem<TypeTag>);

lecture/efm/1p2cvs2p/lens2pproblem.hh

@@ -47,11 +47,7 @@ namespace Properties
 NEW_TYPE_TAG(LensTwoPProblem, INHERITS_FROM(BoxTwoP, Lens2pSpatialParams));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem<TypeTag>);
@@ -367,10 +363,10 @@ private:
      */
     bool onInlet_(const GlobalPosition &globalPos) const
     {
-        Scalar width = this->bBoxMax()[0] - this->bBoxMin()[0];
-        Scalar lambda = (this->bBoxMax()[0] - globalPos[0])/width;
-        return (onUpperBoundary_(globalPos) && (this->bBoxMax()[0]-0.45*width)/width > lambda
-                                            && lambda > (this->bBoxMax()[0]-0.55*width)/width);
+        const Scalar width = this->bBoxMax()[0] - this->bBoxMin()[0];
+        const Scalar lambda = (this->bBoxMax()[0] - globalPos[0])/width;
+        return (onUpperBoundary_(globalPos) && (this->bBoxMax()[0]-0.45*width)/width > lambda + eps_
+                                            && (this->bBoxMax()[0]-0.55*width)/width < lambda - eps_);
     }
 
     Scalar eps_;

lecture/efm/2p/CMakeLists.txt

@@ -5,7 +5,8 @@ add_dumux_test(lens2pexercise2 lens2pexercise2 lens2pexercise2.cc
                  --script fuzzy
                  --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p-exercise2-reference.vtu
                          ${CMAKE_CURRENT_BINARY_DIR}/lens-2p-00052.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise2")
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise2"
+                 --zeroThreshold {"Sn":0.001})
 
 # headers for installation and headercheck
 install(FILES

lecture/efm/2p/lens2pproblem.hh

@@ -48,11 +48,7 @@ namespace Properties
 NEW_TYPE_TAG(LensTwoPProblem, INHERITS_FROM(BoxTwoP, Lens2pSpatialParams));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(LensTwoPProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(LensTwoPProblem, Problem, LensTwoPProblem<TypeTag>);
@@ -425,10 +421,10 @@ private:
      */
     bool onInlet_(const GlobalPosition &globalPos) const
     {
-        Scalar width = this->bBoxMax()[0] - this->bBoxMin()[0];
-        Scalar lambda = (this->bBoxMax()[0] - globalPos[0])/width;
-        return (onUpperBoundary_(globalPos) && (this->bBoxMax()[0]-0.40*width)/width > lambda
-                                            && lambda > (this->bBoxMax()[0]-0.60*width)/width);
+        const Scalar width = this->bBoxMax()[0] - this->bBoxMin()[0];
+        const Scalar lambda = (this->bBoxMax()[0] - globalPos[0])/width;
+        return (onUpperBoundary_(globalPos) && (this->bBoxMax()[0]-0.40*width)/width > lambda + eps_
+                                            && (this->bBoxMax()[0]-0.60*width)/width < lambda - eps_);
     }
 
     Scalar eps_;

lecture/mm/co2plume/CMakeLists.txt

@@ -3,9 +3,9 @@ add_input_file_links()
 add_dumux_test(co2plumeshapeexercise co2plumeshapeexercise co2plumeshapeexercise.cc
                python ${dumux_INCLUDE_DIRS}/bin/runtest.py
                  --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/lecture/references/CO2_PlumeShape-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/CO2_PlumeShape-00018.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/co2plumeshapeexercise -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/co2plumeshapeexercise.input")
+                 --files ${CMAKE_SOURCE_DIR}/lecture/references/co2plumeshape-reference.vtu
+                         ${CMAKE_CURRENT_BINARY_DIR}/co2plumeshape-00003.vtu
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/co2plumeshapeexercise -TimeManager.TEnd 1e7 -TimeManager.EpisodeLength 1e7 -BoundaryConditions.InjectionRate 0.01")
 
 # headers for installation and headercheck
 install(FILES

lecture/mm/co2plume/co2plumeshapeexercise.input

-
 [TimeManager]
-DtInitial = 250# [s]
-TEnd = 2# [s]
+DtInitial = 250 # [s]
+TEnd = 1e100 # [s] actual end time is controlled by injection rate
 EpisodeLength = 1e7 # [s]
 
 [Grid]
-UpperRightX = 200. # x-coordinate of the upper-right corner of the grid [m]
-UpperRightY = 60. # y-coordinate of the upper-right corner of the grid [m]
-NumberOfCellsX = 100 # x-resolution of the grid
-NumberOfCellsY = 30 # y-resolution of the grid
+UpperRight = 200 60 # upper right corner coordinates [m]
+Cells = 100 30 # number of cells in (x,y) directions [-]
 
 [FluidSystem]
 NTemperature = 3# [-]            number of tabularization entries
@@ -19,24 +16,23 @@ TemperatureLow = 283.15 # [Pa]     low end for tabularization of fluid propertie
 TemperatureHigh = 320.15 # [Pa]     high end for tabularization of fluid properties
 
 [SpatialParams]
-Kh = 1e-13 # [m^2] intrinsic permeability
-dipAngle = 0. # [deg] dip angle for the domain
-phi = 0.3 # % porosity
+Permeability = 1e-13 # [m^2] intrinsic permeability
+DipAngle = 0.0 # [deg] dip angle for the domain
+Porosity = 0.3 # porosity
 
 [MaterialLaw]
-swr = 0.2  # [-] residual wetting phase sat.
-snr = 0.2  # [-] residual non-wetting phase sat.
+Swr = 0.2  # [-] residual wetting phase sat.
+Snr = 0.2  # [-] residual non-wetting phase sat.
 Pe =  5e3  # [Pa] capillary entry pressure
 Lambda = 2 # [-] Brooks Corey parameter
 
 [SimulationControl]
-Name = CO2_PlumeShape# [-]            the name of the output files
+Name = co2plumeshape # the name of the output files
 
 [InitialConditions]
 Temperature = 283.15 # [K]  initial temperature of injected CO2
 Pressure = 1.5e7 # [Pa] initial pressure
 
 [BoundaryConditions]
-massInj_ = 0.001 # [kg/s] mass injection of CO2
-Temperature_inj =  313.15 # [K] temperature of injected CO2
-
+InjectionRate = 0.001 # [kg/s] mass injection of CO2
+InjectionTemperature =  313.15 # [K] temperature of injected CO2

lecture/mm/co2plume/co2plumeshapeproblem.hh

@@ -23,10 +23,10 @@
  * meters at the bottom of the left boundary and moves upwards towards
  * an impermeable rock.
  */
-#ifndef CO2_PLUMESHAPE_PROBLEM_HH_
-#define CO2_PLUMESHAPE_PROBLEM_HH_
+#ifndef CO2_PLUMESHAPE_PROBLEM_HH
+#define CO2_PLUMESHAPE_PROBLEM_HH
 
-//#define PI 3.14159
+#include <cmath>
 
 #include <dumux/porousmediumflow/co2/implicit/model.hh>
 #include <dumux/porousmediumflow/co2/implicit/volumevariables.hh>
@@ -35,11 +35,10 @@
 #include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/implicit/box/intersectiontovertexbc.hh>
 
+#include <lecture/common/co2tablesbenchmark3.hh>
 
 #include "co2plumeshapespatialparameters.hh"
-#include "injectionco2tables.hh"
 
-#include <dumux/io/cubegridcreator.hh>
 
 namespace Dumux
 {
@@ -51,25 +50,17 @@ namespace Properties
 // for the correct type tag, see 2p2cniproperties.hh
 NEW_TYPE_TAG(PlumeShapeProblem, INHERITS_FROM(BoxTwoPTwoCNI, PlumeShapeSpatialParams));
 
-SET_TYPE_PROP(PlumeShapeProblem, Grid, Dune::YaspGrid</*dim=*/2>); /*@\label{tutorial-coupled:set-grid}@*/
-SET_TYPE_PROP(PlumeShapeProblem, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-coupled:set-gridcreator}@*/
-
+// Set grid to a two-dimensional structured quadrilateral grid
+SET_TYPE_PROP(PlumeShapeProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_PROP(PlumeShapeProblem, Problem)
-{
-    typedef Dumux::PlumeShapeProblem<TypeTag> type;
-};
+SET_TYPE_PROP(PlumeShapeProblem, Problem, Dumux::PlumeShapeProblem<TypeTag>);
 
 // Set fluid configuration
-SET_PROP(PlumeShapeProblem, FluidSystem)
-{
-    typedef Dumux::BrineCO2FluidSystem<TypeTag> type;
-};
+SET_TYPE_PROP(PlumeShapeProblem, FluidSystem, Dumux::BrineCO2FluidSystem<TypeTag>);
 
 // Set the CO2 table to be used; in this case not the the default table
-//SET_TYPE_PROP(PlumeShapeProblem, CO2Table, Dumux::Injection::CO2Tables);
-SET_TYPE_PROP(PlumeShapeProblem, CO2Table, Dumux::Injection::CO2Tables);
+SET_TYPE_PROP(PlumeShapeProblem, CO2Table, Dumux::CO2TablesBenchmarkThree::CO2Tables);
 // Set the salinity mass fraction of the brine in the reservoir
 SET_SCALAR_PROP(PlumeShapeProblem, ProblemSalinity, 1e-1);
 
@@ -82,7 +73,6 @@ SET_TYPE_PROP(PlumeShapeProblem, IsothermalModel, CO2Model<TypeTag>);
 SET_BOOL_PROP(PlumeShapeProblem, ProblemEnableGravity, true);
 
 SET_BOOL_PROP(PlumeShapeProblem, ImplicitEnableJacobianRecycling, true);
-SET_BOOL_PROP(PlumeShapeProblem, VtkAddVelocity, false);
 
 // set newton relative tolerance
 SET_SCALAR_PROP(PlumeShapeProblem, NewtonMaxRelativeShift, 1e-6);
@@ -134,11 +124,9 @@ class PlumeShapeProblem : public ImplicitPorousMediaProblem<TypeTag>
         lPhaseIdx = Indices::wPhaseIdx,
         gPhaseIdx = Indices::nPhaseIdx,
 
-
         BrineIdx = FluidSystem::BrineIdx,
         CO2Idx = FluidSystem::CO2Idx,
 
-
         conti0EqIdx = Indices::conti0EqIdx,
         contiCO2EqIdx = conti0EqIdx + CO2Idx,
 
@@ -161,8 +149,6 @@ class PlumeShapeProblem : public ImplicitPorousMediaProblem<TypeTag>
     typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
 
     typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-     typedef Dune::FieldVector<Scalar, dim> DimVector;
-
     typedef Dumux::CO2<Scalar, CO2Tables> CO2;
 
 public:
@@ -173,11 +159,7 @@ public:
      * \param gridView The grid view
      */
     PlumeShapeProblem(TimeManager &timeManager, const GridView &gridView)
-        : ParentType(timeManager, gridView)
-        , eps_(1e-6),
-        gravity_(0.)
-    {
-        try
+        : ParentType(timeManager, gridView), eps_(1e-6)
     {
         nTemperature_         = GET_RUNTIME_PARAM(TypeTag, int, FluidSystem.NTemperature);
         nPressure_            = GET_RUNTIME_PARAM(TypeTag, int, FluidSystem.NPressure);
@@ -187,31 +169,17 @@ public:
         temperatureLow_       = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.TemperatureLow);
         temperatureHigh_      = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.TemperatureHigh);
         temperature_          = GET_RUNTIME_PARAM(TypeTag, Scalar, InitialConditions.Temperature);
-                    massInj_            = GET_RUNTIME_PARAM(TypeTag, Scalar, BoundaryConditions.massInj_);
-                    temperatureInj_     = GET_RUNTIME_PARAM(TypeTag, Scalar, BoundaryConditions.Temperature_inj);
-                    kh_                 = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.Kh);
-                    dipAngle_           = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.dipAngle); // [deg]
+        injectionRate_        = GET_RUNTIME_PARAM(TypeTag, Scalar, BoundaryConditions.InjectionRate);
+        injectionTemperature_ = GET_RUNTIME_PARAM(TypeTag, Scalar, BoundaryConditions.InjectionTemperature);
+        dipAngle_             = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.DipAngle); // [deg]
         name_                 = GET_RUNTIME_PARAM(TypeTag, std::string, SimulationControl.Name);
-                }
-                catch (Dumux::ParameterException &e) {
-                    std::cerr << e << ". Abort!\n";
-                    exit(1) ;
-                }
-                catch (...) {
-                    std::cerr << "Unknown exception thrown!\n";
-                    exit(1);
-                }
-
-
-       eps_ = 1e-6;
 
         episodeLength_ = GET_RUNTIME_PARAM(TypeTag, Scalar, TimeManager.EpisodeLength);
         this->timeManager().startNextEpisode(episodeLength_);
 
-       Scalar pi_ = 3.14159;
-       dipAngleRadians_ = (dipAngle_ * pi_)/180.; // [rad]
+        dipAngleRadians_ = (dipAngle_ * M_PI)/180.0; // [rad]
         // rotate the coordinate system / gravity:
-       gravity_[dim-1]  = -9.81 * cos(dipAngleRadians_);
+        gravity_[1] = -9.81 * cos(dipAngleRadians_);
         gravity_[0] = -9.81 * sin(dipAngleRadians_);
 
         // initialize the tables of the fluid system
@@ -222,7 +190,7 @@ public:
                         /*pmax=*/pressureHigh_,
                         /*np=*/nPressure_);
 
-       end_ = false;
+        simulationFinished_ = false; //boolean controlling the simulation end
     }
 
     /*!
@@ -241,24 +209,18 @@ public:
                     << " gas=[" << storageG << "]\n";
        }
 
-        //   if (storageG[1] >= 1.e6) end_ = true;
-
-           //loop over all nodes in the globalIdx_ vector and check if the saturation in any of them is greater zero
-           if(end_)
-           {
-               this->writeOutput();
-               Dumux::Parameters::print<TypeTag>();
-               exit(EXIT_SUCCESS);
-           }
-
+       // tell the time manager in case we reached the end of the injection
+       if(simulationFinished_)
+           this->timeManager().setFinished(true);
     }
 
     void init()
     {
-         // set end time:
-         Scalar final_storage = 1.55e5; // [kg]
-         Scalar endtime_ = final_storage/massInj_; // [s]
-         this->timeManager().setEndTime(endtime_);
+        // set the simulation end time
+        const Scalar finalStorage = 1.55e5; // [kg]
+        // set TimeManager.TEnd in input file to small value to end the simulation earlier
+        const Scalar endTime = std::min(finalStorage/injectionRate_, this->timeManager().endTime()); // [s]
+        this->timeManager().setEndTime(endTime);
         ParentType::init();
     }
 
@@ -283,14 +245,28 @@ public:
     Scalar temperature() const
     { return temperature_; };
 
+
+    /*!
+     * \brief Evaluate the source term for all phases within a given
+     *        sub-control-volume.
+     *
+     * \param values The source and sink values for the conservation equations in units of
+     *                 \f$ [ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$
+     * \param globalPos The position of the center of the finite volume
+     *            for which the source term ought to be
+     *            specified in global coordinates
+     *
+     * For this method, the \a values parameter stores the conserved quantity rate
+     * generated or annihilate per volume unit. Positive values mean
+     * that the conserved quantity is created, negative ones mean that it vanishes.
+     * E.g. for the mass balance that would be a mass rate in \f$ [ kg / (m^3 \cdot s)] \f$.
+     */
     void sourceAtPos(PrimaryVariables &values,
                 const GlobalPosition &globalPos) const
     {
         values = 0;
     }
 
-
-
     /*!
      * \name Boundary conditions
      */
@@ -305,17 +281,19 @@ public:
      */
     void boundaryTypes(BoundaryTypes &values, const Vertex &vertex) const
     {
-            const GlobalPosition globalPos = vertex.geometry().center();
+        const GlobalPosition& globalPos = vertex.geometry().center();
 
         values.setAllNeumann();
 
         // set East boundaries to Dirichlet values
         if ( globalPos[0] > this->bBoxMax()[0] - eps_  )
+        {
             values.setAllDirichlet();
+        }
         // set part of West boundaries to Dirichlet & Neumann values
-            else if ( globalPos[1] < 30. + eps_ && globalPos[0] < eps_){
+        else if ( globalPos[1] < 30.0 + eps_ && globalPos[0] < eps_)
+        {
 #if !ISOTHERMAL
-                //                  primary var  ...  pertaining equation
             values.setDirichlet(temperatureIdx, energyEqIdx);
 #endif
         }
@@ -332,15 +310,16 @@ public:
      */
     void dirichlet(PrimaryVariables &values, const Vertex &vertex) const
     {
-            const GlobalPosition globalPos = vertex.geometry().center();
+        const GlobalPosition& globalPos = vertex.geometry().center();
 
         initial_(values, globalPos);
 
-    #if !ISOTHERMAL
-            if (globalPos[1] < 30. + eps_ && globalPos[0] < eps_)
-                values[temperatureIdx] = temperatureInj_;             //K
-
-    #endif
+#if !ISOTHERMAL
+        if (globalPos[1] < 30.0 + eps_ && globalPos[0] < eps_)
+        {
+            values[temperatureIdx] = injectionTemperature_; //in K
+        }
+#endif
     }
 
     /*!
@@ -370,13 +349,13 @@ public:
         const Scalar pressure = elemVolVars[scvIdx].pressure(gPhaseIdx);
 
         values = 0;
-            if ( globalPos[1] < 30. + eps_ && globalPos[0] < eps_ ) {
-                Scalar massFlux = massInj_ /( 30. ); // [kg/(s*m^2)]
-             //   std::cout<<"values:\n"<<massFlux;
+        if ( globalPos[1] < 30.0 + eps_ && globalPos[0] < eps_ )
+        {
+            Scalar massFlux = injectionRate_ /30.0; // [kg/(s*m^2)]
             values[contiCO2EqIdx] = -massFlux; // kg/(s*m^2)
-    #if !ISOTHERMAL
+#if !ISOTHERMAL
             values[energyEqIdx] = -massFlux*CO2::gasEnthalpy(temperature, pressure); // W/(m^2)
-    #endif
+#endif
         }
     }
 
@@ -398,13 +377,7 @@ public:
                  int scvIdx) const
     {
         const GlobalPosition &globalPos = element.geometry().corner(scvIdx);
-
         initial_(values, globalPos);
-
-     //#if !ISOTHERMAL
-     //        if (globalPos[0] > 20 && globalPos[0] < 30 && globalPos[1] < 30)
-     //            values[temperatureIdx] = 335;
-     //#endif
     }
 
     /*!
@@ -419,15 +392,9 @@ public:
                              const GlobalPosition &globalPos) const
     { return Indices::wPhaseOnly; }
 
-         const DimVector &gravity() const
-         {
-             return gravity_;
-         }
-
     bool shouldWriteOutput() const
     {
-         return
-             this->timeManager().timeStepIndex() == 0 ||
+        return this->timeManager().timeStepIndex() == 0 ||
                this->timeManager().episodeWillBeOver() ||
                this->timeManager().willBeFinished();
     }
@@ -441,45 +408,39 @@ private:
     void initial_(PrimaryVariables &values,
                   const GlobalPosition &globalPos) const
     {
-               Scalar densityW = FluidSystem::Brine::liquidDensity(temperature_, 1e5);
+        const Scalar densityW = FluidSystem::Brine::liquidDensity(temperature_, 1e5);
 
-           //    Scalar pl =  pressure_; //1e5 - densityW*this->gravity()[1]*(depthBOR_ - globalPos[1]);
-               Scalar moleFracLiquidCO2 = 0.00;
-               Scalar moleFracLiquidBrine = 1.0 - moleFracLiquidCO2;
+        const Scalar moleFracLiquidCO2 = 0.00;
+        const Scalar moleFracLiquidBrine = 1.0 - moleFracLiquidCO2;
 
-               Scalar meanM =
-                   FluidSystem::molarMass(BrineIdx)*moleFracLiquidBrine +
+        const Scalar meanM = FluidSystem::molarMass(BrineIdx)*moleFracLiquidBrine +
                              FluidSystem::molarMass(CO2Idx)*moleFracLiquidCO2;
 
-               Scalar massFracLiquidCO2 = moleFracLiquidCO2*FluidSystem::molarMass(CO2Idx)/meanM;
+        const Scalar massFracLiquidCO2 = moleFracLiquidCO2*FluidSystem::molarMass(CO2Idx)/meanM;
 
         // set initial pressure and pressure Dirichlet conditions:
-               Scalar distance_currpos_topboundary_ = ( this->bBoxMax()[dim-1] - this->bBoxMin()[dim-1] ) - globalPos[dim-1]; // distance without rotation
-               Scalar distance_currpos_topboundary_rotated = distance_currpos_topboundary_ / cos(dipAngleRadians_);
-
-               Scalar distance_topboundary_tosurface = sin(dipAngleRadians_) * (this->bBoxMax()[0] - globalPos[0]);
-               values[Indices::pressureIdx] = pressure_ + densityW * 9.81 * distance_currpos_topboundary_rotated +
-                       densityW * 9.81 * distance_topboundary_tosurface;
-            //   std::cerr<<"\n distance_to_top_: " << distance_to_top_ << "\n depth: " << depth_ << "\n\n";
+        const Scalar distanceToTopBoundary_ = ( this->bBoxMax()[1] - this->bBoxMin()[1] ) - globalPos[1]; // distance without rotation
+        const Scalar distanceToTopBoundaryRotated_ = distanceToTopBoundary_ / std::cos(dipAngleRadians_);
 
+        const Scalar distanceTopBoundaryToSurface_ = std::sin(dipAngleRadians_) * (this->bBoxMax()[0] - globalPos[0]);
+        values[Indices::pressureIdx] = pressure_ + densityW * 9.81 * distanceToTopBoundaryRotated_ +
+                                       densityW * 9.81 * distanceTopBoundaryToSurface_;
 
         values[Indices::switchIdx] = massFracLiquidCO2;
 
-       #if !ISOTHERMAL
+#if !ISOTHERMAL
         values[temperatureIdx] = temperature_;//290.0 + (depthBOR_ - globalPos[1])*0.03;
-       #endif
+#endif
     }
 
-           Scalar temperature_,temperatureInj_, kh_;
+    Scalar temperature_,injectionTemperature_;
     Scalar depthBOR_;
     Scalar eps_;
-           Scalar massInj_;
-
+    Scalar injectionRate_;
     Scalar episodeLength_;
+    Scalar dipAngleRadians_, dipAngle_;
 
-           Scalar dipAngleRadians_,dipAngle_;
-
-           DimVector gravity_;
+    GlobalPosition gravity_;
 
     int nTemperature_;
     int nPressure_;
@@ -489,10 +450,9 @@ private:
     Scalar pressureLow_, pressureHigh_, pressure_;
     Scalar temperatureLow_, temperatureHigh_;
 
-           bool end_;
-
+    bool simulationFinished_;
+};
 
-       };
-       } //end namespace
+} //end namespace
 
 #endif

lecture/mm/co2plume/co2plumeshapespatialparameters.hh

@@ -16,8 +16,8 @@
  *   You should have received a copy of the GNU General Public License       *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
-#ifndef CO2_PLUMESHAPE_SPATIALPARAMETERS_HH_
-#define CO2_PLUMESHAPE_SPATIALPARAMETERS_HH_
+#ifndef CO2_PLUMESHAPE_SPATIALPARAMETERS_HH
+#define CO2_PLUMESHAPE_SPATIALPARAMETERS_HH
 
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
@@ -79,7 +79,6 @@ class PlumeShapeSpatialParams : public ImplicitSpatialParams<TypeTag>
     };