From 19492ec4b4e6657bec0b6851b6db8aa8014c3aab Mon Sep 17 00:00:00 2001 From: James E McClure Date: Wed, 27 Mar 2019 07:10:43 -0400 Subject: [PATCH] subphase enabled in basic --- analysis/SubPhase.cpp | 4 ++-- analysis/runAnalysis.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/SubPhase.cpp b/analysis/SubPhase.cpp index b69a043c..2cf2a206 100644 --- a/analysis/SubPhase.cpp +++ b/analysis/SubPhase.cpp @@ -205,11 +205,11 @@ void SubPhase::Basic(){ wb.Pz += rho_w*nB*Vel_z(n); } if ( phi > 0.99 ){ - nb.P += Pressure(n); + nb.p += Pressure(n); count_n += 1.0; } else if ( phi < -0.99 ){ - wb.P += Pressure(n); + wb.p += Pressure(n); count_w += 1.0; } } diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp index 36949ee0..2e357e11 100644 --- a/analysis/runAnalysis.cpp +++ b/analysis/runAnalysis.cpp @@ -934,7 +934,7 @@ void runAnalysis::basic( int timestep, SubPhase &Averages, const double *Phi, do } if ( timestep%d_subphase_analysis_interval == 0 ) { - auto work = new BasicWorkItem(type,timestep,Averages); + auto work = new SubphaseWorkItem(type,timestep,Averages); work->add_dependency(d_wait_subphase); // Make sure we are done using analysis before modifying d_wait_subphase = d_tpool.add_work(work); }