diff --git a/analysis/SubPhase.cpp b/analysis/SubPhase.cpp index d6933140..aa3a7744 100644 --- a/analysis/SubPhase.cpp +++ b/analysis/SubPhase.cpp @@ -190,6 +190,7 @@ void SubPhase::Basic(){ if (Phi(n) != Phi(n)){ // check for NaN Phi(n) = 0.0; + //printf("Nan at %i %i %i \n",i,j,k); } } } @@ -344,7 +345,7 @@ void SubPhase::Basic(){ } } } - printf("wetting interaction = %f, count = %f\n",total_wetting_interaction,count_wetting_interaction); + //printf("wetting interaction = %f, count = %f\n",total_wetting_interaction,count_wetting_interaction); total_wetting_interaction_global=Dm->Comm.sumReduce( total_wetting_interaction); count_wetting_interaction_global=Dm->Comm.sumReduce( count_wetting_interaction); /* normalize wetting interactions */ diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp index f7447188..e2fca48d 100644 --- a/analysis/runAnalysis.cpp +++ b/analysis/runAnalysis.cpp @@ -978,8 +978,7 @@ void runAnalysis::basic(int timestep, std::shared_ptr input_db, SubPha /*if (d_regular) d_ScaLBL_Comm->RegularLayout(d_Map,Phi,Averages.Phi); else */ - ScaLBL_CopyToHost(Averages.Phi.data(),Phi,N*sizeof(double)); - + ScaLBL_CopyToHost(Averages.Phi.data(),Phi,N*sizeof(double)); // copy other variables d_ScaLBL_Comm->RegularLayout(d_Map,Pressure,Averages.Pressure); d_ScaLBL_Comm->RegularLayout(d_Map,&Den[0],Averages.Rho_n); diff --git a/example/Plates/input.db b/example/Plates/input.db index 2e74a43f..2da2ea3e 100644 --- a/example/Plates/input.db +++ b/example/Plates/input.db @@ -7,10 +7,10 @@ Color { beta = 0.95; F = 0, 0, 0 Restart = false - timestepMax = 3000 + timestepMax = 500 flux = 0.0 ComponentLabels = -2, -1 - ComponentAffinity = -1.0, -0.5; + ComponentAffinity = 1.0, 1.0; } Domain { @@ -26,13 +26,14 @@ Domain { } Analysis { - blobid_interval = 1000 // Frequency to perform blob identification - analysis_interval = 1000 // Frequency to perform analysis - restart_interval = 1000 // Frequency to write restart data - visualization_interval = 1000 // Frequency to write visualization data + analysis_interval = 100 // Frequency to perform analysis + visualization_interval = 500 + subphase_analysis_interval = 100 + restart_interval = 100000 restart_file = "Restart" // Filename to use for restart file (will append rank) N_threads = 4 // Number of threads to use load_balance = "independent" // Load balance method to use: "none", "default", "independent" } - +Visualization { +} \ No newline at end of file diff --git a/tests/lbpm_color_simulator.cpp b/tests/lbpm_color_simulator.cpp index 4b9478be..6451d38a 100644 --- a/tests/lbpm_color_simulator.cpp +++ b/tests/lbpm_color_simulator.cpp @@ -79,5 +79,3 @@ int main(int argc, char **argv) Utilities::shutdown(); } - -