From e5e8882d0714ff1326e85622f2eb2746eaa68e10 Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <mhochsteger@cerbsim.com>
Date: Fri, 16 Jul 2021 17:18:41 +0200
Subject: [PATCH] fix identifications, copy whole LocalH tree

---
 libsrc/meshing/meshfunc.cpp | 65 +++++++++++++++++--------------------
 libsrc/meshing/meshing3.cpp |  2 +-
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/libsrc/meshing/meshfunc.cpp b/libsrc/meshing/meshfunc.cpp
index c7a3eca0..b4a4193f 100644
--- a/libsrc/meshing/meshfunc.cpp
+++ b/libsrc/meshing/meshfunc.cpp
@@ -36,9 +36,9 @@ namespace netgen
       Array<MeshingData> ret;
       auto num_domains = mesh.GetNDomains();
 
-      ret.SetSize(num_domains);
       if(num_domains==1 || mp.only3D_domain_nr)
       {
+          ret.SetSize(1);
           // no need to divide mesh, just fill in meshing data
           ret[0].domain = 1;
           if(mp.only3D_domain_nr)
@@ -48,6 +48,7 @@ namespace netgen
           ret[0].mp = mp;
           return ret;
       }
+      ret.SetSize(num_domains);
 
       Array<Array<PointIndex, PointIndex>> ipmap;
       ipmap.SetSize(num_domains);
@@ -55,8 +56,6 @@ namespace netgen
       auto num_points = mesh.GetNP();
       auto num_facedescriptors = mesh.GetNFD();
 
-      auto & identifications = mesh.GetIdentifications();
-
       for(auto i : Range(ret))
       {
           auto & md = ret[i];
@@ -68,7 +67,7 @@ namespace netgen
           ret[i].mesh = make_unique<Mesh>();
           auto & m = *ret[i].mesh;
 
-          // m.SetLocalH(mesh.GetLocalH()->Copy());
+          m.SetLocalH(mesh.GetLocalH());
 
           ipmap[i].SetSize(num_points);
           ipmap[i] = PointIndex::INVALID;
@@ -118,6 +117,22 @@ namespace netgen
             }
       }
 
+      // add segmetns
+      for(auto i : Range(ret))
+      {
+          auto & imap = ipmap[i];
+          auto & m = *ret[i].mesh;
+          for(auto seg : mesh.LineSegments())
+            if(imap[seg[0]].IsValid() && imap[seg[1]].IsValid())
+              {
+                  seg[0] = imap[seg[0]];
+                  seg[1] = imap[seg[1]];
+                  m.AddSegment(seg);
+              }
+      }
+
+      auto & identifications = mesh.GetIdentifications();
+
       for(auto i : Range(ret))
       {
           auto & m = *ret[i].mesh;
@@ -136,38 +151,18 @@ namespace netgen
 
               for(auto pair : pairs)
               {
-                  auto pi0 = pair[0];
-                  auto pi1 = pair[1];
-                  if(imap[pi0].IsValid() && imap[pi1].IsValid())
-                      m_ident.Add(n, imap[pi0], imap[pi1]);
-              }
-          }
-          m.Save("part_"+ToString(i)+".vol.gz");
-      }
+                  auto pi0 = imap[pair[0]];
+                  auto pi1 = imap[pair[1]];
+                  if(!pi0.IsValid() || !pi1.IsValid())
+                      continue;
 
-      // NgArray<INDEX_2> connectednodes;
-      // for(auto i : Range(ret))
-      // {
-      //     auto & imap = ipmap[i];
-      //     auto & m = *ret[i].mesh;
-      //
-      //     for (auto & sel : m.SurfaceElements())
-      //       for(auto & pi : sel.PNums())
-      //         pi = imap[pi];
-      //
-      //      for (int nr = 1; nr <= identifications.GetMaxNr(); nr++)
-      //        if (identifications.GetType(nr) != Identifications::PERIODIC)
-      //          {
-      //            identifications.GetPairs (nr, connectednodes);
-      //            for (auto pair : connectednodes)
-      //            {
-      //                auto pi0 = pair[0];
-      //                auto pi1 = pair[1];
-      //                if(imap[pi0].IsValid() && imap[pi1].IsValid())
-      //                    ret[i].connected_pairs.Append({imap[pi0], imap[pi1]});
-      //            }
-      //          }
-      // }
+                  if(pi1<pi0)
+                      Swap(pi0,pi1);
+                  m_ident.Add(pi0, pi1, n);
+              }
+              m_ident.SetType( n, identifications.GetType(n) );
+          }
+      }
       return ret;
   }
 
diff --git a/libsrc/meshing/meshing3.cpp b/libsrc/meshing/meshing3.cpp
index 182db6d9..a7cf4b08 100644
--- a/libsrc/meshing/meshing3.cpp
+++ b/libsrc/meshing/meshing3.cpp
@@ -1128,7 +1128,7 @@ void Meshing3 :: PrepareBlockFillLocalH (Mesh & mesh,
 
   if (mp.maxh < maxh) maxh = mp.maxh;
 
-  auto loch_ptr = mesh.LocalHFunction().Copy(bounding_box);
+  auto loch_ptr = mesh.LocalHFunction().Copy(); //bounding_box);
   auto & loch = *loch_ptr;
   // auto & loch = mesh.LocalHFunction();