From bf55f928b854775f1970178ed77c9c0c47652712 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Wed, 27 Mar 2019 12:07:35 -0400 Subject: [PATCH 1/2] subphase not quite working with threadpool --- analysis/runAnalysis.cpp | 1 + analysis/runAnalysis.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp index a98a6448..eef31fd8 100644 --- a/analysis/runAnalysis.cpp +++ b/analysis/runAnalysis.cpp @@ -598,6 +598,7 @@ void runAnalysis::finish( ) d_wait_blobID.reset(); d_wait_analysis.reset(); d_wait_vis.reset(); + d_wait_subphase.reset(); d_wait_restart.reset(); // Syncronize MPI_Barrier( d_comm ); diff --git a/analysis/runAnalysis.h b/analysis/runAnalysis.h index d9c96e6b..df73fafd 100644 --- a/analysis/runAnalysis.h +++ b/analysis/runAnalysis.h @@ -15,7 +15,7 @@ typedef std::shared_ptr> BlobIDList; // Types of analysis enum class AnalysisType : uint64_t { AnalyzeNone=0, IdentifyBlobs=0x01, CopyPhaseIndicator=0x02, - CopySimState=0x04, ComputeAverages=0x08, CreateRestart=0x10, WriteVis=0x20 }; + CopySimState=0x04, ComputeAverages=0x08, CreateRestart=0x10, WriteVis=0x20, ComputeSubphase=0x40 }; //! Class to run the analysis in multiple threads From a46c9104c3ed197671cb9a57c9549f2093758765 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Wed, 27 Mar 2019 12:59:56 -0400 Subject: [PATCH 2/2] write subphase -- dumb mistake --- analysis/runAnalysis.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp index eef31fd8..a2b3801d 100644 --- a/analysis/runAnalysis.cpp +++ b/analysis/runAnalysis.cpp @@ -412,6 +412,7 @@ public: PROFILE_START("Compute subphase",1); Averages.Full(); + Averages.Write(timestep); PROFILE_STOP("Compute subphase",1); } private: