From c626fecd77d4ada5e099cc8c85bbf7eadc215319 Mon Sep 17 00:00:00 2001
From: Mike Taverne <mtaverne@bluemarlin.engits.com>
Date: Tue, 28 Apr 2009 17:21:08 +0200
Subject: [PATCH] =?utf8?q?=C2=C2renamed=20createspecialmapping=20to=20surf?=
 =?utf8?q?acesmoother?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 createspecialmapping.cpp | 1171 ----------------------------------------------
 createspecialmapping.h   |  289 ------------
 engrid.pro               |   16 +-
 guismoothsurface.cpp     |   10 +-
 smoothingutilities.h     |    2 +-
 vertexdelegate.cpp       |    2 +-
 6 files changed, 17 insertions(+), 1473 deletions(-)
 delete mode 100644 createspecialmapping.cpp
 delete mode 100644 createspecialmapping.h

diff --git a/createspecialmapping.cpp b/createspecialmapping.cpp
deleted file mode 100644
index d591987..0000000
--- a/createspecialmapping.cpp
+++ /dev/null
@@ -1,1171 +0,0 @@
-#include "createspecialmapping.h"
-
-#include <QString>
-#include <QTextStream>
-#include <vtkCharArray.h>
-
-#include "smoothingutilities.h"
-
-#include "swaptriangles.h"
-#include "laplacesmoother.h"
-#include "guimainwindow.h"
-
-#include <iostream>
-using namespace std;
-
-CreateSpecialMapping::CreateSpecialMapping()
-{
-   DebugLevel=0;
-}
-
-int CreateSpecialMapping::Process()
-{
-  int i_iter=0;
-  for(i_iter=0;i_iter<NumberOfIterations;i_iter++)//TODO:Optimize this loop
-  {
-    cout<<"===ITERATION NB "<<i_iter<<"/"<<NumberOfIterations<<"==="<<endl;
-    
-    m_total_N_newpoints=0;
-    m_total_N_newcells=0;
-    
-    getAllSurfaceCells(m_AllCells,m_grid);
-    getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-    cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-    
-    EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-    
-    m_SelectedNodes.clear();
-    getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-    getNodesFromCells(m_AllCells, nodes, m_grid);
-    setGrid(m_grid);
-    setCells(m_AllCells);
-    
-    cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-    
-    //Phase D: edit points
-    cout<<"===Phase D==="<<endl;
-    N_inserted_FP=0;
-    N_inserted_EP=0;
-    N_removed_FP=0;
-    N_removed_EP=0;
-    
-    //Method 1
-//     FullEdit();
-    
-    //Method 2
-/*    if(insert_FP) insert_FP_all();
-    if(insert_EP) insert_EP_all();
-    if(remove_FP) remove_FP_all();
-    if(remove_EP) remove_EP_all();*/
-    
-    //Method 3
-    if(insert_FP) {
-      UpdateDesiredMeshDensity();
-      insert_FP_all();
-      if(DoSwap) SwapFunction();
-      if(DoLaplaceSmoothing) SmoothFunction();
-    }
-    
-    if(insert_EP) {
-      UpdateDesiredMeshDensity();
-      insert_EP_all();
-      if(DoSwap) SwapFunction();
-      if(DoLaplaceSmoothing) SmoothFunction();
-    }
-    
-    if(remove_FP) {
-      UpdateDesiredMeshDensity();
-      remove_FP_all_3();
-      if(DoSwap) SwapFunction();
-      if(DoLaplaceSmoothing) SmoothFunction();
-    }
-    
-    if(remove_EP) {
-      UpdateDesiredMeshDensity();
-      remove_EP_all_3();
-      if(DoSwap) SwapFunction();
-      if(DoLaplaceSmoothing) SmoothFunction();
-    }
-    
-/*    if(DoSwap) SwapFunction();
-    if(DoLaplaceSmoothing) SmoothFunction();*/
-    
-    cout<<"===Summary==="<<endl;
-    cout<<"N_inserted_FP="<<N_inserted_FP<<endl;
-    cout<<"N_inserted_EP="<<N_inserted_EP<<endl;
-    cout<<"N_removed_FP="<<N_removed_FP<<endl;
-    cout<<"N_removed_EP="<<N_removed_EP<<endl;
-    
-    cout<<"N_points="<<N_points<<endl;
-    cout<<"N_cells="<<N_cells<<endl;
-    cout<<"m_total_N_newpoints="<<m_total_N_newpoints<<endl;
-    cout<<"m_total_N_newcells="<<m_total_N_newcells<<endl;
-    cout<<"============"<<endl;
-    
-//     if(m_total_N_newpoints==0 && m_total_N_newcells==0) break;
-    if(N_inserted_FP==0 && N_inserted_EP==0 && N_removed_FP==0 && N_removed_EP==0) break;
-  }
-  
-  cout<<"i_iter/NumberOfIterations="<<i_iter<<"/"<<NumberOfIterations<<endl;
-  UpdateDesiredMeshDensity();
-  UpdateMeshDensity();
-  if(i_iter<NumberOfIterations) cout<<"WARNING: Exited before finishing all iterations."<<endl;
-  return 1;
-}
-//end of process
-
-int CreateSpecialMapping::UpdateDesiredMeshDensity()
-{
-    //Phase B : define desired mesh density
-  cout<<"=== UpdateDesiredMeshDensity ==="<<endl;
-  
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  getNodesFromCells(m_AllCells, m_AllNodes, m_grid);
-  
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  UpdateNodeType_all();
-  EG_VTKDCN(vtkCharArray, node_type, m_grid, "node_type");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  EG_VTKDCN(vtkIntArray, node_specified_density, m_grid, "node_specified_density");
-  
-/*  //Phase A : Calculate current mesh density
-  cout<<"===Phase A==="<<endl;
-  
-  foreach(vtkIdType node,m_SelectedNodes)
-  {
-    VertexMeshDensity nodeVMD = getVMD(node,node_type->GetValue(node));
-    int idx=VMDvector.indexOf(nodeVMD);
-    if(DebugLevel>3) cout<<"idx="<<idx<<endl;
-    if(idx!=-1)//specified
-    {
-      node_meshdensity->SetValue(node, VMDvector[idx].density);
-    }
-    else//unspecified
-    {
-      double L=CurrentVertexAvgDist(node,n2n,m_grid);
-      double D=1./L;
-      node_meshdensity->SetValue(node, D);
-    }
-  }*/
-  
-  double diff=Convergence_meshdensity+1;
-  if(DebugLevel>3) cout<<"before loop: diff="<<diff<<endl;
-  bool first=true;
-  int iter=0;
-  do {
-    if(DebugLevel>2) cout<<"--->diff="<<diff<<endl;
-    first=true;
-    foreach(vtkIdType node,m_AllNodes)
-    {
-      if(DebugLevel>2) cout<<"======>"<<endl;
-      VertexMeshDensity nodeVMD = getVMD(node,node_type->GetValue(node));
-      int idx=VMDvector.indexOf(nodeVMD);
-      node_specified_density->SetValue(node, idx);
-      if(DebugLevel>2) cout<<"------>idx="<<idx<<endl;
-      if(idx!=-1)//specified
-      {
-        node_meshdensity->SetValue(node, VMDvector[idx].density);
-      }
-      else//unspecified
-      {
-        double D=DesiredMeshDensity(node,n2n,m_grid);
-        if(first) {
-          if(DebugLevel>2) {
-            cout<<"------>FIRST:"<<endl;
-            cout<<"------>D="<<D<<endl;
-            cout<<"------>node_meshdensity->GetValue("<<node<<")="<<node_meshdensity->GetValue(node)<<endl;
-            cout<<"------>D-node_meshdensity->GetValue("<<node<<")="<<D-node_meshdensity->GetValue(node)<<endl;
-            cout<<"------>diff=abs(D-node_meshdensity->GetValue("<<node<<"))="<<abs(D-node_meshdensity->GetValue(node))<<endl;
-          }
-          diff=abs(D-node_meshdensity->GetValue(node));
-          first=false;
-        }
-        else {
-          if(DebugLevel>2) {
-            cout<<"------>NOT FIRST:"<<endl;
-            cout<<"------>D="<<D<<endl;
-            cout<<"------>node_meshdensity->GetValue("<<node<<")="<<node_meshdensity->GetValue(node)<<endl;
-            cout<<"------>D-node_meshdensity->GetValue("<<node<<")="<<D-node_meshdensity->GetValue(node)<<endl;
-            cout<<"------>diff=abs(D-node_meshdensity->GetValue("<<node<<"))="<<abs(D-node_meshdensity->GetValue(node))<<endl;
-            cout<<"------>diff="<<diff<<endl;
-            cout<<"------>max(abs(D-node_meshdensity->GetValue("<<node<<")),diff)="<<max(abs(D-node_meshdensity->GetValue(node)),diff)<<endl;
-          }
-          diff=max(abs(D-node_meshdensity->GetValue(node)),diff);
-        }
-        node_meshdensity->SetValue(node, D);
-      }
-      if(DebugLevel>2) cout<<"======>"<<endl;
-    }
-    iter++;
-  } while(diff>Convergence_meshdensity && !first && iter<maxiter_density);// if first=true, it means no new mesh density has been defined (all densities specified)
-  cout<<"iter="<<iter<<endl;
-  if(iter>=maxiter_density) cout<<"WARNING: Desired convergence factor has not been reached!"<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::SwapFunction()
-{
-  //Phase E : Delaunay swap
-  QSet<int> bcs_complement=complementary_bcs(m_bcs,m_grid,cells);
-  cout<<"m_bcs="<<m_bcs<<endl;
-  cout<<"bcs_complement="<<bcs_complement<<endl;
-  
-  SwapTriangles swap;
-  swap.setGrid(m_grid);
-  swap.setBoundaryCodes(bcs_complement);
-  swap();
-  return(0);
-}
-
-int CreateSpecialMapping::SmoothFunction()
-{
-  cout<<"=== SmoothFunction ==="<<endl;
-  //Phase F : translate points to smooth grid
-  //4 possibilities
-  //vtk smooth 1
-  //vtk smooth 2
-  //laplacian smoothing with projection
-  //Roland smoothing with projection
-
-  //laplacian smoothing with projection
-  LaplaceSmoother Lap;
-  Lap.SetInput(m_bcs,m_grid);
-  Lap.SetNumberOfIterations(N_SmoothIterations);
-  Lap();
-  return(0);
-}
-
-VertexMeshDensity CreateSpecialMapping::getVMD(vtkIdType node, char VertexType)
-{
-  VertexMeshDensity VMD;
-  VMD.type=VertexType;
-  VMD.density=0;
-  VMD.CurrentNode=node;
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-/*  createNodeMapping(nodes, _nodes, m_grid);
-  createNodeToCell(m_AllCells, nodes, _nodes, n2c, m_grid);*/
-  
-  QSet <int> bc;
-  foreach(vtkIdType C, n2c[node])
-  {
-    bc.insert(cell_code->GetValue(C));
-    VMD.BCmap[cell_code->GetValue(C)]=2;
-  }
-  VMD.BClist.resize(bc.size());
-  qCopy(bc.begin(),bc.end(),VMD.BClist.begin());
-  qSort(VMD.BClist.begin(),VMD.BClist.end());
-  return(VMD);
-}
-
-int CreateSpecialMapping::insert_FP_counter()
-{
-  cout<<"===insert_FP_counter() START==="<<endl;
-  foreach(vtkIdType id_cell, m_SelectedCells)
-  {
-    if( !marked_cells[id_cell] && insert_fieldpoint(id_cell) )
-    {
-      if(DebugLevel>0) cout<<"inserting a field point "<<id_cell<<endl;
-      N_inserted_FP++;
-      marked_cells[id_cell]=true;
-      N_newcells+=2;
-      N_newpoints+=1;
-    }
-  }
-  cout<<"===insert_FP_counter() END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::insert_EP_counter()
-{
-  cout<<"===insert_EP_counter() START==="<<endl;
-  
-  //Phase C: Prepare edge_map
-  cout<<"===Phase C==="<<endl;
-  edge_map.clear();
-  vtkIdType edgeId=1;
-  foreach(vtkIdType node1,m_SelectedNodes)
-  {
-//       cout<<"node1="<<node1<<endl;
-    foreach(vtkIdType node2,n2n[node1])
-    {
-      if(edge_map[OrderedPair(node1,node2)]==0) { //this edge hasn't been numbered yet
-        edge_map[OrderedPair(node1,node2)]=edgeId;edgeId++;
-      }
-    }
-  }
-  cout<<"edge_map.size()="<<edge_map.size()<<endl;
-  
-  StencilVector.clear();
-  QMapIterator< pair<vtkIdType,vtkIdType>, vtkIdType> edge_map_iter(edge_map);
-      //rewind the iterator
-  edge_map_iter.toFront ();
-      //start loop
-  while (edge_map_iter.hasNext()) {
-    edge_map_iter.next();
-    vtkIdType node1=edge_map_iter.key().first;
-    vtkIdType node2=edge_map_iter.key().second;
-    if(DebugLevel>10) cout << "--->(" << node1 << "," << node2 << ")" << ": " << edge_map_iter.value() << endl;
-    QSet <int> stencil_cells_set;
-    QVector <int> stencil_cells_vector;
-    stencil_cells_set=n2c[node1];
-    stencil_cells_set.intersect(n2c[node2]);
-    if(DebugLevel>10) cout<<"stencil_cells_set="<<stencil_cells_set<<endl;
-    
-    stencil_cells_vector.resize(stencil_cells_set.size());
-    qCopy(stencil_cells_set.begin(),stencil_cells_set.end(),stencil_cells_vector.begin());
-    if(DebugLevel>10) cout<<"stencil_cells_vector="<<stencil_cells_vector<<endl;
-    
-    vtkIdType id_cell=stencil_cells_vector[0];
-    int SideToSplit = getSide(id_cell,m_grid,node1,node2);
-    if(DebugLevel>10) cout<<"SideToSplit="<<SideToSplit<<endl;
-    if(DebugLevel>10) cout<<"c2c[id_cell][SideToSplit]="<<c2c[id_cell][SideToSplit]<<endl;
-    if(DebugLevel>10) for(int i=0;i<3;i++) cout<<"c2c[id_cell]["<<i<<"]="<<c2c[id_cell][i]<<endl;
-    stencil_t S=getStencil(id_cell,SideToSplit);
-    
-    bool stencil_marked=false;
-    foreach(vtkIdType C,stencil_cells_vector)
-    {
-      if(marked_cells[C]) stencil_marked=true;
-    }
-    if(DebugLevel>10) cout<<"stencil_marked="<<stencil_marked<<endl;
-    if(DebugLevel>10) cout<<"insert_edgepoint(node1,node2)="<<insert_edgepoint(node1,node2)<<endl;
-    
-    if( !stencil_marked && insert_edgepoint(node1,node2) )
-    {
-      if(DebugLevel>1) cout<<"inserting an edge point "<< "(" << node1 << "," << node2 << ")" << ": " << edge_map_iter.value() << endl;
-      N_inserted_EP++;
-      foreach(vtkIdType C,stencil_cells_vector) marked_cells[C]=true;
-      StencilVector.push_back(S);
-      
-      if(stencil_cells_vector.size()==2)//2 cells around the edge
-      {
-        N_newcells+=2;
-        N_newpoints+=1;
-      }
-      else//1 cell around the edge
-      {
-        N_newcells+=1;
-        N_newpoints+=1;
-      }
-    }
-    if(DebugLevel>10) cout <<"--->end of edge processing"<<endl;
-  }
-  cout<<"===insert_EP_counter() END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::remove_FP_counter()
-{
-  cout<<"===remove_FP_counter() START==="<<endl;
-  cout<<"marked_cells="<<marked_cells<<endl;
-//   cout<<"hitlist="<<hitlist<<endl;
-  cout<<"hitlist.size()="<<hitlist.size()<<endl;
-  cout<<"N_newcells="<<N_newcells<<endl;
-  cout<<"N_newpoints="<<N_newpoints<<endl;
-  cout<<"N_removed_FP="<<N_removed_FP<<endl;
-  
-  UpdateNodeType_all();
-  EG_VTKDCN(vtkCharArray, node_type, m_grid, "node_type");
-  foreach(vtkIdType node,m_SelectedNodes)
-  {
-    if(node_type->GetValue(node)==VTK_SIMPLE_VERTEX)
-    {
-      bool marked=false;
-      foreach(vtkIdType C,n2c[node])
-      {
-        if(marked_cells[C]) marked=true;
-      }
-      
-      QSet <vtkIdType> DeadCells;
-      QSet <vtkIdType> MutatedCells;
-      QSet <vtkIdType> MutilatedCells;
-      if( !marked && remove_fieldpoint(node) && FindSnapPoint(m_grid,node,DeadCells,MutatedCells,MutilatedCells, N_newpoints, N_newcells)!=-1)
-      {
-        if(DebugLevel>1) cout<<"removing field point "<<node<<endl;
-        N_removed_FP++;
-        hitlist[node]=1;
-        foreach(vtkIdType C,n2c[node]) marked_cells[C]=true;
-        N_newcells-=2;
-        N_newpoints-=1;
-      }
-    }
-  }
-  cout<<"===remove_FP_counter() END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::remove_EP_counter()
-{
-  cout<<"===remove_EP_counter() START==="<<endl;
-  UpdateNodeType_all();
-  EG_VTKDCN(vtkCharArray, node_type, m_grid, "node_type");
-  foreach(vtkIdType node,m_SelectedNodes)
-  {
-    if(node_type->GetValue(node)==VTK_BOUNDARY_EDGE_VERTEX)
-    {
-      bool marked=false;
-      foreach(vtkIdType C,n2c[node])
-      {
-        if(marked_cells[C]) marked=true;
-      }
-      QSet <vtkIdType> DeadCells;
-      QSet <vtkIdType> MutatedCells;
-      QSet <vtkIdType> MutilatedCells;
-      if( !marked && remove_edgepoint(node) && FindSnapPoint(m_grid,node,DeadCells,MutatedCells,MutilatedCells, N_newpoints, N_newcells)!=-1)
-      {
-        cout<<"removing edge point "<<node<<endl;
-        N_removed_EP++;
-        hitlist[node]=2;
-        foreach(vtkIdType C,n2c[node]) marked_cells[C]=true;
-        if(n2n[node].size()==4)//4 cells around the edge
-        {
-          N_newcells-=2;
-          N_newpoints-=1;
-        }
-        else//2 cells around the edge
-        {
-          N_newcells-=1;
-          N_newpoints-=1;
-        }
-      }
-    }
-  }
-  cout<<"===remove_EP_counter() END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::insert_FP_actor(vtkUnstructuredGrid* grid_tmp)
-{
-  cout<<"===insert_FP_actor START==="<<endl;
-  
-  EG_VTKDCC(vtkIntArray, cell_code_tmp, grid_tmp, "cell_code");
-  foreach(vtkIdType id_cell, m_SelectedCells)
-  {
-/*    if(marked_cells[id_cell]) cout<<"--->marked_cells["<<id_cell<<"]=TRUE"<<endl;
-    else cout<<"--->marked_cells["<<id_cell<<"]=FALSE"<<endl;*/
-    
-    if( !marked_cells[id_cell] && insert_fieldpoint(id_cell) )
-    {
-      if(DebugLevel>0) cout<<"inserting a field point "<<id_cell<<endl;
-      vtkIdType newBC=cell_code_tmp->GetValue(id_cell);
-      if(DebugLevel>42) cout<<"id_cell="<<id_cell<<" newBC="<<newBC<<endl;
-      
-      vtkIdType N_pts, *pts;
-      m_grid->GetCellPoints(id_cell, N_pts, pts);
-      vec3_t C(0,0,0);
-      
-      int N_neighbours=N_pts;
-      if(DebugLevel>42) cout<<"N_neighbours="<<N_neighbours<<endl;
-      vec3_t corner[4];
-      vtkIdType pts_triangle[4][3];
-      for(int i=0;i<N_neighbours;i++)
-      {
-        m_grid->GetPoints()->GetPoint(pts[i], corner[i].data());
-        C+=corner[i];
-      }
-      C=(1/(double)N_neighbours)*C;
-      addPoint(grid_tmp,m_newNodeId,C.data());
-      vtkIdType intmidpoint=m_newNodeId;
-      m_newNodeId++;
-      
-      for(int i=0;i<N_neighbours;i++)
-      {
-        pts_triangle[i][0]=pts[i];
-        pts_triangle[i][1]=pts[(i+1)%N_neighbours];
-        pts_triangle[i][2]=intmidpoint;
-        if(i==0)
-        {
-          grid_tmp->ReplaceCell(id_cell , 3, pts_triangle[0]);
-          cell_code_tmp->SetValue(id_cell, newBC);
-        }
-        else
-        {
-          vtkIdType newCellId = grid_tmp->InsertNextCell(VTK_TRIANGLE,3,pts_triangle[i]);
-          cell_code_tmp->SetValue(newCellId, newBC);
-        }
-      }
-      
-    }
-  }
-  cout<<"===insert_FP_actor END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::insert_EP_actor(vtkUnstructuredGrid* grid_tmp)
-{
-  cout<<"===insert_EP_actor START==="<<endl;
-  
-  EG_VTKDCC(vtkIntArray, cell_code_tmp, grid_tmp, "cell_code");
-  foreach(stencil_t S,StencilVector)
-  {
-    if(DebugLevel>10) cout<<"S="<<S<<endl;
-    vec3_t A,B;
-    grid_tmp->GetPoint(S.p[1],A.data());
-    grid_tmp->GetPoint(S.p[3],B.data());
-    vec3_t M=0.5*(A+B);
-    addPoint(grid_tmp,m_newNodeId,M.data());
-    if(DebugLevel>0) cout<<"NEW EDGE POINT: "<<m_newNodeId<<endl;
-    
-    vtkIdType pts_triangle[4][3];
-    
-    if(S.valid){//there is a neighbour cell
-      if(DebugLevel>10) cout<<"marked_cells["<<S.id_cell1<<"]=true;"<<endl;
-      if(DebugLevel>10) cout<<"marked_cells["<<S.id_cell2<<"]=true;"<<endl;
-      marked_cells[S.id_cell1]=true;
-      marked_cells[S.id_cell2]=true;
-      
-      for(int i=0;i<4;i++)
-      {
-        pts_triangle[i][0]=S.p[i];
-        pts_triangle[i][1]=S.p[(i+1)%4];
-        pts_triangle[i][2]=m_newNodeId;
-      }
-      
-      int bc1=cell_code_tmp->GetValue(S.id_cell1);
-      int bc2=cell_code_tmp->GetValue(S.id_cell2);
-      
-      grid_tmp->ReplaceCell(S.id_cell1 , 3, pts_triangle[0]);
-      cell_code_tmp->SetValue(S.id_cell1, bc1);
-      
-      grid_tmp->ReplaceCell(S.id_cell2 , 3, pts_triangle[1]);
-      cell_code_tmp->SetValue(S.id_cell2, bc2);
-      
-      vtkIdType newCellId;
-      newCellId = grid_tmp->InsertNextCell(VTK_TRIANGLE,3,pts_triangle[2]);
-      cell_code_tmp->SetValue(newCellId, bc2);
-      newCellId = grid_tmp->InsertNextCell(VTK_TRIANGLE,3,pts_triangle[3]);
-      cell_code_tmp->SetValue(newCellId, bc1);
-    }
-    else{//there is no neighbour cell
-      if(DebugLevel>10) cout<<"marked_cells["<<S.id_cell1<<"]=true;"<<endl;
-      marked_cells[S.id_cell1]=true;
-      
-      pts_triangle[0][0]=S.p[0];
-      pts_triangle[0][1]=S.p[1];
-      pts_triangle[0][2]=m_newNodeId;
-      pts_triangle[3][0]=S.p[3];
-      pts_triangle[3][1]=S.p[0];
-      pts_triangle[3][2]=m_newNodeId;
-      
-      int bc1=cell_code_tmp->GetValue(S.id_cell1);
-      
-      grid_tmp->ReplaceCell(S.id_cell1 , 3, pts_triangle[0]);
-      cell_code_tmp->SetValue(S.id_cell1, bc1);
-      
-      vtkIdType newCellId;
-      newCellId = grid_tmp->InsertNextCell(VTK_TRIANGLE,3,pts_triangle[3]);
-      cell_code_tmp->SetValue(newCellId, bc1);
-    }
-    
-    m_newNodeId++;
-  }
-  cout<<"===insert_EP_actor END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::remove_FP_actor(vtkUnstructuredGrid* grid_tmp)
-{
-  cout<<"===remove_FP_actor START==="<<endl;
-  abort();
-  
-  foreach(vtkIdType node,m_SelectedNodes)
-  {
-    if(hitlist[node]==1)
-    {
-    
-    }
-    bool marked=false;
-    foreach(vtkIdType C,n2c[node])
-    {
-      if(marked_cells[C]) marked=true;
-    }
-    if( !marked && remove_fieldpoint(node) )
-    {
-      if(DebugLevel>1) cout<<"removing field point "<<node<<endl;
-      foreach(vtkIdType C,n2c[node]) marked_cells[C]=true;
-      //TODO: Special copy function, leaving out nodes to remove
-    }
-  }
-  cout<<"===remove_FP_actor END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::remove_EP_actor(vtkUnstructuredGrid* grid_tmp)
-{
-  cout<<"===remove_EP_actor START==="<<endl;
-  abort();
-  
-  foreach(vtkIdType node,m_SelectedNodes)
-  {
-    bool marked=false;
-    foreach(vtkIdType C,n2c[node])
-    {
-      if(marked_cells[C]) marked=true;
-    }
-    if( !marked && remove_edgepoint(node) )
-    {
-      if(DebugLevel>1) cout<<"removing edge point "<<node<<endl;
-      foreach(vtkIdType C,n2c[node]) marked_cells[C]=true;
-      if(n2n[node].size()==4)//4 cells around the edge
-      {
-        
-      }
-      else//2 cells around the edge
-      {
-        
-      }
-    }
-  }
-  cout<<"===remove_EP_actor END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::insert_FP_all()
-{
-  cout<<"===insert_FP_all START==="<<endl;
-  
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  N_inserted_FP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-  insert_FP_counter();
-  
-    //unmark cells (TODO: optimize)
-  marked_cells.clear();
-    //init grid_tmp
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  cout<<"N_points="<<N_points<<endl;
-  cout<<"N_cells="<<N_cells<<endl;
-  cout<<"N_newpoints="<<N_newpoints<<endl;
-  cout<<"N_newcells="<<N_newcells<<endl;
-  EG_VTKSP(vtkUnstructuredGrid,grid_tmp);
-  allocateGrid(grid_tmp,N_cells+N_newcells,N_points+N_newpoints);
-  m_total_N_newpoints+=N_newpoints; m_total_N_newcells+=N_newcells;
-  
-  makeCopyNoAlloc(m_grid, grid_tmp);
-    //initialize new node counter
-  m_newNodeId=N_points;
-  
-  insert_FP_actor(grid_tmp);
-  
-  makeCopy(grid_tmp,m_grid);
-  cout<<"===insert_FP_all END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::insert_EP_all()
-{
-  cout<<"===insert_EP_all START==="<<endl;
-  
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  N_inserted_EP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-  insert_EP_counter();
-  
-    //unmark cells (TODO: optimize)
-  marked_cells.clear();
-    //init grid_tmp
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  cout<<"N_points="<<N_points<<endl;
-  cout<<"N_cells="<<N_cells<<endl;
-  cout<<"N_newpoints="<<N_newpoints<<endl;
-  cout<<"N_newcells="<<N_newcells<<endl;
-  EG_VTKSP(vtkUnstructuredGrid,grid_tmp);
-  allocateGrid(grid_tmp,N_cells+N_newcells,N_points+N_newpoints);
-  m_total_N_newpoints+=N_newpoints; m_total_N_newcells+=N_newcells;
-  
-  makeCopyNoAlloc(m_grid, grid_tmp);
-    //initialize new node counter
-  m_newNodeId=N_points;
-  
-  insert_EP_actor(grid_tmp);
-  
-  makeCopy(grid_tmp,m_grid);
-  
-  cout<<"===insert_EP_all END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::remove_FP_all()
-{
-  cout<<"===remove_FP_all START==="<<endl;
-  
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  N_removed_FP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  hitlist.resize(N_points);
-  offset.resize(N_points);
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-  remove_FP_counter();
-  
-    //unmark cells (TODO: optimize)
-  marked_cells.clear();
-    //init grid_tmp
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  cout<<"N_points="<<N_points<<endl;
-  cout<<"N_cells="<<N_cells<<endl;
-  cout<<"N_newpoints="<<N_newpoints<<endl;
-  cout<<"N_newcells="<<N_newcells<<endl;
-  EG_VTKSP(vtkUnstructuredGrid,grid_tmp);
-  allocateGrid(grid_tmp,N_cells+N_newcells,N_points+N_newpoints);
-  m_total_N_newpoints+=N_newpoints; m_total_N_newcells+=N_newcells;
-  
-  makeCopyNoAlloc(m_grid, grid_tmp);
-    //initialize new node counter
-  m_newNodeId=N_points;
-  
-  remove_FP_actor(grid_tmp);
-  
-  makeCopy(grid_tmp,m_grid);
-  
-  cout<<"===remove_FP_all END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::remove_EP_all()
-{
-  cout<<"===remove_EP_all START==="<<endl;
-  
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  N_removed_EP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  hitlist.resize(N_points);
-  offset.resize(N_points);
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-  remove_EP_counter();
-  
-    //unmark cells (TODO: optimize)
-  marked_cells.clear();
-    //init grid_tmp
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  cout<<"N_points="<<N_points<<endl;
-  cout<<"N_cells="<<N_cells<<endl;
-  cout<<"N_newpoints="<<N_newpoints<<endl;
-  cout<<"N_newcells="<<N_newcells<<endl;
-  EG_VTKSP(vtkUnstructuredGrid,grid_tmp);
-  allocateGrid(grid_tmp,N_cells+N_newcells,N_points+N_newpoints);
-  m_total_N_newpoints+=N_newpoints; m_total_N_newcells+=N_newcells;
-  
-  makeCopyNoAlloc(m_grid, grid_tmp);
-    //initialize new node counter
-  m_newNodeId=N_points;
-  
-  remove_EP_actor(grid_tmp);
-  
-  makeCopy(grid_tmp,m_grid);
-  
-  cout<<"===remove_EP_all END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::FullEdit()
-{
-  cout<<"===FullEdit START==="<<endl;
-  
-  N_inserted_FP=0;
-  N_inserted_EP=0;
-  N_removed_FP=0;
-  N_removed_EP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  hitlist.resize(N_points);
-  offset.resize(N_points);
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-  if(insert_FP) insert_FP_counter();
-  if(insert_EP) insert_EP_counter();
-  if(remove_FP) remove_FP_counter();
-  if(remove_EP) remove_EP_counter();
-  
-  cout<<"================="<<endl;
-  cout<<"hitlist.size()="<<hitlist.size()<<endl;
-//   cout<<"hitlist="<<hitlist<<endl;
-  cout<<"================="<<endl;
-  
-    //unmark cells (TODO: optimize)
-  marked_cells.clear();
-    //init grid_tmp
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  cout<<"N_points="<<N_points<<endl;
-  cout<<"N_cells="<<N_cells<<endl;
-  cout<<"N_newpoints="<<N_newpoints<<endl;
-  cout<<"N_newcells="<<N_newcells<<endl;
-  EG_VTKSP(vtkUnstructuredGrid,grid_tmp);
-  allocateGrid(grid_tmp,N_cells+N_newcells,N_points+N_newpoints);
-  m_total_N_newpoints+=N_newpoints; m_total_N_newcells+=N_newcells;
-  
-  makeCopyNoAlloc(m_grid, grid_tmp);//TODO: This will not work if the size of the grid is reduced!
-    //initialize new node counter
-  m_newNodeId=N_points;
-  
-  if(insert_FP) insert_FP_actor(grid_tmp);
-  if(insert_EP) insert_EP_actor(grid_tmp);
-  
-  cout<<"================="<<endl;
-  cout<<"hitlist.size()="<<hitlist.size()<<endl;
-//   cout<<"hitlist="<<hitlist<<endl;
-  cout<<"================="<<endl;
-  if(remove_FP) remove_FP_actor(grid_tmp);
-  if(remove_EP) remove_EP_actor(grid_tmp);
-  
-  makeCopy(grid_tmp,m_grid);
-  
-  cout<<"===FullEdit END==="<<endl;
-  return(0);
-}
-
-int CreateSpecialMapping::remove_EP_all_2()
-{
-  cout<<"===remove_EP_all_2 START==="<<endl;
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  N_removed_EP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  hitlist.clear();
-  offset.clear();
-  hitlist.resize(N_points);
-  offset.resize(N_points);
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-  remove_EP_counter();
-  cout<<"================="<<endl;
-  cout<<"hitlist.size()="<<hitlist.size()<<endl;
-//   cout<<"hitlist="<<hitlist<<endl;
-  cout<<"================="<<endl;
-  
-  int kills=0;
-  int contracts=0;
-  for(int i=0;i<hitlist.size();i++)
-  {
-    if(hitlist[i]==2){
-      contracts++;
-      if(DebugLevel>47) cout<<"Deleting point "<<i<<" currently known as "<<i-kills<<endl;
-      
-      QString num1;num1.setNum(i);
-      QString num2;num2.setNum(i-kills);
-//       GuiMainWindow::pointer()->QuickSave("pre-deleting_"+num1+"_"+num2+".vtu");
-      
-      bool DelResult=DeletePoint_2(m_grid,i-kills,N_newpoints,N_newcells);
-      m_total_N_newpoints+=N_newpoints; m_total_N_newcells+=N_newcells;
-      
-      if(DelResult)
-      {
-        kills++;
-        if(DebugLevel>47) cout<<"Kill successful"<<endl;
-      }
-      else
-      {
-        if(DebugLevel>47) cout<<"Kill failed"<<endl;
-        N_removed_EP--;
-      }
-      
-//       GuiMainWindow::pointer()->QuickSave("post-deleting_"+num1+"_"+num2+".vtu");
-      
-    }
-  }
-  cout<<"Killed: "<<kills<<"/"<<contracts<<endl;
-  if(kills!=contracts) {cout<<"MISSION FAILED"<<endl;EG_BUG;}
-  cout<<"===remove_EP_all_2 END==="<<endl;
-  return(0);
-}
-
-
-//count all to remove, then remove them one by one
-int CreateSpecialMapping::remove_FP_all_2()
-{
-  cout<<"===remove_FP_all_2 START==="<<endl;
-/*  cout<<"+++++++"<<endl;
-  cout_grid(cout,m_grid,true,true,true,true);
-  cout<<"+++++++"<<endl;*/
-  
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  N_removed_FP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  hitlist.clear();
-  offset.clear();
-  hitlist.resize(N_points);
-  offset.resize(N_points);
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-//   DualSave("pre-counter");
-  remove_FP_counter();
-//   DualSave("post-counter");
-  
-//   cout_grid(cout,m_grid);
-  cout<<"================="<<endl;
-  cout<<"hitlist.size()="<<hitlist.size()<<endl;
-//   cout<<"hitlist="<<hitlist<<endl;
-  cout<<"================="<<endl;
-  
-  int kills=0;
-  int contracts=0;
-  for(int i=0;i<hitlist.size();i++)
-  {
-    if(hitlist[i]==1){
-      contracts++;
-      if(DebugLevel>47) cout<<"Deleting point "<<i<<" currently known as "<<i-kills<<endl;
-      
-      QString num1;num1.setNum(i);
-      QString num2;num2.setNum(i-kills);
-//       GuiMainWindow::pointer()->QuickSave("pre-deleting_"+num1+"_"+num2+".vtu");
-      
-      bool DelResult=DeletePoint_2(m_grid,i-kills,N_newpoints,N_newcells);
-      m_total_N_newpoints+=N_newpoints; m_total_N_newcells+=N_newcells;
-      
-      if(DelResult)
-      {
-        kills++;
-        if(DebugLevel>47) cout<<"Kill successful"<<endl;
-      }
-      else
-      {
-        if(DebugLevel>47) cout<<"Kill failed"<<endl;
-        N_removed_FP--;
-      }
-      
-//       GuiMainWindow::pointer()->QuickSave("post-deleting_"+num1+"_"+num2+".vtu");
-      
-    }
-  }
-  cout<<"Killed: "<<kills<<"/"<<contracts<<endl;
-  if(kills!=contracts) {cout<<"MISSION FAILED"<<endl;EG_BUG;}
-  cout<<"===remove_FP_all_2 END==="<<endl;
-  return(0);
-}
-
-//count all to remove, then remove them all at once
-int CreateSpecialMapping::remove_FP_all_3()
-{
-  cout<<"===remove_FP_all_3 START==="<<endl;
-  
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  N_removed_FP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  hitlist.clear();
-  offset.clear();
-  hitlist.resize(N_points);
-  offset.resize(N_points);
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-  remove_FP_counter();
-  cout<<"================="<<endl;
-  cout<<"hitlist.size()="<<hitlist.size()<<endl;
-  cout<<"================="<<endl;
-  
-  QSet <vtkIdType> DeadNodes;
-  for(vtkIdType i=0;i<hitlist.size();i++)
-  {
-    if(hitlist[i]==1) DeadNodes.insert(i);
-  }
-  int N_newpoints=0;
-  int N_newcells=0;
-  DeleteSetOfPoints(m_grid, DeadNodes, N_newpoints, N_newcells);
-  cout<<"N_newpoints="<<N_newpoints<<endl;
-  cout<<"N_newcells="<<N_newcells<<endl;
-  
-  int kills=-N_newpoints;
-  int contracts=DeadNodes.size();
-  cout<<"Killed: "<<kills<<"/"<<contracts<<endl;
-  if(kills!=contracts) {cout<<"MISSION FAILED"<<endl;EG_BUG;}
-  cout<<"===remove_FP_all_3 END==="<<endl;
-  return(0);
-}
-
-//count all to remove, then remove them all at once
-int CreateSpecialMapping::remove_EP_all_3()
-{
-  cout<<"===remove_EP_all_3 START==="<<endl;
-  
-  getAllSurfaceCells(m_AllCells,m_grid);
-  getSurfaceCells(m_bcs, m_SelectedCells, m_grid);
-  EG_VTKDCC(vtkIntArray, cell_code, m_grid, "cell_code");
-  EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-  m_SelectedNodes.clear();
-  getSurfaceNodes(m_bcs,m_SelectedNodes,m_grid);
-  getNodesFromCells(m_AllCells, nodes, m_grid);
-  setGrid(m_grid);
-  setCells(m_AllCells);
-  cout<<"m_AllCells.size()="<<m_AllCells.size()<<endl;
-  
-  N_removed_EP=0;
-  
-  N_points=m_grid->GetNumberOfPoints();
-  N_cells=m_grid->GetNumberOfCells();
-  N_newpoints=0;
-  N_newcells=0;
-  
-  hitlist.clear();
-  offset.clear();
-  hitlist.resize(N_points);
-  offset.resize(N_points);
-  
-  marked_cells.clear();
-  marked_nodes.clear();
-  
-  remove_EP_counter();
-  cout<<"================="<<endl;
-  cout<<"hitlist.size()="<<hitlist.size()<<endl;
-  cout<<"================="<<endl;
-  
-  QSet <vtkIdType> DeadNodes;
-  for(vtkIdType i=0;i<hitlist.size();i++)
-  {
-    if(hitlist[i]==1) DeadNodes.insert(i);
-  }
-  int N_newpoints=0;
-  int N_newcells=0;
-  DeleteSetOfPoints(m_grid, DeadNodes, N_newpoints, N_newcells);
-  cout<<"N_newpoints="<<N_newpoints<<endl;
-  cout<<"N_newcells="<<N_newcells<<endl;
-  
-  int kills=-N_newpoints;
-  int contracts=DeadNodes.size();
-  cout<<"Killed: "<<kills<<"/"<<contracts<<endl;
-  if(kills!=contracts) {cout<<"MISSION FAILED"<<endl;EG_BUG;}
-  cout<<"===remove_EP_all_3 END==="<<endl;
-  return(0);
-}
diff --git a/createspecialmapping.h b/createspecialmapping.h
deleted file mode 100644
index d4100ad..0000000
--- a/createspecialmapping.h
+++ /dev/null
@@ -1,289 +0,0 @@
-#ifndef CREATESPECIALMAPPING_H
-#define CREATESPECIALMAPPING_H
-
-#include <vtkUnstructuredGrid.h>
-#include <vtkPolyData.h>
-#include <QSet>
-#include <QVector>
-#include "egvtkobject.h"
-#include "operation.h"
-#include "vertexmeshdensity.h"
-
-#include "geometrytools.h"
-using namespace GeometryTools;
-
-#include <cmath>
-using namespace std;
-
-class CreateSpecialMapping : public Operation {
-  public:
-    CreateSpecialMapping();
-    int Process();
-    void operate(){};
-  
-    int N_SmoothIterations;
-    int maxiter_density;
-
-    double Convergence_meshdensity;
-  
-    bool insert_FP;
-    bool insert_EP;
-    bool remove_FP;
-    bool remove_EP;
-  
-    bool DoSwap;
-    bool DoLaplaceSmoothing;
-    
-    int N_inserted_FP;
-    int N_inserted_EP;
-    int N_removed_FP;
-    int N_removed_EP;
-    
-    int N_points;
-    int N_cells;
-    int N_newpoints;
-    int N_newcells;
-    int m_total_N_newpoints;
-    int m_total_N_newcells;
-  
-    QSet<int> m_bcs;
-    QVector<vtkIdType> m_AllCells;
-    QVector<vtkIdType> m_SelectedCells;
-    vtkUnstructuredGrid* m_grid;
-    vtkIdType m_newNodeId;
-    
-    QMap< pair<vtkIdType,vtkIdType>, vtkIdType> edge_map;
-    QVector <stencil_t> StencilVector;
-    QSet <vtkIdType> m_SelectedNodes;
-    QVector <vtkIdType> m_AllNodes;
-  
-    QVector <int> hitlist;//Elements to be terminated (0=keep alive, 1=field agent to eliminate, 2=border agent to eliminate)
-    QVector <int> offset;//offset caused by terminated elements
-  
-/*    double SV_value;
-    double FV_value;
-    double FEV_value;
-    double BEV_value;*/
-    
-    QVector <VertexMeshDensity> VMDvector;//Vertices of Mass destruction
-    
-    QMap <vtkIdType,bool> marked_cells;
-    QMap <vtkIdType,bool> marked_nodes;
-  
-    void SetInput(QSet<int> a_bcs,vtkUnstructuredGrid* a_grid)
-    {
-      m_bcs=a_bcs;
-      m_grid=a_grid;
-    };
-  
-    void SetVertexMeshDensityVector(QVector <VertexMeshDensity> a_VMDvector){VMDvector=a_VMDvector;};
-    
-/*    void Set_SV_value(double V){SV_value=V;};
-    void Set_FV_value(double V){FV_value=V;};
-    void Set_FEV_value(double V){FEV_value=V;};
-    void Set_BEV_value(double V){BEV_value=V;};*/
-  
-    void SetConvergence_meshdensity(double C){Convergence_meshdensity=C;};
-    void Set_insert_FP(bool B){insert_FP=B;};
-    void Set_insert_EP(bool B){insert_EP=B;};
-    void Set_remove_FP(bool B){remove_FP=B;};
-    void Set_remove_EP(bool B){remove_EP=B;};
-  
-    VertexMeshDensity getVMD(vtkIdType node, char VertexType);
-  
-  //utilities
-  public:
-    double Um(vtkIdType D) {
-      double ret=0;
-      vtkIdType N_pts, *pts;
-      m_grid->GetCellPoints(D, N_pts, pts);
-      for(int i=0;i<N_pts;i++)
-      {
-        vec3_t A,B;
-        m_grid->GetPoints()->GetPoint(pts[i], A.data());
-        m_grid->GetPoints()->GetPoint(pts[(i+1)%N_pts], B.data());
-        ret+=(B-A).abs();
-      }
-      return(ret);
-    }
-    double A_U(vtkIdType D) { // area of the circumscribed circle of the triangle
-      vtkIdType N_pts, *pts;
-      m_grid->GetCellPoints(D, N_pts, pts);
-      vec3_t A,B,C;
-      m_grid->GetPoints()->GetPoint(pts[0], A.data());
-      m_grid->GetPoints()->GetPoint(pts[1], B.data());
-      m_grid->GetPoints()->GetPoint(pts[2], C.data());
-      double a=(C-B).abs();
-      double alpha=angle((B-A),(C-A));
-      double R=a/(2*sin(alpha));
-      return(M_PI*R*R);
-    }
-    double A_D(vtkIdType D) { // triangle area
-      return(cellVA(m_grid,D));
-    }
-    double DN(int i,vtkIdType D) { //triangle neighbours
-      return(c2c[D][i]);
-    }
-    double nk(vtkIdType P) {
-      return(n2n[P].size());
-    }
-    double G_k(vtkIdType node) {
-      EG_VTKDCN(vtkDoubleArray, node_meshdensity, m_grid, "node_meshdensity");
-      return(1.0/node_meshdensity->GetValue(node));
-    };
-    double DK(int i,vtkIdType D) { // triangle nodes
-      vtkIdType N_pts, *pts;
-      m_grid->GetCellPoints(D, N_pts, pts);
-      return(pts[i]);
-    }
-    vtkIdType KK(int i,vtkIdType j,vtkIdType K) {//i=1 or 2, j=node2, K=node1
-      if(i==1) return(K);
-      else return(j);
-    }
-    double L_k(vtkIdType j,vtkIdType K)// node1 K, node2 j
-    {
-        vec3_t A;
-        vec3_t B;
-        m_grid->GetPoints()->GetPoint(K, A.data());
-        m_grid->GetPoints()->GetPoint(j, B.data());
-        return((B-A).abs());
-    }
-    double Q_L(vtkIdType D)
-    {
-      // Um(D)/sum(G_k(DK(i,D)),i,1,3)
-      double denom_sum=0;
-      for(int i=0;i<3;i++)
-      {
-        denom_sum += G_k(DK(i,D));
-      }
-      /*if(DebugLevel>0) cout<<"D="<<D<<" Um(D)="<<Um(D)<<" denom_sum="<<denom_sum<<endl;*/
-      return(Um(D)/denom_sum);
-    }
-    double Q_L1(vtkIdType P)
-    {
-      // [2*sum(L_k(i~),i,1,nk(P))]/[sum(G_k(KK(1,i~))+G_k(KK(2,i~)),i,1,nk(P))]
-      double num_sum=0;
-      double denom_sum=0;
-      foreach(vtkIdType j,n2n[P])
-      {
-        num_sum += 2*L_k(j,P);
-        denom_sum += G_k(KK(1,j,P))+G_k(KK(2,j,P));
-      }
-      return(num_sum/denom_sum);
-    }
-    double Q_L2(vtkIdType P)
-    {
-      
-      // min([2*L_k(i~)]/[G_k(KK(1,i~))+G_k(KK(2,i~))])
-      QVector <double> V;
-      double num,denom;
-      foreach(vtkIdType j,n2n[P])
-      {
-        num = 2*L_k(j,P);
-        denom = G_k(KK(1,j,P))+G_k(KK(2,j,P));
-        V.push_back(num/denom);
-      }
-      qSort(V.begin(),V.end());
-      return(V[0]);
-    }
-    double T_min(int w)
-    {
-      // sum([A_U(i)]/[A_D(i)^w]*[G_k(i)^(2*(w-1))],i,1,Nd)
-      int N_cells=m_grid->GetNumberOfCells();
-      double T=0;
-      for(int i=0;i<N_cells;i++)
-      {
-        T += A_U(i)/pow(A_D(i),w)*pow(G_k(i),2*(w-1));
-      }
-      return(T);
-    }
-    bool insert_fieldpoint(vtkIdType D)
-    {
-      double Fred1=1.0/sqrt(3);
-      double Qmin=1.1;//1.189;
-      double total=0;
-      for(int i=0;i<3;i++)
-      {
-        vtkIdType cell=DN(i,D);
-        if(cell!=-1) total += Q_L(cell);
-      }
-/*      cout<<"Q_L(D)>1.0/Fred1="<<Q_L(D)<<">"<<1.0/Fred1<<endl;
-      cout<<"total>3*Qmin="<<total<<">"<<3*Qmin<<endl;*/
-      return ( Q_L(D)>1.0/Fred1 && total>3*Qmin );
-    }
-    bool insert_edgepoint(vtkIdType j,vtkIdType K)// node1 K, node2 j
-    {
-/*      cout<<"j="<<j<<endl;
-      cout<<"K="<<K<<endl;
-      cout<<"0.5*G_k(K)="<<0.5*G_k(K)<<endl;
-      cout<<"L_k(j,K)="<<L_k(j,K)<<endl;
-      cout<<"1*G_k(K)="<<1*G_k(K)<<endl;
-      cout<<"return ( 0.5*G_k(K)<L_k(j,K) && L_k(j,K)<1*G_k(K) );"<<endl;
-      return ( 0.5*G_k(K)<L_k(j,K) && L_k(j,K)<1*G_k(K) );*/
-      
-      bool result=L_k(j,K)>0.5*(G_k(j)+G_k(K));
-      if(DebugLevel>0 && result){
-        cout<<"j="<<j<<endl;
-        cout<<"K="<<K<<endl;
-        cout<<"G_k(j)="<<G_k(j)<<endl;
-        cout<<"G_k(K)="<<G_k(K)<<endl;
-        cout<<"0.5*(G_k(j)+G_k(K))="<<0.5*(G_k(j)+G_k(K))<<endl;
-        cout<<"L_k(j,K)="<<L_k(j,K)<<endl;
-      }
-      return ( result );
-    }
-    bool remove_fieldpoint(vtkIdType P)
-    {
-      double QL1max=0.8;
-      double QL2max=0.5;
-      bool result = Q_L1(P)<QL1max && Q_L2(P)<QL2max;
-      if(DebugLevel>0 && result)
-      {
-        cout<<"Q_L1(P)<QL1max="<< Q_L1(P)<< "<" << QL1max<<endl;
-        cout<<"Q_L2(P)<QL2max="<< Q_L2(P)<< "<" << QL2max<<endl;
-      }
-      return ( result );
-    }
-    bool remove_edgepoint(vtkIdType P)
-    {
-      return ( 0.5*G_k(P)<CurrentVertexAvgDist(P,n2n,m_grid) && CurrentVertexAvgDist(P,n2n,m_grid)<1*G_k(P) );
-    }
-    int insert_FP_counter();
-    int insert_EP_counter();
-    int remove_FP_counter();
-    int remove_EP_counter();
-    
-    int insert_FP_actor(vtkUnstructuredGrid* grid_tmp);
-    int insert_EP_actor(vtkUnstructuredGrid* grid_tmp);
-    int remove_FP_actor(vtkUnstructuredGrid* grid_tmp);
-    int remove_EP_actor(vtkUnstructuredGrid* grid_tmp);
-
-    int insert_FP_all();
-    int insert_EP_all();
-    int remove_FP_all();
-    int remove_EP_all();
-  
-    int FullEdit();
-    int UpdateDesiredMeshDensity();
-//     int UpdateNodeType_all();
-//     bool DeletePoint_2(vtkUnstructuredGrid *src, vtkIdType DeadNode);
-//     vtkIdType FindSnapPoint(vtkUnstructuredGrid *src, vtkIdType DeadNode,QSet <vtkIdType> & DeadCells,QSet <vtkIdType> & MutatedCells,QSet <vtkIdType> & MutilatedCells);
-  
-    int remove_EP_all_2();
-    int remove_FP_all_2();
-
-    int remove_EP_all_3();
-    int remove_FP_all_3();
-  
-    int SwapFunction();
-    int SmoothFunction();
-  
-};
-//end of CreateSpecialMapping class
-
-// #define VTK_SIMPLE_VERTEX 0
-// #define VTK_FIXED_VERTEX 1
-// #define VTK_FEATURE_EDGE_VERTEX 2
-// #define VTK_BOUNDARY_EDGE_VERTEX 3
-
-#endif
diff --git a/engrid.pro b/engrid.pro
index 30eddfe..f586da2 100644
--- a/engrid.pro
+++ b/engrid.pro
@@ -47,7 +47,7 @@ LIBS += -lvtkWidgets
 #netgen lib
 LIBS += -lng
 
-!win32 { 
+!win32 {
     LIBS += -L./netgen_svn
     LIBS += -L$(VTKLIBDIR)
     LIBS += -Wl,-rpath
@@ -56,7 +56,7 @@ LIBS += -lng
     INCLUDEPATH += ./netgen_svn/netgen-mesher/netgen/nglib
     INCLUDEPATH += ./netgen_svn/netgen-mesher/netgen/libsrc/general
 }
-win32 { 
+win32 {
     VTK_DIR = C:\VTK
     VTK_SRCDIR = C:\VTK\5.0.4
     LIBS += -L$$VTK_DIR\bin\release
@@ -156,7 +156,6 @@ guisettingsviewer.h \
  \
  guitransform.h \
  vtksmoothpolydatafilter2.h \
- createspecialmapping.h \
  vertexdelegate.h \
  vertexmeshdensity.h \
  smoothingutilities.h \
@@ -168,7 +167,8 @@ guisettingsviewer.h \
  deletepickedpoint.h \
  text3d.h \
  guipick.h \
- egvtkinteractorstyle.h
+ egvtkinteractorstyle.h \
+ surfacesmoother.h
 
 SOURCES = \
 main.cpp \
@@ -232,7 +232,6 @@ guisettingsviewer.cpp \
  \
  guitransform.cpp \
  vtksmoothpolydatafilter2.cpp \
- createspecialmapping.cpp \
  vertexdelegate.cpp \
  vertexmeshdensity.cpp \
  smoothingutilities.cpp \
@@ -244,7 +243,8 @@ guisettingsviewer.cpp \
  deletepickedpoint.cpp \
  text3d.cpp \
  guipick.cpp \
- egvtkinteractorstyle.cpp
+ egvtkinteractorstyle.cpp \
+ surfacesmoother.cpp
 
 FORMS = \
 guicreateboundarylayer.ui \
@@ -259,3 +259,7 @@ guisetboundarycode.ui \
 guismoothsurface.ui \
 guitransform.ui \
 guipick.ui
+SOURCES -= createspecialmapping.cpp
+
+HEADERS -= createspecialmapping.h
+
diff --git a/guismoothsurface.cpp b/guismoothsurface.cpp
index 24c3c89..8ace44e 100644
--- a/guismoothsurface.cpp
+++ b/guismoothsurface.cpp
@@ -22,7 +22,7 @@
 //
 #include "guismoothsurface.h"
 #include "swaptriangles.h"
-#include "createspecialmapping.h"
+#include "surfacesmoother.h"
 #include "vertexdelegate.h"
 #include "settingssheet.h"
 #include "laplacesmoother.h"
@@ -1201,7 +1201,7 @@ void GuiSmoothSurface::operate()
     
     QVector <VertexMeshDensity> VMDvector=GetSet();
     
-    CreateSpecialMapping toto;
+    SurfaceSmoother toto;
     
     toto.SetInput(bcs,grid);
     toto.SetVertexMeshDensityVector(VMDvector);
@@ -1242,7 +1242,7 @@ void GuiSmoothSurface::operate()
   {
     QSet<int> bcs;
     getSelectedItems(ui.listWidget, bcs);
-    CreateSpecialMapping toto;
+    SurfaceSmoother toto;
     toto.SetInput(bcs,grid);
     setDebugLevel(ui.spinBox_DebugLevel->value());
     
@@ -1261,7 +1261,7 @@ void GuiSmoothSurface::operate()
   {
     QSet<int> bcs;
     getSelectedItems(ui.listWidget, bcs);
-    CreateSpecialMapping toto;
+    SurfaceSmoother toto;
     
     SetConvergence(ui.doubleSpinBox_Convergence->value());
     SetFeatureEdgeSmoothing(ui.checkBox_FeatureEdgeSmoothing->checkState());
@@ -1298,7 +1298,7 @@ void GuiSmoothSurface::operate()
   {
     QSet<int> bcs;
     getSelectedItems(ui.listWidget, bcs);
-    CreateSpecialMapping toto;
+    SurfaceSmoother toto;
     
     setDebugLevel(ui.spinBox_DebugLevel->value());
     
diff --git a/smoothingutilities.h b/smoothingutilities.h
index 2692886..ac9e7b9 100644
--- a/smoothingutilities.h
+++ b/smoothingutilities.h
@@ -1,7 +1,7 @@
 #ifndef SMOOTHINGUTILITIES_H
 #define SMOOTHINGUTILITIES_H
 
-// class CreateSpecialMapping : public Operation {
+// class SurfaceSmoother : public Operation {
   
 
 #endif
diff --git a/vertexdelegate.cpp b/vertexdelegate.cpp
index adec3f9..436963e 100644
--- a/vertexdelegate.cpp
+++ b/vertexdelegate.cpp
@@ -1,7 +1,7 @@
 #include <QtGui>
 
 #include "vertexdelegate.h"
-#include "createspecialmapping.h"
+#include "surfacesmoother.h"
 
 #include <iostream>
 using namespace std;
-- 
2.11.4.GIT