From ab92cadfb2d2051f5b66a4e34b533a68ceed927b Mon Sep 17 00:00:00 2001
From: Mark Berrill <berrillma@ornl.gov>
Date: Fri, 28 Oct 2016 09:29:46 -0400
Subject: [PATCH] Fixing bug in analysis

---
 IO/Writer.cpp         | 3 ++-
 analysis/analysis.cpp | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IO/Writer.cpp b/IO/Writer.cpp
index 80ba812f..012cb682 100644
--- a/IO/Writer.cpp
+++ b/IO/Writer.cpp
@@ -71,7 +71,8 @@ static std::vector<IO::MeshDatabase> writeMeshesOrigFormat( const std::vector<IO
             ERROR("Unknown mesh");
         }
         fclose(fid);
-        std::unique(mesh_entry.variables.begin(),mesh_entry.variables.end());
+        std::sort( mesh_entry.variables.begin(), mesh_entry.variables.end() );
+        mesh_entry.variables.erase( std::unique( mesh_entry.variables.begin(), mesh_entry.variables.end() ), mesh_entry.variables.end() );
         meshes_written.push_back(mesh_entry);
     }
     return meshes_written;
diff --git a/analysis/analysis.cpp b/analysis/analysis.cpp
index b54ebab8..62414872 100644
--- a/analysis/analysis.cpp
+++ b/analysis/analysis.cpp
@@ -339,9 +339,8 @@ static int LocalToGlobalIDs( int nx, int ny, int nz, const RankInfoStruct& rank_
     neighbors.push_back( rank_info.rank[1][2][1] );
     neighbors.push_back( rank_info.rank[1][1][0] );
     neighbors.push_back( rank_info.rank[1][1][2] );
-    std::unique(neighbors.begin(),neighbors.end());
-    if ( std::find(neighbors.begin(),neighbors.end(),rank) != neighbors.end() )
-        neighbors.erase(std::find(neighbors.begin(),neighbors.end(),rank));
+    std::sort( neighbors.begin(), neighbors.end() );
+    neighbors.erase( std::unique( neighbors.begin(), neighbors.end() ), neighbors.end() );
     // Create a map of all local ids to the neighbor ids
     std::map<int64_t,global_id_info_struct> map;
     std::set<int64_t> local;