From db56550b662b7c52f312a6d47594c8469fa97e9c Mon Sep 17 00:00:00 2001
From: James E McClure <jemcclur@gmail.com>
Date: Fri, 9 Feb 2018 23:03:16 -0500
Subject: [PATCH] Tweaking analysis routine

---
 analysis/TwoPhase.cpp                | 2 +-
 tests/lbpm_color_macro_simulator.cpp | 6 ------
 tests/lbpm_color_simulator.h         | 8 ++++----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/analysis/TwoPhase.cpp b/analysis/TwoPhase.cpp
index ed171980..c07f4772 100644
--- a/analysis/TwoPhase.cpp
+++ b/analysis/TwoPhase.cpp
@@ -373,7 +373,7 @@ void TwoPhase::UpdateMeshValues()
 	//...........................................................................
 	// Update the time derivative of non-dimensional density field
 	// Map Phase_tplus and Phase_tminus
-	for (int n=0; n<Nx*Ny*Nz; n++)	dPdt(n) = 0.1*(Phase_tplus(n) - Phase_tminus(n));
+	for (int n=0; n<Nx*Ny*Nz; n++)	dPdt(n) = 0.125*(Phase_tplus(n) - Phase_tminus(n));
 	//...........................................................................
 	Dm.CommunicateMeshHalo(Press);
 	//...........................................................................
diff --git a/tests/lbpm_color_macro_simulator.cpp b/tests/lbpm_color_macro_simulator.cpp
index 4cf4c72b..db4bcd71 100644
--- a/tests/lbpm_color_macro_simulator.cpp
+++ b/tests/lbpm_color_macro_simulator.cpp
@@ -600,12 +600,6 @@ int main(int argc, char **argv)
 					alpha, beta, Fx, Fy, Fz, Nx, Nx*Ny, 0, ScaLBL_Comm.next, Np);
 			ScaLBL_DeviceBarrier(); MPI_Barrier(comm);
 
-			// Run the analysis
-			run_analysis(timestep,RESTART_INTERVAL,rank_info,ScaLBL_Comm,*Averages,last_ids,last_index,last_id_map,
-					Np,Nx,Ny,Nz,pBC,beta,err,Phi,Pressure,Velocity,Map,fq,Den,
-					LocalRestartFile,meshData,fillData,tpool,work_ids);
-
-
 			// *************EVEN TIMESTEP*************
 			timestep++;
 			// Compute the Phase indicator field
diff --git a/tests/lbpm_color_simulator.h b/tests/lbpm_color_simulator.h
index 3d48655e..bc950576 100644
--- a/tests/lbpm_color_simulator.h
+++ b/tests/lbpm_color_simulator.h
@@ -248,7 +248,7 @@ void run_analysis( int timestep, int restart_interval,
 
     // Determin the analysis we want to perform
     AnalysisType type = AnalysisType::AnalyzeNone;
-    if ( timestep%ANALYSIS_INTERVAL + 5 == ANALYSIS_INTERVAL ) {
+    if ( timestep%ANALYSIS_INTERVAL + 8 == ANALYSIS_INTERVAL ) {
         // Copy the phase indicator field for the earlier timestep
         type |= AnalysisType::CopyPhaseIndicator;
     }
@@ -264,12 +264,12 @@ void run_analysis( int timestep, int restart_interval,
             type |= AnalysisType::IdentifyBlobs;
         }
     #endif */
-    if ( timestep%ANALYSIS_INTERVAL == 0 ) {
+    if ( timestep%ANALYSIS_INTERVAL + 4 == 0 ) {
         // Copy the averages to the CPU (and identify blobs)
         type |= AnalysisType::CopySimState;
         type |= AnalysisType::IdentifyBlobs;
     }
-    if ( timestep%ANALYSIS_INTERVAL == 5 ) {
+    if ( timestep%ANALYSIS_INTERVAL == 0 ) {
         // Run the analysis
         type |= AnalysisType::ComputeAverages;
     }
@@ -381,7 +381,7 @@ void run_analysis( int timestep, int restart_interval,
         // Retain the timestep associated with the restart files
         if (rank==0) {
             FILE *Rst = fopen("Restart.txt","w");
-            fprintf(Rst,"%i\n",timestep+5);
+            fprintf(Rst,"%i\n",timestep+4);
             fclose(Rst);
         }
         // Write the restart file (using a seperate thread)