From 58f15d2720f7d797bfe711780f61beb247ce0646 Mon Sep 17 00:00:00 2001
From: Yoann Audouin <yoann.audouin@edf.fr>
Date: Wed, 2 Nov 2022 10:56:44 +0100
Subject: [PATCH] Revert "Corrections for parallel smesh"

This reverts commit 1aecb09c15462724ab10751ef9348c24f2f134a9.
---
 src/NETGENPlugin/NETGENPlugin_Mesher.cxx       | 6 ------
 src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx    | 8 ++------
 src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx    | 2 +-
 src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx | 2 +-
 src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx | 2 +-
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index 2d9ff3b..44535f2 100644
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -599,8 +599,6 @@ void NETGENPlugin_Mesher::SetDefaultParameters()
   _fineness               = NETGENPlugin_Hypothesis::GetDefaultFineness();
   mparams.uselocalh       = NETGENPlugin_Hypothesis::GetDefaultSurfaceCurvature();
   netgen::merge_solids    = NETGENPlugin_Hypothesis::GetDefaultFuseEdges();
-  // Unused argument but set 0 to initialise it
-  mparams.elementorder = 0;
 
 #ifdef NETGEN_V6
 
@@ -614,7 +612,6 @@ void NETGENPlugin_Mesher::SetDefaultParameters()
 #endif
 }
 
-
 //=============================================================================
 /*!
  * Pass parameters to NETGEN
@@ -4499,9 +4496,6 @@ int NETGENPlugin_NetgenLibWrapper::GenerateMesh( netgen::OCCGeometry& occgeo,
   if ( !ngMesh )
     ngMesh = new netgen::Mesh;
 
-  // To dump mparam
-  // netgen::mparam.Print(std::cerr);
-
 #ifdef NETGEN_V6
 
   ngMesh->SetGeometry( shared_ptr<netgen::NetgenGeometry>( &occgeo, &NOOP_Deleter ));
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index 8435688..d4712aa 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -218,7 +218,7 @@ bool NETGENPlugin_NETGEN_3D::getSurfaceElements(
     SMESH_ProxyMesh::Ptr proxyMesh,
     NETGENPlugin_Internals &internals,
     SMESH_MesherHelper &helper,
-    std::map<const SMDS_MeshElement*, tuple<bool, bool>, TIDCompare>& listElements
+    std::map<const SMDS_MeshElement*, tuple<bool, bool>>& listElements
 )
 {
   SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
@@ -309,8 +309,6 @@ bool NETGENPlugin_NETGEN_3D::computeFillNgMesh(
     SMESH::Controls::TSequenceOfXYZ nodesCoords;
 
     // maps nodes to ng ID
-    // map must be sorted by ID to ensure that we will have the same number of
-    // 3D element if we recompute
     typedef map< const SMDS_MeshNode*, int, TIDCompare > TNodeToIDMap;
     typedef TNodeToIDMap::value_type                     TN2ID;
     TNodeToIDMap nodeToNetgenID;
@@ -340,9 +338,7 @@ bool NETGENPlugin_NETGEN_3D::computeFillNgMesh(
       proxyMesh.reset( Adaptor );
     }
 
-    // map must be sorted by ID to ensure that we will have the same number of
-    // 3D element if we recompute
-    std::map<const SMDS_MeshElement*, tuple<bool, bool>, TIDCompare> listElements;
+    std::map<const SMDS_MeshElement*, tuple<bool, bool>> listElements;
     bool ret = getSurfaceElements(aMesh, aShape, proxyMesh, internals, helper, listElements);
     if(ret)
       return ret;
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
index f7ebf13..af98746 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
@@ -107,7 +107,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
     SMESH_ProxyMesh::Ptr proxyMesh,
     NETGENPlugin_Internals &internals,
     SMESH_MesherHelper &helper,
-    std::map<const SMDS_MeshElement*, std::tuple<bool, bool>, TIDCompare>& listElements);
+    std::map<const SMDS_MeshElement*, std::tuple<bool, bool>>& listElements);
 
   bool compute(SMESH_Mesh&                          mesh,
                SMESH_MesherHelper&                  helper,
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
index 39b809b..1ea0ad7 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
@@ -322,7 +322,7 @@ bool NETGENPlugin_NETGEN_3D_SA::getSurfaceElements(
     SMESH_ProxyMesh::Ptr proxyMesh,
     NETGENPlugin_Internals &internals,
     SMESH_MesherHelper &helper,
-    std::map<const SMDS_MeshElement*, tuple<bool, bool>, TIDCompare>& listElements
+    std::map<const SMDS_MeshElement*, tuple<bool, bool>>& listElements
     )
 {
   // To remove compilation warnings
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
index dc7919d..0a6a6fc 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
@@ -72,7 +72,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_SA: public NETGENPlugin_NETGEN_
     SMESH_ProxyMesh::Ptr proxyMesh,
     NETGENPlugin_Internals &internals,
     SMESH_MesherHelper &helper,
-    std::map<const SMDS_MeshElement*, tuple<bool, bool>, TIDCompare>& listElements
+    std::map<const SMDS_MeshElement*, tuple<bool, bool>>& listElements
     ) override;
 
    std::string _element_orientation_file="";
-- 
2.30.2