Simplify beam potential runtime output params

Author: davidrudlstorfer

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

@@ -93,7 +93,7 @@ void BeamPotential::set_valid_parameters(std::map<std::string, Core::IO::InputSp
 
   // output interval regarding steps: write output every INTERVAL_STEPS steps
   beampotential_output_sublist.specs.emplace_back(parameter<int>("INTERVAL_STEPS",
-      {.description = "write output at runtime every INTERVAL_STEPS steps", .default_value = -1}));
+      {.description = "write output at runtime every INTERVAL_STEPS steps", .default_value = 1}));
 
   // whether to write output in every iteration of the nonlinear solver
   beampotential_output_sublist.specs.emplace_back(parameter<bool>(
@@ -130,30 +130,31 @@ void BeamPotential::set_valid_conditions(
 {
   using namespace Core::IO::InputSpecBuilders;
 
-  /*-------------------------------------------------------------------*/
   // beam potential interaction: atom/charge density per unit length on LINE
-  Core::Conditions::ConditionDefinition rigidsphere_potential_charge(
-      "DESIGN POINT RIGIDSPHERE POTENTIAL CHARGE CONDITIONS", "RigidspherePotentialPointCharge",
-      "Rigidsphere_Potential_Point_Charge", Core::Conditions::RigidspherePotential_PointCharge,
-      false, Core::Conditions::geometry_type_point);
 
   Core::Conditions::ConditionDefinition beam_potential_line_charge(
       "DESIGN LINE BEAM POTENTIAL CHARGE CONDITIONS", "BeamPotentialLineCharge",
       "Beam_Potential_Line_Charge_Density", Core::Conditions::BeamPotential_LineChargeDensity,
       false, Core::Conditions::geometry_type_line);
 
-  rigidsphere_potential_charge.add_component(parameter<int>("POTLAW"));
-  rigidsphere_potential_charge.add_component(parameter<double>("VAL"));
-  rigidsphere_potential_charge.add_component(
-      parameter<std::optional<int>>("FUNCT", {.description = ""}));
-
   beam_potential_line_charge.add_component(parameter<int>("POTLAW"));
   beam_potential_line_charge.add_component(parameter<double>("VAL"));
   beam_potential_line_charge.add_component(
       parameter<std::optional<int>>("FUNCT", {.description = ""}));
 
-  condlist.push_back(rigidsphere_potential_charge);
   condlist.push_back(beam_potential_line_charge);
+
+  Core::Conditions::ConditionDefinition rigidsphere_potential_charge(
+      "DESIGN POINT RIGIDSPHERE POTENTIAL CHARGE CONDITIONS", "RigidspherePotentialPointCharge",
+      "Rigidsphere_Potential_Point_Charge", Core::Conditions::RigidspherePotential_PointCharge,
+      false, Core::Conditions::geometry_type_point);
+
+  rigidsphere_potential_charge.add_component(parameter<int>("POTLAW"));
+  rigidsphere_potential_charge.add_component(parameter<double>("VAL"));
+  rigidsphere_potential_charge.add_component(
+      parameter<std::optional<int>>("FUNCT", {.description = ""}));
+
+  condlist.push_back(rigidsphere_potential_charge);
 }
 
 FOUR_C_NAMESPACE_CLOSE

src/beaminteraction/src/potential/4C_beaminteraction_potential_params.cpp

@@ -9,7 +9,6 @@
 
 #include "4C_beamcontact_input.hpp"
 #include "4C_beaminteraction_potential_input.hpp"
-#include "4C_beaminteraction_potential_runtime_visualization_output_params.hpp"
 #include "4C_global_data.hpp"
 #include "4C_io_value_parser.hpp"
 #include "4C_utils_exceptions.hpp"
@@ -158,13 +157,33 @@ namespace BeamInteraction
     // create and initialize parameter container object for runtime output
     if (params.write_visualization_output)
     {
-      params.params_runtime_visualization_output_btb_potential =
-          BeamInteraction::BeamToBeamPotentialRuntimeOutputParams(restart_time);
+      params.runtime_output_params = {
+          .visualization_parameters = Core::IO::visualization_parameters_factory(
+              Global::Problem::instance()->io_params().sublist("RUNTIME VTK OUTPUT"),
+              *Global::Problem::instance()->output_control_file(), restart_time)};
 
-      params.params_runtime_visualization_output_btb_potential.init(
-          beam_potential_params_list.sublist("RUNTIME VTK OUTPUT"));
-      params.params_runtime_visualization_output_btb_potential.setup();
+      initialize_validate_beam_potential_runtime_output_params(
+          params.runtime_output_params, beam_potential_params_list.sublist("RUNTIME VTK OUTPUT"));
     }
   }
+
+  void initialize_validate_beam_potential_runtime_output_params(
+      BeamPotentialRuntimeOutputParams& params, Teuchos::ParameterList const& sublist)
+  {
+    params.output_interval = sublist.get<int>("INTERVAL_STEPS");
+
+    params.write_all_iterations = sublist.get<bool>("EVERY_ITERATION");
+
+    params.write_forces = sublist.get<bool>("FORCES");
+
+    params.write_moments = sublist.get<bool>("MOMENTS");
+
+    params.write_forces_moments_per_pair = sublist.get<bool>("WRITE_FORCE_MOMENT_PER_ELEMENTPAIR");
+
+    params.write_uids = sublist.get<bool>("WRITE_UIDS");
+
+    // overwrite global option to write visualization output of every iteration
+    params.visualization_parameters.every_iteration_ = params.write_all_iterations;
+  }
 }  // namespace BeamInteraction
 FOUR_C_NAMESPACE_CLOSE

src/beaminteraction/src/potential/4C_beaminteraction_potential_params.hpp

@@ -11,7 +11,7 @@
 #include "4C_config.hpp"
 
 #include "4C_beaminteraction_potential_input.hpp"
-#include "4C_beaminteraction_potential_runtime_visualization_output_params.hpp"
+#include "4C_io_visualization_parameters.hpp"
 
 #include <unordered_map>
 
@@ -20,6 +20,24 @@ FOUR_C_NAMESPACE_OPEN
 namespace BeamInteraction
 {
 
+  struct BeamPotentialRuntimeOutputParams
+  {
+    //! global visualization parameters
+    Core::IO::VisualizationParameters visualization_parameters;
+
+    int output_interval = false;
+
+    bool write_all_iterations = false;
+
+    bool write_forces = false;
+
+    bool write_moments = false;
+
+    bool write_forces_moments_per_pair = false;
+
+    bool write_uids = false;
+  };
+
   struct BeamPotentialParams
   {
     //! potential law parameters
@@ -55,19 +73,22 @@ namespace BeamInteraction
     //! visualization output
     bool write_visualization_output;
 
-    BeamInteraction::BeamToBeamPotentialRuntimeOutputParams
-        params_runtime_visualization_output_btb_potential =
-            BeamToBeamPotentialRuntimeOutputParams(0.0);
+    BeamInteraction::BeamPotentialRuntimeOutputParams runtime_output_params;
 
     //! data container for prior element lengths for potential reduction strategy
     //! first entry is left prior length and second entry is right prior length
     // this is stored in the beam potential params for easy access during evaluation
     std::unordered_map<int, std::pair<double, double>> ele_gid_prior_length_map;
   };
 
+
   void initialize_validate_beam_potential_params(
       BeamPotentialParams& beam_potential_params, const double restart_time);
 
+  void initialize_validate_beam_potential_runtime_output_params(
+      BeamPotentialRuntimeOutputParams& beam_potential_runtime_output_params,
+      const Teuchos::ParameterList& sublist);
+
 }  // namespace BeamInteraction
 
 FOUR_C_NAMESPACE_CLOSE