From 73e560501da03a362124ee41bd485c09f2a17223 Mon Sep 17 00:00:00 2001 From: Kelly Glen Thompson Date: Tue, 15 Oct 2024 10:28:52 -0600 Subject: [PATCH] Remaining clang-tidy@17 updates for draco --- src/FortranChecks/fc_derived_type.cc | 5 +- src/FortranChecks/test/cppmain.cc | 6 +- src/VendorChecks/test/tstMetis.cc | 19 +- src/VendorChecks/test/tstParmetis.cc | 24 +- ...tPseudo_Line_Analytic_MultigroupOpacity.cc | 41 +- src/experimental/test/tst_mdspan.cc | 11 +- src/memory/memory.cc | 28 +- src/memory/test/tstmemory.cc | 16 +- src/mesh_element/Element_Definition.cc | 13 +- .../test/TestElementDefinition.cc | 357 +++++++++--------- src/ode/quad.i.hh | 2 +- src/ode/test/tstrkqs.cc | 8 +- src/units/MathConstants.hh | 2 +- 13 files changed, 285 insertions(+), 247 deletions(-) diff --git a/src/FortranChecks/fc_derived_type.cc b/src/FortranChecks/fc_derived_type.cc index 307aa34c7..eec6fe724 100644 --- a/src/FortranChecks/fc_derived_type.cc +++ b/src/FortranChecks/fc_derived_type.cc @@ -7,8 +7,8 @@ * \note Copyright (C) 2012-2024 Triad National Security, LLC., All rights reserved. */ //------------------------------------------------------------------------------------------------// -#include "dsxx/config.h" #include +#include // int64_t #include //! Define the derived type as a C structure @@ -27,8 +27,7 @@ extern "C" void rtt_test_derived_type(const my_informative_type &mit, int &error << "\nint = " << mit.some_int << "\nlarge_int = " << mit.some_large_int << "\n*some_pointer[1] = " << *(mit.some_pointer) << "\n*some_pointer[2] = " << *(mit.some_pointer + 1) - << "\nsome_enum = " << mit.some_enum << "\n" - << std::endl; + << "\nsome_enum = " << mit.some_enum << "\n\n"; error_code = 0; diff --git a/src/FortranChecks/test/cppmain.cc b/src/FortranChecks/test/cppmain.cc index 9b644ad88..51fe07dbb 100644 --- a/src/FortranChecks/test/cppmain.cc +++ b/src/FortranChecks/test/cppmain.cc @@ -9,6 +9,8 @@ #include "dsxx/Release.hh" #include "dsxx/ScalarUnitTest.hh" +#include "dsxx/UnitTest.hh" +#include #include //------------------------------------------------------------------------------------------------// @@ -17,14 +19,14 @@ extern "C" void sub1(double alpha, size_t *numPass, size_t *numFail); //------------------------------------------------------------------------------------------------// void test_isocbinding_sub1(rtt_dsxx::UnitTest &ut) { - double alpha = 1.0; + double const alpha = 1.0; size_t np(ut.numPasses); size_t nf(ut.numFails); // Call fortran subroutine sub1(alpha, &np, &nf); ut.numPasses = static_cast(np); ut.numFails = static_cast(nf); - std::cout << ut.numPasses << " " << ut.numFails << std::endl; + std::cout << ut.numPasses << " " << ut.numFails << '\n'; return; } diff --git a/src/VendorChecks/test/tstMetis.cc b/src/VendorChecks/test/tstMetis.cc index b2cd26629..d9848a202 100644 --- a/src/VendorChecks/test/tstMetis.cc +++ b/src/VendorChecks/test/tstMetis.cc @@ -20,7 +20,10 @@ #include "dsxx/Release.hh" #include "dsxx/ScalarUnitTest.hh" +#include "dsxx/UnitTest.hh" #include +#include // int32_t +#include #include // Original provided by Erik Zenker, https://gist.github.com/erikzenker/c4dc42c8d5a8c1cd3e5a @@ -49,19 +52,17 @@ void test_metis(rtt_dsxx::UnitTest &ut) { // index: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13, 14,15,16,17 std::array adjncy = {4, 4, 4, 4, 0, 1, 2, 3, 5, 4, 6, 7, 8, 9, 5, 5, 5, 5}; - // Weights of vertices: if all weights are equal then can be set to NULL - std::vector vwgt(nVertices * nWeights, 0); - // Partition a graph into k parts using either multilevel recursive bisection or multilevel k-way // partitioning. - int ret = METIS_PartGraphKway(&nVertices, &nWeights, xadj.data(), adjncy.data(), nullptr, nullptr, - nullptr, &nParts, nullptr, nullptr, nullptr, &objval, &part[0]); + int const ret = + METIS_PartGraphKway(&nVertices, &nWeights, xadj.data(), adjncy.data(), nullptr, nullptr, + nullptr, &nParts, nullptr, nullptr, nullptr, &objval, &part[0]); std::cout << "partition: "; for (int32_t i = 0; i < nVertices; ++i) { std::cout << part[i] << " "; } - std::cout << std::endl; + std::cout << '\n'; if (ret == METIS_OK) PASSMSG("Successfully called METIS_PartGraphKway()."); @@ -70,9 +71,9 @@ void test_metis(rtt_dsxx::UnitTest &ut) { std::array expectedResult = {1, 1, 1, 1, 1, 0, 0, 0, 0, 0}; std::array mirrorExpectedResult = {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}; - std::vector vExpectedResult(expectedResult.begin(), expectedResult.end()); - std::vector vMirrorExpectedResult(mirrorExpectedResult.begin(), - mirrorExpectedResult.end()); + std::vector const vExpectedResult(expectedResult.begin(), expectedResult.end()); + std::vector const vMirrorExpectedResult(mirrorExpectedResult.begin(), + mirrorExpectedResult.end()); if (part == vExpectedResult || part == vMirrorExpectedResult) PASSMSG("Metis returned the expected result."); else diff --git a/src/VendorChecks/test/tstParmetis.cc b/src/VendorChecks/test/tstParmetis.cc index d317aaba0..75fafbb00 100644 --- a/src/VendorChecks/test/tstParmetis.cc +++ b/src/VendorChecks/test/tstParmetis.cc @@ -6,8 +6,14 @@ * \note Copyright (C) 2016-2024 Triad National Security, LLC., All rights reserved. */ //------------------------------------------------------------------------------------------------// +#include "dsxx/Assert.hh" #include "dsxx/Release.hh" +#include "dsxx/UnitTest.hh" +#include "c4/C4_Functions.hh" #include "c4/ParallelUnitTest.hh" +#include +#include +#include #include #include #include @@ -16,7 +22,11 @@ void test_parmetis(rtt_c4::ParallelUnitTest &ut) { using std::cout; - using std::endl; + + // Don't warn about missing MPI and Parmetis headers that define some macros and variables used + // here. + + // NOLINTBEGIN(misc-include-cleaner) Insist(rtt_c4::nodes() == 3, "test_parmetis must be called with 3 MPI ranks exactly."); @@ -94,9 +104,9 @@ void test_parmetis(rtt_c4::ParallelUnitTest &ut) { if (MPI_PROC_ID == 0) cout << "parmetis initialized." << '\n'; - int result = ParMETIS_V3_PartKway(&vtxdist[0], &xadj[0], &adjncy[0], vwgt, adjwgt, &wgtflag, - &numflag, &ncon, &nparts, &tpwgts[0], &ubvec, &options[0], - &edgecut, &part[0], &rtt_c4::communicator); + int const result = ParMETIS_V3_PartKway(&vtxdist[0], &xadj[0], &adjncy[0], vwgt, adjwgt, &wgtflag, + &numflag, &ncon, &nparts, &tpwgts[0], &ubvec, &options[0], + &edgecut, &part[0], &rtt_c4::communicator); if (result == METIS_OK) { std::ostringstream msg; @@ -109,15 +119,17 @@ void test_parmetis(rtt_c4::ParallelUnitTest &ut) { } if (MPI_PROC_ID == 0) - cout << "parmetis finalized." << endl; + cout << "parmetis finalized.\n"; for (size_t pid = 0; pid < MPI_PROC_TOTAL_NUM; ++pid) { rtt_c4::global_barrier(); cout << MPI_PROC_ID << " edgecut " << edgecut << '\n'; for (int i = 0; i < 5; i++) - cout << "[" << MPI_PROC_ID << "] " << part[i] << endl; + cout << "[" << MPI_PROC_ID << "] " << part[i] << '\n'; } + // NOLINTEND(misc-include-cleaner) + return; } diff --git a/src/cdi_analytic/test/tstPseudo_Line_Analytic_MultigroupOpacity.cc b/src/cdi_analytic/test/tstPseudo_Line_Analytic_MultigroupOpacity.cc index 69d52a9cb..edb5b7319 100644 --- a/src/cdi_analytic/test/tstPseudo_Line_Analytic_MultigroupOpacity.cc +++ b/src/cdi_analytic/test/tstPseudo_Line_Analytic_MultigroupOpacity.cc @@ -25,21 +25,17 @@ using namespace std; using namespace rtt_dsxx; using namespace rtt_cdi_analytic; using namespace rtt_parser; +using PLAMO = Pseudo_Line_Analytic_MultigroupOpacity; //------------------------------------------------------------------------------------------------// // TESTS //------------------------------------------------------------------------------------------------// -Pseudo_Line_Analytic_MultigroupOpacity::Averaging const NONE = - Pseudo_Line_Analytic_MultigroupOpacity::NONE; +PLAMO::Averaging const NONE = PLAMO::NONE; +PLAMO::Averaging const ROSSELAND = PLAMO::ROSSELAND; +PLAMO::Averaging const PLANCK = PLAMO::PLANCK; -Pseudo_Line_Analytic_MultigroupOpacity::Averaging const ROSSELAND = - Pseudo_Line_Analytic_MultigroupOpacity::ROSSELAND; - -Pseudo_Line_Analytic_MultigroupOpacity::Averaging const PLANCK = - Pseudo_Line_Analytic_MultigroupOpacity::PLANCK; - -void tstPseudo_Line_Analytic_MultigroupOpacity(UnitTest &ut) { +void tstPLAMO(UnitTest &ut) { unsigned const NG = 12288; // 10; int const number_of_lines = 20; int const number_of_edges = 10; @@ -68,9 +64,8 @@ void tstPseudo_Line_Analytic_MultigroupOpacity(UnitTest &ut) { } { - Pseudo_Line_Analytic_MultigroupOpacity const model( - group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, number_of_edges, - edge_ratio, Tref, Tpow, emin, emax, NONE, 0, seed); + PLAMO const model(group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, + number_of_edges, edge_ratio, Tref, Tpow, emin, emax, NONE, 0, seed); PASSMSG("Created Pseudo_Line_Analytic_MultigroupOpacity"); @@ -85,9 +80,8 @@ void tstPseudo_Line_Analytic_MultigroupOpacity(UnitTest &ut) { } { - Pseudo_Line_Analytic_MultigroupOpacity const model( - group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, number_of_edges, - edge_ratio, Tref, Tpow, emin, emax, ROSSELAND, 0, seed); + PLAMO const model(group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, + number_of_edges, edge_ratio, Tref, Tpow, emin, emax, ROSSELAND, 0, seed); PASSMSG("Created Pseudo_Line_Analytic_MultigroupOpacity"); @@ -102,9 +96,8 @@ void tstPseudo_Line_Analytic_MultigroupOpacity(UnitTest &ut) { } { - Pseudo_Line_Analytic_MultigroupOpacity const model( - group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, number_of_edges, - edge_ratio, Tref, Tpow, emin, emax, PLANCK, 0, seed); + PLAMO const model(group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, + number_of_edges, edge_ratio, Tref, Tpow, emin, emax, PLANCK, 0, seed); PASSMSG("Created Pseudo_Line_Analytic_MultigroupOpacity"); @@ -119,9 +112,8 @@ void tstPseudo_Line_Analytic_MultigroupOpacity(UnitTest &ut) { } { - Pseudo_Line_Analytic_MultigroupOpacity const model( - group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, number_of_edges, - edge_ratio, Tref, Tpow, emin, emax, ROSSELAND, 1, seed); + PLAMO const model(group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, + number_of_edges, edge_ratio, Tref, Tpow, emin, emax, ROSSELAND, 1, seed); PASSMSG("Created Pseudo_Line_Analytic_MultigroupOpacity"); @@ -136,9 +128,8 @@ void tstPseudo_Line_Analytic_MultigroupOpacity(UnitTest &ut) { } { - Pseudo_Line_Analytic_MultigroupOpacity const model( - group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, number_of_edges, - edge_ratio, Tref, Tpow, emin, emax, PLANCK, 1, seed); + PLAMO const model(group_bounds, rtt_cdi::ABSORPTION, continuum, number_of_lines, peak, width, + number_of_edges, edge_ratio, Tref, Tpow, emin, emax, PLANCK, 1, seed); PASSMSG("Created Pseudo_Line_Analytic_MultigroupOpacity"); @@ -157,7 +148,7 @@ void tstPseudo_Line_Analytic_MultigroupOpacity(UnitTest &ut) { int main(int argc, char *argv[]) { rtt_c4::ParallelUnitTest ut(argc, argv, release); try { - tstPseudo_Line_Analytic_MultigroupOpacity(ut); + tstPLAMO(ut); } UT_EPILOG(ut); } diff --git a/src/experimental/test/tst_mdspan.cc b/src/experimental/test/tst_mdspan.cc index 812d6b213..1a295e08d 100644 --- a/src/experimental/test/tst_mdspan.cc +++ b/src/experimental/test/tst_mdspan.cc @@ -8,9 +8,14 @@ * \note Copyright (C) 2019-2024 Triad National Security, LLC., All rights reserved. */ //------------------------------------------------------------------------------------------------// +// NOLINTBEGIN(misc-include-cleaner) + #include "dsxx/Release.hh" #include "dsxx/ScalarUnitTest.hh" +#include "dsxx/UnitTest.hh" #include "experimental/mdspan" +#include +#include //------------------------------------------------------------------------------------------------// // Helper Classes. @@ -71,7 +76,7 @@ void t1(rtt_dsxx::UnitTest &ut) { fill_in_order(b); FAIL_IF_NOT(dot_product(a, b) == 204); - std::cout << "dot product = " << dot_product(a, b) << std::endl; + std::cout << "dot product = " << dot_product(a, b) << '\n'; if (ut.numFails == 0) PASSMSG("done with t1"); return; @@ -97,7 +102,7 @@ void t2(rtt_dsxx::UnitTest &ut) { fill_in_order(b); FAIL_IF_NOT(dot_product(a, b) == 204); - std::cout << "dot product = " << dot_product(a, b) << std::endl; + std::cout << "dot product = " << dot_product(a, b) << '\n'; if (ut.numFails == 0) PASSMSG("done with t2"); return; @@ -113,6 +118,8 @@ int main(int argc, char *argv[]) { UT_EPILOG(ut); } +// NOLINTEND(misc-include-cleaner) + //------------------------------------------------------------------------------------------------// // end of tst_mdspan.cc //------------------------------------------------------------------------------------------------// diff --git a/src/memory/memory.cc b/src/memory/memory.cc index 253159203..d199f6386 100644 --- a/src/memory/memory.cc +++ b/src/memory/memory.cc @@ -6,12 +6,16 @@ * \note Copyright (C) 2013-2024 Triad National Security, LLC., All rights reserved. */ //------------------------------------------------------------------------------------------------// -#include "memory/memory.hh" -#include "dsxx/Assert.hh" +#include "memory.hh" #include "dsxx/StackTrace.hh" +#include "dsxx/config.h" +#include // uint64_t #include -#include +#include // std::set_new_handler + +#if DRACO_DIAGNOSTICS & 2 #include +#endif #ifdef __clang__ #pragma clang diagnostic push @@ -32,9 +36,11 @@ namespace rtt_memory { using namespace std; -static uint64_t total; -static uint64_t peak; -static uint64_t largest; +namespace { +uint64_t total; +uint64_t peak; +uint64_t largest; +} // namespace #if DRACO_DIAGNOSTICS & 2 @@ -57,7 +63,9 @@ static uint64_t report_threshold = numeric_limits::max(); #endif -static bool is_active = false; +namespace { +bool is_active = false; +} // namespace #if DRACO_DIAGNOSTICS & 2 @@ -98,7 +106,7 @@ struct memory_diagnostics { //------------------------------------------------------------------------------------------------// bool set_memory_checking(bool new_status) { - bool Result = is_active; + bool const Result = is_active; #if DRACO_DIAGNOSTICS & 2 total = 0; @@ -142,11 +150,11 @@ void report_leaks(ostream &out) { map::const_iterator i; for (i = st.alloc_map.begin(); i != st.alloc_map.end(); ++i) { out << i->second.size << " bytes allocated at address " << i->first << " as allocation " - << i->second.count << " of this size" << endl; + << i->second.count << " of this size\n"; } } #else - out << "No leak report available." << endl; + out << "No leak report available.\n"; #endif } } diff --git a/src/memory/test/tstmemory.cc b/src/memory/test/tstmemory.cc index bab99b69b..59d5e6810 100644 --- a/src/memory/test/tstmemory.cc +++ b/src/memory/test/tstmemory.cc @@ -8,8 +8,14 @@ #include "dsxx/Release.hh" #include "dsxx/ScalarUnitTest.hh" +#include "dsxx/UnitTest.hh" +#include "dsxx/config.h" #include "memory/memory.hh" -#include +#include // size_t +#include // cerr +#include +#include // bad_alloc, set_new_handler +#include using namespace std; using namespace rtt_memory; @@ -131,14 +137,14 @@ void tst_memory(rtt_dsxx::UnitTest &ut) { void tst_bad_alloc(rtt_dsxx::UnitTest &ut) { size_t const num_fails_start(ut.numFails); - std::cout << "\nTesting special handler (stack trace) for std::bad_alloc...\n" << std::endl; + std::cout << "\nTesting special handler (stack trace) for std::bad_alloc...\n\n"; // Set a specialized memory handler. std::set_new_handler(rtt_memory::out_of_memory_handler); try { // trigger a std::bad_alloc exception - std::cout << "Attempt to allocate some memory." << std::endl; + std::cout << "Attempt to allocate some memory.\n"; char *pBigArray = new char[get_really_big_size_t()]; @@ -146,12 +152,12 @@ void tst_bad_alloc(rtt_dsxx::UnitTest &ut) { { pBigArray[0] = 'a'; std::cout << "pBigArray[0] = " << pBigArray[0] - << "\ntotal_allocation = " << total_allocation() << std::endl; + << "\ntotal_allocation = " << total_allocation() << '\n'; } delete[] pBigArray; } catch (std::bad_alloc & /*error*/) { - std::cout << "Successfully caught an expected std::bad_alloc exception." << std::endl; + std::cout << "Successfully caught an expected std::bad_alloc exception.\n"; } catch (...) { FAILMSG("Failed to catch a bad_alloc."); } diff --git a/src/mesh_element/Element_Definition.cc b/src/mesh_element/Element_Definition.cc index 642957f30..affbb417c 100644 --- a/src/mesh_element/Element_Definition.cc +++ b/src/mesh_element/Element_Definition.cc @@ -8,8 +8,11 @@ //------------------------------------------------------------------------------------------------// #include "Element_Definition.hh" -#include -#include +#include "dsxx/Assert.hh" +#include // size_t +#include +#include +#include namespace rtt_mesh_element { @@ -159,7 +162,7 @@ bool Element_Definition::invariant_satisfied() const { for (size_t i = 0; i < side_nodes.size(); i++) { ldum = ldum && (side_nodes[i].size() > 0); ldum = ldum && (side_nodes[i].size() == elem_defs[side_type[i]].number_of_nodes); - for (unsigned int side_node : side_nodes[i]) { + for (unsigned int const side_node : side_nodes[i]) { ldum = ldum && (side_node < number_of_nodes); } } @@ -503,7 +506,7 @@ std::ostream &Element_Definition::print(std::ostream &os_out) const { for (unsigned j = 0; j < get_number_of_sides(); j++) { tmp = get_side_nodes(j); os_out << " side# " << j << " - "; - for (unsigned k : tmp) + for (unsigned const k : tmp) os_out << k << " "; os_out << "\n"; } @@ -520,7 +523,7 @@ std::ostream &Element_Definition::print(std::ostream &os_out) const { os_out << "\n"; } } - os_out << std::endl; + os_out << '\n'; return os_out; } diff --git a/src/mesh_element/test/TestElementDefinition.cc b/src/mesh_element/test/TestElementDefinition.cc index 938dd919b..402092f9f 100644 --- a/src/mesh_element/test/TestElementDefinition.cc +++ b/src/mesh_element/test/TestElementDefinition.cc @@ -9,10 +9,15 @@ #include "dsxx/Release.hh" #include "dsxx/ScalarUnitTest.hh" +#include "dsxx/UnitTest.hh" #include "mesh_element/Element_Definition.hh" #include +#include +#include #include #include +#include +#include using namespace std; @@ -84,7 +89,7 @@ void runTest(rtt_dsxx::UnitTest &ut) { type_list.push_back(Element_Definition::HEXA_27); //----------------------------------------------------------------------------------------------// - cout << endl << "Building Elements for Test ---" << endl << endl; + cout << "\nBuilding Elements for Test ---\n\n"; list elem_defs; for (size_t i = 0; i < type_list.size(); i++) { elem_defs.emplace_back(type_list[i]); @@ -92,12 +97,12 @@ void runTest(rtt_dsxx::UnitTest &ut) { if (!elem_defs.back().invariant_satisfied()) { ostringstream msg; msg << "invariant_satisfied() failed for element i=" << i - << ", whose type is = " << elem_defs.back().get_name() << std::endl; + << ", whose type is = " << elem_defs.back().get_name() << '\n'; FAILMSG(msg.str()); } } //----------------------------------------------------------------------------------------------// - cout << "\nChecking Elements ---\n" << endl; + cout << "\nChecking Elements ---\n\n"; // CAREFUL HERE -- the order of the function calls must match the type_list order rtt_mesh_element_test::test_node(ut, elem_defs.front()); @@ -152,13 +157,13 @@ void runTest(rtt_dsxx::UnitTest &ut) { // Test the POLYGON element. //----------------------------------------------------------------------------------------------// - cout << "\nBuilding POLYGON Element ---\n" << endl; + cout << "\nBuilding POLYGON Element ---\n\n"; vector polyg_elem_defs; polyg_elem_defs.emplace_back(Element_Definition::BAR_2); - vector polyg_side_type(8, // number of sides - 0); // index into elem_defs + vector const polyg_side_type(8, // number of sides + 0); // index into elem_defs vector> polyg_side_nodes(8); for (unsigned side = 0; side < 8; ++side) { @@ -166,17 +171,17 @@ void runTest(rtt_dsxx::UnitTest &ut) { polyg_side_nodes[side].push_back((side + 1) % 8); } - Element_Definition polyg("OCT_8", // name - 2, // dimension - 8, // number_of_nodes - 8, // number_of_sides - polyg_elem_defs, polyg_side_type, polyg_side_nodes); + Element_Definition const polyg("OCT_8", // name + 2, // dimension + 8, // number_of_nodes + 8, // number_of_sides + polyg_elem_defs, polyg_side_type, polyg_side_nodes); //----------------------------------------------------------------------------------------------// // Test the POLYHEDRON element. //----------------------------------------------------------------------------------------------// - cout << "\nBuilding POLYHEDRON Element ---\n" << endl; + cout << "\nBuilding POLYHEDRON Element ---\n\n"; vector polyh_elem_defs; vector polyh_side_type; @@ -185,39 +190,39 @@ void runTest(rtt_dsxx::UnitTest &ut) { // First side is QUAD_4 polyh_elem_defs.emplace_back(Element_Definition::QUAD_4); polyh_side_type.push_back(0); - vector side0_nodes = {0, 1, 5, 4}; + vector const side0_nodes = {0, 1, 5, 4}; polyh_side_nodes.push_back(side0_nodes); // Next four sides are QUAD_5 polyh_elem_defs.emplace_back(Element_Definition::QUAD_5); polyh_side_type.push_back(1); - vector side1_nodes = {1, 0, 3, 2, 11}; + vector const side1_nodes = {1, 0, 3, 2, 11}; polyh_side_nodes.push_back(side1_nodes); polyh_side_type.push_back(1); - vector side2_nodes = {5, 1, 2, 6, 10}; + vector const side2_nodes = {5, 1, 2, 6, 10}; polyh_side_nodes.push_back(side2_nodes); polyh_side_type.push_back(1); - vector side3_nodes = {4, 5, 6, 7, 9}; + vector const side3_nodes = {4, 5, 6, 7, 9}; polyh_side_nodes.push_back(side3_nodes); polyh_side_type.push_back(1); - vector side4_nodes = {0, 4, 7, 3, 8}; + vector const side4_nodes = {0, 4, 7, 3, 8}; polyh_side_nodes.push_back(side4_nodes); // Last (sixth) side is QUAD_9 polyh_elem_defs.emplace_back(Element_Definition::QUAD_9); polyh_side_type.push_back(2); - vector side5_nodes = {3, 7, 6, 2, 8, 9, 10, 11, 12}; + vector const side5_nodes = {3, 7, 6, 2, 8, 9, 10, 11, 12}; polyh_side_nodes.push_back(side5_nodes); - Element_Definition polyh("polyhedron1", // name - 3, // dimension - 13, // number_of_nodes - 6, // number_of_sides - polyh_elem_defs, polyh_side_type, polyh_side_nodes); + Element_Definition const polyh("polyhedron1", // name + 3, // dimension + 13, // number_of_nodes + 6, // number_of_sides + polyh_elem_defs, polyh_side_type, polyh_side_nodes); //----------------------------------------------------------------------------------------------// // Merely attempting construction, with DBC active, will invoke a slew of precondition, @@ -238,7 +243,7 @@ namespace rtt_mesh_element_test { bool test_node(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the NODE element. using rtt_mesh_element::Element_Definition; - string ename = "NODE"; + string const ename = "NODE"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::NODE; ldum = ldum && elem_def.get_number_of_nodes() == 1; @@ -246,11 +251,11 @@ bool test_node(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definitio ldum = ldum && elem_def.get_number_of_face_nodes().size() == 0; if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -260,7 +265,7 @@ bool test_node(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definitio bool test_bar_2(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the BAR_2 element. using rtt_mesh_element::Element_Definition; - string ename = "BAR_2"; + string const ename = "BAR_2"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::BAR_2; ldum = ldum && elem_def.get_number_of_nodes() == 2; @@ -270,17 +275,17 @@ bool test_bar_2(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definiti ldum = ldum && elem_def.get_number_of_face_nodes()[0] == 1; ldum = ldum && elem_def.get_number_of_face_nodes()[1] == 1; constexpr int size = 1; - std::array s0 = {0}; - std::array s1 = {1}; + std::array const s0 = {0}; + std::array const s1 = {1}; ldum = ldum && (elem_def.get_side_nodes(0) == makeuv(s0)); ldum = ldum && (elem_def.get_side_nodes(1) == makeuv(s1)); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -290,7 +295,7 @@ bool test_bar_2(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definiti bool test_bar_3(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the BAR_3 element. using rtt_mesh_element::Element_Definition; - string ename = "BAR_3"; + string const ename = "BAR_3"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::BAR_3; ldum = ldum && elem_def.get_number_of_nodes() == 3; @@ -300,17 +305,17 @@ bool test_bar_3(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definiti ldum = ldum && elem_def.get_number_of_face_nodes()[0] == 1; ldum = ldum && elem_def.get_number_of_face_nodes()[1] == 1; constexpr int size = 1; - std::array s0 = {0}; - std::array s1 = {1}; + std::array const s0 = {0}; + std::array const s1 = {1}; ldum = ldum && (elem_def.get_side_nodes(0) == makeuv(s0)); ldum = ldum && (elem_def.get_side_nodes(1) == makeuv(s1)); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -320,7 +325,7 @@ bool test_bar_3(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definiti bool test_tri_3(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the TRI_3 element. using rtt_mesh_element::Element_Definition; - string ename = "TRI_3"; + string const ename = "TRI_3"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::TRI_3; ldum = ldum && elem_def.get_number_of_nodes() == 3; @@ -331,19 +336,19 @@ bool test_tri_3(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definiti ldum = ldum && elem_def.get_number_of_face_nodes()[1] == 2; ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 2; constexpr int size = 2; - std::array s0 = {0, 1}; - std::array s1 = {1, 2}; - std::array s2 = {2, 0}; + std::array const s0 = {0, 1}; + std::array const s1 = {1, 2}; + std::array const s2 = {2, 0}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -353,7 +358,7 @@ bool test_tri_3(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definiti bool test_tri_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the element. using rtt_mesh_element::Element_Definition; - string ename = "TRI_6"; + string const ename = "TRI_6"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::TRI_6; ldum = ldum && elem_def.get_number_of_nodes() == 6; @@ -364,19 +369,19 @@ bool test_tri_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definiti ldum = ldum && elem_def.get_number_of_face_nodes()[1] == 3; ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 3; constexpr int size = 3; - std::array s0 = {0, 1, 3}; - std::array s1 = {1, 2, 4}; - std::array s2 = {2, 0, 5}; + std::array const s0 = {0, 1, 3}; + std::array const s1 = {1, 2, 4}; + std::array const s2 = {2, 0, 5}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -386,7 +391,7 @@ bool test_tri_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definiti bool test_quad_4(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the QUAD_4 element. using rtt_mesh_element::Element_Definition; - string ename = "QUAD_4"; + string const ename = "QUAD_4"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::QUAD_4; ldum = ldum && elem_def.get_number_of_nodes() == 4; @@ -398,21 +403,21 @@ bool test_quad_4(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 2; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 2; constexpr int size = 2; - std::array s0 = {0, 1}; - std::array s1 = {1, 2}; - std::array s2 = {2, 3}; - std::array s3 = {3, 0}; + std::array const s0 = {0, 1}; + std::array const s1 = {1, 2}; + std::array const s2 = {2, 3}; + std::array const s3 = {3, 0}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); ldum = ldum && elem_def.get_side_nodes(3) == makeuv(s3); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -422,7 +427,7 @@ bool test_quad_4(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit bool test_quad_5(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the QUAD_5 element. using rtt_mesh_element::Element_Definition; - string ename = "QUAD_5"; + string const ename = "QUAD_5"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::QUAD_5; @@ -437,10 +442,10 @@ bool test_quad_5(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 2; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 3; - std::array s0 = {0, 1}; - std::array s1 = {1, 2}; - std::array s2 = {2, 3}; - std::array s3 = {3, 0, 4}; + std::array const s0 = {0, 1}; + std::array const s1 = {1, 2}; + std::array const s2 = {2, 3}; + std::array const s3 = {3, 0, 4}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -448,11 +453,11 @@ bool test_quad_5(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -469,7 +474,7 @@ bool test_quad_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit if (elem_def.get_type() == Element_Definition::QUAD_6 || elem_def.get_type() == Element_Definition::QUAD_6a) { - string ename = "QUAD_6"; + string const ename = "QUAD_6"; ldum = ldum && elem_def.get_name() == ename; ldum = ldum && elem_def.get_number_of_nodes() == 6; @@ -483,16 +488,16 @@ bool test_quad_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 3; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 3; - std::array s0 = {0, 1}; - std::array s1 = {1, 2}; - std::array s2 = {2, 3, 4}; - std::array s3 = {3, 0, 5}; + std::array const s0 = {0, 1}; + std::array const s1 = {1, 2}; + std::array const s2 = {2, 3, 4}; + std::array const s3 = {3, 0, 5}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); ldum = ldum && elem_def.get_side_nodes(3) == makeuv(s3); } else { - string ename = "QUAD_6o"; + string const ename = "QUAD_6o"; ldum = ldum && elem_def.get_name() == ename; ldum = ldum && elem_def.get_number_of_nodes() == 6; @@ -506,10 +511,10 @@ bool test_quad_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 2; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 3; - std::array s0 = {0, 1}; - std::array s1 = {1, 2, 4}; - std::array s2 = {2, 3}; - std::array s3 = {3, 0, 5}; + std::array const s0 = {0, 1}; + std::array const s1 = {1, 2, 4}; + std::array const s2 = {2, 3}; + std::array const s3 = {3, 0, 5}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -518,11 +523,11 @@ bool test_quad_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit if (ldum) { ostringstream message; - message << " QUAD_6 element OK." << endl; + message << " QUAD_6 element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in QUAD_6 element." << endl; + message << "Error in QUAD_6 element.\n"; FAILMSG(message.str()); } return ldum; @@ -532,7 +537,7 @@ bool test_quad_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit bool test_quad_7(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the QUAD_7 element. using rtt_mesh_element::Element_Definition; - string ename = "QUAD_7"; + string const ename = "QUAD_7"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::QUAD_7; @@ -547,10 +552,10 @@ bool test_quad_7(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 3; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 3; - std::array s0 = {0, 1}; - std::array s1 = {1, 2, 4}; - std::array s2 = {2, 3, 5}; - std::array s3 = {3, 0, 6}; + std::array const s0 = {0, 1}; + std::array const s1 = {1, 2, 4}; + std::array const s2 = {2, 3, 5}; + std::array const s3 = {3, 0, 6}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -558,11 +563,11 @@ bool test_quad_7(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -572,7 +577,7 @@ bool test_quad_7(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit bool test_quad_8(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the QUAD_8 element. using rtt_mesh_element::Element_Definition; - string ename = "QUAD_8"; + string const ename = "QUAD_8"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::QUAD_8; ldum = ldum && elem_def.get_number_of_nodes() == 8; @@ -584,21 +589,21 @@ bool test_quad_8(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 3; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 3; constexpr int size = 3; - std::array s0 = {0, 1, 4}; - std::array s1 = {1, 2, 5}; - std::array s2 = {2, 3, 6}; - std::array s3 = {3, 0, 7}; + std::array const s0 = {0, 1, 4}; + std::array const s1 = {1, 2, 5}; + std::array const s2 = {2, 3, 6}; + std::array const s3 = {3, 0, 7}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); ldum = ldum && elem_def.get_side_nodes(3) == makeuv(s3); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -608,7 +613,7 @@ bool test_quad_8(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit bool test_quad_9(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the QUAD_9 element. using rtt_mesh_element::Element_Definition; - string ename = "QUAD_9"; + string const ename = "QUAD_9"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::QUAD_9; ldum = ldum && elem_def.get_number_of_nodes() == 9; @@ -620,21 +625,21 @@ bool test_quad_9(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 3; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 3; constexpr int size = 3; - array s0 = {0, 1, 4}; - array s1 = {1, 2, 5}; - array s2 = {2, 3, 6}; - array s3 = {3, 0, 7}; + std::array const s0 = {0, 1, 4}; + std::array const s1 = {1, 2, 5}; + std::array const s2 = {2, 3, 6}; + std::array const s3 = {3, 0, 7}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); ldum = ldum && elem_def.get_side_nodes(3) == makeuv(s3); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -644,7 +649,7 @@ bool test_quad_9(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit bool test_tetra_4(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the TETRA_4 element. using rtt_mesh_element::Element_Definition; - string ename = "TETRA_4"; + string const ename = "TETRA_4"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::TETRA_4; ldum = ldum && elem_def.get_number_of_nodes() == 4; @@ -656,21 +661,21 @@ bool test_tetra_4(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 3; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 3; constexpr int size = 3; - array s0 = {0, 2, 1}; - array s1 = {0, 1, 3}; - array s2 = {1, 2, 3}; - array s3 = {2, 0, 3}; + std::array const s0 = {0, 2, 1}; + std::array const s1 = {0, 1, 3}; + std::array const s2 = {1, 2, 3}; + std::array const s3 = {2, 0, 3}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); ldum = ldum && elem_def.get_side_nodes(3) == makeuv(s3); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -680,7 +685,7 @@ bool test_tetra_4(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini bool test_tetra_10(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the TETRA_10 element. using rtt_mesh_element::Element_Definition; - string ename = "TETRA_10"; + string const ename = "TETRA_10"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::TETRA_10; ldum = ldum && elem_def.get_number_of_nodes() == 10; @@ -692,21 +697,21 @@ bool test_tetra_10(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defin ldum = ldum && elem_def.get_number_of_face_nodes()[2] == 6; ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 6; constexpr int size = 6; - array s0 = {0, 2, 1, 6, 5, 4}; - array s1 = {0, 1, 3, 4, 8, 7}; - array s2 = {1, 2, 3, 5, 9, 8}; - array s3 = {2, 0, 3, 6, 7, 9}; + std::array const s0 = {0, 2, 1, 6, 5, 4}; + std::array const s1 = {0, 1, 3, 4, 8, 7}; + std::array const s2 = {1, 2, 3, 5, 9, 8}; + std::array const s3 = {2, 0, 3, 6, 7, 9}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); ldum = ldum && elem_def.get_side_nodes(3) == makeuv(s3); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -716,7 +721,7 @@ bool test_tetra_10(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defin bool test_pyra_5(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the PYRA_5 element. using rtt_mesh_element::Element_Definition; - string ename = "PYRA_5"; + string const ename = "PYRA_5"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::PYRA_5; ldum = ldum && elem_def.get_number_of_nodes() == 5; @@ -730,12 +735,12 @@ bool test_pyra_5(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[3] == 3; ldum = ldum && elem_def.get_number_of_face_nodes()[4] == 3; constexpr int sizeq = 4; - array s0 = {0, 3, 2, 1}; + array const s0 = {0, 3, 2, 1}; constexpr int sizet = 3; - array s1 = {0, 1, 4}; - array s2 = {1, 2, 4}; - array s3 = {2, 3, 4}; - array s4 = {3, 0, 4}; + array const s1 = {0, 1, 4}; + array const s2 = {1, 2, 4}; + array const s3 = {2, 3, 4}; + array const s4 = {3, 0, 4}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -743,11 +748,11 @@ bool test_pyra_5(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_side_nodes(4) == makeuv(s4); if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -757,7 +762,7 @@ bool test_pyra_5(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit bool test_pyra_14(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the PYRA_14 element. using rtt_mesh_element::Element_Definition; - string ename = "PYRA_14"; + string const ename = "PYRA_14"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::PYRA_14; ldum = ldum && elem_def.get_number_of_nodes() == 14; @@ -765,12 +770,12 @@ bool test_pyra_14(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini ldum = ldum && elem_def.get_number_of_sides() == 5; ldum = ldum && elem_def.get_side_type(0).get_type() == Element_Definition::QUAD_8; constexpr int sizeq = 8; - array s0 = {0, 3, 2, 1, 8, 7, 6, 5}; + array const s0 = {0, 3, 2, 1, 8, 7, 6, 5}; constexpr int sizet = 6; - array s1 = {0, 1, 4, 5, 10, 9}; - array s2 = {1, 2, 4, 6, 11, 10}; - array s3 = {2, 3, 4, 7, 12, 11}; - array s4 = {3, 0, 4, 8, 9, 12}; + array const s1 = {0, 1, 4, 5, 10, 9}; + array const s2 = {1, 2, 4, 6, 11, 10}; + array const s3 = {2, 3, 4, 7, 12, 11}; + array const s4 = {3, 0, 4, 8, 9, 12}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -784,11 +789,11 @@ bool test_pyra_14(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini ldum = ldum && elem_def.get_number_of_face_nodes()[4] == 6; if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -798,7 +803,7 @@ bool test_pyra_14(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini bool test_penta_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the PENTA_6 element. using rtt_mesh_element::Element_Definition; - string ename = "PENTA_6"; + string const ename = "PENTA_6"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::PENTA_6; ldum = ldum && elem_def.get_number_of_nodes() == 6; @@ -809,12 +814,12 @@ bool test_penta_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini for (int j = 3; j < 5; ++j) ldum = ldum && elem_def.get_side_type(j).get_type() == Element_Definition::TRI_3; constexpr int sizeq = 4; - array s0 = {0, 1, 4, 3}; - array s1 = {1, 2, 5, 4}; - array s2 = {2, 0, 3, 5}; + array const s0 = {0, 1, 4, 3}; + array const s1 = {1, 2, 5, 4}; + array const s2 = {2, 0, 3, 5}; constexpr int sizet = 3; - array s3 = {0, 2, 1}; - array s4 = {3, 4, 5}; + array const s3 = {0, 2, 1}; + array const s4 = {3, 4, 5}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -828,11 +833,11 @@ bool test_penta_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini ldum = ldum && elem_def.get_number_of_face_nodes()[4] == 3; if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -842,7 +847,7 @@ bool test_penta_6(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini bool test_penta_15(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the PENTA_15 element. using rtt_mesh_element::Element_Definition; - string ename = "PENTA_15"; + string const ename = "PENTA_15"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::PENTA_15; ldum = ldum && elem_def.get_number_of_nodes() == 15; @@ -853,12 +858,12 @@ bool test_penta_15(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defin for (int j = 3; j < 5; ++j) ldum = ldum && elem_def.get_side_type(j).get_type() == Element_Definition::TRI_6; constexpr int sizeq = 8; - array s0 = {0, 1, 4, 3, 6, 10, 12, 9}; - array s1 = {1, 2, 5, 4, 7, 11, 13, 10}; - array s2 = {2, 0, 3, 5, 8, 9, 14, 11}; + array const s0 = {0, 1, 4, 3, 6, 10, 12, 9}; + array const s1 = {1, 2, 5, 4, 7, 11, 13, 10}; + array const s2 = {2, 0, 3, 5, 8, 9, 14, 11}; constexpr int sizet = 6; - array s3 = {0, 2, 1, 8, 7, 6}; - array s4 = {3, 4, 5, 12, 13, 14}; + array const s3 = {0, 2, 1, 8, 7, 6}; + array const s4 = {3, 4, 5, 12, 13, 14}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -872,11 +877,11 @@ bool test_penta_15(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defin ldum = ldum && elem_def.get_number_of_face_nodes()[4] == 6; if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -886,7 +891,7 @@ bool test_penta_15(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defin bool test_penta_18(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the PENTA_18 element. using rtt_mesh_element::Element_Definition; - string ename = "PENTA_18"; + string const ename = "PENTA_18"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::PENTA_18; ldum = ldum && elem_def.get_number_of_nodes() == 18; @@ -897,12 +902,12 @@ bool test_penta_18(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defin for (int j = 3; j < 5; ++j) ldum = ldum && elem_def.get_side_type(j).get_type() == Element_Definition::TRI_6; constexpr int sizeq = 9; - array s0 = {0, 1, 4, 3, 6, 10, 12, 9, 15}; - array s1 = {1, 2, 5, 4, 7, 11, 13, 10, 16}; - array s2 = {2, 0, 3, 5, 8, 9, 14, 11, 17}; + array const s0 = {0, 1, 4, 3, 6, 10, 12, 9, 15}; + array const s1 = {1, 2, 5, 4, 7, 11, 13, 10, 16}; + array const s2 = {2, 0, 3, 5, 8, 9, 14, 11, 17}; constexpr int sizet = 6; - array s3 = {0, 2, 1, 8, 7, 6}; - array s4 = {3, 4, 5, 12, 13, 14}; + array const s3 = {0, 2, 1, 8, 7, 6}; + array const s4 = {3, 4, 5, 12, 13, 14}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -917,11 +922,11 @@ bool test_penta_18(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defin if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -931,7 +936,7 @@ bool test_penta_18(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defin bool test_hexa_8(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the HEXA_8 element. using rtt_mesh_element::Element_Definition; - string ename = "HEXA_8"; + string const ename = "HEXA_8"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::HEXA_8; ldum = ldum && elem_def.get_number_of_nodes() == 8; @@ -940,12 +945,12 @@ bool test_hexa_8(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit for (int j = 0; j < 6; ++j) ldum = ldum && elem_def.get_side_type(j).get_type() == Element_Definition::QUAD_4; constexpr int size = 4; - array s0 = {0, 3, 2, 1}; - array s1 = {0, 4, 7, 3}; - array s2 = {2, 3, 7, 6}; - array s3 = {1, 2, 6, 5}; - array s4 = {0, 1, 5, 4}; - array s5 = {4, 5, 6, 7}; + std::array const s0 = {0, 3, 2, 1}; + std::array const s1 = {0, 4, 7, 3}; + std::array const s2 = {2, 3, 7, 6}; + std::array const s3 = {1, 2, 6, 5}; + std::array const s4 = {0, 1, 5, 4}; + std::array const s5 = {4, 5, 6, 7}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -961,11 +966,11 @@ bool test_hexa_8(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit ldum = ldum && elem_def.get_number_of_face_nodes()[5] == 4; if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -975,7 +980,7 @@ bool test_hexa_8(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definit bool test_hexa_20(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the HEXA_20 element. using rtt_mesh_element::Element_Definition; - string ename = "HEXA_20"; + string const ename = "HEXA_20"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::HEXA_20; ldum = ldum && elem_def.get_number_of_nodes() == 20; @@ -984,12 +989,12 @@ bool test_hexa_20(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini for (int j = 0; j < 6; ++j) ldum = ldum && elem_def.get_side_type(j).get_type() == Element_Definition::QUAD_8; constexpr int size = 8; - array s0 = {0, 3, 2, 1, 11, 10, 9, 8}; - array s1 = {0, 4, 7, 3, 12, 19, 15, 11}; - array s2 = {2, 3, 7, 6, 10, 15, 18, 14}; - array s3 = {1, 2, 6, 5, 9, 14, 17, 13}; - array s4 = {0, 1, 5, 4, 8, 13, 16, 12}; - array s5 = {4, 5, 6, 7, 16, 17, 18, 19}; + std::array const s0 = {0, 3, 2, 1, 11, 10, 9, 8}; + std::array const s1 = {0, 4, 7, 3, 12, 19, 15, 11}; + std::array const s2 = {2, 3, 7, 6, 10, 15, 18, 14}; + std::array const s3 = {1, 2, 6, 5, 9, 14, 17, 13}; + std::array const s4 = {0, 1, 5, 4, 8, 13, 16, 12}; + std::array const s5 = {4, 5, 6, 7, 16, 17, 18, 19}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -1006,11 +1011,11 @@ bool test_hexa_20(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; @@ -1020,7 +1025,7 @@ bool test_hexa_20(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini bool test_hexa_27(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Definition &elem_def) { // Test the HEXA_27 element. using rtt_mesh_element::Element_Definition; - string ename = "HEXA_27"; + string const ename = "HEXA_27"; bool ldum = elem_def.get_name() == ename; ldum = ldum && elem_def.get_type() == Element_Definition::HEXA_27; ldum = ldum && elem_def.get_number_of_nodes() == 27; @@ -1029,12 +1034,12 @@ bool test_hexa_27(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini for (int j = 0; j < 6; ++j) ldum = ldum && elem_def.get_side_type(j).get_type() == Element_Definition::QUAD_9; constexpr int size = 9; - array s0 = {0, 3, 2, 1, 11, 10, 9, 8, 20}; - array s1 = {0, 4, 7, 3, 12, 19, 15, 11, 21}; - array s2 = {2, 3, 7, 6, 10, 15, 18, 14, 22}; - array s3 = {1, 2, 6, 5, 9, 14, 17, 13, 23}; - array s4 = {0, 1, 5, 4, 8, 13, 16, 12, 24}; - array s5 = {4, 5, 6, 7, 16, 17, 18, 19, 25}; + std::array const s0 = {0, 3, 2, 1, 11, 10, 9, 8, 20}; + std::array const s1 = {0, 4, 7, 3, 12, 19, 15, 11, 21}; + std::array const s2 = {2, 3, 7, 6, 10, 15, 18, 14, 22}; + std::array const s3 = {1, 2, 6, 5, 9, 14, 17, 13, 23}; + std::array const s4 = {0, 1, 5, 4, 8, 13, 16, 12, 24}; + std::array const s5 = {4, 5, 6, 7, 16, 17, 18, 19, 25}; ldum = ldum && elem_def.get_side_nodes(0) == makeuv(s0); ldum = ldum && elem_def.get_side_nodes(1) == makeuv(s1); ldum = ldum && elem_def.get_side_nodes(2) == makeuv(s2); @@ -1069,11 +1074,11 @@ bool test_hexa_27(rtt_dsxx::UnitTest &ut, const rtt_mesh_element::Element_Defini if (ldum) { ostringstream message; - message << ename << " Element OK." << endl; + message << ename << " Element OK.\n"; PASSMSG(message.str()); } else { ostringstream message; - message << "Error in " << ename << " Element." << endl; + message << "Error in " << ename << " Element.\n"; FAILMSG(message.str()); } return ldum; diff --git a/src/ode/quad.i.hh b/src/ode/quad.i.hh index 09ce3dcb5..61d4cae40 100644 --- a/src/ode/quad.i.hh +++ b/src/ode/quad.i.hh @@ -50,7 +50,7 @@ typename Function_Traits::return_type quad(Function func, double x1, d using Field = typename Function_Traits::return_type; - double x = x1; + double x = x1; // NOLINT(misc-const-correctness) double h = x2 - x1; vector y(1, Field(0.0)); vector dydx(1); diff --git a/src/ode/test/tstrkqs.cc b/src/ode/test/tstrkqs.cc index 27c56e0cd..0f0fb55c2 100644 --- a/src/ode/test/tstrkqs.cc +++ b/src/ode/test/tstrkqs.cc @@ -23,8 +23,12 @@ using namespace rtt_dsxx; // TESTS //------------------------------------------------------------------------------------------------// -static void ederivs(double /*x*/, const vector &y, vector &dydx) { dydx[0] = y[0]; } +// Instead of declaring ederivs 'static', use an unnamed namespece to limit the scope to this file. +namespace { +void ederivs(double /*x*/, const vector &y, vector &dydx) { dydx[0] = y[0]; } +} // namespace +//------------------------------------------------------------------------------------------------// void tstrkqs(UnitTest &ut) { vector y(1, 1.0); vector dydx(1, 1.0); @@ -41,7 +45,7 @@ void tstrkqs(UnitTest &ut) { y[0] = 1.0; dydx[0] = 1.0; x = 0.0; - vector yscal(1, 1.0); + vector const yscal(1, 1.0); double hdid, hnext; rkqs(y, dydx, x, 1.0, numeric_limits::epsilon(), yscal, hdid, hnext, ederivs); diff --git a/src/units/MathConstants.hh b/src/units/MathConstants.hh index b3a338e50..00e3e6de3 100644 --- a/src/units/MathConstants.hh +++ b/src/units/MathConstants.hh @@ -1,5 +1,5 @@ //--------------------------------------------*-C++-*---------------------------------------------// -/*! \file MathConstants.hh +/*! \file units/MathConstants.hh * \author Kelly Thompson * \brief Provide a single place where physical constants (pi, speed of light, etc) are defined. * \date Fri Nov 07 10:04:52 2003