Commit 75b72cb5 authored by Timo Koch's avatar Timo Koch
Browse files

Replace const char * by std::string for more flexibility

(cherry picked from commit 3b62b6af)
parent d2325b24
......@@ -973,7 +973,7 @@ public:
/*!
* \brief Returns the name of the used eddy viscosity model.
*/
const char *eddyViscosityModelName() const
std::string eddyViscosityModelName() const
{
switch (GET_PARAM_FROM_GROUP(TypeTag, int, ZeroEq, EddyViscosityModel))
{
......
......@@ -352,7 +352,7 @@ public:
/*!
* \brief Returns the name of used the eddy diffusivity model.
*/
const char *eddyDiffusivityModelName() const
std::string eddyDiffusivityModelName() const
{
switch (GET_PARAM_FROM_GROUP(TypeTag, int, ZeroEq, EddyDiffusivityModel))
{
......
......@@ -364,7 +364,7 @@ public:
/*!
* \brief Returns the name of used the eddy conductivity model.
*/
const char *eddyConductivityModelName() const
std::string eddyConductivityModelName() const
{
switch (GET_PARAM_FROM_GROUP(TypeTag, int, ZeroEq, EddyConductivityModel))
{
......
......@@ -48,7 +48,7 @@ public:
/*!
* \brief A human readable name for Air.
*/
static const char *name()
static std::string name()
{ return "Air"; }
/*!
......
......@@ -45,7 +45,7 @@ public:
/*!
* \brief A human readable name for the benzene
*/
static const char *name()
static std::string name()
{ return "benzene"; }
/*!
......
......@@ -59,7 +59,7 @@ public:
/*!
* \brief A human readable name for the brine.
*/
static const char *name()
static std::string name()
{ return "Brine"; }
/*!
......
......@@ -51,7 +51,7 @@ public:
/*!
* \brief A human readable name for methane.
*/
static const char *name()
static std::string name()
{ return "CH4"; }
/*!
......
......@@ -57,7 +57,7 @@ public:
/*!
* \brief A human readable name for the CO2.
*/
static const char *name()
static std::string name()
{ return "CO2"; }
/*!
......
......@@ -81,7 +81,7 @@ public:
/*!
* \brief A human readable name for the component.
*/
static const char *name()
static std::string name()
{ DUNE_THROW(Dune::NotImplemented, "Component::name()"); }
/*!
......
......@@ -65,7 +65,7 @@ public:
/*!
* \brief A human readable name for the component.
*/
static const char *name()
static std::string name()
{ return "Constant"; }
/*!
......
......@@ -44,7 +44,7 @@ public:
/*!
* \brief A human readable name for the dense NAPL TCE.
*/
static const char *name()
static std::string name()
{ return "DNAPL_TCE"; }
/*!
......
......@@ -51,7 +51,7 @@ public:
/*!
* \brief A human readable name for the \f$H_2\f$.
*/
static const char *name()
static std::string name()
{ return "H2"; }
/*!
......
......@@ -48,7 +48,7 @@ public:
/*!
* \brief A human readable name for heavyoil
*/
static const char *name()
static std::string name()
{ return "heavyoil"; }
/*!
......
......@@ -44,7 +44,7 @@ public:
/*!
* \brief A human readable name for the LNAPL.
*/
static const char *name()
static std::string name()
{ return "LNAPL"; }
/*!
......
......@@ -48,7 +48,7 @@ public:
/*!
* \brief A human readable name for the mesitylene
*/
static const char *name()
static std::string name()
{ return "mesitylene"; }
/*!
......
......@@ -45,7 +45,7 @@ public:
/*!
* \brief A human readable name for the NaCl.
*/
static const char *name()
static std::string name()
{
return "NaCl";
}
......
......@@ -50,7 +50,7 @@ public:
/*!
* \brief A human readable name for the \f$CO_2\f$.
*/
static const char *name()
static std::string name()
{ return "CO2"; }
/*!
......
......@@ -52,7 +52,7 @@ public:
/*!
* \brief A human readable name for the water.
*/
static const char *name()
static std::string name()
{ return "H2O"; }
/*!
......
......@@ -570,7 +570,7 @@ public:
private:
// prints a warning if the result is not in range or the table has
// not been initialized
static void printWarning_(const char *quantity, Scalar arg1, Scalar arg2)
static void printWarning_(std::string quantity, Scalar arg1, Scalar arg2)
{
#ifndef NDEBUG
if (warningPrinted_)
......
......@@ -43,7 +43,7 @@ public:
/*!
* \brief A human readable name for the component.
*/
static const char *name()
static std::string name()
{ return "Unit"; }
/*!
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment