From b53f1fe0dee79eba4cfd0da095408789d244fc4c Mon Sep 17 00:00:00 2001 From: Matthew Marine Date: Tue, 24 Oct 2023 11:58:36 -0400 Subject: [PATCH] PR requested changes --- src/Plugins/ComplexCore/test/FindArrayStatisticsTest.cpp | 4 ---- src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp | 1 - .../Filters/Algorithms/FindKernelAvgMisorientations.cpp | 1 - .../src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp | 1 - 4 files changed, 7 deletions(-) diff --git a/src/Plugins/ComplexCore/test/FindArrayStatisticsTest.cpp b/src/Plugins/ComplexCore/test/FindArrayStatisticsTest.cpp index 245b2c9979..2ba4aceab4 100644 --- a/src/Plugins/ComplexCore/test/FindArrayStatisticsTest.cpp +++ b/src/Plugins/ComplexCore/test/FindArrayStatisticsTest.cpp @@ -317,13 +317,9 @@ TEST_CASE("ComplexCore::FindArrayStatisticsFilter: Test Algorithm By Index", "[C auto preflightResult = filter.preflight(dataStructure, args); REQUIRE(preflightResult.outputActions.valid()); - std::cout << "Before Execution" << std::endl; - // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); REQUIRE(executeResult.result.valid()); - - std::cout << "After Execution" << std::endl; } // Check resulting values diff --git a/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp b/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp index f71957122c..353e7fe250 100644 --- a/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp +++ b/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp @@ -52,7 +52,6 @@ void test_impl(const std::vector& geometryDims, const std::string& featu // Change Feature 470 to 0 REQUIRE(dataStructure.getDataAs(k_FeatureIDsPath) != nullptr); - // REQUIRE_NOTHROW(dataStructure.getDataRefAs(k_FeatureIDsPath)); Int32Array& featureIds = dataStructure.getDataRefAs(k_FeatureIDsPath); std::replace(featureIds.begin(), featureIds.end(), 470, 0); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.cpp index d2c0d82010..37d35dafa9 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/FindKernelAvgMisorientations.cpp @@ -210,7 +210,6 @@ Result<> FindKernelAvgMisorientations::operator()() ParallelData3DAlgorithm parallelAlgorithm; parallelAlgorithm.setRange(Range3D(0, udims[0], 0, udims[1], 0, udims[2])); - parallelAlgorithm.setParallelizationEnabled(false); parallelAlgorithm.execute(FindKernelAvgMisorientationsImpl(this, m_DataStructure, m_InputValues, m_ShouldCancel)); return {}; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp index 798ea2d03f..2bb950c131 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternions.cpp @@ -267,7 +267,6 @@ Result<> GenerateFZQuaternions::executeImpl(DataStructure& dataStructure, const // Parallel algorithm to find duplicate nodes ParallelDataAlgorithm dataAlg; dataAlg.setRange(0ULL, static_cast(quatArray.getNumberOfTuples())); - dataAlg.setParallelizationEnabled(false); if(pUseGoodVoxelsValue) {