From 3b62b6afb52189eab3a25f39cbc049b582fad862 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Mon, 30 Jan 2017 18:41:50 +0100 Subject: [PATCH] Replace const char * by std::string for more flexibility --- dumux/freeflow/zeroeq/model.hh | 2 +- dumux/freeflow/zeroeqnc/model.hh | 2 +- dumux/freeflow/zeroeqncni/model.hh | 2 +- dumux/material/components/air.hh | 2 +- dumux/material/components/benzene.hh | 2 +- dumux/material/components/brine.hh | 2 +- dumux/material/components/ch4.hh | 2 +- dumux/material/components/co2.hh | 2 +- dumux/material/components/component.hh | 2 +- dumux/material/components/constant.hh | 2 +- dumux/material/components/dnapl.hh | 2 +- dumux/material/components/h2.hh | 2 +- dumux/material/components/heavyoil.hh | 2 +- dumux/material/components/lnapl.hh | 2 +- dumux/material/components/mesitylene.hh | 2 +- dumux/material/components/nacl.hh | 2 +- dumux/material/components/simpleco2.hh | 2 +- dumux/material/components/simpleh2o.hh | 2 +- .../material/components/tabulatedcomponent.hh | 2 +- dumux/material/components/unit.hh | 2 +- dumux/material/components/xylene.hh | 2 +- dumux/material/fluidsystems/1p.hh | 4 +-- dumux/material/fluidsystems/2pimmiscible.hh | 10 +++---- dumux/material/fluidsystems/2pliquidvapor.hh | 12 ++++----- dumux/material/fluidsystems/brineair.hh | 4 +-- dumux/material/fluidsystems/brineco2.hh | 12 ++++----- dumux/material/fluidsystems/gasphase.hh | 6 ++--- dumux/material/fluidsystems/h2oairxylene.hh | 4 +-- .../fluidsystems/h2oheavyoilfluidsystem.hh | 4 +-- dumux/material/fluidsystems/h2on2.hh | 7 +---- dumux/material/fluidsystems/h2on2kinetic.hh | 2 +- dumux/material/fluidsystems/h2on2o2.hh | 4 +-- dumux/material/fluidsystems/liquidphase.hh | 6 ++--- .../material/fluidsystems/purewatersimple.hh | 14 +++++----- dumux/material/fluidsystems/spe5.hh | 26 +++++++++---------- dumux/multidomain/problem.hh | 6 ++--- .../mpnc/implicit/energy/vtkwriterkinetic.hh | 14 +++++----- .../mpnc/implicit/vtkwritermodule.hh | 8 +++--- .../sequential/impetproblem.hh | 6 ++--- .../sequential/onemodelproblem.hh | 6 ++--- .../navierstokes/navierstokestestproblem.hh | 2 +- test/freeflow/stokes/stokestestproblem.hh | 2 +- test/geomechanics/el1p2c/el1p2cproblem.hh | 2 +- test/geomechanics/el2p/el2pproblem.hh | 2 +- .../elastic/elasticmatrixproblem.hh | 2 +- .../1p/sequential/test_1pproblem.hh | 2 +- .../1p/sequential/test_diffusion3d.cc | 6 ++--- .../2p/implicit/cc2pcornerpointproblem.hh | 4 +-- .../implicit/generalizeddirichletproblem.hh | 4 +-- .../2p/implicit/lensproblem.hh | 4 +-- .../2p/sequential/test_3d2pproblem.hh | 7 ++--- .../sequential/test_impesadaptiveproblem.hh | 4 +-- .../2p/sequential/test_mpfa2pproblem.hh | 9 ++----- .../2p/sequential/test_transportproblem.hh | 2 +- .../sequential/test_adaptive2p2c2dproblem.hh | 3 +-- .../sequential/test_adaptive2p2c3dproblem.hh | 4 +-- .../2p2c/sequential/test_dec2p2cproblem.hh | 2 +- .../test_multiphysics2p2cproblem.hh | 2 +- .../2pdfm/implicit/2pdfmtestproblem.hh | 2 +- .../3p/implicit/3pniconductionproblem.hh | 4 +-- .../3p/implicit/3pniconvectionproblem.hh | 4 +-- .../implicit/richardsniconductionproblem.hh | 4 +-- .../implicit/richardsniconvectionproblem.hh | 4 +-- .../ex2_tutorialproblem_implicit.hh | 2 +- tutorial/solutions_implicit/ex4_benzene.hh | 2 +- .../ex5_tutorialproblem_implicit.hh | 2 +- .../ex2tutorialproblem_sequential.hh | 2 +- tutorial/solutions_sequential/ex4_benzene.hh | 2 +- .../ex5_tutorialproblem_sequential.hh | 2 +- tutorial/tutorialproblem_implicit.hh | 2 +- tutorial/tutorialproblem_sequential.hh | 2 +- 71 files changed, 140 insertions(+), 154 deletions(-) diff --git a/dumux/freeflow/zeroeq/model.hh b/dumux/freeflow/zeroeq/model.hh index 53f1d2c356..b64c307105 100644 --- a/dumux/freeflow/zeroeq/model.hh +++ b/dumux/freeflow/zeroeq/model.hh @@ -967,7 +967,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)) { diff --git a/dumux/freeflow/zeroeqnc/model.hh b/dumux/freeflow/zeroeqnc/model.hh index 38d24e68cc..dcb92d2be2 100644 --- a/dumux/freeflow/zeroeqnc/model.hh +++ b/dumux/freeflow/zeroeqnc/model.hh @@ -348,7 +348,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)) { diff --git a/dumux/freeflow/zeroeqncni/model.hh b/dumux/freeflow/zeroeqncni/model.hh index 20b1afc4f7..a9da7b57b7 100644 --- a/dumux/freeflow/zeroeqncni/model.hh +++ b/dumux/freeflow/zeroeqncni/model.hh @@ -360,7 +360,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)) { diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh index e9ecbc4052..9d8e45b57d 100644 --- a/dumux/material/components/air.hh +++ b/dumux/material/components/air.hh @@ -48,7 +48,7 @@ public: /*! * \brief A human readable name for Air. */ - static const char *name() + static std::string name() { return "Air"; } /*! diff --git a/dumux/material/components/benzene.hh b/dumux/material/components/benzene.hh index 61f29bfd71..645dc1eb79 100644 --- a/dumux/material/components/benzene.hh +++ b/dumux/material/components/benzene.hh @@ -45,7 +45,7 @@ public: /*! * \brief A human readable name for the benzene */ - static const char *name() + static std::string name() { return "benzene"; } /*! diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh index 152c2f669e..dc50cf4bf2 100644 --- a/dumux/material/components/brine.hh +++ b/dumux/material/components/brine.hh @@ -58,7 +58,7 @@ public: /*! * \brief A human readable name for the brine. */ - static const char *name() + static std::string name() { return "Brine"; } /*! diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh index 6634cbc2ae..066990a03c 100644 --- a/dumux/material/components/ch4.hh +++ b/dumux/material/components/ch4.hh @@ -51,7 +51,7 @@ public: /*! * \brief A human readable name for methane. */ - static const char *name() + static std::string name() { return "CH4"; } /*! diff --git a/dumux/material/components/co2.hh b/dumux/material/components/co2.hh index 14b00c851c..b64aa41426 100644 --- a/dumux/material/components/co2.hh +++ b/dumux/material/components/co2.hh @@ -57,7 +57,7 @@ public: /*! * \brief A human readable name for the CO2. */ - static const char *name() + static std::string name() { return "CO2"; } /*! diff --git a/dumux/material/components/component.hh b/dumux/material/components/component.hh index b24f699af0..4cee3ab519 100644 --- a/dumux/material/components/component.hh +++ b/dumux/material/components/component.hh @@ -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()"); } /*! diff --git a/dumux/material/components/constant.hh b/dumux/material/components/constant.hh index eb545337ea..5298cd8636 100644 --- a/dumux/material/components/constant.hh +++ b/dumux/material/components/constant.hh @@ -65,7 +65,7 @@ public: /*! * \brief A human readable name for the component. */ - static const char *name() + static std::string name() { return "Constant"; } /*! diff --git a/dumux/material/components/dnapl.hh b/dumux/material/components/dnapl.hh index 57126aec16..485387e1cf 100644 --- a/dumux/material/components/dnapl.hh +++ b/dumux/material/components/dnapl.hh @@ -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"; } /*! diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh index e6ea4c9948..d95d1d2844 100644 --- a/dumux/material/components/h2.hh +++ b/dumux/material/components/h2.hh @@ -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"; } /*! diff --git a/dumux/material/components/heavyoil.hh b/dumux/material/components/heavyoil.hh index 697efdb0cb..149234b1a2 100644 --- a/dumux/material/components/heavyoil.hh +++ b/dumux/material/components/heavyoil.hh @@ -48,7 +48,7 @@ public: /*! * \brief A human readable name for heavyoil */ - static const char *name() + static std::string name() { return "heavyoil"; } /*! diff --git a/dumux/material/components/lnapl.hh b/dumux/material/components/lnapl.hh index 53eb32238c..0a08a279d1 100644 --- a/dumux/material/components/lnapl.hh +++ b/dumux/material/components/lnapl.hh @@ -44,7 +44,7 @@ public: /*! * \brief A human readable name for the LNAPL. */ - static const char *name() + static std::string name() { return "LNAPL"; } /*! diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh index 2204685ef5..3c483fe355 100644 --- a/dumux/material/components/mesitylene.hh +++ b/dumux/material/components/mesitylene.hh @@ -48,7 +48,7 @@ public: /*! * \brief A human readable name for the mesitylene */ - static const char *name() + static std::string name() { return "mesitylene"; } /*! diff --git a/dumux/material/components/nacl.hh b/dumux/material/components/nacl.hh index 3d3d271f59..6f6acdfa46 100644 --- a/dumux/material/components/nacl.hh +++ b/dumux/material/components/nacl.hh @@ -45,7 +45,7 @@ public: /*! * \brief A human readable name for the NaCl. */ - static const char *name() + static std::string name() { return "NaCl"; } diff --git a/dumux/material/components/simpleco2.hh b/dumux/material/components/simpleco2.hh index e5af02cdd7..54153940b7 100644 --- a/dumux/material/components/simpleco2.hh +++ b/dumux/material/components/simpleco2.hh @@ -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"; } /*! diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh index 7316c85d2b..ce465b7020 100644 --- a/dumux/material/components/simpleh2o.hh +++ b/dumux/material/components/simpleh2o.hh @@ -52,7 +52,7 @@ public: /*! * \brief A human readable name for the water. */ - static const char *name() + static std::string name() { return "H2O"; } /*! diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh index 77d885c41f..7330808a7e 100644 --- a/dumux/material/components/tabulatedcomponent.hh +++ b/dumux/material/components/tabulatedcomponent.hh @@ -557,7 +557,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_) diff --git a/dumux/material/components/unit.hh b/dumux/material/components/unit.hh index 2007313b5b..844c0c052d 100644 --- a/dumux/material/components/unit.hh +++ b/dumux/material/components/unit.hh @@ -43,7 +43,7 @@ public: /*! * \brief A human readable name for the component. */ - static const char *name() + static std::string name() { return "Unit"; } /*! diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh index 785685281e..904e7aadf7 100644 --- a/dumux/material/components/xylene.hh +++ b/dumux/material/components/xylene.hh @@ -49,7 +49,7 @@ public: /*! * \brief A human readable name for the xylene */ - static const char *name() + static std::string name() { return "xylene"; } /*! diff --git a/dumux/material/fluidsystems/1p.hh b/dumux/material/fluidsystems/1p.hh index 7679e52b13..e77f8efd89 100644 --- a/dumux/material/fluidsystems/1p.hh +++ b/dumux/material/fluidsystems/1p.hh @@ -75,7 +75,7 @@ public: * * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); @@ -159,7 +159,7 @@ public: * * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { assert(0 <= compIdx && compIdx < numComponents); diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh index 49eb242469..bd7751f1d4 100644 --- a/dumux/material/fluidsystems/2pimmiscible.hh +++ b/dumux/material/fluidsystems/2pimmiscible.hh @@ -82,13 +82,13 @@ public: * \brief Return the human readable name of a fluid phase * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - static const char *name[] = { - "w", - "n" + static std::string name[] = { + std::string("w"), + std::string("n") }; return name[phaseIdx]; } @@ -179,7 +179,7 @@ public: * * \param compIdx index of the component */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { assert(0 <= compIdx && compIdx < numComponents); diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh index eccfc792e6..be319c91ef 100644 --- a/dumux/material/fluidsystems/2pliquidvapor.hh +++ b/dumux/material/fluidsystems/2pliquidvapor.hh @@ -81,11 +81,11 @@ public: * * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { - static const char *name[] = { - "liquid", - "vapor", + static std::string name[] = { + std::string("liquid"), + std::string("vapor"), }; assert(0 <= phaseIdx && phaseIdx < numPhases); @@ -177,9 +177,9 @@ public: * * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { - static const char *name[] = { + static std::string name[] = { Component::name() }; diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh index 1bb1b3a961..6f442966bd 100644 --- a/dumux/material/fluidsystems/brineair.hh +++ b/dumux/material/fluidsystems/brineair.hh @@ -127,7 +127,7 @@ public: * * \param phaseIdx index of the phase */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { switch (phaseIdx) { case wPhaseIdx: return "liquid"; @@ -223,7 +223,7 @@ public: * * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { switch (compIdx) { diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh index 9ccc5362ac..a238f8a101 100644 --- a/dumux/material/fluidsystems/brineco2.hh +++ b/dumux/material/fluidsystems/brineco2.hh @@ -95,11 +95,11 @@ public: * * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { - static const char *name[] = { - "l", - "g" + static std::string name[] = { + std::string("l"), + std::string("g") }; assert(0 <= phaseIdx && phaseIdx < numPhases); @@ -160,9 +160,9 @@ public: * * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { - static const char *name[] = { + static std::string name[] = { Brine::name(), CO2::name(), }; diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh index c8f979f7aa..bfbe8fcf06 100644 --- a/dumux/material/fluidsystems/gasphase.hh +++ b/dumux/material/fluidsystems/gasphase.hh @@ -69,7 +69,7 @@ public: * * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx = 0) + static std::string phaseName(int phaseIdx = 0) { return Component::name(); } /*! @@ -77,13 +77,13 @@ public: * * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx = 0) + static std::string componentName(int compIdx = 0) { return Component::name(); } /*! * \brief A human readable name for the component. */ - static const char *name() + static std::string name() { return Component::name(); } /*! diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh index 41e652b32a..f1586b027e 100644 --- a/dumux/material/fluidsystems/h2oairxylene.hh +++ b/dumux/material/fluidsystems/h2oairxylene.hh @@ -184,7 +184,7 @@ public: * \brief Return the human readable name of a phase (used in indices) * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { switch (phaseIdx) { case wPhaseIdx: return "w"; @@ -198,7 +198,7 @@ public: * \brief Return the human readable name of a component (used in indices) * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { switch (compIdx) { case H2OIdx: return H2O::name(); diff --git a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh index 701b72e398..e08409edfd 100644 --- a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh +++ b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh @@ -179,7 +179,7 @@ public: /*! * \brief Return the human readable name of a phase (used in indices) */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { switch (phaseIdx) { case wPhaseIdx: return "w"; @@ -192,7 +192,7 @@ public: /*! * \brief Return the human readable name of a component (used in indices) */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { switch (compIdx) { case H2OIdx: return H2O::name(); diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh index e422c7d601..2a939a938a 100644 --- a/dumux/material/fluidsystems/h2on2.hh +++ b/dumux/material/fluidsystems/h2on2.hh @@ -98,13 +98,8 @@ public: */ static const std::string& phaseName(int phaseIdx) { - static const std::string name[] = { - "w", - "n" - }; - assert(0 <= phaseIdx && phaseIdx < numPhases); - return name[phaseIdx]; + return phaseIdx == wPhaseIdx ? "w" : "n"; } /*! diff --git a/dumux/material/fluidsystems/h2on2kinetic.hh b/dumux/material/fluidsystems/h2on2kinetic.hh index 3b09cf1075..5d24e2aa3f 100644 --- a/dumux/material/fluidsystems/h2on2kinetic.hh +++ b/dumux/material/fluidsystems/h2on2kinetic.hh @@ -61,7 +61,7 @@ public: //! Index of the solid phase static constexpr int sPhaseIdx = 2; - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { if (phaseIdx == sPhaseIdx) return "s"; diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh index 74f513dbba..26eee94949 100644 --- a/dumux/material/fluidsystems/h2on2o2.hh +++ b/dumux/material/fluidsystems/h2on2o2.hh @@ -111,8 +111,8 @@ public: static const std::string& phaseName(int phaseIdx) { static const std::string name[] = { - "l", - "g" + std::string("l"), + std::string("g") }; assert(0 <= phaseIdx && phaseIdx < numPhases); diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh index b073cec32f..c774bed530 100644 --- a/dumux/material/fluidsystems/liquidphase.hh +++ b/dumux/material/fluidsystems/liquidphase.hh @@ -68,7 +68,7 @@ public: * * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx = 0) + static std::string phaseName(int phaseIdx = 0) { return Component::name(); } /*! @@ -76,13 +76,13 @@ public: * * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx = 0) + static std::string componentName(int compIdx = 0) { return Component::name(); } /*! * \brief A human readable name for the component. */ - static const char *name() + static std::string name() { return Component::name(); } /*! diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/dumux/material/fluidsystems/purewatersimple.hh index fef356f2d2..338bce8fd5 100644 --- a/dumux/material/fluidsystems/purewatersimple.hh +++ b/dumux/material/fluidsystems/purewatersimple.hh @@ -96,12 +96,12 @@ public: * * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { - static const char *name[] = { - "w", - "n", - "s" + static std::string name[] = { + std::string("w"), + std::string("n"), + std::string("s") }; assert(0 <= phaseIdx && phaseIdx < numPhases); @@ -198,9 +198,9 @@ public: * * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { - static const char *name[] = { + static std::string name[] = { H2O::name(), N2::name() }; diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh index 496d49727a..97685a3cee 100644 --- a/dumux/material/fluidsystems/spe5.hh +++ b/dumux/material/fluidsystems/spe5.hh @@ -84,12 +84,12 @@ public: * \brief Return the human readable name of a fluid phase * \param phaseIdx The index of the fluid phase to consider */ - static const char *phaseName(int phaseIdx) + static std::string phaseName(int phaseIdx) { - static const char *name[] = { - "g", - "w", - "o", + static std::string name[] = { + std::string("g"), + std::string("w"), + std::string("o"), }; assert(0 <= phaseIdx && phaseIdx < numPhases); @@ -170,16 +170,16 @@ public: * \brief Return the human readable name of a component * \param compIdx The index of the component to consider */ - static const char *componentName(int compIdx) + static std::string componentName(int compIdx) { - static const char *name[] = { + static std::string name[] = { H2O::name(), - "C1", - "C3", - "C6", - "C10", - "C15", - "C20" + std::string("C1"), + std::string("C3"), + std::string("C6"), + std::string("C10"), + std::string("C15"), + std::string("C20") }; assert(0 <= compIdx && compIdx < numComponents); diff --git a/dumux/multidomain/problem.hh b/dumux/multidomain/problem.hh index 4f0879ae15..1aff9346c7 100644 --- a/dumux/multidomain/problem.hh +++ b/dumux/multidomain/problem.hh @@ -265,11 +265,11 @@ public: // \} //! \copydoc ImplicitProblem::name() - const char *name() const - { return simname_.c_str(); } + const std::string& name() const + { return simname_; } //! \copydoc ImplicitProblem::setName() - static void setName(const char *newName) + static void setName(std::string newName) { simname_ = newName; } //! \copydoc ImplicitProblem::timeManager() diff --git a/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriterkinetic.hh b/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriterkinetic.hh index b811f641b1..7fb5dd9644 100644 --- a/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriterkinetic.hh +++ b/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriterkinetic.hh @@ -238,7 +238,7 @@ private: */ template void commitTemperaturesBuffer_(MultiWriter & writer, - const char *pattern, + std::string pattern, EnergyEqVector & buffer, bool vertexCentered = true) { @@ -466,13 +466,13 @@ private: */ template void commitTemperaturesBuffer_(MultiWriter & writer, - const char *pattern, + std::string pattern, EnergyEqVector & buffer, bool vertexCentered = true) { - static const char *name[] = { - "fluid", - "solid" + static std::string name[] = { + std::string("fluid"), + std::string("solid") }; for (int energyEqIdx = 0; energyEqIdx < numEnergyEqs; ++energyEqIdx) { @@ -486,9 +486,9 @@ private: } } -// static const char *phaseName(int phaseIdx) +// static std::string phaseName(int phaseIdx) // { -// static const char *name[] = { +// static std::string name[] = { // "w", // "n" // }; diff --git a/dumux/porousmediumflow/mpnc/implicit/vtkwritermodule.hh b/dumux/porousmediumflow/mpnc/implicit/vtkwritermodule.hh index 7d13ad1d3a..a886b47476 100644 --- a/dumux/porousmediumflow/mpnc/implicit/vtkwritermodule.hh +++ b/dumux/porousmediumflow/mpnc/implicit/vtkwritermodule.hh @@ -181,7 +181,7 @@ protected: */ template void commitScalarBuffer_(MultiWriter &writer, - const char *name, + std::string name, ScalarVector &buffer, bool vertexCentered = true) { @@ -196,7 +196,7 @@ protected: */ template void commitPhaseBuffer_(MultiWriter &writer, - const char *pattern, + std::string pattern, PhaseVector &buffer, bool vertexCentered = true) { @@ -216,7 +216,7 @@ protected: */ template void commitComponentBuffer_(MultiWriter &writer, - const char *pattern, + std::string pattern, ComponentVector &buffer, bool vertexCentered = true) { @@ -236,7 +236,7 @@ protected: */ template void commitPhaseComponentBuffer_(MultiWriter &writer, - const char *pattern, + std::string pattern, PhaseComponentMatrix &buffer, bool vertexCentered = true) { diff --git a/dumux/porousmediumflow/sequential/impetproblem.hh b/dumux/porousmediumflow/sequential/impetproblem.hh index d881b904dd..c529f5d63a 100644 --- a/dumux/porousmediumflow/sequential/impetproblem.hh +++ b/dumux/porousmediumflow/sequential/impetproblem.hh @@ -539,9 +539,9 @@ public: * It could be either overwritten by the problem files, or simply * declared over the setName() function in the application file. */ - const char *name() const + const std::string& name() const { - return simname_.c_str(); + return simname_; } /*! @@ -553,7 +553,7 @@ public: * * \param newName The problem's name */ - void setName(const char *newName) + void setName(std::string newName) { simname_ = newName; } diff --git a/dumux/porousmediumflow/sequential/onemodelproblem.hh b/dumux/porousmediumflow/sequential/onemodelproblem.hh index e3e095cf5b..e28c6e0fd0 100644 --- a/dumux/porousmediumflow/sequential/onemodelproblem.hh +++ b/dumux/porousmediumflow/sequential/onemodelproblem.hh @@ -489,9 +489,9 @@ public: * It could be either overwritten by the problem files, or simply * declared over the setName() function in the application file. */ - const char *name() const + const std::string& name() const { - return simname_.c_str(); + return simname_; } /*! @@ -501,7 +501,7 @@ public: * the application problem is declared! If not, the default name "sim" * will be used. */ - void setName(const char *newName) + void setName(std::string newName) { simname_ = newName; } diff --git a/test/freeflow/navierstokes/navierstokestestproblem.hh b/test/freeflow/navierstokes/navierstokestestproblem.hh index ab46820723..f11f1ab21c 100644 --- a/test/freeflow/navierstokes/navierstokestestproblem.hh +++ b/test/freeflow/navierstokes/navierstokestestproblem.hh @@ -123,7 +123,7 @@ namespace Dumux * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + std::string name() const { return "navierstokes"; } diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh index dc79c2ec8a..b99fc961da 100644 --- a/test/freeflow/stokes/stokestestproblem.hh +++ b/test/freeflow/stokes/stokestestproblem.hh @@ -124,7 +124,7 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + std::string name() const { return "stokes"; } /*! diff --git a/test/geomechanics/el1p2c/el1p2cproblem.hh b/test/geomechanics/el1p2c/el1p2cproblem.hh index 592bda3fa9..cb7d81761e 100644 --- a/test/geomechanics/el1p2c/el1p2cproblem.hh +++ b/test/geomechanics/el1p2c/el1p2cproblem.hh @@ -124,7 +124,7 @@ class El1P2CProblem: public ImplicitPorousMediaProblem * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + std::string name() const { return "el1p2c";} /*! diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh index d0627913fa..ae4f7fe3fe 100644 --- a/test/geomechanics/el2p/el2pproblem.hh +++ b/test/geomechanics/el2p/el2pproblem.hh @@ -365,7 +365,7 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + std::string name() const { return "el2p"; } diff --git a/test/geomechanics/elastic/elasticmatrixproblem.hh b/test/geomechanics/elastic/elasticmatrixproblem.hh index 612599adac..9a88e31e5d 100644 --- a/test/geomechanics/elastic/elasticmatrixproblem.hh +++ b/test/geomechanics/elastic/elasticmatrixproblem.hh @@ -130,7 +130,7 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + std::string name() const { return "elasticmatrix";} // \} diff --git a/test/porousmediumflow/1p/sequential/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh index 2533b5f75c..58e7b158e0 100644 --- a/test/porousmediumflow/1p/sequential/test_1pproblem.hh +++ b/test/porousmediumflow/1p/sequential/test_1pproblem.hh @@ -123,7 +123,7 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + std::string name() const { return "test_1p"; } diff --git a/test/porousmediumflow/1p/sequential/test_diffusion3d.cc b/test/porousmediumflow/1p/sequential/test_diffusion3d.cc index 0ae5d30ec3..3587552f36 100644 --- a/test/porousmediumflow/1p/sequential/test_diffusion3d.cc +++ b/test/porousmediumflow/1p/sequential/test_diffusion3d.cc @@ -139,7 +139,7 @@ int start(int argc, std::string fvOutput = "test_diffusion3d_fv" + outputName; if (numRefine > 0) fvOutput += "_numRefine" + std::to_string(numRefine); - fvProblem->setName(fvOutput.c_str()); + fvProblem->setName(fvOutput); timer.reset(); @@ -167,7 +167,7 @@ int start(int argc, std::string fvmpfaOutput = "test_diffusion3d_fvmpfal" + outputName; if (numRefine > 0) fvmpfaOutput += "_numRefine" + std::to_string(numRefine); - mpfaProblem->setName(fvmpfaOutput.c_str()); + mpfaProblem->setName(fvmpfaOutput); timer.reset(); @@ -195,7 +195,7 @@ int start(int argc, std::string mimeticOutput = "test_diffusion3d_mimetic" + outputName; if (numRefine > 0) mimeticOutput += "_numRefine" + std::to_string(numRefine); - mimeticProblem->setName(mimeticOutput.c_str()); + mimeticProblem->setName(mimeticOutput); timer.reset(); diff --git a/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh b/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh index a0fcee1620..3da4ba0aaa 100644 --- a/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh +++ b/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh @@ -150,9 +150,9 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + const std::string& name() const { - return name_.c_str(); + return name_; } /*! diff --git a/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh b/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh index a43fbdf113..3f8a05f0be 100644 --- a/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh +++ b/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh @@ -119,8 +119,8 @@ public: //! Specifies the problem name. This is used as a prefix for files //! generated by the simulation. - const char *name() const - { return name_.c_str(); } + const std::string& name() const + { return name_; } //! Returns the temperature within a finite volume. We use constant //! 10 degrees Celsius. diff --git a/test/porousmediumflow/2p/implicit/lensproblem.hh b/test/porousmediumflow/2p/implicit/lensproblem.hh index 4c5d81e480..1e7d797f9f 100644 --- a/test/porousmediumflow/2p/implicit/lensproblem.hh +++ b/test/porousmediumflow/2p/implicit/lensproblem.hh @@ -229,9 +229,9 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + const std::string& name() const { - return name_.c_str(); + return name_; } /*! diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh index cad2120f29..bad603a222 100644 --- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh @@ -230,13 +230,10 @@ ParentType(timeManager, gridView), inflowEdge_(0), outflowEdge_(0) * * This is used as a prefix for files generated by the simulation. */ -const char *name() const +std::string name() const { if (ParameterTree::tree().hasKey("Problem.OutputName")) - { - std::string name(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, OutputName)); - return name.c_str(); - } + return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, OutputName); else return "test_3d2p"; } diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh index 3a45ef74c5..2f61a59e98 100644 --- a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh @@ -170,9 +170,9 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + const std::string& name() const { - return name_.c_str(); + return name_; } bool shouldWriteRestartFile() const diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh index 6b5e854b40..3ff1f29c39 100644 --- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh @@ -270,17 +270,12 @@ void addOutputVtkFields() * * This is used as a prefix for files generated by the simulation. */ -const char *name() const +std::string name() const { if (ParameterTree::tree().hasKey("Problem.OutputFileName")) - { - std::string fileName(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, OutputFileName)); - return fileName.c_str(); - } + return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, OutputFileName); else - { return "test_mpfa2p"; - } } bool shouldWriteRestartFile() const diff --git a/test/porousmediumflow/2p/sequential/test_transportproblem.hh b/test/porousmediumflow/2p/sequential/test_transportproblem.hh index b833a0d3c0..8f3a41fd41 100644 --- a/test/porousmediumflow/2p/sequential/test_transportproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_transportproblem.hh @@ -170,7 +170,7 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + std::string name() const { return "test_transport"; } diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh index c66fca6f71..f4221dfde6 100644 --- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh +++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh @@ -136,8 +136,7 @@ Adaptive2p2c2d(TimeManager &timeManager, const GridView& gridView) : debugWriter_(gridView, "gridAfterAdapt") { this->setGrid(GridCreator::grid()); - std::string s = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, SimulationName); - this->setName(s.c_str()); + this->setName(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, SimulationName)); this->setOutputInterval(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Problem, OutputInterval)); } diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh index 126e9e8fd7..90bf8199f0 100644 --- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh +++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh @@ -151,9 +151,9 @@ Adaptive2p2c3d(TimeManager &timeManager, const GridView& gridView) : */ // \{ //! @copydoc TestDecTwoPTwoCProblem::name() -const char *name() const +std::string name() const { - return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name).c_str(); + return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name); } //! @copydoc TestDecTwoPTwoCProblem::shouldWriteRestartFile() diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh index f2d09ca79f..83c5627822 100644 --- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh +++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh @@ -125,7 +125,7 @@ ParentType(timeManager, gridView), depthBOR_(1000.0) //! The problem name. /*! This is used as a prefix for files generated by the simulation. */ -const char *name() const +std::string name() const { return "test_dec2p2c"; } diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh index 31b4affa42..ec36912639 100644 --- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh +++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh @@ -135,7 +135,7 @@ ParentType(timeManager, gridView), lowerLeft_(0), upperRight_(upperRight), depth //! The problem name. /*! This is used as a prefix for files generated by the simulation. */ -const char *name() const +std::string name() const { return "test_multiphysics2p2c"; } diff --git a/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh b/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh index 0dc4fbee5b..367c394610 100644 --- a/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh +++ b/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh @@ -158,7 +158,7 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + std::string name() const { return "2pdfm"; } /*! diff --git a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh index f5b32b5d21..b5adb99f47 100644 --- a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh +++ b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh @@ -231,9 +231,9 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + const std::string& name() const { - return name_.c_str(); + return name_; } // \} diff --git a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh index 86cde5f6a9..c6c2eac4fa 100644 --- a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh +++ b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh @@ -236,9 +236,9 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + const std::string& name() const { - return name_.c_str(); + return name_; } // \} diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh index 2e3e7ea527..f2f445cb46 100644 --- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh +++ b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh @@ -213,9 +213,9 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + const std::string& name() const { - return name_.c_str(); + return name_; } // \} diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh index c8476248c1..43ba330f78 100644 --- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh +++ b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh @@ -223,9 +223,9 @@ public: * * This is used as a prefix for files generated by the simulation. */ - const char *name() const + const std::string& name() const { - return name_.c_str(); + return name_; } // \} diff --git a/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh b/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh index 337cf77c2f..53f7716b82 100644 --- a/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh +++ b/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh @@ -121,7 +121,7 @@ public: //! Specifies the problem name. This is used as a prefix for files //! generated by the simulation. - const char *name() const + std::string name() const { return "tutorial_implicit"; } //! Returns true if a restart file should be written. diff --git a/tutorial/solutions_implicit/ex4_benzene.hh b/tutorial/solutions_implicit/ex4_benzene.hh index 0d2b878bd3..14c8f23eb3 100644 --- a/tutorial/solutions_implicit/ex4_benzene.hh +++ b/tutorial/solutions_implicit/ex4_benzene.hh @@ -45,7 +45,7 @@ public: /*! * \brief A human readable name for the benzene */ - static const char *name() + static std::string name() { return "benzene"; } /*! diff --git a/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh b/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh index 9809127876..05203fc7a8 100644 --- a/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh +++ b/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh @@ -119,7 +119,7 @@ public: //! Specifies the problem name. This is used as a prefix for files //! generated by the simulation. - const char *name() const + std::string name() const { return "ex5_tutorial_implicit"; } //! Returns true if a restart file should be written. diff --git a/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh b/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh index ebf5c1c76c..f263fbabfe 100644 --- a/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh +++ b/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh @@ -135,7 +135,7 @@ public: //! The problem name. /*! This is used as a prefix for files generated by the simulation. */ - const char *name() const /*@\label{tutorial-sequential:name}@*/ + std::string name() const /*@\label{tutorial-sequential:name}@*/ { return "tutorial_sequential"; } diff --git a/tutorial/solutions_sequential/ex4_benzene.hh b/tutorial/solutions_sequential/ex4_benzene.hh index 0d2b878bd3..14c8f23eb3 100644 --- a/tutorial/solutions_sequential/ex4_benzene.hh +++ b/tutorial/solutions_sequential/ex4_benzene.hh @@ -45,7 +45,7 @@ public: /*! * \brief A human readable name for the benzene */ - static const char *name() + static std::string name() { return "benzene"; } /*! diff --git a/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh b/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh index a4580d29fd..24398cc52c 100644 --- a/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh +++ b/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh @@ -136,7 +136,7 @@ public: //! The problem name. /*! This is used as a prefix for files generated by the simulation. */ - const char *name() const /*@\label{tutorial-sequential:name}@*/ + std::string name() const /*@\label{tutorial-sequential:name}@*/ { return "ex5_tutorial_sequential"; } diff --git a/tutorial/tutorialproblem_implicit.hh b/tutorial/tutorialproblem_implicit.hh index d39495bfab..562c075af4 100644 --- a/tutorial/tutorialproblem_implicit.hh +++ b/tutorial/tutorialproblem_implicit.hh @@ -121,7 +121,7 @@ public: //! Specifies the problem name. This is used as a prefix for files //! generated by the simulation. - const char *name() const + std::string name() const { return "tutorial_implicit"; } //! Returns true if a restart file should be written. diff --git a/tutorial/tutorialproblem_sequential.hh b/tutorial/tutorialproblem_sequential.hh index ccef75d33e..2402a4c2db 100644 --- a/tutorial/tutorialproblem_sequential.hh +++ b/tutorial/tutorialproblem_sequential.hh @@ -135,7 +135,7 @@ public: //! The problem name. /*! This is used as a prefix for files generated by the simulation. */ - const char *name() const /*@\label{tutorial-sequential:name}@*/ + std::string name() const /*@\label{tutorial-sequential:name}@*/ { return "tutorial_sequential"; } -- GitLab