From 0f6fa3afa72ce8eb2a9f673f7b6c1891893c95d2 Mon Sep 17 00:00:00 2001
From: James E McClure <jemcclur@gmail.com>
Date: Wed, 1 Aug 2018 09:12:33 -0400
Subject: [PATCH] refactor TwoPhase analysis to respect multi-mineral
 convention

---
 analysis/TwoPhase.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/analysis/TwoPhase.cpp b/analysis/TwoPhase.cpp
index e6b441f9..71ca8f08 100644
--- a/analysis/TwoPhase.cpp
+++ b/analysis/TwoPhase.cpp
@@ -394,7 +394,7 @@ void TwoPhase::UpdateMeshValues()
 		for (j=0; j<Ny; j++){
 			for (i=0; i<Nx; i++){
 				n = k*Nx*Ny+j*Nx+i;
-				if (Dm->id[n] == 0){
+				if (!(Dm->id[n] > 0)){
 					// Solid phase
 					PhaseID(i,j,k) = 0;
 				}
@@ -431,7 +431,7 @@ void TwoPhase::ComputeLocal()
 				// Compute volume averages
 				for (int p=0;p<8;p++){
 					n = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny;
-					if ( Dm->id[n] != 0 ){
+					if ( Dm->id[n] > 0 ){
 						// 1-D index for this cube corner
 						// compute the norm of the gradient of the phase indicator field
 						// Compute the non-wetting phase volume contribution
@@ -624,7 +624,7 @@ void TwoPhase::ComponentAverages()
 				// Compute volume averages
 				for (int p=0;p<8;p++){
 					n = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny;
-					if ( Dm->id[n] != 0 ){
+					if ( Dm->id[n] > 0 ){
 						// 1-D index for this cube corner
 						// compute the norm of the gradient of the phase indicator field
 						// Compute the non-wetting phase volume contribution