getVariable now returns an OptionalReference

Author: thelfer

include/MGIS/Behaviour/Variable.hxx

@@ -20,6 +20,7 @@
 #include <string_view>
 #include "MGIS/Config.hxx"
 #include "MGIS/Context.hxx"
+#include "MGIS/Utilities/OptionalReference.hxx"
 #include "MGIS/Behaviour/Hypothesis.hxx"
 
 namespace mgis::behaviour {
@@ -72,7 +73,7 @@ namespace mgis::behaviour {
    * \param[in] vs: variables
    * \param[in] n: name
    */
-  MGIS_EXPORT [[nodiscard]] std::optional<const Variable *> getVariable(
+  MGIS_EXPORT OptionalReference<const Variable> getVariable(
       Context &,
       const std::vector<Variable> &,
       const std::string_view) noexcept;

src/MaterialStateManager.cxx

@@ -182,7 +182,7 @@ namespace mgis::behaviour {
     if (isInvalid(omp)) {
       return false;
     }
-    const auto& mp = *(*omp);
+    const auto& mp = *omp;
     if (mp.type != Variable::SCALAR) {
       return ctx.registerErrorMessage(
           "setMaterialProperty: "
@@ -231,7 +231,7 @@ namespace mgis::behaviour {
     if (isInvalid(omp)) {
       return false;
     }
-    const auto& mp = *(*omp);
+    const auto& mp = *omp;
     if (mp.type != Variable::SCALAR) {
       return ctx.registerErrorMessage(
           "setMaterialProperty: "
@@ -376,7 +376,7 @@ namespace mgis::behaviour {
     if (isInvalid(oesv)) {
       return false;
     }
-    if ((*oesv)->type != Variable::SCALAR){
+    if (oesv->type != Variable::SCALAR){
       return ctx.registerErrorMessage(
           "setExternalStateVariable: "
           "invalid external state variable "
@@ -395,10 +395,16 @@ namespace mgis::behaviour {
       const std::span<real>& v,
       const MaterialStateManager::StorageMode s,
       const MaterialStateManager::UpdatePolicy p) noexcept {
-    const auto esv = getVariable(m.b.esvs, n);
-    const auto vs = getVariableSize(esv, m.b.hypothesis);
-    if (((static_cast<mgis::size_type>(v.size()) != m.n * vs) &&
-         (static_cast<mgis::size_type>(v.size()) != vs))) {
+    const auto oesv = getVariable(ctx, m.b.esvs, n);
+    if (isInvalid(oesv)) {
+      return false;
+    }
+    const auto ovs = getVariableSize(ctx, *oesv, m.b.hypothesis);
+    if (isInvalid(ovs)) {
+      return false;
+    }
+    if (((static_cast<mgis::size_type>(v.size()) != m.n * (*ovs)) &&
+         (static_cast<mgis::size_type>(v.size()) != (*ovs)))) {
       return ctx.registerErrorMessage(
           "setExternalStateVariable: invalid number of values");
     }

src/Variable.cxx

@@ -330,7 +330,7 @@ namespace mgis::behaviour {
     return *p;
   }  // end of getVariable
 
-  std::optional<const Variable *> getVariable(
+  OptionalReference<const Variable> getVariable(
       Context &ctx,
       const std::vector<Variable> &vs,
       const std::string_view n) noexcept {
@@ -340,7 +340,7 @@ namespace mgis::behaviour {
       return ctx.registerErrorMessage("getVariable: no variable named '" +
                                       std::string(n) + "'");
     }
-    return &(*p);
+    return {&(*p)};
   }  // end of getVariable
 
   size_type getArraySize(const std::vector<Variable> &vs, const Hypothesis h) {