Remove ElementFactory::pre_evaluate

This is now a do nothing operation.

Author: sebproell

src/core/comm/src/4C_comm_parobjectfactory.cpp

@@ -222,17 +222,13 @@ void Core::Communication::ParObjectFactory::initialize_elements(Core::FE::Discre
 
   Core::LinAlg::allreduce_vector(localtypeids, globaltypeids, dis.get_comm());
 
-  std::set<Core::Elements::ElementType*>& ae = active_elements_[&dis];
-
   // This is element specific code. Thus we need a down cast.
-
   for (std::vector<int>::iterator i = globaltypeids.begin(); i != globaltypeids.end(); ++i)
   {
     ParObjectType* pot = type_map_[*i];
     Core::Elements::ElementType* eot = dynamic_cast<Core::Elements::ElementType*>(pot);
     if (eot != nullptr)
     {
-      ae.insert(eot);
       int err = eot->initialize(dis);
       if (err) FOUR_C_THROW("Element Initialize returned err={}", err);
     }
@@ -244,27 +240,6 @@ void Core::Communication::ParObjectFactory::initialize_elements(Core::FE::Discre
 }
 
 
-/*----------------------------------------------------------------------*/
-/*----------------------------------------------------------------------*/
-void Core::Communication::ParObjectFactory::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)
-{
-  finalize_registration();
-
-  std::set<Core::Elements::ElementType*>& ae = active_elements_[&dis];
-
-  for (std::set<Core::Elements::ElementType*>::iterator i = ae.begin(); i != ae.end(); ++i)
-  {
-    (*i)->pre_evaluate(
-        dis, p, systemmatrix1, systemmatrix2, systemvector1, systemvector2, systemvector3);
-  }
-}
-
-
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
 void Core::Communication::ParObjectFactory::setup_element_definition(

src/core/comm/src/4C_comm_parobjectfactory.hpp

@@ -112,14 +112,6 @@ namespace Core::Communication
     /// initialize all element types
     void initialize_elements(Core::FE::Discretization& dis);
 
-    /// preevaluate elements (via element types)
-    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);
-
     /// setup definition of element input file lines
     void setup_element_definition(
         std::map<std::string, std::map<std::string, Core::IO::InputSpec>>& definitions);
@@ -142,11 +134,7 @@ namespace Core::Communication
     /// preregistered types
     std::vector<ParObjectType*> types_;
 
-    /// element types that are actually used
-    std::map<Core::FE::Discretization*, std::set<Core::Elements::ElementType*>> active_elements_;
-
     // no copying
-
     ParObjectFactory(const ParObjectFactory&);
     ParObjectFactory& operator=(const ParObjectFactory&);
   };

src/core/fem/src/discretization/4C_fem_discretization_evaluate.cpp

@@ -77,14 +77,6 @@ void Core::FE::Discretization::evaluate(Teuchos::ParameterList& params,
   int row = strategy.first_dof_set();
   int col = strategy.second_dof_set();
 
-  // call the element's register class preevaluation method
-  // for each type of element
-  // for most element types, just the base class dummy is called
-  // that does nothing
-  Core::Communication::ParObjectFactory::instance().pre_evaluate(*this, params,
-      strategy.systemmatrix1(), strategy.systemmatrix2(), strategy.systemvector1(),
-      strategy.systemvector2(), strategy.systemvector3());
-
   Core::Elements::LocationArray la(dofsets_.size());
 
   // loop over column elements

src/core/fem/src/discretization/4C_fem_discretization_utils_evaluate.cpp

@@ -67,17 +67,6 @@ void Core::FE::Utils::evaluate(Core::FE::Discretization& discret, Teuchos::Param
   int row = strategy.first_dof_set();
   int col = strategy.second_dof_set();
 
-  // call the element's register class pre-evaluation method
-  // for each type of element
-  // for most element types, just the base class dummy is called
-  // that does nothing
-  {
-    TEUCHOS_FUNC_TIME_MONITOR("Core::FE::Utils::Evaluate pre_evaluate");
-    Core::Communication::ParObjectFactory::instance().pre_evaluate(discret, eparams,
-        strategy.systemmatrix1(), strategy.systemmatrix2(), strategy.systemvector1(),
-        strategy.systemvector2(), strategy.systemvector3());
-  }
-
   Core::Elements::LocationArray la(discret.num_dof_sets());
 
   bool is_subset = false;

src/core/fem/src/general/element/4C_fem_general_elementtype.hpp

@@ -71,17 +71,6 @@ namespace Core::Elements
     /// initialize the element type
     virtual int initialize(Core::FE::Discretization& dis);
 
-    /// preevaluation
-    virtual inline 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)
-    {
-      return;
-    }
-
     /*!
     \brief Get nodal block information to create a null space description