Merge branch 'MplConvertAssertsToFatals' into 'master'

[MPL] Convert asserts to OGS_FATAL in dValue().

See merge request ogs/ogs!3811

MaterialLib/MPL/Properties/AverageMolarMass.cpp

@@ -87,11 +87,13 @@ PropertyDataType AverageMolarMass::dValue(
     ParameterLib::SpatialPosition const& pos, double const t,
     double const dt) const
 {
-    (void)primary_variable;
-    assert(((primary_variable == Variable::phase_pressure) ||
-            (primary_variable == Variable::temperature)) &&
-           "AverageMolarMass::dValue is implemented for derivatives with "
-           "respect to phase_pressure or temperature only.");
+    if ((primary_variable != Variable::phase_pressure) &&
+        (primary_variable != Variable::temperature))
+    {
+        OGS_FATAL(
+            "AverageMolarMass::dValue is implemented for derivatives with "
+            "respect to phase_pressure or temperature only.");
+    }
 
     auto phase = std::get<Phase*>(scale_);
 
@@ -103,7 +105,7 @@ PropertyDataType AverageMolarMass::dValue(
     else if (numberOfComponents > 2)
     {
         OGS_FATAL(
-            "AverageMolarMass::dvalue is currently implemented two or less "
+            "AverageMolarMass::dValue is currently implemented two or less "
             "phase components only.");
     }
 

MaterialLib/MPL/Properties/BishopsPowerLaw.cpp

@@ -43,10 +43,12 @@ PropertyDataType BishopsPowerLaw::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)variable;
-    assert((variable == Variable::liquid_saturation) &&
-           "BishopsPowerLaw::dvalue is implemented for derivatives with "
-           "respect to liquid saturation only.");
+    if (variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "BishopsPowerLaw::dValue is implemented for derivatives with "
+            "respect to liquid saturation only.");
+    }
 
     auto const S_L = std::get<double>(
         variable_array[static_cast<int>(Variable::liquid_saturation)]);

MaterialLib/MPL/Properties/BishopsSaturationCutoff.cpp

@@ -44,11 +44,12 @@ PropertyDataType BishopsSaturationCutoff::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)variable;
-    assert(
-        (variable == Variable::liquid_saturation) &&
-        "BishopsSaturationCutoff::dvalue is implemented for derivatives with "
-        "respect to liquid saturation only.");
+    if (variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "BishopsSaturationCutoff::dValue is implemented for derivatives "
+            "with respect to liquid saturation only.");
+    }
 
     return 0.;
 }

MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureRegularizedVanGenuchten.cpp

@@ -73,10 +73,12 @@ PropertyDataType CapillaryPressureRegularizedVanGenuchten::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::liquid_saturation) &&
-           "CapillaryPressureRegularizedVanGenuchten::dValue is implemented "
-           "for derivatives with respect to liquid saturation only.");
+    if (primary_variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "CapillaryPressureRegularizedVanGenuchten::dValue is implemented "
+            "for derivatives with respect to liquid saturation only.");
+    }
 
     const double Sl = std::get<double>(
         variable_array[static_cast<int>(Variable::liquid_saturation)]);

MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureVanGenuchten.cpp

@@ -112,10 +112,12 @@ PropertyDataType CapillaryPressureVanGenuchten::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::liquid_saturation) &&
-           "CapillaryPressureVanGenuchten::dValue is implemented for "
-           "derivatives with respect to liquid saturation only.");
+    if (primary_variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "CapillaryPressureVanGenuchten::dValue is implemented for "
+            "derivatives with respect to liquid saturation only.");
+    }
 
     double const S_L = std::get<double>(
         variable_array[static_cast<int>(Variable::liquid_saturation)]);

MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationBrooksCorey.cpp

@@ -61,10 +61,12 @@ PropertyDataType SaturationBrooksCorey::dValue(
     ParameterLib::SpatialPosition const& pos, double const t,
     double const dt) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::capillary_pressure) &&
-           "SaturationBrooksCorey::dValue is implemented for "
-           " derivatives with respect to capillary pressure only.");
+    if (primary_variable != Variable::capillary_pressure)
+    {
+        OGS_FATAL(
+            "SaturationBrooksCorey::dValue is implemented for derivatives with "
+            "respect to capillary pressure only.");
+    }
 
     const double s_L_res = residual_liquid_saturation_;
     const double s_L_max = 1.0 - residual_gas_saturation_;
@@ -93,12 +95,13 @@ PropertyDataType SaturationBrooksCorey::d2Value(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable1;
-    (void)primary_variable2;
-    assert((primary_variable1 == Variable::capillary_pressure) &&
-           (primary_variable2 == Variable::capillary_pressure) &&
-           "SaturationBrooksCorey::d2Value is implemented for "
-           " derivatives with respect to capillary pressure only.");
+    if ((primary_variable1 != Variable::capillary_pressure) &&
+        (primary_variable2 != Variable::capillary_pressure))
+    {
+        OGS_FATAL(
+            "SaturationBrooksCorey::d2Value is implemented for derivatives "
+            "with respect to capillary pressure only.");
+    }
 
     const double p_b = entry_pressure_;
     const double p_cap = std::max(

MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationLiakopoulos.cpp

@@ -42,10 +42,12 @@ PropertyDataType SaturationLiakopoulos::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::capillary_pressure) &&
-           "SaturationLiakopoulos::dvalue is implemented for  derivatives with "
-           "respect to capillary pressure only.");
+    if (primary_variable != Variable::capillary_pressure)
+    {
+        OGS_FATAL(
+            "SaturationLiakopoulos::dValue is implemented for derivatives with "
+            "respect to capillary pressure only.");
+    }
 
     const double p_cap = std::get<double>(
         variable_array[static_cast<int>(Variable::capillary_pressure)]);
@@ -65,12 +67,13 @@ PropertyDataType SaturationLiakopoulos::d2Value(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable1;
-    (void)primary_variable2;
-    assert((primary_variable1 == Variable::capillary_pressure) &&
-           (primary_variable2 == Variable::capillary_pressure) &&
-           "SaturationLiakopoulos::ddvalue is implemented for  derivatives "
-           "with respect to capillary pressure only.");
+    if ((primary_variable1 != Variable::capillary_pressure) &&
+        (primary_variable2 != Variable::capillary_pressure))
+    {
+        OGS_FATAL(
+            "SaturationLiakopoulos::d2Value is implemented for derivatives "
+            "with respect to capillary pressure only.");
+    }
 
     const double p_cap = std::get<double>(
         variable_array[static_cast<int>(Variable::capillary_pressure)]);

MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp

@@ -66,10 +66,12 @@ PropertyDataType SaturationVanGenuchten::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::capillary_pressure) &&
-           "SaturationVanGenuchten::dvalue is implemented for derivatives with "
-           "respect to capillary pressure only.");
+    if (primary_variable != Variable::capillary_pressure)
+    {
+        OGS_FATAL(
+            "SaturationVanGenuchten::dValue is implemented for derivatives "
+            "with respect to capillary pressure only.");
+    }
 
     const double p_cap = std::get<double>(
         variable_array[static_cast<int>(Variable::capillary_pressure)]);

MaterialLib/MPL/Properties/Density/WaterVapourDensity.cpp

@@ -90,7 +90,7 @@ PropertyDataType WaterVapourDensity::dValue(
     }
 
     OGS_FATAL(
-        "WaterVapourDensity::dvalue is implemented for derivatives with "
+        "WaterVapourDensity::dValue is implemented for derivatives with "
         "respect to temperature or phase_pressure only.");
 }
 

MaterialLib/MPL/Properties/EmbeddedFracturePermeability.cpp

@@ -83,10 +83,12 @@ PropertyDataType EmbeddedFracturePermeability<DisplacementDim>::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::mechanical_strain) &&
-           "EmbeddedFracturePermeability::dValue is implemented for "
-           "derivatives with respect to strain only.");
+    if (primary_variable != Variable::mechanical_strain)
+    {
+        OGS_FATAL(
+            "EmbeddedFracturePermeability::dValue is implemented for "
+            "derivatives with respect to strain only.");
+    }
 
     Eigen::Matrix<double, 3, 1> const n = [&] {
         if (_n_const)

MaterialLib/MPL/Properties/OrthotropicEmbeddedFracturePermeability.cpp

@@ -88,10 +88,12 @@ OrthotropicEmbeddedFracturePermeability<DisplacementDim>::dValue(
     ParameterLib::SpatialPosition const& pos, double const t,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::mechanical_strain) &&
-           "OrthotropicEmbeddedFracturePermeability::dValue is implemented for "
-           " derivatives with respect to strain only.");
+    if (primary_variable != Variable::mechanical_strain)
+    {
+        OGS_FATAL(
+            "OrthotropicEmbeddedFracturePermeability::dValue is implemented "
+            "for derivatives with respect to strain only.");
+    }
 
     auto const eps = formEigenTensor<3>(std::get<SymmetricTensor>(
         variable_array[static_cast<int>(Variable::mechanical_strain)]));

MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp

@@ -91,10 +91,12 @@ PropertyDataType PermeabilityOrthotropicPowerLaw<DisplacementDim>::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::total_strain) &&
-           "PermeabilityOrthotropicPowerLaw::dValue is implemented for  "
-           "derivatives with respect to total strain only.");
+    if (primary_variable != Variable::total_strain)
+    {
+        OGS_FATAL(
+            "PermeabilityOrthotropicPowerLaw::dValue is implemented for "
+            "derivatives with respect to total strain only.");
+    }
 
     return 0.;
 }

MaterialLib/MPL/Properties/RelativePermeability/RelPermBrooksCorey.cpp

@@ -77,10 +77,13 @@ PropertyDataType RelPermBrooksCorey::dValue(
     ParameterLib::SpatialPosition const& pos, double const t,
     double const dt) const
 {
-    (void)variable;
-    assert((variable == Variable::liquid_saturation) &&
-           "RelPermBrooksCorey::dValue is implemented for "
-           " derivatives with respect to liquid saturation only.");
+    if (variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "RelPermBrooksCorey::dValue is implemented for derivatives with "
+            "respect to liquid saturation only.");
+    }
+
     /// here, an extra computation of saturation is forced, guaranteeing a
     /// correct value. In order to speed up the computing time, saturation could
     /// be inserted into the primary variable array after it is computed in the

MaterialLib/MPL/Properties/RelativePermeability/RelPermBrooksCoreyNonwettingPhase.cpp

@@ -79,10 +79,12 @@ PropertyDataType RelPermBrooksCoreyNonwettingPhase::dValue(
     ParameterLib::SpatialPosition const& pos, double const t,
     double const dt) const
 {
-    (void)variable;
-    assert((variable == Variable::liquid_saturation) &&
-           "RelPermBrooksCorey::dValue is implemented for "
-           " derivatives with respect to liquid saturation only.");
+    if (variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "RelPermBrooksCoreyNonwettingPhase::dValue is implemented for "
+            "derivatives with respect to liquid saturation only.");
+    }
     /// here, an extra computation of saturation is forced, guaranteeing a
     /// correct value. In order to speed up the computing time, saturation could
     /// be inserted into the primary variable array after it is computed in the

MaterialLib/MPL/Properties/RelativePermeability/RelPermLiakopoulos.cpp

@@ -65,10 +65,12 @@ PropertyDataType RelPermLiakopoulos::dValue(
     ParameterLib::SpatialPosition const& pos, double const t,
     double const dt) const
 {
-    (void)variable;
-    assert((variable == Variable::liquid_saturation) &&
-           "RelPermLiakopoulos::dValue is implemented for "
-           " derivatives with respect to liquid saturation only.");
+    if (variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "RelPermLiakopoulos::dValue is implemented for derivatives with "
+            "respect to liquid saturation only.");
+    }
     /// here, an extra computation of saturation is forced, guaranteeing a
     /// correct value. In order to speed up the computing time, saturation could
     /// be inserted into the primary variable array after it is computed in the

MaterialLib/MPL/Properties/RelativePermeability/RelPermNonWettingPhaseVanGenuchtenMualem.cpp

@@ -56,11 +56,12 @@ PropertyDataType RelPermNonWettingPhaseVanGenuchtenMualem::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)variable;
-    assert(
-        (variable == Variable::liquid_saturation) &&
-        "RelPermNonWettingPhaseVanGenuchtenMualem::dValue is implemented for "
-        "the derivative with respect to liquid saturation only.");
+    if (variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "RelPermNonWettingPhaseVanGenuchtenMualem::dValue is implemented "
+            "for the derivative with respect to liquid saturation only.");
+    }
 
     const double S_L = std::get<double>(
         variable_array[static_cast<int>(Variable::liquid_saturation)]);

MaterialLib/MPL/Properties/RelativePermeability/RelPermUdell.cpp

@@ -67,10 +67,12 @@ PropertyDataType RelPermUdell::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)variable;
-    assert((variable == Variable::liquid_saturation) &&
-           "RelPermUdell::dValue is implemented for "
-           " derivatives with respect to liquid saturation only.");
+    if (variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "RelPermUdell::dValue is implemented for derivatives with respect "
+            "to liquid saturation only.");
+    }
 
     const double S_L = std::get<double>(
         variable_array[static_cast<int>(Variable::liquid_saturation)]);

MaterialLib/MPL/Properties/RelativePermeability/RelPermUdellNonwettingPhase.cpp

@@ -72,10 +72,12 @@ PropertyDataType RelPermUdellNonwettingPhase::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::liquid_saturation) &&
-           "RelPermUdellNonwettingPhase::dValue is implemented for  "
-           "derivatives with respect to liquid saturation only.");
+    if (primary_variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "RelPermUdellNonwettingPhase::dValue is implemented for "
+            "derivatives with respect to liquid saturation only.");
+    }
 
     const double S_L = std::get<double>(
         variable_array[static_cast<int>(Variable::liquid_saturation)]);

MaterialLib/MPL/Properties/RelativePermeability/RelPermVanGenuchten.cpp

@@ -60,10 +60,13 @@ PropertyDataType RelPermVanGenuchten::dValue(
     ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::liquid_saturation) &&
-           "RelativePermeabilityVanGenuchten::dValue is implemented for "
-           "derivatives with respect to liquid saturation only.");
+    if (primary_variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "RelativePermeabilityVanGenuchten::dValue is implemented for "
+            "derivatives with respect to liquid saturation only.");
+    }
+
     double const S_L = std::clamp(
         std::get<double>(
             variable_array[static_cast<int>(Variable::liquid_saturation)]),

MaterialLib/MPL/Properties/SaturationDependentSwelling.cpp

@@ -104,10 +104,12 @@ PropertyDataType SaturationDependentSwelling::dValue(
     ParameterLib::SpatialPosition const& pos, double const /*t*/,
     double const /*dt*/) const
 {
-    (void)primary_variable;
-    assert((primary_variable == Variable::liquid_saturation) &&
-           "SaturationDependentSwelling::dValue is implemented for  "
-           "derivatives with respect to liquid saturation only.");
+    if (primary_variable != Variable::liquid_saturation)
+    {
+        OGS_FATAL(
+            "SaturationDependentSwelling::dValue is implemented for "
+            "derivatives with respect to liquid saturation only.");
+    }
 
     auto const S_L = std::get<double>(
         variable_array[static_cast<int>(Variable::liquid_saturation)]);