From 697cc142777b8da01fb8b00a06a927585bef1d77 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Thu, 13 Oct 2016 11:32:36 +0200
Subject: [PATCH] [cleanup][deprecations] Remove deprecated stuff after release
2.10
---
dumux/common/pointsource.hh | 21 -----------------
dumux/io/plotmateriallaw.hh | 23 -------------------
dumux/io/plotmateriallaw3p.hh | 23 -------------------
dumux/material/components/nacl.hh | 1 -
dumux/material/fluidsystems/gasphase.hh | 13 -----------
dumux/material/fluidsystems/liquidphase.hh | 13 -----------
.../1p2c/implicit/fluxvariables.hh | 1 -
.../2pminc/implicit/fluxvariables.hh | 1 -
.../2pnc/implicit/fluxvariables.hh | 15 ------------
.../fluidsystems/test_fluidsystems.cc | 4 ----
10 files changed, 115 deletions(-)
diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh
index a60dcb545b..33607ce412 100644
--- a/dumux/common/pointsource.hh
+++ b/dumux/common/pointsource.hh
@@ -354,27 +354,6 @@ public:
}
};
-template <class TypeTag>
-class PointSourceHelper : public BoundingBoxTreePointSourceHelper<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PointSource) PointSource;
- using ParentType = BoundingBoxTreePointSourceHelper<TypeTag>;
- typedef Dumux::BoundingBoxTree<GridView> BoundingBoxTree;
-
-public:
- // this seems to be the only deprecation working. The compiler warning will be slightly misleading but the message should clear things up
- DUNE_DEPRECATED_MSG("PointSourceHelper<TypeTag> will be removed after the 2.10 release. Use BoundingBoxTreePointSourceHelper<TypeTag> instead.")
- static void computePointSourceMap(const Problem& problem,
- const BoundingBoxTree& boundingBoxTree,
- std::vector<PointSource>& sources,
- std::map<std::pair<unsigned int, unsigned int>, std::vector<PointSource> >& pointSourceMap)
- {
- ParentType::computePointSourceMap(problem, boundingBoxTree, sources, pointSourceMap);
- }
-} DUNE_DEPRECATED_MSG("PointSourceHelper<TypeTag> will be removed after the 2.10 release. Use BoundingBoxTreePointSourceHelper<TypeTag> instead.");
-
} // end namespace Dumux
#endif
diff --git a/dumux/io/plotmateriallaw.hh b/dumux/io/plotmateriallaw.hh
index 0d9d893252..f90b81c751 100644
--- a/dumux/io/plotmateriallaw.hh
+++ b/dumux/io/plotmateriallaw.hh
@@ -24,8 +24,6 @@
#ifndef DUMUX_PLOT_FLUID_MATRIX_LAW_HH
#define DUMUX_PLOT_FLUID_MATRIX_LAW_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/common/basicproperties.hh>
#include <dumux/io/gnuplotinterface.hh>
@@ -323,27 +321,6 @@ public:
gnuplotkrdsw_.plot("dkrndsw");
}
- /*!
- * \brief Check the validity range for wetting saturation, to avoid an
- * assert of the used material laws
- *
- * \param params The material law parameters
- * \param lowerSat Minimum x-value
- * \param upperSat Maximum x-value
- * \param curveTitle Name of the plotted curve
- */
- DUNE_DEPRECATED_MSG("checkEffectiveSaturation is deprecated.")
- void checkEffectiveSaturation(const MaterialLawParams ¶ms,
- Scalar lowerSat,
- Scalar upperSat,
- std::string curveTitle = "")
- {
- if (lowerSat < params.swr())
- Dune::dwarn << "warning: fluid-matrix law " << curveTitle << " can only be plotted for sw > swr" << std::endl;
- if (upperSat > (1.0 - params.snr()))
- Dune::dwarn << "warning: fluid-matrix law " << curveTitle << " can only be plotted for sw < 1.0 - snr" << std::endl;
- }
-
private:
/*!
* \brief Check the values for occurrences of nan and inf
diff --git a/dumux/io/plotmateriallaw3p.hh b/dumux/io/plotmateriallaw3p.hh
index 4b05cbd347..2dc8e41eea 100644
--- a/dumux/io/plotmateriallaw3p.hh
+++ b/dumux/io/plotmateriallaw3p.hh
@@ -24,8 +24,6 @@
#ifndef DUMUX_PLOT_FLUID_MATRIX_LAW_HH
#define DUMUX_PLOT_FLUID_MATRIX_LAW_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/common/basicproperties.hh>
#include <dumux/io/gnuplotinterface.hh>
@@ -296,27 +294,6 @@ public:
gnuplotpcAlpha_.plot("alpha");
}
- /*!
- * \brief Check the validity range for wetting saturation, to avoid an
- * assert of the used material laws
- *
- * \param params The material law parameters
- * \param lowerSat Minimum x-value
- * \param upperSat Maximum x-value
- * \param curveTitle Name of the plotted curve
- */
- DUNE_DEPRECATED_MSG("checkEffectiveSaturation is deprecated.")
- void checkEffectiveSaturation(const MaterialLawParams ¶ms,
- Scalar lowerSat,
- Scalar upperSat,
- std::string curveTitle = "")
- {
- if (lowerSat < params.swr())
- Dune::dwarn << "warning: fluid-matrix law " << curveTitle << " can only be plotted for sw > swr" << std::endl;
- if (upperSat > (1.0 - params.snr()))
- Dune::dwarn << "warning: fluid-matrix law " << curveTitle << " can only be plotted for sw < 1.0 - snr" << std::endl;
- }
-
private:
/*!
* \brief Check the values for occurrences of nan and inf
diff --git a/dumux/material/components/nacl.hh b/dumux/material/components/nacl.hh
index 9717fbfbe5..3d3d271f59 100644
--- a/dumux/material/components/nacl.hh
+++ b/dumux/material/components/nacl.hh
@@ -27,7 +27,6 @@
#define DUMUX_NACL_HH
#include <dumux/common/exceptions.hh>
-#include <dune/common/deprecated.hh>
#include <dumux/material/components/component.hh>
#include <cmath>
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh
index e7334a9501..c8f979f7aa 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/gasphase.hh
@@ -27,7 +27,6 @@
#include <cassert>
#include <limits>
-#include <dune/common/deprecated.hh>
#include <dune/common/exceptions.hh>
#include <dumux/material/fluidsystems/base.hh>
@@ -338,18 +337,6 @@ public:
};
} // namespace FluidSystems
-
-/*!
- * \ingroup Fluidsystems
- * \brief A gaseous phase consisting of a single component
- */
-template <class Scalar, class ComponentT>
-class
-DUNE_DEPRECATED_MSG("Class GasPhase is deprecated. Use FluidSystems::GasPhase instead.")
-GasPhase
-: public FluidSystems::GasPhase<Scalar, ComponentT>
-{ };
-
} // namespace
#endif
diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh
index 56e5cfdc99..b073cec32f 100644
--- a/dumux/material/fluidsystems/liquidphase.hh
+++ b/dumux/material/fluidsystems/liquidphase.hh
@@ -27,7 +27,6 @@
#include <cassert>
#include <limits>
-#include <dune/common/deprecated.hh>
#include <dune/common/exceptions.hh>
#include <dumux/material/fluidsystems/base.hh>
@@ -321,18 +320,6 @@ public:
};
} // namespace FluidSystems
-
-/*!
- * \ingroup Fluidsystems
- * \brief A liquid phase consisting of a single component
- */
-template <class Scalar, class ComponentT>
-class
-DUNE_DEPRECATED_MSG("Class LiquidPhase is deprecated. Use FluidSystems::LiquidPhase instead.")
-LiquidPhase
-: public FluidSystems::LiquidPhase<Scalar, ComponentT>
-{ };
-
} // namespace
#endif
diff --git a/dumux/porousmediumflow/1p2c/implicit/fluxvariables.hh b/dumux/porousmediumflow/1p2c/implicit/fluxvariables.hh
index 042fe0b756..1ee1cef6ae 100644
--- a/dumux/porousmediumflow/1p2c/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/1p2c/implicit/fluxvariables.hh
@@ -29,7 +29,6 @@
#define DUMUX_1P2C_FLUX_VARIABLES_HH
#include <dune/common/exceptions.hh>
-#include <dune/common/deprecated.hh>
#include "properties.hh"
diff --git a/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh b/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
index bee4f79773..5d8bf5dc74 100644
--- a/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/fluxvariables.hh
@@ -28,7 +28,6 @@
#define DUMUX_TWOPMINC_FLUX_VARIABLES_HH
#include <dune/common/exceptions.hh>
-#include <dune/common/deprecated.hh>
#include "properties.hh"
diff --git a/dumux/porousmediumflow/2pnc/implicit/fluxvariables.hh b/dumux/porousmediumflow/2pnc/implicit/fluxvariables.hh
index 87e0a400bd..9c2dedaffd 100644
--- a/dumux/porousmediumflow/2pnc/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/fluxvariables.hh
@@ -133,7 +133,6 @@ protected:
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
- concentrationGrad_[phaseIdx].fill(GlobalPosition(0.0)); // TODO: deprecated, remove this once the interface function gets removed
moleFractionGrad_[phaseIdx].fill(GlobalPosition(0.0));
}
@@ -155,9 +154,6 @@ protected:
if(compIdx != phaseIdx) //No grad is needed for this case
{
moleFractionGrad_[phaseIdx][compIdx].axpy(elemVolVars[volVarsIdx].moleFraction(phaseIdx, compIdx), feGrad);
- // TODO: deprecated, remove this once the interface function gets removed
- concentrationGrad_[phaseIdx][compIdx].axpy(elemVolVars[volVarsIdx].moleFraction(phaseIdx, compIdx)
- *elemVolVars[volVarsIdx].molarDensity(phaseIdx), feGrad);
}
}
}
@@ -240,16 +236,6 @@ public:
Scalar molarDensity(int phaseIdx) const
{ return molarDensity_[phaseIdx]; }
- /*!
- * \brief The concentration gradient of a component in a phase.
- *
- * \param phaseIdx The phase index
- * \param compIdx The component index
- */
- DUNE_DEPRECATED_MSG("Don't use concentration gradient. Fick's law is based on mole fraction gradients!")
- const GlobalPosition &concentrationGrad(int phaseIdx, int compIdx) const
- { return concentrationGrad_[phaseIdx][compIdx]; }
-
/*!
* \brief The mole fraction gradient of a component in a phase.
*
@@ -263,7 +249,6 @@ protected:
// mole fraction gradient
std::array<std::array<GlobalPosition, numComponents>, numPhases> moleFractionGrad_;
- std::array<std::array<GlobalPosition, numComponents>, numPhases> concentrationGrad_; // TODO: deprecated
// density of each face at the integration point
std::array<Scalar, numPhases> density_, molarDensity_;
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index 355afe6772..1e67b73e0b 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -173,8 +173,6 @@ int main()
success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// gas phase
- { typedef Dumux::GasPhase<Scalar, H2O> FluidSystem;
- success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::GasPhase<Scalar, H2O> FluidSystem;
success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
@@ -205,8 +203,6 @@ int main()
success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// liquid phase
- { typedef Dumux::LiquidPhase<Scalar, H2O> FluidSystem;
- success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::LiquidPhase<Scalar, H2O> FluidSystem;
success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
--
GitLab