[PL] Use string views avoiding a temporary strings

ufz · Jan 18, 2024 · a88ea31 · a88ea31
1 parent 0a333b1
commit a88ea31
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 58 deletions.
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM-impl.h
@@ -1046,7 +1046,7 @@ template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
           int DisplacementDim>
 std::size_t HydroMechanicsLocalAssembler<
     ShapeFunctionDisplacement, ShapeFunctionPressure,
-    DisplacementDim>::setIPDataInitialConditions(std::string const& name,
+    DisplacementDim>::setIPDataInitialConditions(std::string_view const name,
                                                  double const* values,
                                                  int const integration_order)
 {

diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
@@ -196,7 +196,7 @@ class HydroMechanicsLocalAssembler
 
     /// Returns number of read integration points.
     std::size_t setIPDataInitialConditions(
-        std::string const& name,
+        std::string_view const name,
         double const* values,
         int const integration_order) override;
 

diff --git a/ProcessLib/HydroMechanics/LocalAssemblerInterface.h b/ProcessLib/HydroMechanics/LocalAssemblerInterface.h
@@ -23,7 +23,7 @@ struct LocalAssemblerInterface : public ProcessLib::LocalAssemblerInterface,
                                  public NumLib::ExtrapolatableElement
 {
     virtual std::size_t setIPDataInitialConditions(
-        std::string const& name, double const* values,
+        std::string_view const name, double const* values,
         int const integration_order) = 0;
 
     virtual std::vector<double> getSigma() const = 0;

diff --git a/ProcessLib/LargeDeformation/LocalAssemblerInterface.h b/ProcessLib/LargeDeformation/LocalAssemblerInterface.h
@@ -61,7 +61,7 @@ struct LargeDeformationLocalAssemblerInterface
         output_data_.resize(n_integration_points);
     }
     /// Returns number of read integration points.
-    std::size_t setIPDataInitialConditions(std::string const& name,
+    std::size_t setIPDataInitialConditions(std::string_view name,
                                            double const* values,
                                            int const integration_order)
     {
@@ -77,17 +77,16 @@ struct LargeDeformationLocalAssemblerInterface
 
         if (name.starts_with("material_state_variable_"))
         {
-            std::string const variable_name = name.substr(24, name.size() - 24);
+            name.remove_prefix(24);
 
             auto const& internal_variables =
                 solid_material_.getInternalVariables();
             if (auto const iv = std::find_if(
                     begin(internal_variables), end(internal_variables),
-                    [&variable_name](auto const& iv)
-                    { return iv.name == variable_name; });
+                    [&name](auto const& iv) { return iv.name == name; });
                 iv != end(internal_variables))
             {
-                DBUG("Setting material state variable '{:s}'", variable_name);
+                DBUG("Setting material state variable '{:s}'", name);
                 return ProcessLib::
                     setIntegrationPointDataMaterialStateVariables(
                         values, material_states_,
@@ -99,7 +98,7 @@ struct LargeDeformationLocalAssemblerInterface
             WARN(
                 "Could not find variable {:s} in solid material model's "
                 "internal variables.",
-                variable_name);
+                name);
             return 0;
         }
 

diff --git a/ProcessLib/Reflection/ReflectionSetIPData.h b/ProcessLib/Reflection/ReflectionSetIPData.h
@@ -72,7 +72,7 @@ void setIPData(double const* values,
 // Returns true if IP have been set, false otherwise.
 template <int dim, typename IPData, typename Accessor_CurrentLevelFromIPData,
           typename Class, typename Accessor>
-bool setIPDataIfNameMatches(std::string const& name, double const* values,
+bool setIPDataIfNameMatches(std::string_view const name, double const* values,
                             std::vector<IPData>& ip_data_vector,
                             Accessor_CurrentLevelFromIPData const& accessor,
                             ReflectionData<Class, Accessor> const& refl_data)
@@ -112,7 +112,7 @@ bool setIPDataIfNameMatches(std::string const& name, double const* values,
 template <int dim, typename IPData, typename Accessor_CurrentLevelFromIPData,
           typename... Classes, typename... Accessors, std::size_t... Idcs>
 bool reflectSetIPData(
-    std::string const& name, double const* values,
+    std::string_view const name, double const* values,
     std::vector<IPData>& ip_data_vector,
     Accessor_CurrentLevelFromIPData const& accessor,
     std::tuple<ReflectionData<Classes, Accessors>...> const& refl_data,
@@ -128,7 +128,7 @@ bool reflectSetIPData(
 template <int dim, typename IPData, typename Accessor_CurrentLevelFromIPData,
           typename... Classes, typename... Accessors>
 bool reflectSetIPData(
-    std::string const& name, double const* values,
+    std::string_view const name, double const* values,
     std::vector<IPData>& ip_data_vector,
     Accessor_CurrentLevelFromIPData const& accessor,
     std::tuple<ReflectionData<Classes, Accessors>...> const& refl_data)
@@ -149,7 +149,7 @@ bool reflectSetIPData(
  * \return The number of integration points.
  */
 template <int dim, typename IPData>
-std::size_t reflectSetIPData(std::string const& name, double const* values,
+std::size_t reflectSetIPData(std::string_view const name, double const* values,
                              std::vector<IPData>& ip_data_vector)
 {
     detail::reflectSetIPData<dim>(

diff --git a/ProcessLib/RichardsMechanics/LocalAssemblerInterface.h b/ProcessLib/RichardsMechanics/LocalAssemblerInterface.h
@@ -23,7 +23,7 @@ struct LocalAssemblerInterface : public ProcessLib::LocalAssemblerInterface,
                                  public NumLib::ExtrapolatableElement
 {
     virtual std::size_t setIPDataInitialConditions(
-        std::string const& name, double const* values,
+        std::string_view const name, double const* values,
         int const integration_order) = 0;
 
     virtual std::vector<double> getSigma() const = 0;

diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
@@ -195,7 +195,7 @@ template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
           int DisplacementDim>
 std::size_t RichardsMechanicsLocalAssembler<
     ShapeFunctionDisplacement, ShapeFunctionPressure,
-    DisplacementDim>::setIPDataInitialConditions(std::string const& name,
+    DisplacementDim>::setIPDataInitialConditions(std::string_view name,
                                                  double const* values,
                                                  int const integration_order)
 {
@@ -250,27 +250,26 @@ std::size_t RichardsMechanicsLocalAssembler<
     }
     if (name.starts_with("material_state_variable_"))
     {
-        std::string const variable_name = name.substr(24, name.size() - 24);
+        name.remove_prefix(24);
 
         // Using first ip data for solid material. TODO (naumov) move solid
         // material into element, store only material state in IPs.
         auto const& internal_variables =
             _ip_data[0].solid_material.getInternalVariables();
-        if (auto const iv =
-                std::find_if(begin(internal_variables), end(internal_variables),
-                             [&variable_name](auto const& iv)
-                             { return iv.name == variable_name; });
+        if (auto const iv = std::find_if(
+                begin(internal_variables), end(internal_variables),
+                [&name](auto const& iv) { return iv.name == name; });
             iv != end(internal_variables))
         {
-            DBUG("Setting material state variable '{:s}'", variable_name);
+            DBUG("Setting material state variable '{:s}'", name);
             return ProcessLib::setIntegrationPointDataMaterialStateVariables(
                 values, _ip_data, &IpData::material_state_variables,
                 iv->reference);
         }
 
         ERR("Could not find variable {:s} in solid material model's internal "
             "variables.",
-            variable_name);
+            name);
     }
     return 0;
 }

diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h
@@ -90,7 +90,7 @@ class RichardsMechanicsLocalAssembler
 
     /// \return the number of read integration points.
     std::size_t setIPDataInitialConditions(
-        std::string const& name,
+        std::string_view const name,
         double const* values,
         int const integration_order) override;
 

diff --git a/ProcessLib/SmallDeformation/LocalAssemblerInterface.h b/ProcessLib/SmallDeformation/LocalAssemblerInterface.h
@@ -64,7 +64,7 @@ struct SmallDeformationLocalAssemblerInterface
         output_data_.resize(n_integration_points);
     }
     /// Returns number of read integration points.
-    std::size_t setIPDataInitialConditions(std::string const& name,
+    std::size_t setIPDataInitialConditions(std::string_view name,
                                            double const* values,
                                            int const integration_order)
     {
@@ -80,17 +80,16 @@ struct SmallDeformationLocalAssemblerInterface
 
         if (name.starts_with("material_state_variable_"))
         {
-            std::string const variable_name = name.substr(24, name.size() - 24);
+            name.remove_prefix(24);
 
             auto const& internal_variables =
                 solid_material_.getInternalVariables();
             if (auto const iv = std::find_if(
                     begin(internal_variables), end(internal_variables),
-                    [&variable_name](auto const& iv)
-                    { return iv.name == variable_name; });
+                    [&name](auto const& iv) { return iv.name == name; });
                 iv != end(internal_variables))
             {
-                DBUG("Setting material state variable '{:s}'", variable_name);
+                DBUG("Setting material state variable '{:s}'", name);
                 return ProcessLib::
                     setIntegrationPointDataMaterialStateVariables(
                         values, material_states_,
@@ -102,7 +101,7 @@ struct SmallDeformationLocalAssemblerInterface
             WARN(
                 "Could not find variable {:s} in solid material model's "
                 "internal variables.",
-                variable_name);
+                name);
             return 0;
         }
 

diff --git a/ProcessLib/SmallDeformationNonlocal/LocalAssemblerInterface.h b/ProcessLib/SmallDeformationNonlocal/LocalAssemblerInterface.h
@@ -27,7 +27,7 @@ struct SmallDeformationNonlocalLocalAssemblerInterface
       public NumLib::ExtrapolatableElement
 {
     virtual std::size_t setIPDataInitialConditions(
-        std::string const& name, double const* values,
+        std::string_view const name, double const* values,
         int const integration_order) = 0;
 
     virtual void setIPDataInitialConditionsFromCellData(

diff --git a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalFEM.h b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalFEM.h
@@ -146,7 +146,7 @@ class SmallDeformationNonlocalLocalAssembler
         }
     }
 
-    std::size_t setIPDataInitialConditions(std::string const& name,
+    std::size_t setIPDataInitialConditions(std::string_view const name,
                                            double const* values,
                                            int const integration_order) override
     {

diff --git a/ProcessLib/TH2M/LocalAssemblerInterface.h b/ProcessLib/TH2M/LocalAssemblerInterface.h
@@ -23,7 +23,7 @@ struct LocalAssemblerInterface : public ProcessLib::LocalAssemblerInterface,
                                  public NumLib::ExtrapolatableElement
 {
     virtual std::size_t setIPDataInitialConditions(
-        std::string const& name, double const* values,
+        std::string_view name, double const* values,
         int const integration_order) = 0;
 
     virtual std::vector<double> getSigma() const = 0;

diff --git a/ProcessLib/TH2M/TH2MFEM-impl.h b/ProcessLib/TH2M/TH2MFEM-impl.h
@@ -852,7 +852,7 @@ template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
           int DisplacementDim>
 std::size_t TH2MLocalAssembler<
     ShapeFunctionDisplacement, ShapeFunctionPressure,
-    DisplacementDim>::setIPDataInitialConditions(std::string const& name,
+    DisplacementDim>::setIPDataInitialConditions(std::string_view name,
                                                  double const* values,
                                                  int const integration_order)
 {
@@ -897,19 +897,19 @@ std::size_t TH2MLocalAssembler<
     }
     if (name.starts_with("material_state_variable_"))
     {
-        std::string const variable_name = name.substr(24, name.size() - 24);
+        name.remove_prefix(24);
+        DBUG("Setting material state variable '{:s}'", name);
 
         // Using first ip data for solid material. TODO (naumov) move solid
         // material into element, store only material state in IPs.
         auto const& internal_variables =
             _ip_data[0].solid_material.getInternalVariables();
-        if (auto const iv =
-                std::find_if(begin(internal_variables), end(internal_variables),
-                             [&variable_name](auto const& iv)
-                             { return iv.name == variable_name; });
+        if (auto const iv = std::find_if(
+                begin(internal_variables), end(internal_variables),
+                [&name](auto const& iv) { return iv.name == name; });
             iv != end(internal_variables))
         {
-            DBUG("Setting material state variable '{:s}'", variable_name);
+            DBUG("Setting material state variable '{:s}'", name);
             return ProcessLib::setIntegrationPointDataMaterialStateVariables(
                 values, _ip_data, &IpData::material_state_variables,
                 iv->reference);
@@ -918,7 +918,7 @@ std::size_t TH2MLocalAssembler<
         WARN(
             "Could not find variable {:s} in solid material model's "
             "internal variables.",
-            variable_name);
+            name);
     }
     return 0;
 }

diff --git a/ProcessLib/TH2M/TH2MFEM.h b/ProcessLib/TH2M/TH2MFEM.h
@@ -93,7 +93,7 @@ class TH2MLocalAssembler : public LocalAssemblerInterface<DisplacementDim>
 private:
     /// \return the number of read integration points.
     std::size_t setIPDataInitialConditions(
-        std::string const& name,
+        std::string_view const name,
         double const* values,
         int const integration_order) override;
 

diff --git a/ProcessLib/ThermoHydroMechanics/LocalAssemblerInterface.h b/ProcessLib/ThermoHydroMechanics/LocalAssemblerInterface.h
@@ -21,7 +21,7 @@ struct LocalAssemblerInterface : public ProcessLib::LocalAssemblerInterface,
                                  public NumLib::ExtrapolatableElement
 {
     virtual std::size_t setIPDataInitialConditions(
-        std::string const& name, double const* values,
+        std::string_view const name, double const* values,
         int const integration_order) = 0;
 
     virtual std::vector<double> getSigma() const = 0;

diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
@@ -106,7 +106,7 @@ template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
           int DisplacementDim>
 std::size_t ThermoHydroMechanicsLocalAssembler<
     ShapeFunctionDisplacement, ShapeFunctionPressure,
-    DisplacementDim>::setIPDataInitialConditions(std::string const& name,
+    DisplacementDim>::setIPDataInitialConditions(std::string_view const name,
                                                  double const* values,
                                                  int const integration_order)
 {

diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h
@@ -89,7 +89,7 @@ class ThermoHydroMechanicsLocalAssembler : public LocalAssemblerInterface
 
     /// Returns number of read integration points.
     std::size_t setIPDataInitialConditions(
-        std::string const& name,
+        std::string_view const name,
         double const* values,
         int const integration_order) override;
 

diff --git a/ProcessLib/ThermoMechanics/LocalAssemblerInterface.h b/ProcessLib/ThermoMechanics/LocalAssemblerInterface.h
@@ -26,7 +26,7 @@ struct ThermoMechanicsLocalAssemblerInterface
       public NumLib::ExtrapolatableElement
 {
     virtual std::size_t setIPDataInitialConditions(
-        std::string const& name, double const* values,
+        std::string_view const name, double const* values,
         int const integration_order) = 0;
 
     virtual std::vector<double> getSigma() const = 0;

diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h
@@ -81,7 +81,7 @@ ThermoMechanicsLocalAssembler<ShapeFunction, DisplacementDim>::
 
 template <typename ShapeFunction, int DisplacementDim>
 std::size_t ThermoMechanicsLocalAssembler<ShapeFunction, DisplacementDim>::
-    setIPDataInitialConditions(std::string const& name,
+    setIPDataInitialConditions(std::string_view const name,
                                double const* values,
                                int const integration_order)
 {

diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
@@ -163,7 +163,7 @@ class ThermoMechanicsLocalAssembler
 
     /// Returns number of read integration points.
     std::size_t setIPDataInitialConditions(
-        std::string const& name,
+        std::string_view const name,
         double const* values,
         int const integration_order) override;
 

diff --git a/ProcessLib/ThermoRichardsFlow/LocalAssemblerInterface.h b/ProcessLib/ThermoRichardsFlow/LocalAssemblerInterface.h
@@ -22,7 +22,7 @@ struct LocalAssemblerInterface : public ProcessLib::LocalAssemblerInterface,
                                  public NumLib::ExtrapolatableElement
 {
     virtual std::size_t setIPDataInitialConditions(
-        std::string const& name, double const* values,
+        std::string_view const name, double const* values,
         int const integration_order) = 0;
 
     virtual std::vector<double> const& getIntPtDarcyVelocity(

diff --git a/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowFEM-impl.h b/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowFEM-impl.h
@@ -80,7 +80,7 @@ ThermoRichardsFlowLocalAssembler<ShapeFunction, GlobalDim>::
 
 template <typename ShapeFunction, int GlobalDim>
 std::size_t ThermoRichardsFlowLocalAssembler<ShapeFunction, GlobalDim>::
-    setIPDataInitialConditions(std::string const& name,
+    setIPDataInitialConditions(std::string_view const name,
                                double const* values,
                                int const integration_order)
 {

diff --git a/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowFEM.h b/ProcessLib/ThermoRichardsFlow/ThermoRichardsFlowFEM.h
@@ -59,7 +59,7 @@ class ThermoRichardsFlowLocalAssembler : public LocalAssemblerInterface
 
     /// \return the number of read integration points.
     std::size_t setIPDataInitialConditions(
-        std::string const& name,
+        std::string_view const name,
         double const* values,
         int const integration_order) override;
 

diff --git a/ProcessLib/ThermoRichardsMechanics/LocalAssemblerInterface.h b/ProcessLib/ThermoRichardsMechanics/LocalAssemblerInterface.h
@@ -54,7 +54,7 @@ struct LocalAssemblerInterface : public ProcessLib::LocalAssemblerInterface,
         }
     }
 
-    std::size_t setIPDataInitialConditions(std::string const& name,
+    std::size_t setIPDataInitialConditions(std::string_view name,
                                            double const* values,
                                            int const integration_order)
     {
@@ -83,17 +83,16 @@ struct LocalAssemblerInterface : public ProcessLib::LocalAssemblerInterface,
         // reflectWithName function also supports only a single return value.
         if (name.starts_with("material_state_variable_"))
         {
-            std::string const variable_name = name.substr(24, name.size() - 24);
+            name.remove_prefix(24);
 
             auto const& internal_variables =
                 solid_material_.getInternalVariables();
             if (auto const iv = std::find_if(
                     begin(internal_variables), end(internal_variables),
-                    [&variable_name](auto const& iv)
-                    { return iv.name == variable_name; });
+                    [&name](auto const& iv) { return iv.name == name; });
                 iv != end(internal_variables))
             {
-                DBUG("Setting material state variable '{:s}'", variable_name);
+                DBUG("Setting material state variable '{:s}'", name);
                 return ProcessLib::
                     setIntegrationPointDataMaterialStateVariables(
                         values, material_states_,