Merge branch 'vapor_th2m' into 'master'

[MPL] make vapor diffusion models accessible to TH2M See merge request ogs/ogs!4827
ufz · Dec 2, 2023 · 5c0150e · 5c0150e
2 parents bfb70c6 + 4749d14
commit 5c0150e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/MaterialLib/MPL/Properties/VapourDiffusion/VapourDiffusionFEBEX.h b/MaterialLib/MPL/Properties/VapourDiffusion/VapourDiffusionFEBEX.h
@@ -63,11 +63,12 @@ class VapourDiffusionFEBEX final : public Property
 
     void checkScale() const override
     {
-        if (!std::holds_alternative<Phase*>(scale_))
+        if (!(std::holds_alternative<Phase*>(scale_) ||
+              std::holds_alternative<Component*>(scale_)))
         {
             OGS_FATAL(
                 "The property 'VapourDiffusionFEBEX' is "
-                "implemented on the 'phase' scale only.");
+                "implemented on the 'phase' and 'component' scale only.");
         }
     }
 

diff --git a/MaterialLib/MPL/Properties/VapourDiffusion/VapourDiffusionPMQ.h b/MaterialLib/MPL/Properties/VapourDiffusion/VapourDiffusionPMQ.h
@@ -70,11 +70,12 @@ class VapourDiffusionPMQ final : public Property
 
     void checkScale() const override
     {
-        if (!std::holds_alternative<Phase*>(scale_))
+        if (!(std::holds_alternative<Phase*>(scale_) ||
+              std::holds_alternative<Component*>(scale_)))
         {
             OGS_FATAL(
                 "The property 'VapourDiffusionPMQ' is "
-                "implemented on the 'phase' scale only.");
+                "implemented on the 'phase' and 'component' scale only.");
         }
     }