From 896a3617b8268d2e68bca90cd1beb91930f25529 Mon Sep 17 00:00:00 2001
From: James McClure <mcclurej@vt.edu>
Date: Thu, 8 Oct 2020 13:14:01 -0400
Subject: [PATCH] adding dedicated analysis for grey model (broken)

---
 models/GreyscaleColorModel.cpp | 40 +---------------------------------
 models/GreyscaleColorModel.h   |  3 +--
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/models/GreyscaleColorModel.cpp b/models/GreyscaleColorModel.cpp
index d97c844d..e35aff4a 100644
--- a/models/GreyscaleColorModel.cpp
+++ b/models/GreyscaleColorModel.cpp
@@ -19,43 +19,6 @@ Nx(0),Ny(0),Nz(0),N(0),Np(0),nprocx(0),nprocy(0),nprocz(0),BoundaryCondition(0),
 ScaLBL_GreyscaleColorModel::~ScaLBL_GreyscaleColorModel(){
 
 }
-
-/*void ScaLBL_GreyscaleColorModel::WriteCheckpoint(const char *FILENAME, const double *cPhi, const double *cfq, int Np)
-{
-    int q,n;
-    double value;
-    ofstream File(FILENAME,ios::binary);
-    for (n=0; n<Np; n++){
-        // Write the two density values
-        value = cPhi[n];
-        File.write((char*) &value, sizeof(value));
-        // Write the even distributions
-        for (q=0; q<19; q++){
-            value = cfq[q*Np+n];
-            File.write((char*) &value, sizeof(value));
-        }
-    }
-    File.close();
-
-}
-
-void ScaLBL_GreyscaleColorModel::ReadCheckpoint(char *FILENAME, double *cPhi, double *cfq, int Np)
-{
-    int q=0, n=0;
-    double value=0;
-    ifstream File(FILENAME,ios::binary);
-    for (n=0; n<Np; n++){
-        File.read((char*) &value, sizeof(value));
-        cPhi[n] = value;
-        // Read the distributions
-        for (q=0; q<19; q++){
-            File.read((char*) &value, sizeof(value));
-            cfq[q*Np+n] = value;
-        }
-    }
-    File.close();
-}
- */
 void ScaLBL_GreyscaleColorModel::ReadParams(string filename){
 	// read the input database 
 	db = std::make_shared<Database>( filename );
@@ -172,8 +135,7 @@ void ScaLBL_GreyscaleColorModel::SetDomain(){
 	N = Nx*Ny*Nz;
 	id = new signed char [N];
 	for (int i=0; i<Nx*Ny*Nz; i++) Dm->id[i] = 1;               // initialize this way
-	//Averages = std::shared_ptr<TwoPhase> ( new TwoPhase(Dm) ); // TwoPhase analysis object
-	Averages = std::shared_ptr<SubPhase> ( new SubPhase(Dm) ); // TwoPhase analysis object
+	Averages = std::shared_ptr<GreyPhase> ( new SubPhase(Dm) ); // TwoPhase analysis object
 	MPI_Barrier(comm);
 	Dm->CommInit();
 	MPI_Barrier(comm);
diff --git a/models/GreyscaleColorModel.h b/models/GreyscaleColorModel.h
index d7dde941..b9e8d11f 100644
--- a/models/GreyscaleColorModel.h
+++ b/models/GreyscaleColorModel.h
@@ -50,8 +50,7 @@ public:
 	std::shared_ptr<Domain> Mask; // this domain is for lbm
 	std::shared_ptr<ScaLBL_Communicator> ScaLBL_Comm;
 	std::shared_ptr<ScaLBL_Communicator> ScaLBL_Comm_Regular;
-    //std::shared_ptr<TwoPhase> Averages;
-    std::shared_ptr<SubPhase> Averages;
+        std::shared_ptr<GreyPhase> Averages;
     
     // input database
     std::shared_ptr<Database> db;