From 561e573232d412e25968d8dd2b454ca41eac8eeb Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Mon, 3 Apr 2017 08:24:16 +0200
Subject: [PATCH] [dumux][cleanup] Remove deprecation warnings
(cherry picked from commit a803fc94850c9d87a9f592b5340e46a8738c1a80)
---
dumux/common/timemanager.hh | 17 -
dumux/io/gnuplotinterface.hh | 24 --
dumux/io/ploteffectivediffusivitymodel.hh | 51 +--
dumux/io/plotmateriallaw.hh | 290 +-----------------
dumux/io/plotthermalconductivitymodel.hh | 72 +----
dumux/material/components/iapws/region1.hh | 27 --
dumux/material/components/iapws/region2.hh | 22 --
.../compositionfromfugacities2pncmin.hh | 55 ----
.../computefromreferencephase2pnc.hh | 72 -----
.../computefromreferencephase2pncmin.hh | 77 -----
.../porousmediumflow/2p2c/implicit/indices.hh | 8 -
.../3pwateroil/fluxvariables.hh | 11 +-
.../3pwateroil/volumevariables.hh | 2 +-
13 files changed, 13 insertions(+), 715 deletions(-)
delete mode 100644 dumux/material/constraintsolvers/compositionfromfugacities2pncmin.hh
delete mode 100644 dumux/material/constraintsolvers/computefromreferencephase2pnc.hh
delete mode 100644 dumux/material/constraintsolvers/computefromreferencephase2pncmin.hh
diff --git a/dumux/common/timemanager.hh b/dumux/common/timemanager.hh
index 690481a599..9b93ff399d 100644
--- a/dumux/common/timemanager.hh
+++ b/dumux/common/timemanager.hh
@@ -347,23 +347,6 @@ public:
bool episodeWillBeFinished() const
{ return time() + timeStepSize() >= episodeStartTime_ + episodeLength(); }
- /*!
- * \brief Returns true if the current episode is finished at the
- * current time.
- */
- DUNE_DEPRECATED_MSG("episodeIsOver() is deprecated and has been replaced by episodeIsFinished() instead.")
- bool episodeIsOver() const
- { return episodeIsFinished(); }
-
- /*!
- * \brief Returns true if the current episode will be finished
- * after the current time step.
- */
- DUNE_DEPRECATED_MSG("episodeWillBeOver() is deprecated and has been replaced by episodeWillBeFinished() instead.")
- bool episodeWillBeOver() const
- { return episodeWillBeFinished(); }
-
-
/*!
* \brief Aligns the time step size to the episode boundary if the
* current time step crosses the boundary of the current episode.
diff --git a/dumux/io/gnuplotinterface.hh b/dumux/io/gnuplotinterface.hh
index ea23705a49..1d7015acfd 100644
--- a/dumux/io/gnuplotinterface.hh
+++ b/dumux/io/gnuplotinterface.hh
@@ -42,7 +42,6 @@
#include <string>
#include <vector>
-#include <dune/common/deprecated.hh>
#include <dune/common/stdstreams.hh>
namespace Dumux
@@ -141,18 +140,6 @@ public:
file.close();
}
- /*!
- * \brief Deletes all plots from a plotting window and resets user-defined options
- */
- DUNE_DEPRECATED_MSG("reset() is deprecated. Use resetPlot() instead.")
- void reset()
- {
- curveFile_.resize(0);
- curveOptions_.resize(0);
- curveTitle_.resize(0);
- plotOptions_ = "";
- }
-
/*!
* \brief Restarts gnuplot
*/
@@ -259,17 +246,6 @@ public:
curveTitle_.push_back(plotName);
}
- /*!
- * \brief Set whether a gnuplot window will be opened or not
- *
- * \param interaction Open window or not
- */
- DUNE_DEPRECATED_MSG("setInteraction() is deprecated. Use setOpenPlotWindow() instead.")
- void setInteraction(bool interaction)
- {
- setOpenPlotWindow(interaction);
- }
-
/*!
* \brief Sets the label for the x-axis
*
diff --git a/dumux/io/ploteffectivediffusivitymodel.hh b/dumux/io/ploteffectivediffusivitymodel.hh
index d850723b74..0de0d4296b 100644
--- a/dumux/io/ploteffectivediffusivitymodel.hh
+++ b/dumux/io/ploteffectivediffusivitymodel.hh
@@ -24,8 +24,6 @@
#ifndef DUMUX_PLOT_EFFECTIVE_DIFFUSIVITY_MODEL_HH
#define DUMUX_PLOT_EFFECTIVE_DIFFUSIVITY_MODEL_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/common/basicproperties.hh>
#include <dumux/io/gnuplotinterface.hh>
@@ -48,14 +46,6 @@ class PlotEffectiveDiffusivityModel
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- //! Constructor
- DUNE_DEPRECATED_MSG("PlotEffectiveDiffusivityModel(bool) is deprecated. Use PlotEffectiveDiffusivityModel() instead.")
- PlotEffectiveDiffusivityModel(bool interaction)
- : numIntervals_(1000)
- {
- gnuplot_.setInteraction(interaction);
- }
-
//! Constructor
PlotEffectiveDiffusivityModel()
: numIntervals_(1000)
@@ -94,47 +84,10 @@ public:
gnuplot.addDataSetToPlot(sw, deff, curveName, curveOptions);
}
- /*!
- * \brief Plot the effective diffusion factor-saturation curve
- *
- * \param porosity The porosity of the porous medium
- * \param lowerSat Minimum x-value
- * \param upperSat Maximum x-value
- * \param curveTitle Name of the plotted curve
- */
- DUNE_DEPRECATED_MSG("plotdeff() is deprecated. Use adddeffcurve() instead.")
- void plotdeff(Scalar porosity,
- Scalar lowerSat = 0.0,
- Scalar upperSat = 1.0,
- std::string curveTitle = "")
- {
- std::vector<Scalar> sw(numIntervals_+1);
- std::vector<Scalar> deff(numIntervals_+1);
- Scalar satInterval = upperSat - lowerSat;
- Scalar deffMin = 1e100;
- Scalar deffMax = -1e100;
-
- for (int i = 0; i <= numIntervals_; i++)
- {
- sw[i] = lowerSat + satInterval * Scalar(i) / Scalar(numIntervals_);
- deff[i] = EffectiveDiffusivityModel::effectiveDiffusivity(porosity, sw[i],
- 1.0 /*Diffusion Coefficient*/);
- deffMin = std::min(deffMin, deff[i]);
- deffMax = std::max(deffMax, deff[i]);
- }
-
- gnuplot_.setXRange(lowerSat, upperSat);
- gnuplot_.setYRange(deffMin, deffMax);
- gnuplot_.setXlabel("phase saturation [-]");
- gnuplot_.setYlabel("effective diffusion/molecular diffusion [-]");
- gnuplot_.addDataSetToPlot(sw, deff, curveTitle + "_d_eff");
- gnuplot_.plot("deff");
- }
-
private:
int numIntervals_;
- GnuplotInterface<Scalar> gnuplot_;
};
-} // end of namespace
+
+} // end namespace Dumux
#endif // DUMUX_PLOT_EFFECTIVE_DIFFUSIVITY_MODEL_HH
diff --git a/dumux/io/plotmateriallaw.hh b/dumux/io/plotmateriallaw.hh
index 00188c06a1..f8fa98726f 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>
@@ -50,19 +48,6 @@ class PlotMaterialLaw
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- //! Constructor
- DUNE_DEPRECATED_MSG("PlotMaterialLaw(bool) is deprecated. Use PlotMaterialLaw() instead.")
- PlotMaterialLaw(bool interaction)
- : numIntervals_(1000)
- {
- gnuplotpcsw_.setInteraction(interaction);
- gnuplotswpc_.setInteraction(interaction);
- gnuplotdpcdsw_.setInteraction(interaction);
- gnuplotdswdpc_.setInteraction(interaction);
- gnuplotkr_.setInteraction(interaction);
- gnuplotkrdsw_.setInteraction(interaction);
- }
-
//! Constructor
PlotMaterialLaw()
: numIntervals_(1000)
@@ -101,55 +86,7 @@ public:
}
/*!
- * \brief Plot the capillary pressure-saturation curve
- *
- * \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("plotpcsw() is deprecated. Use addpcswcurve() instead.")
- void plotpcsw(const MaterialLawParams ¶ms,
- Scalar lowerSat = 0.0,
- Scalar upperSat = 1.0,
- std::string curveTitle = "")
- {
- std::vector<Scalar> sw;
- std::vector<Scalar> pc;
- Scalar satInterval = upperSat - lowerSat;
- Scalar pcMin = 0.0;
- Scalar pcMax = -1e100;
-
- Scalar swTemp, pcTemp = 0.0;
- for (int i = 0; i <= numIntervals_; i++)
- {
- swTemp = lowerSat + satInterval * Scalar(i) / Scalar(numIntervals_);
- pcTemp = MaterialLaw::pc(params, swTemp);
- if (checkValues_(swTemp, pcTemp))
- {
- sw.push_back(swTemp);
- pc.push_back(pcTemp);
- pcMin = std::min(pcMin, pcTemp);
- pcMax = std::max(pcMax, pcTemp);
- }
- }
-
- // use log scale for very high capillary pressures
- if (pcMax / std::max(pcMin, 1.0) > 1e6)
- {
- gnuplotpcsw_.setOption("set log y");
- pcMin = std::max(pcMin, 1.0);
- }
-
- gnuplotpcsw_.setXRange(lowerSat, upperSat);
- gnuplotpcsw_.setYRange(pcMin, pcMax);
- gnuplotpcsw_.setXlabel("wetting phase saturation [-]");
- gnuplotpcsw_.setYlabel("capillary pressure [Pa]");
- gnuplotpcsw_.addDataSetToPlot(sw, pc, curveTitle + "_pc-Sw");
- gnuplotpcsw_.plot("pc-Sw");
- }
- /*!
* \brief Add a saturation-capillary pressure data set to the plot
*
* \param gnuplot The gnuplot interface
@@ -187,48 +124,6 @@ public:
gnuplot.addDataSetToPlot(pc, sw, curveName, curveOptions);
}
- /*!
- * \brief Plot the saturation-capillary pressure curve
- *
- * \param params The material law parameters
- * \param lowerpc Minimum x-value
- * \param upperpc Maximum x-value
- * \param curveTitle Name of the plotted curve
- */
- DUNE_DEPRECATED_MSG("plotswpc() is deprecated. Use addswpccurve() instead.")
- void plotswpc(const MaterialLawParams ¶ms,
- Scalar lowerpc = 0.0,
- Scalar upperpc = 5000.0,
- std::string curveTitle = "")
- {
- std::vector<Scalar> sw;
- std::vector<Scalar> pc;
- Scalar pcInterval = upperpc - lowerpc;
- Scalar swMin = 1e100;
- Scalar swMax = -1e100;
-
- Scalar pcTemp, swTemp = 0.0;
- for (int i = 0; i <= numIntervals_; i++)
- {
- pcTemp = lowerpc + pcInterval * Scalar(i) / Scalar(numIntervals_);
- swTemp = MaterialLaw::sw(params, pcTemp);
- if (checkValues_(pcTemp, swTemp))
- {
- pc.push_back(pcTemp);
- sw.push_back(swTemp);
- swMin = std::min(swMin, swTemp);
- swMax = std::max(swMax, swTemp);
- }
- }
-
- gnuplotswpc_.setXRange(lowerpc, upperpc);
- gnuplotswpc_.setYRange(swMin, swMax);
- gnuplotswpc_.setXlabel("capillary pressure [Pa]");
- gnuplotswpc_.setYlabel("wetting phase saturation [-]");
- gnuplotswpc_.addDataSetToPlot(pc, sw, curveTitle + "_Sw-pc");
- gnuplotswpc_.plot("sw-pc");
- }
-
/*!
* \brief Add a capillary pressure-saturation gradient data set to the plot
*
@@ -267,48 +162,6 @@ public:
gnuplot.addDataSetToPlot(sw, dpcdsw, curveName, curveOptions);
}
- /*!
- * \brief Plot the gradient of the capillary pressure-saturation curve
- *
- * \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("plotdpcdsw() is deprecated. Use adddpcdswcurve() instead.")
- void plotdpcdsw(const MaterialLawParams ¶ms,
- Scalar lowerSat = 0.0,
- Scalar upperSat = 1.0,
- std::string curveTitle = "")
- {
- std::vector<Scalar> sw;
- std::vector<Scalar> dpcdsw;
- Scalar satInterval = upperSat - lowerSat;
- Scalar dpcdswMin = 1e100;
- Scalar dpcdswMax = -1e100;
-
- Scalar swTemp, dpcdswTemp = 0.0;
- for (int i = 0; i <= numIntervals_; i++)
- {
- swTemp = lowerSat + satInterval * Scalar(i) / Scalar(numIntervals_);
- dpcdswTemp = MaterialLaw::dpc_dsw(params, swTemp);
- if (checkValues_(swTemp, dpcdsw))
- {
- sw.push_back(swTemp);
- dpcdsw.push_back(dpcdswTemp);
- dpcdswMin = std::min(dpcdswMin, dpcdswTemp);
- dpcdswMax = std::max(dpcdswMax, dpcdswTemp);
- }
- }
-
- gnuplotdpcdsw_.setXRange(lowerSat, upperSat);
- gnuplotdpcdsw_.setYRange(dpcdswMin, dpcdswMax);
- gnuplotdpcdsw_.setXlabel("wetting phase saturation [-]");
- gnuplotdpcdsw_.setYlabel("gradient of the pc-Sw curve [Pa]");
- gnuplotdpcdsw_.addDataSetToPlot(sw, dpcdsw, curveTitle + "_dpcdSw-Sw");
- gnuplotdpcdsw_.plot("dpcdsw");
- }
-
/*!
* \brief Add a saturation-capillary pressure gradient data set to the plot
*
@@ -347,48 +200,6 @@ public:
gnuplot.addDataSetToPlot(pc, dswdpc, curveName, curveOptions);
}
- /*!
- * \brief Plot the gradient of the saturation-capillary pressure curve
- *
- * \param params The material law parameters
- * \param lowerpc Minimum x-value
- * \param upperpc Maximum x-value
- * \param curveTitle Name of the plotted curve
- */
- DUNE_DEPRECATED_MSG("plotdswdpc() is deprecated. Use adddswdpccurve() instead.")
- void plotdswdpc(const MaterialLawParams ¶ms,
- Scalar lowerpc = 0.0,
- Scalar upperpc = 5000.0,
- std::string curveTitle = "")
- {
- std::vector<Scalar> pc;
- std::vector<Scalar> dswdpc;
- Scalar pcInterval = upperpc - lowerpc;
- Scalar dswdpcMin = 1e100;
- Scalar dswdpcMax = -1e100;
-
- Scalar dswdpcTemp, pcTemp = 0.0;
- for (int i = 0; i <= numIntervals_; i++)
- {
- pcTemp = lowerpc + pcInterval * Scalar(i) / Scalar(numIntervals_);
- dswdpcTemp = MaterialLaw::dsw_dpc(params, pcTemp);
- if (checkValues_(pcTemp, dswdpcTemp))
- {
- pc.push_back(pcTemp);
- dswdpc.push_back(dswdpcTemp);
- dswdpcMin = std::min(dswdpcMin, dswdpcTemp);
- dswdpcMax = std::max(dswdpcMax, dswdpcTemp);
- }
- }
-
- gnuplotdswdpc_.setXRange(lowerpc, upperpc);
- gnuplotdswdpc_.setYRange(dswdpcMin, dswdpcMax);
- gnuplotdswdpc_.setXlabel("capillary pressure [Pa]");
- gnuplotdswdpc_.setYlabel("gradient of the Sw-pc curve [1/Pa]");
- gnuplotdswdpc_.addDataSetToPlot(pc, dswdpc, curveTitle + "_dSwdpc-pc");
- gnuplotdswdpc_.plot("dswdpc");
- }
-
/*!
* \brief Add relative permeabilities data sets to the plot
*
@@ -431,52 +242,6 @@ public:
gnuplot.addDataSetToPlot(sw, krn, curveName + "_krn", curveOptions);
}
- /*!
- * \brief Plot the relative permeabilities
- *
- * \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("plotkr() is deprecated. Use addkrcurves() instead.")
- void plotkr(const MaterialLawParams ¶ms,
- Scalar lowerSat = 0.0,
- Scalar upperSat = 1.0,
- std::string curveTitle = "")
- {
- std::vector<Scalar> sw;
- std::vector<Scalar> krw;
- std::vector<Scalar> krn;
- Scalar satInterval = upperSat - lowerSat;
- Scalar krMin = 1e100;
- Scalar krMax = -1e100;
-
- Scalar swTemp, krwTemp, krnTemp = 0.0;
- for (int i = 0; i <= numIntervals_; i++)
- {
- swTemp = lowerSat + satInterval * Scalar(i) / Scalar(numIntervals_);
- krwTemp = MaterialLaw::krw(params, swTemp);
- krnTemp = MaterialLaw::krn(params, swTemp);
- if (checkValues_(swTemp, krwTemp) && checkValues_(swTemp, krnTemp))
- {
- sw.push_back(swTemp);
- krw.push_back(krwTemp);
- krn.push_back(krnTemp);
- krMin = std::min({krMin, krwTemp, krnTemp});
- krMax = std::max({krMax, krwTemp, krnTemp});
- }
- }
-
- gnuplotkr_.setXRange(lowerSat, upperSat);
- gnuplotkr_.setYRange(krMin, krMax);
- gnuplotkr_.setXlabel("wetting phase saturation [-]");
- gnuplotkr_.setYlabel("relative permeability [-]");
- gnuplotkr_.addDataSetToPlot(sw, krw, curveTitle + "_krw");
- gnuplotkr_.addDataSetToPlot(sw, krn, curveTitle + "_krn");
- gnuplotkr_.plot("kr");
- }
-
/*!
* \brief Add relative permeabilities gradients data sets to the plot
*
@@ -519,52 +284,6 @@ public:
gnuplot.addDataSetToPlot(sw, dkrn_dsw, curveName + "_dkrn_dsw", curveOptions);
}
- /*!
- * \brief Plot the gradient of the relative permeabilities
- *
- * \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("plotdkrdsw() is deprecated. Use adddkrdswcurves() instead.")
- void plotdkrdsw(const MaterialLawParams ¶ms,
- Scalar lowerSat = 0.0,
- Scalar upperSat = 1.0,
- std::string curveTitle = "")
- {
- std::vector<Scalar> sw;
- std::vector<Scalar> dkrw_dsw;
- std::vector<Scalar> dkrn_dsw;
- Scalar satInterval = upperSat - lowerSat;
- Scalar dkrdswMin = 1e100;
- Scalar dkrdswMax = -1e100;
-
- Scalar swTemp, dkrwdswTemp, dkrndswTemp = 0.0;
- for (int i = 0; i <= numIntervals_; i++)
- {
- swTemp = lowerSat + satInterval * Scalar(i) / Scalar(numIntervals_);
- dkrwdswTemp = MaterialLaw::dkrw_dsw(params, swTemp);
- dkrndswTemp = MaterialLaw::dkrn_dsw(params, swTemp);
- if (checkValues_(swTemp, dkrwdswTemp) && checkValues_(swTemp, dkrndswTemp))
- {
- sw.push_back(swTemp);
- dkrw_dsw.push_back(dkrwdswTemp);
- dkrn_dsw.push_back(dkrndswTemp);
- dkrdswMin = std::min({dkrdswMin, dkrwdswTemp, dkrndswTemp});
- dkrdswMax = std::max({dkrdswMax, dkrwdswTemp, dkrndswTemp});
- }
- }
-
- gnuplotkrdsw_.setXRange(lowerSat, upperSat);
- gnuplotkrdsw_.setYRange(dkrdswMin, dkrdswMax);
- gnuplotkrdsw_.setXlabel("wetting phase saturation [-]");
- gnuplotkrdsw_.setYlabel("gradient of the kr-Sw function [-]");
- gnuplotkrdsw_.addDataSetToPlot(sw, dkrw_dsw, curveTitle + "_dkrw_dsw");
- gnuplotkrdsw_.addDataSetToPlot(sw, dkrn_dsw, curveTitle + "_dkrn_dsw");
- gnuplotkrdsw_.plot("dkrndsw");
- }
-
private:
/*!
* \brief Check the values for occurrences of nan and inf
@@ -579,13 +298,8 @@ private:
}
int numIntervals_;
- GnuplotInterface<Scalar> gnuplotpcsw_;
- GnuplotInterface<Scalar> gnuplotswpc_;
- GnuplotInterface<Scalar> gnuplotdpcdsw_;
- GnuplotInterface<Scalar> gnuplotdswdpc_;
- GnuplotInterface<Scalar> gnuplotkr_;
- GnuplotInterface<Scalar> gnuplotkrdsw_;
};
-} // end of namespace
+
+} // end namespace Dumux
#endif // DUMUX_PLOT_FLUID_MATRIX_LAW_HH
diff --git a/dumux/io/plotthermalconductivitymodel.hh b/dumux/io/plotthermalconductivitymodel.hh
index 45d934bbc9..ca6c7ac4b8 100644
--- a/dumux/io/plotthermalconductivitymodel.hh
+++ b/dumux/io/plotthermalconductivitymodel.hh
@@ -24,8 +24,6 @@
#ifndef DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH
#define DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/common/basicproperties.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidstates/compositional.hh>
@@ -61,30 +59,6 @@ class PlotThermalConductivityModel
};
public:
- /*!
- * \brief Constructor
- *
- * Initializes the fluid system.
- *
- * \param temperature temperature in \f$\mathrm{[K]}\f$
- * \param pressure reference pressure in \f$\mathrm{[Pa]}\f$
- * \param interaction Specifies whether a live output via a gnuplot window is wanted
- */
- DUNE_DEPRECATED_MSG("PlotThermalConductivityModel(Scalar, Scalar, bool) is deprecated. Use PlotThermalConductivityModel(Scalar, Scalar) instead.")
- PlotThermalConductivityModel(Scalar temperature,
- Scalar pressure,
- bool interaction)
- : numIntervals_(1000)
- {
- FluidState fluidstate;
- fluidstate.setTemperature(temperature);
- fluidstate.setPressure(wPhaseIdx, pressure);
- fluidstate.setPressure(nPhaseIdx, pressure);
- lambdaW_ = FluidSystem::template thermalConductivity<FluidState>(fluidstate, wPhaseIdx);
- lambdaN_ = FluidSystem::template thermalConductivity<FluidState>(fluidstate, nPhaseIdx);
- gnuplot_.setInteraction(interaction);
- }
-
/*!
* \brief Constructor
*
@@ -141,54 +115,12 @@ public:
gnuplot.addDataSetToPlot(sw, lambda, curveName, curveOptions);
}
- /*!
- * \brief Plot the effective thermal conductivity-saturation curve
- *
- * \param porosity The porosity of the porous medium
- * \param rhoSolid The density of the solid material
- * \param lambdaSolid The thermal conductivity of the solid material
- * \param lowerSat Minimum x-value
- * \param upperSat Maximum x-value
- * \param curveTitle Name of the plotted curve
- */
- DUNE_DEPRECATED_MSG("plotlambdaeff() is deprecated. Use addlambdaeffcurve() instead.")
- void plotlambdaeff(Scalar porosity,
- Scalar rhoSolid,
- Scalar lambdaSolid,
- Scalar lowerSat = 0.0,
- Scalar upperSat = 1.0,
- std::string curveTitle = "")
- {
- std::vector<Scalar> sw(numIntervals_+1);
- std::vector<Scalar> lambda(numIntervals_+1);
- Scalar satInterval = upperSat - lowerSat;
- Scalar lambdaMin = 0.0;
- Scalar lambdaMax = -1e100;
-
- for (int i = 0; i <= numIntervals_; i++)
- {
- sw[i] = lowerSat + satInterval * Scalar(i) / Scalar(numIntervals_);
- lambda[i] = ThermalConductivityModel::effectiveThermalConductivity(sw[i], lambdaW_,
- lambdaN_, lambdaSolid,
- porosity, rhoSolid);
- lambdaMin = std::min(lambdaMin, lambda[i]);
- lambdaMax = std::max(lambdaMax, lambda[i]);
- }
-
- gnuplot_.setXRange(lowerSat, upperSat);
- gnuplot_.setYRange(lambdaMin, lambdaMax);
- gnuplot_.setXlabel("wetting phase saturation [-]");
- gnuplot_.setYlabel("effective thermal conductivity [W/(m K)]");
- gnuplot_.addDataSetToPlot(sw, lambda, curveTitle + "_lambda_eff");
- gnuplot_.plot("lambdaeff");
- }
-
private:
int numIntervals_;
- GnuplotInterface<Scalar> gnuplot_;
Scalar lambdaN_;
Scalar lambdaW_;
};
-} // end of namespace
+
+} // end namespace Dumux
#endif // DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH
diff --git a/dumux/material/components/iapws/region1.hh b/dumux/material/components/iapws/region1.hh
index cb1e24050e..d4d24a36c7 100644
--- a/dumux/material/components/iapws/region1.hh
+++ b/dumux/material/components/iapws/region1.hh
@@ -34,7 +34,6 @@
#include <cmath>
#include <iostream>
-#include <dune/common/deprecated.hh>
#include <dumux/common/exceptions.hh>
namespace Dumux
@@ -58,32 +57,6 @@ template <class Scalar>
class Region1
{
public:
- /*!
- * \brief Returns true if IAPWS region 1 applies for a
- * (temperature in \f$\mathrm{[K]}\f$, pressure in \f$\mathrm{[Pa]}\f$) pair.
- *
- * \param temperature temperature of component in \f$\mathrm{[K]}\f$
- * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
- */
- DUNE_DEPRECATED_MSG("isValid is deprecated. Use checkValidityRange instead.")
- static constexpr bool isValid(Scalar temperature, Scalar pressure)
- {
- return
- temperature <= 623.15 &&
- pressure <= 100e6;
-
- // actually this is:
- /*
- return
- (
- 273.15 <= temperature &&
- temperature <= 623.15 &&
- pressure >= vaporPressure(temperature) &&
- pressure <= 100e6
- );
- */
- }
-
/*!
* \brief Returns true if IAPWS region 1 applies for a
* (temperature in \f$\mathrm{[K]}\f$, pressure in \f$\mathrm{[Pa]}\f$) pair.
diff --git a/dumux/material/components/iapws/region2.hh b/dumux/material/components/iapws/region2.hh
index 5d64423016..2886838aa8 100644
--- a/dumux/material/components/iapws/region2.hh
+++ b/dumux/material/components/iapws/region2.hh
@@ -35,7 +35,6 @@
#include <cmath>
#include <iostream>
-#include <dune/common/deprecated.hh>
#include <dumux/common/exceptions.hh>
namespace Dumux
@@ -60,27 +59,6 @@ template <class Scalar>
class Region2
{
public:
- /*!
- * \brief Returns true if IAPWS region 2 applies for a
- * (temperature, pressure) pair.
- *
- * \param temperature temperature of component in \f$\mathrm{[K]}\f$
- * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
- */
- DUNE_DEPRECATED_MSG("isValid is deprecated. Use checkValidityRange instead.")
- static constexpr bool isValid(Scalar temperature, Scalar pressure)
- {
- return temperature <= 623.15 && pressure <= 100e6;
-
- // actually this is:
- /*
- return
- (273.15 <= temperature && temperature <= 623.15 && pressure <= vaporPressure(temperature)) ||
- (623.15 < temperature && temperature <= 863.15 && pressure <= auxPressure(temperature)) ||
- (863.15 < temperature && temperature <= 1073.15 && pressure < 100e6);
- */
- }
-
/*!
* \brief Returns true if IAPWS region 2 applies for a
* (temperature, pressure) pair.
diff --git a/dumux/material/constraintsolvers/compositionfromfugacities2pncmin.hh b/dumux/material/constraintsolvers/compositionfromfugacities2pncmin.hh
deleted file mode 100644
index e31eea5b77..0000000000
--- a/dumux/material/constraintsolvers/compositionfromfugacities2pncmin.hh
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Determines the fluid composition given the component
- * fugacities and an arbitary equation of state.
- */
-#ifndef DUMUX_COMPOSITION_FROM_FUGACITIES_2PNCMIN_HH
-#define DUMUX_COMPOSITION_FROM_FUGACITIES_2PNCMIN_HH
-
-#include "compositionfromfugacities.hh"
-#include <dune/common/deprecated.hh>
-#include <dune/common/fvector.hh>
-#include <dune/common/fmatrix.hh>
-
-#include <dumux/common/exceptions.hh>
-#include <dumux/common/valgrind.hh>
-
-namespace Dumux {
-/*!
- * \ingroup ConstraintSolver
- * \brief Calculates the chemical equilibrium from the component
- * fugacities in a phase.
- */
-template <class Scalar, class FluidSystem>
-class DUNE_DEPRECATED_MSG("CompositionFromFugacities2pncmin is deprecated. Use CompositionFromFugacities instead.")
- CompositionFromFugacities2pncmin
- : public CompositionFromFugacities<Scalar, FluidSystem>
-{ };
-
-template <class Scalar, class FluidSystem>
-class DUNE_DEPRECATED_MSG("compositionFromFugacities2pncmin is deprecated. Use CompositionFromFugacities instead.")
- compositionFromFugacities2pncmin
- : public CompositionFromFugacities<Scalar, FluidSystem>
-{ };
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/material/constraintsolvers/computefromreferencephase2pnc.hh b/dumux/material/constraintsolvers/computefromreferencephase2pnc.hh
deleted file mode 100644
index 7ba997335e..0000000000
--- a/dumux/material/constraintsolvers/computefromreferencephase2pnc.hh
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Computes all quantities of a generic fluid state if a
- * reference phase has been specified.
- *
- * This makes it is possible to specify just one phase and let the
- * remaining ones be calculated by the constraint solver. This
- * constraint solver assumes thermodynamic equilibrium
- */
-#ifndef DUMUX_COMPUTE_FROM_REFERENCE_PHASE_2PNC_HH
-#define DUMUX_COMPUTE_FROM_REFERENCE_PHASE_2PNC_HH
-
-#include <dune/common/deprecated.hh>
-
-#include "computefromreferencephase.hh"
-
-namespace Dumux {
-
-/*!
- * \ingroup ConstraintSolver
- * \brief Computes all quantities of a generic fluid state if a
- * reference phase has been specified.
- *
- * This makes it is possible to specify just one phase and let the
- * remaining ones be calculated by the constraint solver. This
- * constraint solver assumes thermodynamic equilibrium. It assumes the
- * following quantities to be set:
- *
- * - composition (mole+mass fractions) of the *reference* phase
- * - temperature of the *reference* phase
- * - saturations of *all* phases
- * - pressures of *all* phases
- *
- * after calling the solve() method the following quantities are
- * calculated in addition:
- *
- * - temperature of *all* phases
- * - density, molar density, molar volume of *all* phases
- * - composition in mole and mass fractions and molaries of *all* phases
- * - mean molar masses of *all* phases
- * - fugacity coefficients of *all* components in *all* phases
- * - if the setViscosity parameter is true, also dynamic viscosities of *all* phases
- * - if the setEnthalpy parameter is true, also specific enthalpies and internal energies of *all* phases
- */
-template <class Scalar, class FluidSystem>
-DUNE_DEPRECATED_MSG("ComputeFromReferencePhase2pNC is deprecated. Use ComputeFromReferencePhase2p instead.")
-class ComputeFromReferencePhase2pNC
- : public ComputeFromReferencePhase<Scalar, FluidSystem>
-{ };
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/material/constraintsolvers/computefromreferencephase2pncmin.hh b/dumux/material/constraintsolvers/computefromreferencephase2pncmin.hh
deleted file mode 100644
index 6ccfec7331..0000000000
--- a/dumux/material/constraintsolvers/computefromreferencephase2pncmin.hh
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Computes all quantities of a generic fluid state if a
- * reference phase has been specified.
- *
- * This makes it is possible to specify just one phase and let the
- * remaining ones be calculated by the constraint solver. This
- * constraint solver assumes thermodynamic equilibrium
- */
-#ifndef DUMUX_COMPUTE_FROM_REFERENCE_PHASE_2PNCMIN_HH
-#define DUMUX_COMPUTE_FROM_REFERENCE_PHASE_2PNCMIN_HH
-
-#include "computefromreferencephase.hh"
-
-#include <dune/common/deprecated.hh>
-#include <dune/common/fvector.hh>
-#include <dune/common/fmatrix.hh>
-
-#include <dumux/common/exceptions.hh>
-#include <dumux/common/valgrind.hh>
-
-namespace Dumux {
-
-/*!
- * \ingroup ConstraintSolver
- * \brief Computes all quantities of a generic fluid state if a
- * reference phase has been specified.
- *
- * This makes it is possible to specify just one phase and let the
- * remaining ones be calculated by the constraint solver. This
- * constraint solver assumes thermodynamic equilibrium. It assumes the
- * following quantities to be set:
- *
- * - composition (mole+mass fractions) of the *reference* phase
- * - temperature of the *reference* phase
- * - saturations of *all* phases
- * - pressures of *all* phases
- *
- * after calling the solve() method the following quantities are
- * calculated in addition:
- *
- * - temperature of *all* phases
- * - density, molar density, molar volume of *all* phases
- * - composition in mole and mass fractions and molaries of *all* phases
- * - mean molar masses of *all* phases
- * - fugacity coefficients of *all* components in *all* phases
- * - if the setViscosity parameter is true, also dynamic viscosities of *all* phases
- * - if the setEnthalpy parameter is true, also specific enthalpies and internal energies of *all* phases
- */
-template <class Scalar, class FluidSystem>
-class DUNE_DEPRECATED_MSG("ComputeFromReferencePhase2pNCMin is deprecated. Use ComputeFromReferencePhase instead.")
- ComputeFromReferencePhase2pNCMin
- : public ComputeFromReferencePhase<Scalar, FluidSystem>
-{ };
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/porousmediumflow/2p2c/implicit/indices.hh b/dumux/porousmediumflow/2p2c/implicit/indices.hh
index eea656510c..ef95192a2b 100644
--- a/dumux/porousmediumflow/2p2c/implicit/indices.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/indices.hh
@@ -25,7 +25,6 @@
#ifndef DUMUX_2P2C_INDICES_HH
#define DUMUX_2P2C_INDICES_HH
-#include <dune/common/deprecated.hh>
#include "properties.hh"
namespace Dumux
@@ -77,13 +76,6 @@ public:
//! Index of either the saturation or the mass fraction of the non-wetting/wetting phase
static const int switchIdx = PVOffset + 1;
- //! Index for wetting phase pressure in a solution vector
- DUNE_DEPRECATED_MSG("pwIdx is deprecated. Use pressureIdx instead.")
- static const int pwIdx = pressureIdx;
- //! Index of either the saturation of the non-wetting phase or the mass fraction secondary component in the only phase
- DUNE_DEPRECATED_MSG("snOrXIdx is deprecated. Use switchIdx instead.")
- static const int snOrXIdx = switchIdx;
-
// equation indices
//! Index of the mass conservation equation for the first component
static const int conti0EqIdx = PVOffset;
diff --git a/dumux/porousmediumflow/3pwateroil/fluxvariables.hh b/dumux/porousmediumflow/3pwateroil/fluxvariables.hh
index 3c4698d810..428efedc56 100644
--- a/dumux/porousmediumflow/3pwateroil/fluxvariables.hh
+++ b/dumux/porousmediumflow/3pwateroil/fluxvariables.hh
@@ -244,10 +244,12 @@ private:
public:
/*!
- * \brief The diffusivity vector
+ * \brief The binary diffusion coefficient for each fluid phase.
+ *
+ * \param phaseIdx The phase index
*/
- Dune::FieldVector<Scalar, numPhases> porousDiffCoeff() const
- { return porousDiffCoeff_; };
+ Scalar porousDiffCoeff(int phaseIdx) const
+ { return porousDiffCoeff_[phaseIdx];}
/*!
* \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase.
@@ -285,9 +287,8 @@ protected:
// the diffusivity matrix for the porous medium
Dune::FieldVector<Scalar, numPhases> porousDiffCoeff_;
-
};
-} // end namespace
+} // end namespace Dumux
#endif
diff --git a/dumux/porousmediumflow/3pwateroil/volumevariables.hh b/dumux/porousmediumflow/3pwateroil/volumevariables.hh
index f964145321..ace6851b75 100644
--- a/dumux/porousmediumflow/3pwateroil/volumevariables.hh
+++ b/dumux/porousmediumflow/3pwateroil/volumevariables.hh
@@ -811,7 +811,7 @@ public:
/*!
* \brief Returns the diffusivity coefficient matrix
*/
- Dune::FieldVector<Scalar, numPhases> diffusionCoefficient() const
+ const Dune::FieldVector<Scalar, numPhases>& diffusionCoefficient() const
{ return diffusionCoefficient_; }
/*!
--
GitLab