From c9640c46ba54699bba7d4af39a235719bb496b4e Mon Sep 17 00:00:00 2001
From: JamesEMcclure <jemcclur@gmail.com>
Date: Wed, 22 Jul 2020 13:14:07 -0400
Subject: [PATCH] fix smooth distance

---
 analysis/Minkowski.cpp | 7 ++++---
 analysis/Minkowski.h   | 1 +
 analysis/filters.cpp   | 8 ++------
 analysis/filters.h     | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/analysis/Minkowski.cpp b/analysis/Minkowski.cpp
index 5b9826e6..7707286f 100644
--- a/analysis/Minkowski.cpp
+++ b/analysis/Minkowski.cpp
@@ -140,7 +140,7 @@ void Minkowski::MeasureObject(){
 	 *    0 - labels the object
 	 *    1 - labels the rest of the 
 	 */
-
+  DoubleArray smooth_distance(Nx,Ny,Nz);
 	for (int k=0; k<Nz; k++){
 		for (int j=0; j<Ny; j++){
 			for (int i=0; i<Nx; i++){
@@ -149,8 +149,9 @@ void Minkowski::MeasureObject(){
 		}
 	}	
 	CalcDist(distance,id,*Dm);
-	Eikonal(distance, id, *Dm, 10, {true, true, true});
-	ComputeScalar(distance,0.0);
+	Mean3D(distance,smooth_distance);
+	//Eikonal(distance, id, *Dm, 10, {true, true, true});
+	ComputeScalar(smooth_distance,0.0);
 
 }
 
diff --git a/analysis/Minkowski.h b/analysis/Minkowski.h
index 0d36e33d..bcdf95f7 100644
--- a/analysis/Minkowski.h
+++ b/analysis/Minkowski.h
@@ -10,6 +10,7 @@
 #include "common/Communication.h"
 #include "analysis/analysis.h"
 #include "analysis/distance.h"
+#include "analysis/filters.h"
 
 #include "common/Utilities.h"
 #include "common/MPI_Helpers.h"
diff --git a/analysis/filters.cpp b/analysis/filters.cpp
index 8c532712..b71e4369 100644
--- a/analysis/filters.cpp
+++ b/analysis/filters.cpp
@@ -2,15 +2,11 @@
 #include "math.h"
 #include "ProfilerApp.h"
 
-void Mean3D( const Array<float> &Input, Array<float> &Output )
+void Mean3D( const Array<double> &Input, Array<double> &Output )
 {
 	PROFILE_START("Mean3D");
 	// Perform a 3D Mean filter on Input array
-	int i,j,k,ii,jj,kk;
-	int imin,jmin,kmin,imax,jmax,kmax;
-
-	float *List;
-	List=new float[27];
+	int i,j,k;
 
 	int Nx = int(Input.size(0));
 	int Ny = int(Input.size(1));
diff --git a/analysis/filters.h b/analysis/filters.h
index 250ba23a..404fb265 100644
--- a/analysis/filters.h
+++ b/analysis/filters.h
@@ -10,7 +10,7 @@
  * @param[in] Input     Input image
  * @param[out] Output   Output image
  */
-void Mean3D( const Array<float> &Input, Array<float> &Output )
+void Mean3D( const Array<double> &Input, Array<double> &Output );
 
 /*!
  * @brief  Filter image