Operators/IProductWRTBase/IProductWRTBaseSumFac.hpp

@@ -44,24 +44,42 @@ public:
             {
                 // Segment
                 case LibUtilities::Seg:
-                    std::cout << "Sumfac-Seg" << std::endl;
                     IProductWRTBaseSumFacSegKernel(inptr, outptr, expPtr, m_jac,
                                                    numElmts, jac_idx);
                     break;
+                // Triangles
+                case LibUtilities::Tri:
+                    IProductWRTBaseSumFacTriKernel(inptr, outptr, expPtr, m_jac,
+                                                   numElmts, jac_idx);
+                    break;
                 // Quads
                 case LibUtilities::Quad:
-                    std::cout << "Sumfac-Quad" << std::endl;
                     IProductWRTBaseSumFacQuadKernel(inptr, outptr, expPtr,
                                                     m_jac, numElmts, jac_idx);
                     break;
+                // Tet
+                case LibUtilities::Tet:
+                    IProductWRTBaseSumFacTetKernel(inptr, outptr, expPtr, m_jac,
+                                                   numElmts, jac_idx);
+                    break;
+                // Pyr
+                case LibUtilities::Pyr:
+                    IProductWRTBaseSumFacPyrKernel(inptr, outptr, expPtr, m_jac,
+                                                   numElmts, jac_idx);
+                    break;
+                // Prism
+                case LibUtilities::Prism:
+                    IProductWRTBaseSumFacPrismKernel(inptr, outptr, expPtr,
+                                                     m_jac, numElmts, jac_idx);
+                    break;
                 // Hexes
                 case LibUtilities::Hex:
-                    std::cout << "Sumfac-Hex" << std::endl;
                     IProductWRTBaseSumFacHexKernel(inptr, outptr, expPtr, m_jac,
                                                    numElmts, jac_idx);
                     break;
                 default:
-                    std::cout << "Only Seg, Quad, or Hex implemented so far" << std::endl;
+                    std::cout << "shapetype not implemented" << std::endl;
+
             }
 
             inptr += in.GetBlocks()[block_idx].block_size;

tests/CMakeLists.txt

@@ -178,14 +178,16 @@ target_include_directories(test_mass PRIVATE ${NEKTAR++_INCLUDE_DIRS})
 target_compile_definitions(test_mass PRIVATE
     -DTEST_PATH="${CMAKE_SOURCE_DIR}")
 
-add_executable(test_masscuda test_masscuda.cpp)
-target_link_libraries(test_masscuda PRIVATE Operators)
-target_link_libraries(test_masscuda PRIVATE ${NEKTAR++_LIBRARIES})
-target_link_libraries(test_masscuda PRIVATE Boost::unit_test_framework)
-target_include_directories(test_masscuda PRIVATE "${CMAKE_SOURCE_DIR}")
-target_include_directories(test_masscuda PRIVATE ${NEKTAR++_INCLUDE_DIRS})
-target_compile_definitions(test_masscuda PRIVATE
-    -DTEST_PATH="${CMAKE_SOURCE_DIR}")
+IF (NEKTAR_USE_CUDA)
+    add_executable(test_masscuda test_masscuda.cpp)
+    target_link_libraries(test_masscuda PRIVATE Operators)
+    target_link_libraries(test_masscuda PRIVATE ${NEKTAR++_LIBRARIES})
+    target_link_libraries(test_masscuda PRIVATE Boost::unit_test_framework)
+    target_include_directories(test_masscuda PRIVATE "${CMAKE_SOURCE_DIR}")
+    target_include_directories(test_masscuda PRIVATE ${NEKTAR++_INCLUDE_DIRS})
+    target_compile_definitions(test_masscuda PRIVATE
+        -DTEST_PATH="${CMAKE_SOURCE_DIR}")
+ENDIF()
 
 add_executable(test_assmbscatr test_assmbscatr.cpp)
 target_link_libraries(test_assmbscatr PRIVATE Operators)

tests/test_ipwrtbasesumfac.cpp

@@ -43,7 +43,7 @@ BOOST_FIXTURE_TEST_CASE(ipwrtbase_quad, Quad)
     }
 }
 
-/*BOOST_FIXTURE_TEST_CASE(ipwrtbase_tri, Tri)
+BOOST_FIXTURE_TEST_CASE(ipwrtbase_tri, Tri)
 {
     Configure();
     SetTestCase(fixt_in->GetBlocks(), fixt_in->GetStorage().GetCPUPtr());
@@ -73,7 +73,7 @@ BOOST_FIXTURE_TEST_CASE(ipwrtbase_square_all_elements, SquareAllElements)
         OutputIfNotMatch(fixt_out->GetStorage().GetCPUPtr(),
                          fixt_expected->GetStorage().GetCPUPtr(), 1.0E-12);
     }
-}*/
+}
 
 BOOST_FIXTURE_TEST_CASE(ipwrtbase_hex, Hex)
 {
@@ -91,7 +91,7 @@ BOOST_FIXTURE_TEST_CASE(ipwrtbase_hex, Hex)
     }
 }
 
-/*BOOST_FIXTURE_TEST_CASE(ipwrtbase_prism, Prism)
+BOOST_FIXTURE_TEST_CASE(ipwrtbase_prism, Prism)
 {
     Configure();
     SetTestCase(fixt_in->GetBlocks(), fixt_in->GetStorage().GetCPUPtr());
@@ -163,12 +163,12 @@ BOOST_FIXTURE_TEST_CASE(ipwrtbase_cube_all_elements, CubeAllElements)
         ->apply(*fixt_in, *fixt_out);
     ExpectedSolution(fixt_expected->GetBlocks(),
                      fixt_expected->GetStorage().GetCPUPtr());
-    BOOST_TEST(fixt_out->compare(*fixt_expected, 1.0E-12));
+    BOOST_TEST(fixt_out->compare(*fixt_expected, 1.0E-10));
     boost::test_tools::output_test_stream output;
     {
         OutputIfNotMatch(fixt_out->GetStorage().GetCPUPtr(),
-                         fixt_expected->GetStorage().GetCPUPtr(), 1.0E-12);
+                         fixt_expected->GetStorage().GetCPUPtr(), 1.0E-10);
     }
-}*/
+}
 
 BOOST_AUTO_TEST_SUITE_END()