From 05035eeacd0addb03c06aeee5919d2e27845cfce Mon Sep 17 00:00:00 2001
From: James E McClure <jemcclur@gmail.com>
Date: Tue, 19 Mar 2019 08:36:08 -0400
Subject: [PATCH] working on subphase analysis

---
 analysis/Minkowski.cpp | 4 ++++
 analysis/Minkowski.h   | 5 ++++-
 analysis/TwoPhase.cpp  | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/analysis/Minkowski.cpp b/analysis/Minkowski.cpp
index 650d30dc..253fbadc 100644
--- a/analysis/Minkowski.cpp
+++ b/analysis/Minkowski.cpp
@@ -24,6 +24,9 @@ Minkowski::Minkowski(std::shared_ptr <Domain> dm):
 	Nx=dm->Nx; Ny=dm->Ny; Nz=dm->Nz;
 	Volume=double((Nx-2)*(Ny-2)*(Nz-2))*double(Dm->nprocx()*Dm->nprocy()*Dm->nprocz());
 	
+	label.resize(Nx,Ny,Nz);         label.fill(0);
+	distance.resize(Nx,Ny,Nz);      distance.fill(0);
+
 	if (Dm->rank()==0){
 		LOGFILE = fopen("minkowski.csv","a+");
 		if (fseek(LOGFILE,0,SEEK_SET) == fseek(LOGFILE,0,SEEK_CUR))
@@ -128,6 +131,7 @@ void Minkowski::ComputeScalar(const DoubleArray& Field, const double isovalue)
     PROFILE_STOP("ComputeScalar");
 }
 
+
 void Minkowski::PrintAll()
 {
 	if (Dm->rank()==0){
diff --git a/analysis/Minkowski.h b/analysis/Minkowski.h
index 8c39b68a..b8e0d383 100644
--- a/analysis/Minkowski.h
+++ b/analysis/Minkowski.h
@@ -30,6 +30,8 @@ class Minkowski{
 public:
 	//...........................................................................
 	std::shared_ptr <Domain> Dm;
+	Array <char> label;
+	Array <double> distance;
 	//...........................................................................
 	// Averaging variables
 	//...........................................................................
@@ -44,12 +46,13 @@ public:
 	double A();
 	double J();
 	double X();
-	
+		
 	//..........................................................................
 	Minkowski(){};//NULL CONSTRUCTOR
 	Minkowski(std::shared_ptr <Domain> Dm);
 	~Minkowski();
 	void ComputeScalar(const DoubleArray& Field, const double isovalue);
+
 	void PrintAll();
 
 };
diff --git a/analysis/TwoPhase.cpp b/analysis/TwoPhase.cpp
index cb752f07..58b4c63f 100644
--- a/analysis/TwoPhase.cpp
+++ b/analysis/TwoPhase.cpp
@@ -429,7 +429,6 @@ void TwoPhase::UpdateMeshValues()
 			}
 		}
 	}
-
 }
 void TwoPhase::ComputeLocal()
 {