Skip to content
Permalink
Browse files

Merge branch 'braces' into develop

  • Loading branch information...
jbakosi committed Mar 23, 2019
2 parents 7b0e93e + 1aac8cb commit 96d6d8eec9f29a83b6dfe21ba8eb2c9f08de72b9
Showing with 6 additions and 6 deletions.
  1. +1 −1 doc/pages/mainpage.dox
  2. +1 −1 src/Mesh/DerivedData.C
  3. +4 −4 tests/unit/Mesh/TestDerivedData.C
@@ -114,7 +114,7 @@ For larger problems and computers, however, you should build from source.

git clone --recurse-submodules https://github.com/quinoacomputing/quinoa.git; cd quinoa
mkdir external/build; cd external/build; cmake -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_C_COMPILER=mpicc -DCMAKE_Fortran_COMPILER=mpif90 .. && make; cd -
mkdir build; cd build; cmake -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_C_COMPILER=mpicc ../src && make && ./charmrun +p 8 Main/unittest -v -q && ctest -j 8 --output-on-failure -LE extreme
mkdir build; cd build; cmake -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_C_COMPILER=mpicc -DCMAKE_BUILD_TYPE=Release ../src && make -sj8 && ./charmrun +p8 Main/unittest -v -q && ctest -j8 --output-on-failure -LE extreme

All executables will be under `build/Main/`.

@@ -1623,7 +1623,7 @@ conforming( const std::vector< std::size_t >& inpoel,
Coord en{{ (x[n[0]] + x[n[1]]) / 2.0,
(y[n[0]] + y[n[1]]) / 2.0,
(z[n[0]] + z[n[1]]) / 2.0 }};
edgeNodes[ en ] = { e, {{A,B,C,D}}, n };
edgeNodes[ en ] = std::tuple<std::size_t,Tet,Edge>{ e, {{A,B,C,D}}, n };
}
}

@@ -3303,7 +3303,7 @@ void DerivedData_object::test< 72 >() {
set_test_name( "Mesh conformity, empty inpoel, empty coord" );

try {
tk::conforming( {}, {} );
tk::conforming( std::vector< std::size_t >(), tk::UnsMesh::Coords() );
#ifndef NDEBUG // exception only thrown in DEBUG mode
fail( "should throw exception in DEBUG mode" );
#endif
@@ -3325,7 +3325,7 @@ void DerivedData_object::test< 73 >() {
{{ 1, 0, 1, 1, 0, 0, 1, 1, 0.5, 0.5, 0, 0.5, 1, 0.5 }},
{{ 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0.5, 0.5, 0.5, 0.5 }} }};

tk::conforming( {}, coord );
tk::conforming( std::vector< std::size_t >(), coord );
#ifndef NDEBUG // exception only thrown in DEBUG mode
fail( "should throw exception in DEBUG mode" );
#endif
@@ -3348,7 +3348,7 @@ void DerivedData_object::test< 74 >() {
// Partial mesh non-zero based mesh connectivity for tetrahedron-mesh
std::vector< std::size_t > inpoel { 12, 14, 9, 11,
14, 4, 13, 9 };
tk::conforming( inpoel, {} );
tk::conforming( inpoel, tk::UnsMesh::Coords() );
fail( "should throw exception in DEBUG mode" );
}
catch ( tk::Exception& ) {
@@ -3370,7 +3370,7 @@ void DerivedData_object::test< 75 >() {
// Partial mesh connectivity with partial tet for tetrahedron-mesh
std::vector< std::size_t > inpoel { 1, 14, 9, 11,
14, 4, 13 };
tk::conforming( inpoel, {} );
tk::conforming( inpoel, tk::UnsMesh::Coords() );
fail( "should throw exception in DEBUG mode" );
}
catch ( tk::Exception& ) {

0 comments on commit 96d6d8e

Please sign in to comment.
You can’t perform that action at this time.