From 0cdc13100cf3f00b0719bf4d7f5615ea77d56b93 Mon Sep 17 00:00:00 2001 From: James McClure Date: Fri, 6 Jul 2018 09:21:29 -0400 Subject: [PATCH] Updating color/dfh model analysis --- models/ColorModel.cpp | 9 +++++---- models/DFHModel.cpp | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index b4dfd5a5..53829643 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -354,8 +354,9 @@ void ScaLBL_ColorModel::Run(){ //************ MAIN ITERATION LOOP ***************************************/ PROFILE_START("Loop"); //std::shared_ptr analysis_db; - //runAnalysis analysis( analysis_db, rank_info, ScaLBL_Comm, Dm, Np, pBC, beta, Map ); - //analysis.createThreads( analysis_method, 4 ); + bool Regular = false; + runAnalysis analysis( analysis_db, rank_info, ScaLBL_Comm, Dm, Np, Regular, beta, Map ); + analysis.createThreads( analysis_method, 4 ); while (timestep < timestepMax ) { //if ( rank==0 ) { printf("Running timestep %i (%i MB)\n",timestep+1,(int)(Utilities::getMemoryUsage()/1048576)); } PROFILE_START("Update"); @@ -432,10 +433,10 @@ void ScaLBL_ColorModel::Run(){ PROFILE_STOP("Update"); // Run the analysis - //analysis.run( timestep, *Averages, Phi, Pressure, Velocity, fq, Den ); + analysis.run( timestep, *Averages, Phi, Pressure, Velocity, fq, Den ); } - //analysis.finish(); + analysis.finish(); PROFILE_STOP("Loop"); PROFILE_SAVE("lbpm_color_simulator",1); //************************************************************************ diff --git a/models/DFHModel.cpp b/models/DFHModel.cpp index 80491dd4..7b9c1d2d 100644 --- a/models/DFHModel.cpp +++ b/models/DFHModel.cpp @@ -451,8 +451,9 @@ void ScaLBL_DFHModel::Run(){ //......................................... //************ MAIN ITERATION LOOP ***************************************/ + bool Regular = true; PROFILE_START("Loop"); - runAnalysis analysis( analysis_db, rank_info, ScaLBL_Comm, Dm, Np, pBC, beta, Map ); + runAnalysis analysis( analysis_db, rank_info, ScaLBL_Comm, Dm, Np, Regular, beta, Map ); while (timestep < timestepMax ) { //if ( rank==0 ) { printf("Running timestep %i (%i MB)\n",timestep+1,(int)(Utilities::getMemoryUsage()/1048576)); } PROFILE_START("Update");