Merge pull request #566 from sebproell/more-pre-evaluate

Remove ElementType::pre_evaluate

Author: sebproell

src/contact/4C_contact_friction_node.hpp

@@ -12,6 +12,8 @@
 
 #include "4C_contact_node.hpp"
 
+#include <set>
+
 FOUR_C_NAMESPACE_OPEN
 
 namespace CONTACT

src/contact/4C_contact_line_coupling.hpp

@@ -13,6 +13,8 @@
 
 #include "4C_mortar_coupling3d_classes.hpp"
 
+#include <set>
+
 FOUR_C_NAMESPACE_OPEN
 
 namespace Mortar

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

@@ -11,12 +11,9 @@
 #include "4C_config.hpp"
 
 #include "4C_comm_pack_buffer.hpp"
-#include "4C_linalg_vector.hpp"
-#include "4C_utils_parameter_list.fwd.hpp"
 
 #include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <vector>
 
@@ -112,14 +109,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 +131,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/dofset/4C_fem_dofset_definedmapping_wrapper.hpp

@@ -13,6 +13,8 @@
 #include "4C_fem_dofset_base.hpp"
 #include "4C_fem_general_node.hpp"
 
+#include <set>
+
 
 FOUR_C_NAMESPACE_OPEN
 
@@ -21,6 +23,12 @@ namespace Core::FE
   class Discretization;
 }  // namespace Core::FE
 
+namespace Core::LinAlg
+{
+  template <typename T>
+  class Vector;
+}
+
 namespace Core::DOFSets
 {
   /*!

src/core/fem/src/dofset/4C_fem_dofset_pbc.hpp

@@ -11,10 +11,10 @@
 #include "4C_config.hpp"
 
 #include "4C_fem_dofset.hpp"
-#include "4C_linalg_map.hpp"
 
 #include <map>
 #include <memory>
+#include <set>
 #include <vector>
 
 FOUR_C_NAMESPACE_OPEN

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
 

src/core/fem/src/nurbs_discretization/4C_fem_nurbs_discretization_knotvector.cpp

@@ -664,8 +664,9 @@ void Core::FE::Nurbs::Knotvector::finish_knots(const int smallest_gid_in_dis)
 
         for (int mm = 1; mm < (degree_[np])[rr] + 1; ++mm)
         {
-          double db = abs((*((knot_values_[np])[rr]))[mm] - firstval);
-          double de = abs((*((knot_values_[np])[rr]))[(n_x_m_x_l_[np])[rr] - 1 - mm] - lastval);
+          double db = std::abs((*((knot_values_[np])[rr]))[mm] - firstval);
+          double de =
+              std::abs((*((knot_values_[np])[rr]))[(n_x_m_x_l_[np])[rr] - 1 - mm] - lastval);
 
           if (de > 1e-9 || db > 1e-9)
           {
@@ -683,7 +684,7 @@ void Core::FE::Nurbs::Knotvector::finish_knots(const int smallest_gid_in_dis)
           double db = (*((knot_values_[np])[rr]))[mm] - (*((knot_values_[np])[rr]))[mm - 1];
           double de = (*((knot_values_[np])[rr]))[(n_x_m_x_l_[np])[rr] - mm] -
                       (*((knot_values_[np])[rr]))[(n_x_m_x_l_[np])[rr] - 1 - mm];
-          if (abs(de - db) > 1e-9)
+          if (std::abs(de - db) > 1e-9)
           {
             FOUR_C_THROW("periodic knotvector doesn't obey periodicity\n");
           }