merge conflicts

srcs/BEM/functionsBEM.cpp

@@ -36,7 +36,10 @@
 //todo: créer d'autres .geo avec des géométries plus complexes
 //gérer des matériaux composites
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
 void element_node_data(std::vector<std::vector<std::vector<double>>> &data, std::vector<std::vector<size_t>> &elementTags2d_domain_BEM, std::vector<int> &elementTypes2d_domain_BEM, std::vector<std::vector<size_t>> &nodeTags2d_domain_BEM, std::vector<elementStruct> &elementVector, std::map<int, double> &nodeMapDomain, bool &show_element_node_data, int &entities_tags_for_physical_group_domain_BEM)
 {
     //The first part of the algorithm consists in recovering the tag of the 2d elements of the domain which have at least one node in common with the boundary
@@ -712,7 +715,6 @@ void compute_internal_phi(std::vector<double> &allCoord, std::vector<size_t> &No
 #pragma omp critical
         nodeMapDomain[NodeTags2d_domain[i]] = phi;
     }
-
 }
 
 void computeData(const std::vector<elementStruct> &elementVector, std::vector<size_t> &tags, std::vector<std::vector<double>> &data, const std::string integrationType, std::vector<int> &entities_tags_2d_domain_BEM)
@@ -825,4 +827,4 @@ void remove_no_domain_nodes(std::vector<size_t> &NodeTags2d_domain, std::vector<
     }
     NodeTags2d_domain.swap(NodeTags2d_domain_temp);
     NodeTags2d_domain_temp.clear();
-}
+}
\ No newline at end of file

srcs/BEM/functionsBEM.hpp

@@ -37,4 +37,4 @@ void compute_internal_phi(std::vector<double> &allCoord, std::vector<size_t> &No
 void element_node_data(std::vector<std::vector<std::vector<double>>> &data, std::vector<std::vector<size_t>> &elementTags2d_domain_BEM, std::vector<int> &elementTypes2d_domain_BEM, std::vector<std::vector<size_t>> &nodeTags2d_domain_BEM, std::vector<elementStruct> &elementVector, std::map<int, double> &nodeMapDomain, bool &show_element_node_data, int &entities_tags_for_physical_group_domain_BEM);
 void disp_element_node_data(std::vector<int> &nodes_commun_tag, std::vector<int> &elements_commun_tag);
 void display_time(std::chrono::time_point<std::chrono::system_clock> &start, std::chrono::time_point<std::chrono::system_clock> &end, std::string &function_name, bool &show_time);
-void remove_no_domain_nodes(std::vector<size_t> &NodeTags2d_domain, std::vector<elementStruct> &elementVector);
+void remove_no_domain_nodes(std::vector<size_t> &NodeTags2d_domain, std::vector<elementStruct> &elementVector);
\ No newline at end of file