From 0c134187df2b9eed020249a0946540d3b737fe4b Mon Sep 17 00:00:00 2001 From: "Nathan V. Roberts" Date: Tue, 15 Dec 2020 09:24:47 -0700 Subject: [PATCH] Commenting out #pragma mark lines. (These are useful for organizing unit tests in a way that is easy to navigate with Xcode; however, they break the build for certain CI tests.) --- .../MonolithicExecutable/DataTests.cpp | 12 ++--- .../DirectSumBasisTests.cpp | 2 +- .../MonolithicExecutable/HostCopyTests.cpp | 2 +- .../StructuredIntegrationTests.cpp | 52 +++++++++---------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/intrepid2/unit-test/MonolithicExecutable/DataTests.cpp b/packages/intrepid2/unit-test/MonolithicExecutable/DataTests.cpp index 23dcee9a62d6..6aa510893f8a 100644 --- a/packages/intrepid2/unit-test/MonolithicExecutable/DataTests.cpp +++ b/packages/intrepid2/unit-test/MonolithicExecutable/DataTests.cpp @@ -59,7 +59,7 @@ namespace { using namespace Intrepid2; -#pragma mark Data: EmptyDataMarkedAsInvalid +// #pragma mark Data: EmptyDataMarkedAsInvalid TEUCHOS_UNIT_TEST( Data, EmptyDataMarkedAsInvalid ) { // check the new default constructor for Data @@ -67,7 +67,7 @@ namespace TEST_EQUALITY(emptyData.isValid(), false); // empty data container should return false from isValid() } -#pragma mark Data: GetWritableEntry +// #pragma mark Data: GetWritableEntry TEUCHOS_UNIT_TEST( Data, GetWritableEntry ) { using Scalar = double; @@ -100,7 +100,7 @@ namespace testFloatingEquality2(expectedView, data, relTol, absTol, out, success); } -#pragma mark Data: MatVec +// #pragma mark Data: MatVec TEUCHOS_UNIT_TEST( Data, MatVec ) { double relTol = 1e-13; @@ -137,7 +137,7 @@ namespace testFloatingEquality1(expectedResultView, actualResultData.getUnderlyingView1(), relTol, absTol, out, success); } -#pragma mark Data: MatMat +// #pragma mark Data: MatMat TEUCHOS_UNIT_TEST( Data, MatMat ) { double relTol = 1e-13; @@ -198,7 +198,7 @@ namespace printView(actualResultData.getUnderlyingView3(), out); } -#pragma mark Data: MatMatExplicitIdentity_PDD +// #pragma mark Data: MatMatExplicitIdentity_PDD TEUCHOS_UNIT_TEST( Data, MatMatExplicitIdentity_PDD ) // (P,D,D) underlying; notionally (C,P,D,D) { // tests that identity * identity = identity @@ -265,7 +265,7 @@ TEUCHOS_UNIT_TEST( Data, MatMatExplicitIdentity_PDD ) // (P,D,D) underlying; not } } - #pragma mark Data: MatMatBlockPlusDiagonal + // #pragma mark Data: MatMatBlockPlusDiagonal TEUCHOS_UNIT_TEST( Data, MatMatBlockPlusDiagonal ) { double relTol = 1e-13; diff --git a/packages/intrepid2/unit-test/MonolithicExecutable/DirectSumBasisTests.cpp b/packages/intrepid2/unit-test/MonolithicExecutable/DirectSumBasisTests.cpp index faa65e9552f4..0178df1fda4c 100644 --- a/packages/intrepid2/unit-test/MonolithicExecutable/DirectSumBasisTests.cpp +++ b/packages/intrepid2/unit-test/MonolithicExecutable/DirectSumBasisTests.cpp @@ -61,7 +61,7 @@ namespace { using namespace Intrepid2; -#pragma mark DirectSumBasis group +// #pragma mark DirectSumBasis group TEUCHOS_UNIT_TEST( DirectSumBasis, AllocateBasisValues ) { using Basis = HierarchicalBasisFamily<>::HDIV_HEX; diff --git a/packages/intrepid2/unit-test/MonolithicExecutable/HostCopyTests.cpp b/packages/intrepid2/unit-test/MonolithicExecutable/HostCopyTests.cpp index 30b265b97f6a..8e1648def08a 100644 --- a/packages/intrepid2/unit-test/MonolithicExecutable/HostCopyTests.cpp +++ b/packages/intrepid2/unit-test/MonolithicExecutable/HostCopyTests.cpp @@ -69,7 +69,7 @@ namespace { using namespace Intrepid2; -#pragma mark HostCopy group +// #pragma mark HostCopy group TEUCHOS_UNIT_TEST(HostCopy, BasisValues) { // first, construct a BasisValues object with scalar tensor data diff --git a/packages/intrepid2/unit-test/MonolithicExecutable/StructuredIntegrationTests.cpp b/packages/intrepid2/unit-test/MonolithicExecutable/StructuredIntegrationTests.cpp index 75e40d5f840d..6ddb384e356e 100644 --- a/packages/intrepid2/unit-test/MonolithicExecutable/StructuredIntegrationTests.cpp +++ b/packages/intrepid2/unit-test/MonolithicExecutable/StructuredIntegrationTests.cpp @@ -605,7 +605,7 @@ ScalarView performStandardQuadratureHypercube(int meshWidt testFloatingEquality3(standardIntegrals, integralData, relTol, absTol, out, success, "standard Intrepid2 integral", "reduced data integral"); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_1D_p1_AffinePath +// #pragma mark StructuredIntegration: QuadratureUniformMesh_1D_p1_AffinePath TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_1D_p1_AffinePath ) { using DataScalar = double; @@ -619,7 +619,7 @@ ScalarView performStandardQuadratureHypercube(int meshWidt testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_1D_p1_GeneralPath +// #pragma mark StructuredIntegration: QuadratureUniformMesh_1D_p1_GeneralPath TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_1D_p1_GeneralPath ) { using DataScalar = double; @@ -633,7 +633,7 @@ ScalarView performStandardQuadratureHypercube(int meshWidt testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_1D_p4_GeneralPath +// #pragma mark StructuredIntegration: QuadratureUniformMesh_1D_p4_GeneralPath TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_1D_p4_GeneralPath ) { using DataScalar = double; @@ -647,7 +647,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_1D_p4_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_1D_p2 +// #pragma mark StructuredIntegration: QuadratureUniformMesh_1D_p2 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_1D_p2 ) { using DataScalar = double; @@ -661,7 +661,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_1D_p4_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_2D_p1 +// #pragma mark StructuredIntegration: QuadratureUniformMesh_2D_p1 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_2D_p1 ) { using DataScalar = double; @@ -675,7 +675,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_1D_p4_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_2D_p1_GeneralPath +// #pragma mark StructuredIntegration: QuadratureUniformMesh_2D_p1_GeneralPath TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_2D_p1_GeneralPath ) { using DataScalar = double; @@ -689,7 +689,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_1D_p4_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_2D_p2_GeneralPath +// #pragma mark StructuredIntegration: QuadratureUniformMesh_2D_p2_GeneralPath TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_2D_p2_GeneralPath ) { using DataScalar = double; @@ -703,7 +703,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_2D_p2_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_2D_p2 +// #pragma mark StructuredIntegration: QuadratureUniformMesh_2D_p2 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_2D_p2 ) { using DataScalar = double; @@ -717,7 +717,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_2D_p2_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p1 +// #pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p1 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p1 ) { using DataScalar = double; @@ -731,7 +731,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_2D_p2_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p1_GeneralPath +// #pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p1_GeneralPath TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p1_GeneralPath ) { using DataScalar = double; @@ -745,7 +745,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p1_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p2 +// #pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p2 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p2 ) { using DataScalar = double; @@ -759,7 +759,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p1_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p2_GeneralPath +// #pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p2_GeneralPath TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p2_GeneralPath ) { using DataScalar = double; @@ -773,7 +773,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p2_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p3 +// #pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p3 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p3 ) { using DataScalar = double; @@ -787,7 +787,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p2_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p3_GeneralPath +// #pragma mark StructuredIntegration: QuadratureUniformMesh_3D_p3_GeneralPath TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p3_GeneralPath ) { using DataScalar = double; @@ -801,7 +801,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureUniformMesh_3D_p2_GeneralPat testQuadratureHypercube(affinePath,meshWidth, polyOrder, worksetSize, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_AxisAlignedPath_Case1 +// #pragma mark StructuredIntegration: QuadratureSynthetic_AxisAlignedPath_Case1 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_AxisAlignedPath_Case1 ) { using DataScalar = double; @@ -845,7 +845,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_AxisAlignedPath_Ca testIntegrateMatchesBaseline(transformedUnitVectorData, constantCellMeasures, transformedUnitVectorData, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case1 +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case1 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case1 ) { using DataScalar = double; @@ -892,7 +892,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case1 testIntegrateMatchesBaseline(transformedUnitVectorData, constantCellMeasures, transformedUnitVectorData, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case2 +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case2 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case2 ) { using DataScalar = double; @@ -968,7 +968,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case2 testIntegrateMatchesBaseline(transformedVectorData, constantCellMeasures, transformedVectorData, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case3 +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case3 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case3 ) { using DataScalar = double; @@ -1038,7 +1038,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case3 testIntegrateMatchesBaseline(transformedUnitVectorData, constantCellMeasures, transformedUnitVectorData, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case4 +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case4 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case4 ) { using DataScalar = double; @@ -1109,7 +1109,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case4 testIntegrateMatchesBaseline(transformedUnitVectorData, constantCellMeasures, transformedUnitVectorData, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case5 +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case5 TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case5 ) { using DataScalar = double; @@ -1192,7 +1192,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case5 testIntegrateMatchesBaseline(transformedUnitVectorDataLeft, constantCellMeasures, transformedUnitVectorDataRight, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_AxisAlignedPath_Case6_3D +// #pragma mark StructuredIntegration: QuadratureSynthetic_AxisAlignedPath_Case6_3D TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_AxisAlignedPath_Case6_3D ) { using DataScalar = double; @@ -1281,7 +1281,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_AxisAlignedPath_Ca testIntegrateMatchesBaseline(transformedUnitVectorDataLeft, constantCellMeasures, transformedUnitVectorDataRight, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case6_3D +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case6_3D TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case6_3D ) { using DataScalar = double; @@ -1388,7 +1388,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case6_ testIntegrateMatchesBaseline(transformedUnitVectorDataLeft, constantCellMeasures, transformedUnitVectorDataRight, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case7_3D +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case7_3D TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case7_3D ) { // super-simple case for 3D: symmetric data, 1 point, 1 field. @@ -1475,7 +1475,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case7_ testIntegrateMatchesBaseline(transformedUnitVectorDataLeft, constantCellMeasures, transformedUnitVectorDataRight, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case8_3D +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case8_3D TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case8_3D ) { // like case 7, but multi-family @@ -1566,7 +1566,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case8_ testIntegrateMatchesBaseline(transformedUnitVectorDataLeft, constantCellMeasures, transformedUnitVectorDataRight, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case9_3D +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case9_3D TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case9_3D ) { using DataScalar = double; @@ -1654,7 +1654,7 @@ TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case9_ testIntegrateMatchesBaseline(transformedUnitVectorDataLeft, constantCellMeasures, transformedUnitVectorDataRight, out, success); } -#pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case10_3D +// #pragma mark StructuredIntegration: QuadratureSynthetic_GeneralPath_Case10_3D TEUCHOS_UNIT_TEST( StructuredIntegration, QuadratureSynthetic_GeneralPath_Case10_3D ) { // test with variable quadrature weights