diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh index 196b3a207ebc14d1853dbcde02b9be811c7df0ff..4758f68dea38c9d37362c373353821403050a142 100644 --- a/dumux/material/components/air.hh +++ b/dumux/material/components/air.hh @@ -99,13 +99,13 @@ public: /*! * \brief Returns true, the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return true; } /*! * \brief Returns true, the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*! diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh index 422bee5dae03103d7293875bd0d4d94dd6511ee2..ae6df588f7b4f307af9b35c9ecfbf7e03e8cdc06 100644 --- a/dumux/material/components/brine.hh +++ b/dumux/material/components/brine.hh @@ -281,13 +281,13 @@ public: /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return H2O::gasIsIdeal(); } /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return H2O::gasIsCompressible(); } /*! diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh index 6011d61751ad5c3455727ffc29a0fa95f7279354..abca67f4dd0ddfcb0f4b022acf90349374d2ef94 100644 --- a/dumux/material/components/ch4.hh +++ b/dumux/material/components/ch4.hh @@ -95,7 +95,7 @@ public: /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return true; } /*! @@ -122,7 +122,7 @@ public: /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*! diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh index f34e7524525c6599049b64cce504b06d810499ff..9386b03c1fdbfa5a81f5299604bbcfb6cbd81c73 100644 --- a/dumux/material/components/h2.hh +++ b/dumux/material/components/h2.hh @@ -131,13 +131,13 @@ public: /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return true; } /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*! diff --git a/dumux/material/components/heavyoil.hh b/dumux/material/components/heavyoil.hh index 141d9b61f7b645f342d3934419c012f95ad8f1d3..bdc4aeec9fb712a34bbf4dad886f03434a166429 100644 --- a/dumux/material/components/heavyoil.hh +++ b/dumux/material/components/heavyoil.hh @@ -384,13 +384,13 @@ public: /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return true; } /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*! diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh index ec732d2d10e1b3d17a302cfe94e1edf333847268..4486c3d71c726d70554f79db4dcd6ace6e2adc65 100644 --- a/dumux/material/components/mesitylene.hh +++ b/dumux/material/components/mesitylene.hh @@ -258,13 +258,13 @@ public: /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return true; } /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*! diff --git a/dumux/material/components/n2.hh b/dumux/material/components/n2.hh index 04a953e6b769f3dd3affb98243fa99ff860a731c..4720451557e9906c68d9b2289bbecdf36c26d1a3 100644 --- a/dumux/material/components/n2.hh +++ b/dumux/material/components/n2.hh @@ -146,13 +146,13 @@ public: /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return true; } /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*! diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh index c6f34a39e293c7f86c1acc90082f2a792b0e07ab..5e56909c5886c0b50358031b3b59e7ecef95b25e 100644 --- a/dumux/material/components/simpleh2o.hh +++ b/dumux/material/components/simpleh2o.hh @@ -235,7 +235,7 @@ public: /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*! diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh index 497ca323642865fb188f8037af3ab465229a0400..405244859e18b877536086266064d73621ba34bb 100644 --- a/dumux/material/components/tabulatedcomponent.hh +++ b/dumux/material/components/tabulatedcomponent.hh @@ -413,7 +413,7 @@ public: /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return RawComponent::gasIsCompressible(); } /*! @@ -425,7 +425,7 @@ public: /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return RawComponent::gasIsIdeal(); } diff --git a/dumux/material/components/trichloroethene.hh b/dumux/material/components/trichloroethene.hh index d1364126ec054a0c4649acd4dc006c942b7ef763..bf30f45ce5454942217cd49afd478ca3413832e7 100644 --- a/dumux/material/components/trichloroethene.hh +++ b/dumux/material/components/trichloroethene.hh @@ -108,7 +108,7 @@ public: /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return true; } /*! @@ -149,7 +149,7 @@ public: /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*! diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh index 050612a15ae64605089f3278cabe621c5875d6a9..010be342dde8eec612a08f44847599ec054dbcbe 100644 --- a/dumux/material/components/xylene.hh +++ b/dumux/material/components/xylene.hh @@ -304,13 +304,13 @@ public: /*! * \brief Returns true if the gas phase is assumed to be compressible */ - static bool gasIsCompressible() + static constexpr bool gasIsCompressible() { return true; } /*! * \brief Returns true if the gas phase is assumed to be ideal */ - static bool gasIsIdeal() + static constexpr bool gasIsIdeal() { return true; } /*!