finally working

library/NekMeshUtils/2DGenerator/2DGenerator.cpp

@@ -111,7 +111,6 @@ void Generator2D::Process()
 
     if (m_config["periodic"].beenSet)
     {
-        cout << "periodic" << endl;
         PeriodicPrep();
         MakePeriodic();
     }
@@ -374,56 +373,7 @@ void Generator2D::MakePeriodic()
     for (map<unsigned, unsigned>::iterator ip = m_periodicPairs.begin();
          ip != m_periodicPairs.end(); ++ip)
     {
-        Array<OneD, NekDouble> T =
-            m_mesh->m_cad->GetPeriodicTranslationVector(ip->first, ip->second);
-
-        CADCurveSharedPtr c1 = m_mesh->m_cad->GetCurve(ip->first);
-        CADCurveSharedPtr c2 = m_mesh->m_cad->GetCurve(ip->second);
-
-        bool reversed = c1->GetOrienationWRT(1) == c2->GetOrienationWRT(1);
-
-        vector<NodeSharedPtr> nodes = m_curvemeshes[ip->first]->GetMeshPoints();
-        vector<NodeSharedPtr> nnodes;
-
-        vector<pair<CADSurfSharedPtr, CADOrientation::Orientation> > surfs =
-            c2->GetAdjSurf();
-
-        for (int i = 1; i < nodes.size() - 1; i++)
-        {
-            Array<OneD, NekDouble> loc = nodes[i]->GetLoc();
-            NodeSharedPtr nn = NodeSharedPtr(new Node(
-                m_mesh->m_numNodes++, loc[0] + T[0], loc[1] + T[1], 0.0));
-
-            for (int j = 0; j < surfs.size(); j++)
-            {
-                nn->SetCADSurf(surfs[j].first->GetId(), surfs[j].first,
-                               surfs[j].first->locuv(nn->GetLoc()));
-            }
-
-            nn->SetCADCurve(ip->second, c2, c2->loct(nn->GetLoc()));
-
-            nnodes.push_back(nn);
-        }
-
-        // Reverse internal nodes of the vector if necessary
-        if (reversed)
-        {
-            reverse(nnodes.begin(), nnodes.end());
-        }
-
-        nnodes.insert(nnodes.begin(), m_curvemeshes[ip->second]->GetFirstPoint());
-        nnodes.push_back(m_curvemeshes[ip->second]->GetLastPoint());
-
-        // Clean m_edgeSet and build new CurveMesh
-        vector<EdgeSharedPtr> edges = m_curvemeshes[ip->second]->GetMeshEdges();
-        for (vector<EdgeSharedPtr>::iterator ie = edges.begin();
-             ie != edges.end(); ++ie)
-        {
-            m_mesh->m_edgeSet.erase(*ie);
-        }
-
-        m_curvemeshes[ip->second] = MemoryManager<CurveMesh>::AllocateSharedPtr(
-            ip->second, m_mesh, nnodes);
+        m_curvemeshes[ip->second]->PeriodicOverwrite(m_curvemeshes[ip->first]);
     }
 
     if (m_mesh->m_verbose)

library/NekMeshUtils/SurfaceMeshing/CurveMesh.cpp

@@ -108,8 +108,7 @@ void CurveMesh::Mesh()
     Array<OneD, NekDouble> loc;
 
     vector<CADVertSharedPtr> verts = m_cadcurve->GetVertex();
-    vector<pair<CADSurfSharedPtr, CADOrientation::Orientation> > s =
-        m_cadcurve->GetAdjSurf();
+    vector<pair<CADSurfSharedPtr, CADOrientation::Orientation> > s = m_cadcurve->GetAdjSurf();
 
     NodeSharedPtr n = verts[0]->GetNode();
     t               = m_bounds[0];
@@ -165,7 +164,15 @@ void CurveMesh::Mesh()
     ASSERTL0(Ne + 1 == m_meshpoints.size(),
              "incorrect number of points in curve mesh");
 
-    MakeEdges();
+    // make edges and add them to the edgeset for the face mesher to use
+    for (int i = 0; i < m_meshpoints.size() - 1; i++)
+    {
+        EdgeSharedPtr e = boost::shared_ptr<Edge>(
+            new Edge(m_meshpoints[i], m_meshpoints[i + 1]));
+        e->m_parentCAD = m_cadcurve;
+        m_mesh->m_edgeSet.insert(e);
+        m_meshedges.push_back(e);
+    }
 
     if (m_mesh->m_verbose)
     {
@@ -180,19 +187,6 @@ void CurveMesh::Mesh()
     }
 }
 
-void CurveMesh::MakeEdges()
-{
-    // make edges and add them to the edgeset for the face mesher to use
-    for (int i = 0; i < m_meshpoints.size() - 1; i++)
-    {
-        EdgeSharedPtr e =
-            EdgeSharedPtr(new Edge(m_meshpoints[i], m_meshpoints[i + 1]));
-        e->m_parentCAD = m_cadcurve;
-        m_mesh->m_edgeSet.insert(e);
-        m_meshedges.push_back(e);
-    }
-}
-
 void CurveMesh::GetPhiFunction()
 {
     m_ps.resize(m_numSamplePoints);
@@ -220,7 +214,7 @@ NekDouble CurveMesh::EvaluateDS(NekDouble s)
     int a = 0;
     int b = 0;
 
-    ASSERTL1(!(s < 0) && !(s > m_curvelength), "s out of bounds");
+    ASSERTL1(!(s < 0) && !(s > m_curvelength),"s out of bounds");
 
     if (s == 0)
     {
@@ -259,7 +253,7 @@ NekDouble CurveMesh::EvaluatePS(NekDouble s)
     int a = 0;
     int b = 0;
 
-    ASSERTL1(!(s < 0) && !(s > m_curvelength), "s out of bounds");
+    ASSERTL1(!(s < 0) && !(s > m_curvelength),"s out of bounds");
 
     if (s == 0)
     {
@@ -351,7 +345,7 @@ void CurveMesh::GetSampleFunction()
         }
         else
         {*/
-        dsti[0] = m_mesh->m_octree->Query(loc);
+            dsti[0] = m_mesh->m_octree->Query(loc);
         //}
 
         dsti[2] = t;
@@ -359,5 +353,71 @@ void CurveMesh::GetSampleFunction()
         m_dst[i] = dsti;
     }
 }
+
+void CurveMesh::PeriodicOverwrite(CurveMeshSharedPtr from)
+{
+    //clear current mesh points and remove edges from edgeset
+    m_meshpoints.clear();
+    for (int i = 0; i < m_meshedges.size(); i++)
+    {
+        m_mesh->m_edgeSet.erase(m_meshedges[i]);
+    }
+    m_meshedges.clear();
+
+    ///////
+
+    int tid = from->GetId();
+    Array<OneD, NekDouble> T =
+        m_mesh->m_cad->GetPeriodicTranslationVector(tid, m_id);
+
+    CADCurveSharedPtr c1 = m_mesh->m_cad->GetCurve(tid);
+
+    bool reversed = c1->GetOrienationWRT(1) == m_cadcurve->GetOrienationWRT(1);
+
+    vector<NodeSharedPtr> nodes = from->GetMeshPoints();
+
+    vector<pair<CADSurfSharedPtr, CADOrientation::Orientation> > surfs =
+        m_cadcurve->GetAdjSurf();
+
+    for (int i = 1; i < nodes.size() - 1; i++)
+    {
+        Array<OneD, NekDouble> loc = nodes[i]->GetLoc();
+        NodeSharedPtr nn = NodeSharedPtr(new Node(
+            m_mesh->m_numNodes++, loc[0] + T[0], loc[1] + T[1], 0.0));
+
+        for (int j = 0; j < surfs.size(); j++)
+        {
+            nn->SetCADSurf(surfs[j].first->GetId(), surfs[j].first,
+                           surfs[j].first->locuv(nn->GetLoc()));
+        }
+
+        nn->SetCADCurve(m_id, m_cadcurve, m_cadcurve->loct(nn->GetLoc()));
+
+        m_meshpoints.push_back(nn);
+    }
+
+    // Reverse internal nodes of the vector if necessary
+    if (reversed)
+    {
+        reverse(m_meshpoints.begin(), m_meshpoints.end());
+    }
+
+    vector<CADVertSharedPtr> verts = m_cadcurve->GetVertex();
+
+    m_meshpoints.insert(m_meshpoints.begin(), verts[0]->GetNode());
+    m_meshpoints.push_back(verts[1]->GetNode());
+    //dont need to realign cad for vertices
+
+    // make edges and add them to the edgeset for the face mesher to use
+    for (int i = 0; i < m_meshpoints.size() - 1; i++)
+    {
+        EdgeSharedPtr e = boost::shared_ptr<Edge>(
+            new Edge(m_meshpoints[i], m_meshpoints[i + 1]));
+        e->m_parentCAD = m_cadcurve;
+        m_mesh->m_edgeSet.insert(e);
+        m_meshedges.push_back(e);
+    }
+}
+
 }
 }

library/NekMeshUtils/SurfaceMeshing/CurveMesh.h

@@ -54,6 +54,10 @@ namespace Nektar
 namespace NekMeshUtils
 {
 
+//forward
+class CurveMesh;
+typedef boost::shared_ptr<CurveMesh> CurveMeshSharedPtr;
+
 class CurveMesh
 {
 public:
@@ -73,7 +77,6 @@ public:
         : m_id(id), m_mesh(m), m_meshpoints(ns)
     {
         m_cadcurve = m_mesh->m_cad->GetCurve(m_id);
-        MakeEdges();
     }
 
     /**
@@ -126,6 +129,13 @@ public:
         return m_curvelength;
     }
 
+    void PeriodicOverwrite(CurveMeshSharedPtr from);
+
+    int GetId()
+    {
+        return m_id;
+    }
+
 private:
     /**
      * @brief get node spacing sampling function
@@ -147,8 +157,6 @@ private:
      */
     NekDouble EvaluatePS(NekDouble s);
 
-    void MakeEdges();
-
     /// CAD curve
     CADCurveSharedPtr m_cadcurve;
     /// length of the curve in real space
@@ -182,7 +190,6 @@ private:
     int m_blID;
 };
 
-typedef boost::shared_ptr<CurveMesh> CurveMeshSharedPtr;
 }
 }