Simplify beaminteraction potential params

Author: davidrudlstorfer

src/beamcontact/4C_beamcontact_beam3contact_manager.cpp

@@ -275,27 +275,27 @@ CONTACT::Beam3cmanager::Beam3cmanager(Core::FE::Discretization& discret, double
     mi_->clear();
     // read potential law parameters from input and check
     {
-      std::string pot_law_exponents_in(
+      std::string potential_law_exponents_in(
           Teuchos::getNumericStringParameter(sbeampotential_, "POT_LAW_EXPONENT"));
 
-      Core::IO::ValueParser pot_law_exponents_parser(
-          pot_law_exponents_in, {.user_scope_message = "While reading potential law exponents: "});
+      Core::IO::ValueParser potential_law_exponents_parser(potential_law_exponents_in,
+          {.user_scope_message = "While reading potential law exponents: "});
 
-      while (!pot_law_exponents_parser.at_end())
+      while (!potential_law_exponents_parser.at_end())
       {
-        mi_->push_back(pot_law_exponents_parser.read<double>());
+        mi_->push_back(potential_law_exponents_parser.read<double>());
       }
     }
     {
-      std::string pot_law_prefactors_in(
+      std::string potential_law_prefactors_in(
           Teuchos::getNumericStringParameter(sbeampotential_, "POT_LAW_PREFACTOR"));
 
-      Core::IO::ValueParser pot_law_prefactors_parser(pot_law_prefactors_in,
+      Core::IO::ValueParser potential_law_prefactors_parser(potential_law_prefactors_in,
           {.user_scope_message = "While reading potential law prefactors: "});
 
-      while (!pot_law_prefactors_parser.at_end())
+      while (!potential_law_prefactors_parser.at_end())
       {
-        ki_->push_back(pot_law_prefactors_parser.read<double>());
+        ki_->push_back(potential_law_prefactors_parser.read<double>());
       }
     }
     if (!ki_->empty())

src/beaminteraction/src/potential/4C_beaminteraction_potential_input.cpp

@@ -59,10 +59,10 @@ void BeamPotential::set_valid_parameters(std::map<std::string, Core::IO::InputSp
       {.description = "Use regularization of force law at separations smaller than this separation",
           .default_value = -1.0}));
 
-  beampotential.specs.emplace_back(parameter<int>("NUM_INTEGRATION_SEGMENTS",
+  beampotential.specs.emplace_back(parameter<int>("N_INTEGRATION_SEGMENTS",
       {.description = "Number of integration segments used per beam element", .default_value = 1}));
 
-  beampotential.specs.emplace_back(parameter<int>("NUM_GAUSSPOINTS",
+  beampotential.specs.emplace_back(parameter<int>("N_GAUSS_POINTS",
       {.description = "Number of Gauss points used per integration segment", .default_value = 10}));
 
   beampotential.specs.emplace_back(parameter<bool>("AUTOMATIC_DIFFERENTIATION",

src/beaminteraction/src/potential/4C_beaminteraction_potential_pair_base.cpp

@@ -86,7 +86,7 @@ std::shared_ptr<BeamInteraction::BeamPotentialPair> BeamInteraction::BeamPotenti
             return std::make_shared<BeamInteraction::BeamToSpherePotentialPair<2, 1>>();
           else
           {
-            if (beam_potential_params.use_fad())
+            if (beam_potential_params.use_fad)
               return std::make_shared<
                   BeamInteraction::BeamToBeamPotentialPair<2, 1, Sacado::Fad::DFad<double>>>();
             else
@@ -99,7 +99,7 @@ std::shared_ptr<BeamInteraction::BeamPotentialPair> BeamInteraction::BeamPotenti
             return std::make_shared<BeamInteraction::BeamToSpherePotentialPair<3, 1>>();
           else
           {
-            if (beam_potential_params.use_fad())
+            if (beam_potential_params.use_fad)
               return std::make_shared<
                   BeamInteraction::BeamToBeamPotentialPair<3, 1, Sacado::Fad::DFad<double>>>();
             else
@@ -112,7 +112,7 @@ std::shared_ptr<BeamInteraction::BeamPotentialPair> BeamInteraction::BeamPotenti
             return std::make_shared<BeamInteraction::BeamToSpherePotentialPair<4, 1>>();
           else
           {
-            if (beam_potential_params.use_fad())
+            if (beam_potential_params.use_fad)
               return std::make_shared<
                   BeamInteraction::BeamToBeamPotentialPair<4, 1, Sacado::Fad::DFad<double>>>();
             else
@@ -125,7 +125,7 @@ std::shared_ptr<BeamInteraction::BeamPotentialPair> BeamInteraction::BeamPotenti
             return std::make_shared<BeamInteraction::BeamToSpherePotentialPair<5, 1>>();
           else
           {
-            if (beam_potential_params.use_fad())
+            if (beam_potential_params.use_fad)
               return std::make_shared<
                   BeamInteraction::BeamToBeamPotentialPair<5, 1, Sacado::Fad::DFad<double>>>();
             else
@@ -154,7 +154,7 @@ std::shared_ptr<BeamInteraction::BeamPotentialPair> BeamInteraction::BeamPotenti
             return std::make_shared<BeamInteraction::BeamToSpherePotentialPair<2, 2>>();
           else
           {
-            if (beam_potential_params.use_fad())
+            if (beam_potential_params.use_fad)
               return std::make_shared<
                   BeamInteraction::BeamToBeamPotentialPair<2, 2, Sacado::Fad::DFad<double>>>();
             else
@@ -203,7 +203,7 @@ void BeamInteraction::BeamPotentialPair::check_init_setup() const
  *-----------------------------------------------------------------------------------------------*/
 Core::FE::GaussRule1D BeamInteraction::BeamPotentialPair::get_gauss_rule() const
 {
-  switch (params()->number_gauss_points())
+  switch (params()->n_gauss_points)
   {
     case 5:
     {
@@ -236,7 +236,7 @@ Core::FE::GaussRule1D BeamInteraction::BeamPotentialPair::get_gauss_rule() const
     }
 
     default:
-      FOUR_C_THROW("{} Gauss points are not supported yet!", params()->number_gauss_points());
+      FOUR_C_THROW("{} Gauss points are not supported yet!", params()->n_gauss_points);
   }
 
   return Core::FE::GaussRule1D::undefined;

src/beaminteraction/src/potential/4C_beaminteraction_potential_pair_base.hpp

@@ -33,7 +33,7 @@ namespace Core::Elements
 namespace BeamInteraction
 {
   // forward declaration ...
-  class BeamPotentialParams;
+  struct BeamPotentialParams;
 
 
   /*!