Remove pre_evaluate from LubricationType

Author: sebproell

src/lubrication/src/4C_lubrication_ele.hpp

@@ -43,14 +43,6 @@ namespace Discret
       void setup_element_definition(
           std::map<std::string, std::map<std::string, Core::IO::InputSpec>>& definitions) override;
 
-      /// pre-evaluation
-      void pre_evaluate(Core::FE::Discretization& dis, Teuchos::ParameterList& p,
-          std::shared_ptr<Core::LinAlg::SparseOperator> systemmatrix1,
-          std::shared_ptr<Core::LinAlg::SparseOperator> systemmatrix2,
-          std::shared_ptr<Core::LinAlg::Vector<double>> systemvector1,
-          std::shared_ptr<Core::LinAlg::Vector<double>> systemvector2,
-          std::shared_ptr<Core::LinAlg::Vector<double>> systemvector3) override;
-
      private:
       static LubricationType instance_;
     };

src/lubrication/src/4C_lubrication_ele_action.hpp

@@ -22,12 +22,10 @@ namespace Lubrication
   enum Action
   {
     // domain action
-    set_general_lubrication_parameter,  // set general parameters for element evaluation
-    set_time_parameter,                 // set time-integration parameters for element evaluation
-    calc_mat_and_rhs,                   // calc_condif_systemmat_and_residual,
-    calc_mean_pressures,                // calc_mean_pressures,
-    calc_error,                         // calc_error
-    calc_lubrication_coupltang          // calculate off-diagonal tangent matrix term
+    calc_mat_and_rhs,           // calc_condif_systemmat_and_residual,
+    calc_mean_pressures,        // calc_mean_pressures,
+    calc_error,                 // calc_error
+    calc_lubrication_coupltang  // calculate off-diagonal tangent matrix term
   };  // enum Action
 
   /*--------------------------------------------------------------------------*/

src/lubrication/src/4C_lubrication_ele_evaluate.cpp

@@ -52,10 +52,6 @@ int Discret::Elements::Lubrication::evaluate(Teuchos::ParameterList& params,
               this, params, discretization, la, elemat1, elemat2, elevec1, elevec2, elevec3);
       break;
     }
-    case FourC::Lubrication::set_time_parameter:
-    case FourC::Lubrication::set_general_lubrication_parameter:
-      // these actions have already been evaluated during element pre-evaluate
-      break;
     default:
     {
       FOUR_C_THROW("Unknown type of action '{}' for Lubrication", action);
@@ -81,39 +77,5 @@ int Discret::Elements::Lubrication::evaluate_neumann(Teuchos::ParameterList& par
   return 0;
 }
 
-/*---------------------------------------------------------------------*
-|  Call the element to set all basic parameter             wirtz 10/15 |
-*----------------------------------------------------------------------*/
-void Discret::Elements::LubricationType::pre_evaluate(Core::FE::Discretization& dis,
-    Teuchos::ParameterList& p, std::shared_ptr<Core::LinAlg::SparseOperator> systemmatrix1,
-    std::shared_ptr<Core::LinAlg::SparseOperator> systemmatrix2,
-    std::shared_ptr<Core::LinAlg::Vector<double>> systemvector1,
-    std::shared_ptr<Core::LinAlg::Vector<double>> systemvector2,
-    std::shared_ptr<Core::LinAlg::Vector<double>> systemvector3)
-{
-  const auto action = Teuchos::getIntegralValue<FourC::Lubrication::Action>(p, "action");
-
-  switch (action)
-  {
-    case FourC::Lubrication::set_general_lubrication_parameter:
-    {
-      Discret::Elements::LubricationEleParameter::instance(dis.name())->set_general_parameters(p);
-
-      break;
-    }
-
-    case FourC::Lubrication::set_time_parameter:
-    {
-      Discret::Elements::LubricationEleParameter::instance(dis.name())->set_time_parameters(p);
-
-      break;
-    }
-    default:
-      // do nothing in all other cases
-      break;
-  }
-
-  return;
-}
 
 FOUR_C_NAMESPACE_CLOSE

src/lubrication/src/4C_lubrication_timint_implicit.cpp

@@ -19,6 +19,7 @@
 #include "4C_linalg_utils_sparse_algebra_print.hpp"
 #include "4C_linear_solver_method_linalg.hpp"
 #include "4C_lubrication_ele_action.hpp"
+#include "4C_lubrication_ele_parameter.hpp"
 #include "4C_lubrication_input.hpp"
 #include "4C_utils_function.hpp"
 
@@ -172,8 +173,6 @@ void Lubrication::TimIntImpl::set_element_general_parameters() const
 {
   Teuchos::ParameterList eleparams;
 
-  eleparams.set<Lubrication::Action>("action", Lubrication::set_general_lubrication_parameter);
-
   eleparams.set<bool>("isale", isale_);
 
   eleparams.set<bool>("ismodifiedrey", modified_reynolds_);
@@ -184,10 +183,8 @@ void Lubrication::TimIntImpl::set_element_general_parameters() const
 
   eleparams.set("roughnessdeviation", roughness_deviation_);
 
-  // call standard loop over elements
-  discret_->evaluate(eleparams, nullptr, nullptr, nullptr, nullptr, nullptr);
-
-  return;
+  Discret::Elements::LubricationEleParameter::instance(discret_->name())
+      ->set_general_parameters(eleparams);
 }
 
 

src/lubrication/src/4C_lubrication_timint_stat.cpp

@@ -11,6 +11,7 @@
 #include "4C_global_data.hpp"
 #include "4C_io.hpp"
 #include "4C_lubrication_ele_action.hpp"
+#include "4C_lubrication_ele_parameter.hpp"
 
 #include <Teuchos_TimeMonitor.hpp>
 
@@ -57,17 +58,15 @@ void Lubrication::TimIntStationary::init()
 void Lubrication::TimIntStationary::set_element_time_parameter() const
 {
   Teuchos::ParameterList eleparams;
-
-  eleparams.set<Lubrication::Action>("action", Lubrication::set_time_parameter);
   eleparams.set<bool>("using generalized-alpha time integration", false);
   eleparams.set<bool>("using stationary formulation", true);
   eleparams.set<double>("time-step length", dta_);
   eleparams.set<double>("total time", time_);
   eleparams.set<double>("time factor", 1.0);
   eleparams.set<double>("alpha_F", 1.0);
 
-  // call standard loop over elements
-  discret_->evaluate(eleparams, nullptr, nullptr, nullptr, nullptr, nullptr);
+  Discret::Elements::LubricationEleParameter::instance(discret_->name())
+      ->set_time_parameters(eleparams);
 }