Merge pull request #1716 from davidrudlstorfer/restructure_beaminteraction_input

Restructure and modularize beaminteraction input

Author: davidrudlstorfer

src/adapter/4C_adapter_str_structure_new.cpp

@@ -17,15 +17,15 @@
 #include "4C_adapter_str_wrapper.hpp"
 #include "4C_beam3_kirchhoff.hpp"
 #include "4C_beam3_reissner.hpp"
+#include "4C_beaminteraction_contact_beam_to_solid_input.hpp"
+#include "4C_beaminteraction_contact_beam_to_sphere_input.hpp"
 #include "4C_binstrategy.hpp"
 #include "4C_contact_input.hpp"
 #include "4C_fem_condition.hpp"
 #include "4C_fem_condition_point_coupling_redistribution.hpp"
 #include "4C_fem_discretization.hpp"
 #include "4C_fem_dofset.hpp"
 #include "4C_global_data.hpp"
-#include "4C_inpar_beam_to_solid.hpp"
-#include "4C_inpar_beaminteraction.hpp"
 #include "4C_inpar_fsi.hpp"
 #include "4C_io.hpp"
 #include "4C_io_pstream.hpp"
@@ -530,21 +530,21 @@ void Adapter::StructureBaseAlgorithmNew::set_model_types(
           .sublist("SPHERE BEAM LINK")
           .get<bool>("SPHEREBEAMLINKING") or
       beamtobeamcontactconditions.size() > 0 or
-      Teuchos::getIntegralValue<Inpar::BeamInteraction::Strategy>(
+      Teuchos::getIntegralValue<BeamInteraction::Strategy>(
           Global::Problem::instance()->beam_interaction_params().sublist("BEAM TO SPHERE CONTACT"),
-          "STRATEGY") != Inpar::BeamInteraction::bstr_none or
-      Teuchos::getIntegralValue<Inpar::BeamToSolid::BeamToSolidContactDiscretization>(
+          "STRATEGY") != BeamInteraction::Strategy::bstr_none or
+      Teuchos::getIntegralValue<BeamToSolid::BeamToSolidContactDiscretization>(
           Global::Problem::instance()->beam_interaction_params().sublist(
               "BEAM TO SOLID VOLUME MESHTYING"),
-          "CONTACT_DISCRETIZATION") != Inpar::BeamToSolid::BeamToSolidContactDiscretization::none or
-      Teuchos::getIntegralValue<Inpar::BeamToSolid::BeamToSolidContactDiscretization>(
+          "CONTACT_DISCRETIZATION") != BeamToSolid::BeamToSolidContactDiscretization::none or
+      Teuchos::getIntegralValue<BeamToSolid::BeamToSolidContactDiscretization>(
           Global::Problem::instance()->beam_interaction_params().sublist(
               "BEAM TO SOLID SURFACE MESHTYING"),
-          "CONTACT_DISCRETIZATION") != Inpar::BeamToSolid::BeamToSolidContactDiscretization::none or
-      Teuchos::getIntegralValue<Inpar::BeamToSolid::BeamToSolidContactDiscretization>(
+          "CONTACT_DISCRETIZATION") != BeamToSolid::BeamToSolidContactDiscretization::none or
+      Teuchos::getIntegralValue<BeamToSolid::BeamToSolidContactDiscretization>(
           Global::Problem::instance()->beam_interaction_params().sublist(
               "BEAM TO SOLID SURFACE CONTACT"),
-          "CONTACT_DISCRETIZATION") != Inpar::BeamToSolid::BeamToSolidContactDiscretization::none or
+          "CONTACT_DISCRETIZATION") != BeamToSolid::BeamToSolidContactDiscretization::none or
       Global::Problem::instance()->parameters().isParameter(
           "BEAM INTERACTION/BEAM TO SOLID EDGE CONTACT") or
       beampotconditions.size() > 0 or beampenaltycouplingconditions_direct.size() > 0 or

src/beam3/4C_beam3_base.cpp

@@ -8,6 +8,7 @@
 #include "4C_beam3_base.hpp"
 
 #include "4C_beaminteraction_calc_utils.hpp"
+#include "4C_beaminteraction_crosslinking_submodel_evaluator.hpp"
 #include "4C_browniandyn_input.hpp"  // enums
 #include "4C_comm_pack_helpers.hpp"
 #include "4C_fem_geometry_periodic_boundingbox.hpp"
@@ -27,7 +28,7 @@ Discret::Elements::Beam3Base::Beam3Base(int id, int owner)
     : Core::Elements::Element(id, owner),
       Tref_(0),
       centerline_hermite_(true),
-      filamenttype_(Inpar::BeamInteraction::filetype_none),
+      filamenttype_(BeamInteraction::FilamentType::filetype_none),
       interface_ptr_(nullptr),
       browndyn_interface_ptr_(nullptr)
 {
@@ -388,7 +389,7 @@ void Discret::Elements::Beam3Base::get_directions_of_shifts(std::vector<double>&
 /*--------------------------------------------------------------------------------------------*
  *--------------------------------------------------------------------------------------------*/
 void Discret::Elements::Beam3Base::get_pos_of_binding_spot(Core::LinAlg::Matrix<3, 1>& pos,
-    std::vector<double>& disp, Inpar::BeamInteraction::CrosslinkerType linkertype, int bspotlocn,
+    std::vector<double>& disp, BeamInteraction::CrosslinkerType linkertype, int bspotlocn,
     Core::Geo::MeshFree::BoundingBox const& periodic_boundingbox) const
 {
   const double xi = bspotposxi_.at(linkertype)[bspotlocn];
@@ -402,8 +403,7 @@ void Discret::Elements::Beam3Base::get_pos_of_binding_spot(Core::LinAlg::Matrix<
 /*--------------------------------------------------------------------------------------------*
  *--------------------------------------------------------------------------------------------*/
 void Discret::Elements::Beam3Base::get_triad_of_binding_spot(Core::LinAlg::Matrix<3, 3>& triad,
-    std::vector<double>& disp, Inpar::BeamInteraction::CrosslinkerType linkertype,
-    int bspotlocn) const
+    std::vector<double>& disp, BeamInteraction::CrosslinkerType linkertype, int bspotlocn) const
 {
   const double xi = bspotposxi_.at(linkertype)[bspotlocn];
   // get position

src/beam3/4C_beam3_base.hpp

@@ -11,13 +11,13 @@
 #include "4C_config.hpp"
 
 #include "4C_beam3_spatial_discretization_utils.hpp"
+#include "4C_beaminteraction_crosslinking_submodel_evaluator.hpp"
 #include "4C_fem_discretization.hpp"
 #include "4C_fem_general_element.hpp"
 #include "4C_fem_general_elementtype.hpp"
 #include "4C_fem_general_node.hpp"
 #include "4C_fem_general_utils_fem_shapefunctions.hpp"
 #include "4C_fem_general_utils_integration.hpp"
-#include "4C_inpar_beaminteraction.hpp"
 #include "4C_inpar_structure.hpp"
 #include "4C_linalg_vector.hpp"
 
@@ -549,19 +549,19 @@ namespace Discret
       //! get centerline pos at binding spot with locn x stored in element parameter space
       //! coordinates \in [-1,1] from displacement state vector
       void get_pos_of_binding_spot(Core::LinAlg::Matrix<3, 1>& pos, std::vector<double>& disp,
-          Inpar::BeamInteraction::CrosslinkerType linkertype, int bspotlocn,
+          BeamInteraction::CrosslinkerType linkertype, int bspotlocn,
           Core::Geo::MeshFree::BoundingBox const& periodic_boundingbox) const;
 
       //! get triad at binding spot with locn x stored in element parameter space coordinates \in
       //! [-1,1] from displacement state vector
       void get_triad_of_binding_spot(Core::LinAlg::Matrix<3, 3>& triad, std::vector<double>& disp,
-          Inpar::BeamInteraction::CrosslinkerType linkertype, int bspotlocn) const;
+          BeamInteraction::CrosslinkerType linkertype, int bspotlocn) const;
 
       /** \brief get entire binding spot information of element
        *
        */
-      std::map<Inpar::BeamInteraction::CrosslinkerType, std::vector<double>> const&
-      get_binding_spots() const
+      std::map<BeamInteraction::CrosslinkerType, std::vector<double>> const& get_binding_spots()
+          const
       {
         return bspotposxi_;
       }
@@ -574,8 +574,7 @@ namespace Discret
       /** \brief get number of binding spots of certain binding spot type on this element
        *
        */
-      unsigned int get_number_of_binding_spots(
-          Inpar::BeamInteraction::CrosslinkerType linkertype) const
+      unsigned int get_number_of_binding_spots(BeamInteraction::CrosslinkerType linkertype) const
       {
         return bspotposxi_.at(linkertype).size();
       }
@@ -584,7 +583,7 @@ namespace Discret
        *
        */
       double get_binding_spot_xi(
-          Inpar::BeamInteraction::CrosslinkerType linkertype, unsigned int bspotlocn) const
+          BeamInteraction::CrosslinkerType linkertype, unsigned int bspotlocn) const
       {
         if (bspotlocn > bspotposxi_.at(linkertype).size())
           FOUR_C_THROW("number of requested binding spot exceeds total number of binding spots");
@@ -596,7 +595,7 @@ namespace Discret
        *
        */
       void set_binding_spots(
-          std::map<Inpar::BeamInteraction::CrosslinkerType, std::vector<double>> bspotposxi)
+          std::map<BeamInteraction::CrosslinkerType, std::vector<double>> bspotposxi)
       {
         bspotposxi_.clear();
         bspotposxi_ = bspotposxi;
@@ -606,20 +605,20 @@ namespace Discret
        *
        */
       void set_positions_of_binding_spot_type(
-          Inpar::BeamInteraction::CrosslinkerType linkertype, std::vector<double> const& bspotposxi)
+          BeamInteraction::CrosslinkerType linkertype, std::vector<double> const& bspotposxi)
       {
         bspotposxi_[linkertype] = bspotposxi;
       }
 
       /** \brief set/get type of filament the element is part of
        *
        */
-      void set_filament_type(Inpar::BeamInteraction::FilamentType filamenttype)
+      void set_filament_type(BeamInteraction::FilamentType filamenttype)
       {
         filamenttype_ = filamenttype;
       }
 
-      Inpar::BeamInteraction::FilamentType get_filament_type() const { return filamenttype_; }
+      BeamInteraction::FilamentType get_filament_type() const { return filamenttype_; }
 
       /**
        * \brief Get the bounding volume of the element for geometric search
@@ -636,10 +635,10 @@ namespace Discret
      private:
       //! position of binding spots on beam element in local coordinate system
       //! size of vector equals number of binding spots on this element
-      std::map<Inpar::BeamInteraction::CrosslinkerType, std::vector<double>> bspotposxi_;
+      std::map<BeamInteraction::CrosslinkerType, std::vector<double>> bspotposxi_;
 
       //! type of filament element belongs to
-      Inpar::BeamInteraction::FilamentType filamenttype_;
+      BeamInteraction::FilamentType filamenttype_;
 
       //! @}
 

src/beam3/4C_beam3_discretization_runtime_vtu_writer.cpp

@@ -629,8 +629,8 @@ void BeamDiscretizationRuntimeOutputWriter::append_element_filament_id_and_type(
     const Core::Conditions::Condition* cond =
         beam_line_filament_conditioned_nodes.find(ele->nodes()[0]->id())->second;
     double current_id = cond->parameters().get<int>("ID");
-    double current_type = Inpar::BeamInteraction::string_to_filament_type(
-        (cond->parameters().get<std::string>("TYPE")));
+    double current_type =
+        BeamInteraction::string_to_filament_type((cond->parameters().get<std::string>("TYPE")));
 
     for (int i = 0; i < num_cells_per_element_[ibeamele]; ++i)
     {

src/beaminteraction/src/4C_beaminteraction_calc_utils.cpp

@@ -237,7 +237,7 @@ namespace BeamInteraction
       discret->get_condition("BeamLineFilamentCondition", filamentconditions);
 
       // compute number of linker types
-      std::vector<Inpar::BeamInteraction::CrosslinkerType> linkertypes = params.linker_types();
+      std::vector<BeamInteraction::CrosslinkerType> linkertypes = params.linker_types();
 
       // loop over all relevant (on myrank) filaments
       for (auto const& filiter : relevantfilaments)
@@ -302,7 +302,7 @@ namespace BeamInteraction
               << Core::IO::endl;
           Core::IO::cout(Core::IO::debug)
               << numbspot << " binding spots of type "
-              << Inpar::BeamInteraction::crosslinker_type_to_string(linkertypes[linkertype_i])
+              << BeamInteraction::crosslinker_type_to_string(linkertypes[linkertype_i])
               << " on filament " << filiter << " (consists of "
               << static_cast<int>(sortedfilamenteles.size()) << " elements)"
               << " with: " << Core::IO::endl;
@@ -457,8 +457,8 @@ namespace BeamInteraction
      *-----------------------------------------------------------------------------*/
     void set_binding_spots_positions_on_filament(
         std::vector<Core::Elements::Element*>& sortedfilamenteles, double start,
-        Inpar::BeamInteraction::CrosslinkerType linkertype, int numbspot,
-        double filamentbspotinterval, double tol)
+        BeamInteraction::CrosslinkerType linkertype, int numbspot, double filamentbspotinterval,
+        double tol)
     {
       // default no occupied binding spots
       std::pair<double, double> elearcinterval = std::make_pair(0.0, 0.0);
@@ -504,7 +504,7 @@ namespace BeamInteraction
     /*-----------------------------------------------------------------------------*
      *-----------------------------------------------------------------------------*/
     void get_pos_and_triad_of_binding_spot(Core::Elements::Element* ele,
-        Core::Geo::MeshFree::BoundingBox& pbb, Inpar::BeamInteraction::CrosslinkerType linkertype,
+        Core::Geo::MeshFree::BoundingBox& pbb, BeamInteraction::CrosslinkerType linkertype,
         int locbspotnum, Core::LinAlg::Matrix<3, 1>& bspotpos,
         Core::LinAlg::Matrix<3, 3>& bspottriad, std::vector<double>& eledisp)
     {
@@ -526,7 +526,7 @@ namespace BeamInteraction
      *-----------------------------------------------------------------------------*/
     void get_pos_and_triad_of_binding_spot(Core::FE::Discretization const& discret,
         Core::Elements::Element* ele, Core::LinAlg::Vector<double>& ia_discolnp,
-        Core::Geo::MeshFree::BoundingBox& pbb, Inpar::BeamInteraction::CrosslinkerType linkertype,
+        Core::Geo::MeshFree::BoundingBox& pbb, BeamInteraction::CrosslinkerType linkertype,
         int locbspotnum, Core::LinAlg::Matrix<3, 1>& bspotpos,
         Core::LinAlg::Matrix<3, 3>& bspottriad)
     {

src/beaminteraction/src/4C_beaminteraction_calc_utils.hpp

@@ -10,8 +10,7 @@
 
 #include "4C_config.hpp"
 
-#include "4C_binstrategy_utils.hpp"
-#include "4C_inpar_beaminteraction.hpp"
+#include "4C_beaminteraction_crosslinking_submodel_evaluator.hpp"
 #include "4C_linalg_fevector.hpp"
 #include "4C_linalg_fixedsizematrix.hpp"
 #include "4C_linalg_mapextractor.hpp"
@@ -285,21 +284,21 @@ namespace BeamInteraction
      *-----------------------------------------------------------------------------*/
     void set_binding_spots_positions_on_filament(
         std::vector<Core::Elements::Element*>& sortedfilamenteles, double start,
-        Inpar::BeamInteraction::CrosslinkerType linkertype, int numbspot,
-        double filamentbspotinterval, double tol);
+        BeamInteraction::CrosslinkerType linkertype, int numbspot, double filamentbspotinterval,
+        double tol);
 
     /*-----------------------------------------------------------------------------*
      *-----------------------------------------------------------------------------*/
     void get_pos_and_triad_of_binding_spot(Core::Elements::Element* ele,
-        Core::Geo::MeshFree::BoundingBox& pbb, Inpar::BeamInteraction::CrosslinkerType linkertype,
+        Core::Geo::MeshFree::BoundingBox& pbb, BeamInteraction::CrosslinkerType linkertype,
         int locbspotnum, Core::LinAlg::Matrix<3, 1>& bspotpos,
         Core::LinAlg::Matrix<3, 3>& bspottriad, std::vector<double>& eledisp);
 
     /*-----------------------------------------------------------------------------*
      *-----------------------------------------------------------------------------*/
     void get_pos_and_triad_of_binding_spot(Core::FE::Discretization const& discret,
         Core::Elements::Element* ele, Core::LinAlg::Vector<double>& ia_discolnp,
-        Core::Geo::MeshFree::BoundingBox& pbb, Inpar::BeamInteraction::CrosslinkerType linkertype,
+        Core::Geo::MeshFree::BoundingBox& pbb, BeamInteraction::CrosslinkerType linkertype,
         int locbspotnum, Core::LinAlg::Matrix<3, 1>& bspotpos,
         Core::LinAlg::Matrix<3, 3>& bspottriad);