From db8661ca1f120a8eabdca8ac886fe5ae1c714a64 Mon Sep 17 00:00:00 2001 From: Chris Siefert Date: Tue, 28 May 2024 10:32:04 -0600 Subject: [PATCH 01/68] Tpetra: Adding prorotype aztec ordering checker --- .../tpetra/core/src/Tpetra_Import_Util.hpp | 71 ++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/packages/tpetra/core/src/Tpetra_Import_Util.hpp b/packages/tpetra/core/src/Tpetra_Import_Util.hpp index 5c62cc43cb29..ce0cf642b034 100644 --- a/packages/tpetra/core/src/Tpetra_Import_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_Util.hpp @@ -229,7 +229,7 @@ getRemotePIDs (const Tpetra::Import& Importer, } } - + /* Check some of the validity of an Import object WARNING: This is a debugging routine only. */ template @@ -477,6 +477,75 @@ checkImportValidity (const Tpetra::Import& Impo } +/* Check to see that the import object's target map respects AztecOO/ML ordering */ +template +bool +checkAztecOOMLOrdering (const Tpetra::Import& Importer) +{ + + Teuchos::RCP > source = Importer.getSourceMap(); + Teuchos::RCP > target = Importer.getTargetMap(); + + // Get the (pid, gid) pairs (with locals flagged as -1) + Teuchos::Array > gpids; + getPidGidPairs (Importer, gpids, true); + + bool is_ok=true; + bool is_local = true; + int last_PID = -1; + GlobalOrdinal INVALID = Teuchos::OrdinalTraits::invalid(); + GlobalOrdinal last_GID = Teuchos::OrdinalTraits::invalid(); + + for(size_t i=0; i<(size_t) gpids.size(); i++) { + int pid = gpids[i].first; + GlobalOrdinal gid = gpids[i].second; + + if(is_local == false && pid == -1) { + // Out-of-order local + is_ok = false; + break; + } + else if(pid == --1) { + // Local, matching PID + if(source->getGlobalElement(i) != target->getGlobalElement(i) { + // GIDs don't match, though the PIDs do + is_ok == false; + break; + } + } + else { + // Off-rank section + is_local = false; + if(last_PID == -1) { + last_PID = pid; + last_GID = gid; + } + else if(pid < last_PID) { + // PIDs out of order + is_ok=false; + break; + } + else if(pid == last_PID) { + if(gid < last_GID) { + // Same rank, but gids out of order + is_ok=false; + break; + } + + } + else { + // New rank + last_PID = pid; + last_GID = gid; + } + } + } + + return is_ok; +} + + + } // namespace Import_Util } // namespace Tpetra From 93569618173da917745213d91204b6e8efdcde08 Mon Sep 17 00:00:00 2001 From: Chris Siefert Date: Wed, 29 May 2024 09:43:24 -0600 Subject: [PATCH 02/68] Tpetra: Minor Fixes --- packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp | 3 ++- packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp index 84a31d969815..ec7520ecaad7 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp @@ -1758,7 +1758,8 @@ namespace Tpetra { /// \param remotePIDs [out] The process ranks corresponding to the /// column Map's "remote" (not on the calling process in the /// domain Map) indices. - void makeColMap (Teuchos::Array& remotePIDs); + /// \param userDomainMap [in] User-provided alternative to the domainMap. + void makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap = getDomainMap()); /// \brief Convert column indices from global to local. /// diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp index 4cf1a13a7405..551a00646ba2 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp @@ -4384,7 +4384,7 @@ namespace Tpetra { template void CrsGraph:: - makeColMap (Teuchos::Array& remotePIDs) + makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap) { using Details::ProfilingRegion; using std::endl; @@ -4423,7 +4423,7 @@ namespace Tpetra { std::ostringstream errStrm; const int lclErrCode = Details::makeColMap (colMap, remotePIDs, - getDomainMap (), *this, sortEachProcsGids, &errStrm); + userDomainMap, *this, sortEachProcsGids, &errStrm); auto comm = this->getComm (); if (! comm.is_null ()) { const int lclSuccess = (lclErrCode == 0) ? 1 : 0; @@ -4443,7 +4443,7 @@ namespace Tpetra { } else { (void) Details::makeColMap (colMap, remotePIDs, - getDomainMap (), *this, sortEachProcsGids, nullptr); + userDomainMap, *this, sortEachProcsGids, nullptr); } // See above. We want to admit the possibility of makeColMap // actually revising an existing column Map, even though that From a1105eb16b8c21abcaa249c88192191d703c14cc Mon Sep 17 00:00:00 2001 From: kliegeois Date: Wed, 29 May 2024 10:12:05 -0600 Subject: [PATCH 03/68] minor fixes in checkAztecOOMLOrdering --- .../tpetra/core/src/Tpetra_Import_Util.hpp | 83 +++++++++---------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Import_Util.hpp b/packages/tpetra/core/src/Tpetra_Import_Util.hpp index ce0cf642b034..71c92b4bbe49 100644 --- a/packages/tpetra/core/src/Tpetra_Import_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_Util.hpp @@ -487,7 +487,7 @@ checkAztecOOMLOrdering (const Tpetra::Import& I Teuchos::RCP > target = Importer.getTargetMap(); // Get the (pid, gid) pairs (with locals flagged as -1) - Teuchos::Array > gpids; + Teuchos::Array > gpids; getPidGidPairs (Importer, gpids, true); bool is_ok=true; @@ -497,48 +497,47 @@ checkAztecOOMLOrdering (const Tpetra::Import& I GlobalOrdinal last_GID = Teuchos::OrdinalTraits::invalid(); for(size_t i=0; i<(size_t) gpids.size(); i++) { - int pid = gpids[i].first; - GlobalOrdinal gid = gpids[i].second; + int pid = gpids[i].first; + GlobalOrdinal gid = gpids[i].second; - if(is_local == false && pid == -1) { - // Out-of-order local - is_ok = false; - break; - } - else if(pid == --1) { - // Local, matching PID - if(source->getGlobalElement(i) != target->getGlobalElement(i) { - // GIDs don't match, though the PIDs do - is_ok == false; - break; - } - } - else { - // Off-rank section - is_local = false; - if(last_PID == -1) { - last_PID = pid; - last_GID = gid; - } - else if(pid < last_PID) { - // PIDs out of order - is_ok=false; - break; - } - else if(pid == last_PID) { - if(gid < last_GID) { - // Same rank, but gids out of order - is_ok=false; - break; - } - - } - else { - // New rank - last_PID = pid; - last_GID = gid; - } - } + if(is_local == false && pid == -1) { + // Out-of-order local + is_ok = false; + break; + } + else if(pid == -1) { + // Local, matching PID + if(source->getGlobalElement(i) != target->getGlobalElement(i)) { + // GIDs don't match, though the PIDs do + is_ok = false; + break; + } + } + else { + // Off-rank section + is_local = false; + if(last_PID == -1) { + last_PID = pid; + last_GID = gid; + } + else if(pid < last_PID) { + // PIDs out of order + is_ok=false; + break; + } + else if(pid == last_PID) { + if(gid < last_GID) { + // Same rank, but gids out of order + is_ok=false; + break; + } + } + else { + // New rank + last_PID = pid; + last_GID = gid; + } + } } return is_ok; From 1670bfdcc1e9756a3f0d7ba7684b206700c68497 Mon Sep 17 00:00:00 2001 From: Chris Siefert Date: Wed, 29 May 2024 11:11:58 -0600 Subject: [PATCH 04/68] Tpetra: adding modifications --- packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp | 2 +- packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp | 8 ++++++-- packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp | 5 +++-- .../tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp index ec7520ecaad7..5face5335bf3 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp @@ -1759,7 +1759,7 @@ namespace Tpetra { /// column Map's "remote" (not on the calling process in the /// domain Map) indices. /// \param userDomainMap [in] User-provided alternative to the domainMap. - void makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap = getDomainMap()); + void makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap = Teuchos::null); /// \brief Convert column indices from global to local. /// diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp index 551a00646ba2..25a6e23d4d1d 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp @@ -4390,6 +4390,7 @@ namespace Tpetra { using std::endl; const char tfecfFuncName[] = "makeColMap"; + ProfilingRegion regionSortAndMerge ("Tpetra::CrsGraph::makeColMap"); std::unique_ptr prefix; if (verbose_) { @@ -4399,6 +4400,9 @@ namespace Tpetra { std::cerr << os.str(); } + // If the user doesn't provide a domainMap we use the one from this matrix + Teuchos::RCP myDomainMap = userDomainMap.is_null() ? getDomainMap() : userDomainMap; + // this->colMap_ should be null at this point, but we accept the // future possibility that it might not be (esp. if we decide // later to support graph structure changes after first @@ -4423,7 +4427,7 @@ namespace Tpetra { std::ostringstream errStrm; const int lclErrCode = Details::makeColMap (colMap, remotePIDs, - userDomainMap, *this, sortEachProcsGids, &errStrm); + myDomainMap, *this, sortEachProcsGids, &errStrm); auto comm = this->getComm (); if (! comm.is_null ()) { const int lclSuccess = (lclErrCode == 0) ? 1 : 0; @@ -4443,7 +4447,7 @@ namespace Tpetra { } else { (void) Details::makeColMap (colMap, remotePIDs, - userDomainMap, *this, sortEachProcsGids, nullptr); + myDomainMap, *this, sortEachProcsGids, nullptr); } // See above. We want to admit the possibility of makeColMap // actually revising an existing column Map, even though that diff --git a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp index 4e48fbc597ca..f056fb0ea453 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp @@ -260,10 +260,11 @@ void FECrsGraph::doOwnedPlusSharedToOwned(con this->doExport(*this,*ownedRowsImporter_,CM,true); // Under the "if you own an element, you own at least one of its nodes" assumption, - // we can start by making a columnmap for ownedPlusShared + // we can start by making a columnmap for ownedPlusShared. We use the ownedMap to + // ensure AztecOO/ML ordering of the final output colmap if(!this->hasColMap()) { Teuchos::Array remotePIDs (0); - this->makeColMap(remotePIDs); + this->makeColMap(remotePIDs,ownedDomainMap_); } // Now run CrsGraph's fillComplete to get the final importer diff --git a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp index 93c3cfb4f884..cff9d96c8e34 100644 --- a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp +++ b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp @@ -578,14 +578,17 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble2D_OPSDomain, LO, GO, Nod CG g11(pack.uniqueMap,9); g11.doExport(g0,import,Tpetra::INSERT); g11.fillComplete(pack.uniqueMap,pack.uniqueMap); + out<<"Comparing g11/g1"< Date: Thu, 30 May 2024 13:58:18 -0600 Subject: [PATCH 05/68] Add ability to precondition block solves within hierarchical block solver --- ...chicalGaussSeidelPreconditionerFactory.cpp | 38 +++++++++++++++---- ...chicalGaussSeidelPreconditionerFactory.hpp | 6 ++- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp index 144b82069411..ff87bf0c714d 100644 --- a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp +++ b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp @@ -271,24 +271,42 @@ LinearOp HierarchicalGaussSeidelPreconditionerFactory::buildPreconditionerOperat for (auto [hierarchicalBlockNum, blocks] : blockToRow) { auto A_bb = extractSubblockMatrix(blo, blocks, blocks); blockToInvOp[hierarchicalBlockNum] = this->buildBlockInverse( - *blockToInverse.at(hierarchicalBlockNum), A_bb, state, hierarchicalBlockNum); + *blockToInverse.at(hierarchicalBlockNum), blockToPreconditioner.at(hierarchicalBlockNum), + A_bb, state, hierarchicalBlockNum); } return Teuchos::rcp(new NestedBlockGS(blockToRow, blockToInvOp, blo, useLowerTriangle)); } LinearOp HierarchicalGaussSeidelPreconditionerFactory::buildBlockInverse( - const InverseFactory& invFact, const BlockedLinearOp& matrix, BlockPreconditionerState& state, + const InverseFactory& invFact, Teuchos::RCP& precFact, + const BlockedLinearOp& matrix, BlockPreconditionerState& state, int hierarchicalBlockNum) const { std::stringstream ss; ss << "hierarchical_block_" << hierarchicalBlockNum; - ModifiableLinearOp& invOp = state.getModifiableOp(ss.str()); + ModifiableLinearOp& invOp = state.getModifiableOp(ss.str()); + ModifiableLinearOp& precOp = state.getModifiableOp("prec_" + ss.str()); - if (invOp == Teuchos::null) { - invOp = buildInverse(invFact, matrix); - } else { - rebuildInverse(invFact, matrix, invOp); + if (precFact != Teuchos::null) { + if (precOp == Teuchos::null) { + precOp = precFact->buildInverse(matrix); + state.addModifiableOp("prec_" + ss.str(), precOp); + } else { + Teko::rebuildInverse(*precFact, matrix, precOp); + } + } + + if (invOp == Teuchos::null) + if (precOp.is_null()) + invOp = Teko::buildInverse(invFact, matrix); + else + invOp = Teko::buildInverse(invFact, matrix, precOp); + else { + if (precOp.is_null()) + Teko::rebuildInverse(invFact, matrix, invOp); + else + Teko::rebuildInverse(invFact, matrix, precOp, invOp); } return invOp; @@ -313,6 +331,12 @@ void HierarchicalGaussSeidelPreconditionerFactory::initializeFromParameterList( ss.str()); auto invStr = hierarchicalParams.get("Inverse Type"); blockToInverse[*hierarchicalBlockNumber] = invLib->getInverseFactory(invStr); + + blockToPreconditioner[*hierarchicalBlockNumber] = Teuchos::null; + if (hierarchicalParams.isParameter("Preconditioner Type")) { + auto precStr = hierarchicalParams.get("Preconditioner Type"); + blockToPreconditioner[*hierarchicalBlockNumber] = invLib->getInverseFactory(precStr); + } } useLowerTriangle = false; diff --git a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp index b0ab109c7607..6459cc83849b 100644 --- a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp +++ b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp @@ -104,11 +104,13 @@ class HierarchicalGaussSeidelPreconditionerFactory : public BlockPreconditionerF using BlockPreconditionerFactory::buildPreconditionerOperator; private: - LinearOp buildBlockInverse(const InverseFactory& invFact, const BlockedLinearOp& matrix, - BlockPreconditionerState& state, int hierarchicalBlockNum) const; + LinearOp buildBlockInverse(const InverseFactory& invFact, Teuchos::RCP& precFact, + const BlockedLinearOp& matrix, BlockPreconditionerState& state, + int hierarchicalBlockNum) const; std::map> blockToRow; std::map> blockToInverse; + std::map> blockToPreconditioner; mutable std::map blockToInvOp; bool useLowerTriangle = false; From 81b7b4b39ce216af1e2dedb2909529b00416fde5 Mon Sep 17 00:00:00 2001 From: malphil Date: Thu, 30 May 2024 14:00:48 -0600 Subject: [PATCH 06/68] Attempt to use preconditioned block solves in SIMPLE unit test --- .../teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp b/packages/teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp index 6f880c95d84b..336e85df914b 100644 --- a/packages/teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp +++ b/packages/teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp @@ -781,10 +781,12 @@ bool tSIMPLEPreconditionerFactory_tpetra::test_hierarchicalSolves(int verbosity, ifl.sublist("HBGS").set("Type", "Hierarchical Block Gauss-Seidel"); ifl.sublist("HBGS").sublist("Hierarchical Block 1").set("Included Subblocks", "1,2"); - ifl.sublist("HBGS").sublist("Hierarchical Block 1").set("Inverse Type", "SIMPLE"); + ifl.sublist("HBGS").sublist("Hierarchical Block 1").set("Inverse Type", "Belos"); + ifl.sublist("HBGS").sublist("Hierarchical Block 1").set("Preconditioner Type", "SIMPLE"); ifl.sublist("HBGS").sublist("Hierarchical Block 2").set("Included Subblocks", "3"); - ifl.sublist("HBGS").sublist("Hierarchical Block 2").set("Inverse Type", "SINGLE_BGS"); + ifl.sublist("HBGS").sublist("Hierarchical Block 2").set("Inverse Type", "Belos"); + ifl.sublist("HBGS").sublist("Hierarchical Block 2").set("Preconditioner Type", "SINGLE_BGS"); ifl.sublist("SIMPLE").set("Type", "NS SIMPLE"); ifl.sublist("SIMPLE").set("Inverse Velocity Type", "Belos"); From 2e90552a61252cae4c8aa0866f0d838a66c79406 Mon Sep 17 00:00:00 2001 From: malphil Date: Thu, 30 May 2024 14:12:32 -0600 Subject: [PATCH 07/68] Const-correctness fix --- .../src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp | 2 +- .../src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp index ff87bf0c714d..58b41ac1dc30 100644 --- a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp +++ b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp @@ -279,7 +279,7 @@ LinearOp HierarchicalGaussSeidelPreconditionerFactory::buildPreconditionerOperat } LinearOp HierarchicalGaussSeidelPreconditionerFactory::buildBlockInverse( - const InverseFactory& invFact, Teuchos::RCP& precFact, + const InverseFactory& invFact, const Teuchos::RCP& precFact, const BlockedLinearOp& matrix, BlockPreconditionerState& state, int hierarchicalBlockNum) const { std::stringstream ss; diff --git a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp index 6459cc83849b..9b6ce28b1177 100644 --- a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp +++ b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp @@ -104,7 +104,8 @@ class HierarchicalGaussSeidelPreconditionerFactory : public BlockPreconditionerF using BlockPreconditionerFactory::buildPreconditionerOperator; private: - LinearOp buildBlockInverse(const InverseFactory& invFact, Teuchos::RCP& precFact, + LinearOp buildBlockInverse(const InverseFactory& invFact, + const Teuchos::RCP& precFact, const BlockedLinearOp& matrix, BlockPreconditionerState& state, int hierarchicalBlockNum) const; From c1c0a42db290f10580227cab218ac94a753c1ea7 Mon Sep 17 00:00:00 2001 From: Kim Liegeois Date: Wed, 5 Jun 2024 10:04:04 -0600 Subject: [PATCH 08/68] use stable insertion sort --- .../core/src/Tpetra_Details_shortSort.hpp | 32 ++++---- packages/tpetra/core/src/Tpetra_Util.hpp | 76 ++++++++++++++++++- packages/tpetra/core/test/Sort/Sort.cpp | 34 ++++----- 3 files changed, 103 insertions(+), 39 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp b/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp index 7befe85eb8ec..d8106b9c7ddd 100644 --- a/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp @@ -357,27 +357,21 @@ shellSortKeysAndValues (KeyType keys[], "This implementation does a count-down loop, " "and may thus loop forever " "if one attempts to use it with unsigned IndexType."); - constexpr IndexType ZERO = 0; - IndexType midpoint = n / static_cast (2); + IndexType i = 0; - while (midpoint > ZERO) { - // Avoid names like "max" in case they collide with macros. - const IndexType theMax = n - midpoint; - for (IndexType j = 0; j < theMax; ++j) { - // IndexType is signed, so it's legit to compare >= 0. - for (IndexType k = j; k >= 0; k -= midpoint) { - if (keys[k + midpoint] >= keys[k]) { - break; - } - const KeyType tmpKey = keys[k + midpoint]; - keys[k + midpoint] = keys[k]; - keys[k] = tmpKey; - const ValueType tmpVal = values[k + midpoint]; - values[k + midpoint] = values[k]; - values[k] = tmpVal; - } + while (i < n) { + auto x1 = keys[i]; + auto x2 = values[i]; + IndexType j = i; + while (j >= 0 && keys[j-1] > x1) + { + keys[j] = keys[j-1]; + values[j] = values[j-1]; + --j; } - midpoint = midpoint / 2; + keys[j] = x1; + values[j] = x2; + ++i; } } diff --git a/packages/tpetra/core/src/Tpetra_Util.hpp b/packages/tpetra/core/src/Tpetra_Util.hpp index 804878cb0c7a..77c9b7998bc2 100644 --- a/packages/tpetra/core/src/Tpetra_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Util.hpp @@ -475,6 +475,78 @@ namespace Tpetra { } } + /** + * \brief Sort the first array using insertion sort, and apply the resulting + * permutation to the second array. + * + * All of the input argument iterators are random access iterators. + */ + template + void in_sort2(const IT1& first1, + const IT1& last1, + const IT2& first2, + const IT2& last2) + { + typedef typename std::iterator_traits::difference_type DT; + DT n = last1 - first1; + DT i = 0; + + while (i < n) + { + auto x1 = first1[i]; + auto x2 = first2[i]; + DT j = i; + while (j >= 0 && first1[j-1] > x1) + { + first1[j] = first1[j-1]; + first2[j] = first2[j-1]; + --j; + } + first1[j] = x1; + first2[j] = x2; + ++i; + } + } + + /** + * \brief Sort the first array using insertion sort, and apply the resulting + * permutation to the second and third arrays. + * + * All of the input argument iterators are random access iterators. + */ + template + void in_sort3( + const IT1& first1, + const IT1& last1, + const IT2& first2, + const IT2& /* last2 */, + const IT3& first3, + const IT3& /* last3 */) + { + typedef typename std::iterator_traits::difference_type DT; + DT n = last1 - first1; + DT i = 0; + + while (i < n) + { + auto x1 = first1[i]; + auto x2 = first2[i]; + auto x3 = first3[i]; + DT j = i; + while (j >= 0 && first1[j-1] > x1) + { + first1[j] = first1[j-1]; + first2[j] = first2[j-1]; + first3[j] = first3[j-1]; + --j; + } + first1[j] = x1; + first2[j] = x2; + first3[j] = x3; + ++i; + } + } + } //end namespace SortDetails @@ -505,7 +577,7 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::sh_sort2(first1, last1, first2, first2+(last1-first1)); + SortDetails::in_sort2(first1, last1, first2, first2+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG if(!SortDetails::isAlreadySorted(first1, last1)){ std::cout << "Trouble: sort() did not sort !!" << std::endl; @@ -606,7 +678,7 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::sh_sort3(first1, last1, first2, first2+(last1-first1), first3, + SortDetails::in_sort3(first1, last1, first2, first2+(last1-first1), first3, first3+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG diff --git a/packages/tpetra/core/test/Sort/Sort.cpp b/packages/tpetra/core/test/Sort/Sort.cpp index 2c1dacd21ac2..ec2bf4b5f53b 100644 --- a/packages/tpetra/core/test/Sort/Sort.cpp +++ b/packages/tpetra/core/test/Sort/Sort.cpp @@ -69,24 +69,22 @@ shellSortKeysAndValues (KeyType keys[], ValueType values[], const int n) { - const int ZERO = 0; - int midpoint = n / 2; - - while (midpoint > ZERO) { - // Avoid names like "max" in case they collide with macros. - const int theMax = n - midpoint; - for (int j = 0; j < theMax; ++j) { - // int is signed, so it's legit to compare >= 0. - for (int k = j; k >= 0; k -= midpoint) { - if (keys[k + midpoint] >= keys[k]) { - break; - } - std::swap (keys[k + midpoint], keys[k]); - std::swap (values[k + midpoint], values[k]); - } - } - midpoint = midpoint / 2; - } + int i = 0; + + while (i < n) { + auto x1 = keys[i]; + auto x2 = values[i]; + int j = i; + while (j >= 0 && keys[j-1] > x1) + { + keys[j] = keys[j-1]; + values[j] = values[j-1]; + --j; + } + keys[j] = x1; + values[j] = x2; + ++i; + } } // Is the given range of keys sorted? From 3bd4194ddc59ed88ef63152ffb58aa1eaff4db2b Mon Sep 17 00:00:00 2001 From: Kim Liegeois Date: Wed, 29 May 2024 10:21:21 -0600 Subject: [PATCH 09/68] add checkAztecOOMLOrdering call to BTDS --- packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp index 30c9d79f1ea8..8e0f4890fd19 100644 --- a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp +++ b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp @@ -54,6 +54,7 @@ #include "Ifpack2_Parameters.hpp" #include "Teuchos_TimeMonitor.hpp" #include "Tpetra_BlockCrsMatrix_Helpers_decl.hpp" +#include "Tpetra_Import_Util.hpp" namespace Ifpack2 { @@ -180,6 +181,7 @@ getValidParameters () const validParams->set("partitioner: block size", -1); validParams->set("partitioner: print level", false); validParams->set("partitioner: explicit convert to BlockCrs", false); + validParams->set("partitioner: checkAztecOOMLOrdering", true); return validParams; } @@ -649,6 +651,13 @@ initialize () graph = A_->getGraph (); } else { + if ( !List_.isParameter("partitioner: checkAztecOOMLOrdering") || List_.get("partitioner: checkAztecOOMLOrdering")) { + if ( !A_->getGraph ()->getImporter().is_null()) { + TEUCHOS_TEST_FOR_EXCEPT_MSG + (!Tpetra::Import_Util::checkAztecOOMLOrdering(*(A_->getGraph ()->getImporter())), + "The pointwise graph of the input matrix A pointwise does not follow the AztecOOMLOrdering."); + } + } graph = Tpetra::getBlockCrsGraph(*Teuchos::rcp_dynamic_cast(A_), block_size, true); } Kokkos::DefaultExecutionSpace().fence(); From e54630dee163be6caa189e40e62b39ffbc6e58cb Mon Sep 17 00:00:00 2001 From: malphil Date: Wed, 5 Jun 2024 13:25:40 -0600 Subject: [PATCH 10/68] Replace datacopy call with assignment, making sure to pre-allocate scratch vectors for Block G-S implicit operators --- packages/teko/src/Teko_BlockLowerTriInverseOp.cpp | 7 +++++-- packages/teko/src/Teko_BlockUpperTriInverseOp.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp index ed860406b87e..667457a37344 100644 --- a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp @@ -69,6 +69,9 @@ BlockLowerTriInverseOp::BlockLowerTriInverseOp(BlockedLinearOp& L, // just flip flop them! productRange_ = L_->productDomain(); productDomain_ = L_->productRange(); + + srcScrap_ = toBlockedMultiVector(Thyra::createMember(*productDomain_)); + dstScrap_ = toBlockedMultiVector(Thyra::createMember(*productRange_)); } /** @brief Perform a matrix vector multiply with this operator. @@ -91,10 +94,10 @@ void BlockLowerTriInverseOp::implicitApply(const BlockedMultiVector& src, Blocke TEUCHOS_ASSERT(blocks == blockCount(dst)); // build a scrap vector for storing work - srcScrap_ = datacopy(src, srcScrap_); + Thyra::assign(srcScrap_.ptr(), *src); BlockedMultiVector dstCopy; if (beta != 0.0) { - dstScrap_ = datacopy(dst, dstScrap_); + Thyra::assign(dstScrap_.ptr(), *dst); dstCopy = dstScrap_; } else dstCopy = dst; // shallow copy diff --git a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp index e3a852d6ba05..0be2f19ed85b 100644 --- a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp @@ -79,6 +79,9 @@ BlockUpperTriInverseOp::BlockUpperTriInverseOp(BlockedLinearOp& U, // just flip flop them! productRange_ = U->productDomain(); productDomain_ = U->productRange(); + + srcScrap_ = toBlockedMultiVector(Thyra::createMember(*productDomain_)); + dstScrap_ = toBlockedMultiVector(Thyra::createMember(*productRange_)); } void BlockUpperTriInverseOp::implicitApply(const BlockedMultiVector& src, BlockedMultiVector& dst, @@ -108,10 +111,10 @@ void BlockUpperTriInverseOp::implicitApply(const Thyra::EOpTransp M_trans, TEUCHOS_ASSERT(blocks == blockCount(dst)); // build a scrap vector for storing work - srcScrap_ = datacopy(src, srcScrap_); + Thyra::assign(srcScrap_.ptr(), *src); BlockedMultiVector dstCopy; if (beta != 0.0) { - dstScrap_ = datacopy(dst, dstScrap_); + Thyra::assign(dstScrap_.ptr(), *dst); dstCopy = dstScrap_; } else dstCopy = dst; // shallow copy From cd53ac2935eb6f3a596376b7b8787616fdbead74 Mon Sep 17 00:00:00 2001 From: malphil Date: Wed, 5 Jun 2024 13:34:40 -0600 Subject: [PATCH 11/68] Apply clang formatting to changes --- packages/teko/src/Teko_BlockLowerTriInverseOp.cpp | 2 +- packages/teko/src/Teko_BlockUpperTriInverseOp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp index 667457a37344..77a9cfe02cf5 100644 --- a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp @@ -98,7 +98,7 @@ void BlockLowerTriInverseOp::implicitApply(const BlockedMultiVector& src, Blocke BlockedMultiVector dstCopy; if (beta != 0.0) { Thyra::assign(dstScrap_.ptr(), *dst); - dstCopy = dstScrap_; + dstCopy = dstScrap_; } else dstCopy = dst; // shallow copy diff --git a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp index 0be2f19ed85b..57a772e419b8 100644 --- a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp @@ -115,7 +115,7 @@ void BlockUpperTriInverseOp::implicitApply(const Thyra::EOpTransp M_trans, BlockedMultiVector dstCopy; if (beta != 0.0) { Thyra::assign(dstScrap_.ptr(), *dst); - dstCopy = dstScrap_; + dstCopy = dstScrap_; } else dstCopy = dst; // shallow copy From e42c382fbd474264d506a4cef3754cc437e3ec41 Mon Sep 17 00:00:00 2001 From: kliegeois Date: Thu, 6 Jun 2024 21:35:52 -0600 Subject: [PATCH 12/68] add checkBlockConsistency --- .../src/Ifpack2_BlockRelaxation_def.hpp | 8 +++--- .../tpetra/core/src/Tpetra_CrsGraph_decl.hpp | 3 +-- .../tpetra/core/src/Tpetra_CrsGraph_def.hpp | 10 +++----- .../tpetra/core/src/Tpetra_FECrsGraph_def.hpp | 5 ++-- .../tpetra/core/src/Tpetra_Import_Util.hpp | 25 ++++++++++++++++++- .../test/FECrsGraph/FECrsGraph_UnitTests.cpp | 4 --- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp index 8e0f4890fd19..94974f41e020 100644 --- a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp +++ b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp @@ -181,7 +181,7 @@ getValidParameters () const validParams->set("partitioner: block size", -1); validParams->set("partitioner: print level", false); validParams->set("partitioner: explicit convert to BlockCrs", false); - validParams->set("partitioner: checkAztecOOMLOrdering", true); + validParams->set("partitioner: checkBlockConsistency", true); return validParams; } @@ -651,11 +651,11 @@ initialize () graph = A_->getGraph (); } else { - if ( !List_.isParameter("partitioner: checkAztecOOMLOrdering") || List_.get("partitioner: checkAztecOOMLOrdering")) { + if ( !List_.isParameter("partitioner: checkBlockConsistency") || List_.get("partitioner: checkBlockConsistency")) { if ( !A_->getGraph ()->getImporter().is_null()) { TEUCHOS_TEST_FOR_EXCEPT_MSG - (!Tpetra::Import_Util::checkAztecOOMLOrdering(*(A_->getGraph ()->getImporter())), - "The pointwise graph of the input matrix A pointwise does not follow the AztecOOMLOrdering."); + (!Tpetra::Import_Util::checkBlockConsistency(*(A_->getGraph ()->getColMap()), block_size), + "The pointwise graph of the input matrix A pointwise is not consistent with block_size."); } } graph = Tpetra::getBlockCrsGraph(*Teuchos::rcp_dynamic_cast(A_), block_size, true); diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp index 5face5335bf3..84a31d969815 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp @@ -1758,8 +1758,7 @@ namespace Tpetra { /// \param remotePIDs [out] The process ranks corresponding to the /// column Map's "remote" (not on the calling process in the /// domain Map) indices. - /// \param userDomainMap [in] User-provided alternative to the domainMap. - void makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap = Teuchos::null); + void makeColMap (Teuchos::Array& remotePIDs); /// \brief Convert column indices from global to local. /// diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp index 25a6e23d4d1d..4cf1a13a7405 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp @@ -4384,13 +4384,12 @@ namespace Tpetra { template void CrsGraph:: - makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap) + makeColMap (Teuchos::Array& remotePIDs) { using Details::ProfilingRegion; using std::endl; const char tfecfFuncName[] = "makeColMap"; - ProfilingRegion regionSortAndMerge ("Tpetra::CrsGraph::makeColMap"); std::unique_ptr prefix; if (verbose_) { @@ -4400,9 +4399,6 @@ namespace Tpetra { std::cerr << os.str(); } - // If the user doesn't provide a domainMap we use the one from this matrix - Teuchos::RCP myDomainMap = userDomainMap.is_null() ? getDomainMap() : userDomainMap; - // this->colMap_ should be null at this point, but we accept the // future possibility that it might not be (esp. if we decide // later to support graph structure changes after first @@ -4427,7 +4423,7 @@ namespace Tpetra { std::ostringstream errStrm; const int lclErrCode = Details::makeColMap (colMap, remotePIDs, - myDomainMap, *this, sortEachProcsGids, &errStrm); + getDomainMap (), *this, sortEachProcsGids, &errStrm); auto comm = this->getComm (); if (! comm.is_null ()) { const int lclSuccess = (lclErrCode == 0) ? 1 : 0; @@ -4447,7 +4443,7 @@ namespace Tpetra { } else { (void) Details::makeColMap (colMap, remotePIDs, - myDomainMap, *this, sortEachProcsGids, nullptr); + getDomainMap (), *this, sortEachProcsGids, nullptr); } // See above. We want to admit the possibility of makeColMap // actually revising an existing column Map, even though that diff --git a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp index f056fb0ea453..4e48fbc597ca 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp @@ -260,11 +260,10 @@ void FECrsGraph::doOwnedPlusSharedToOwned(con this->doExport(*this,*ownedRowsImporter_,CM,true); // Under the "if you own an element, you own at least one of its nodes" assumption, - // we can start by making a columnmap for ownedPlusShared. We use the ownedMap to - // ensure AztecOO/ML ordering of the final output colmap + // we can start by making a columnmap for ownedPlusShared if(!this->hasColMap()) { Teuchos::Array remotePIDs (0); - this->makeColMap(remotePIDs,ownedDomainMap_); + this->makeColMap(remotePIDs); } // Now run CrsGraph's fillComplete to get the final importer diff --git a/packages/tpetra/core/src/Tpetra_Import_Util.hpp b/packages/tpetra/core/src/Tpetra_Import_Util.hpp index 71c92b4bbe49..18ca7f693866 100644 --- a/packages/tpetra/core/src/Tpetra_Import_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_Util.hpp @@ -229,7 +229,7 @@ getRemotePIDs (const Tpetra::Import& Importer, } } - + /* Check some of the validity of an Import object WARNING: This is a debugging routine only. */ template @@ -544,6 +544,29 @@ checkAztecOOMLOrdering (const Tpetra::Import& I } +/* Check to see that the import object's target map respects AztecOO/ML ordering */ +template +bool +checkBlockConsistency(const Tpetra::Map& map, size_t block_size) { + bool consistent_block = true; + + for (size_t lid = 0; lid < map.getLocalNumElements (); lid += block_size) { + auto lbid = floor(double(lid)/block_size); + auto gbid = floor(double(map.getGlobalElement(lid))/block_size); + + for (size_t lid2 = 1; lid2 < block_size; ++lid2) { + auto lbid_n = floor(double(lid+lid2)/block_size); + auto gbid_n = floor(double(map.getGlobalElement(lid+lid2))/block_size); + auto old_consistent_block = consistent_block; + if (consistent_block) + consistent_block = (lbid == lbid_n); + if (consistent_block) + consistent_block = (gbid == gbid_n); + } + } + + return consistent_block; +} } // namespace Import_Util diff --git a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp index cff9d96c8e34..93c3cfb4f884 100644 --- a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp +++ b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp @@ -578,17 +578,14 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble2D_OPSDomain, LO, GO, Nod CG g11(pack.uniqueMap,9); g11.doExport(g0,import,Tpetra::INSERT); g11.fillComplete(pack.uniqueMap,pack.uniqueMap); - out<<"Comparing g11/g1"< Date: Fri, 7 Jun 2024 13:39:53 -0600 Subject: [PATCH 13/68] clean --- .../core/src/Tpetra_Details_shortSort.hpp | 32 ++++++++++------- packages/tpetra/core/test/Sort/Sort.cpp | 34 ++++++++++--------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp b/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp index d8106b9c7ddd..7befe85eb8ec 100644 --- a/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp @@ -357,21 +357,27 @@ shellSortKeysAndValues (KeyType keys[], "This implementation does a count-down loop, " "and may thus loop forever " "if one attempts to use it with unsigned IndexType."); - IndexType i = 0; + constexpr IndexType ZERO = 0; + IndexType midpoint = n / static_cast (2); - while (i < n) { - auto x1 = keys[i]; - auto x2 = values[i]; - IndexType j = i; - while (j >= 0 && keys[j-1] > x1) - { - keys[j] = keys[j-1]; - values[j] = values[j-1]; - --j; + while (midpoint > ZERO) { + // Avoid names like "max" in case they collide with macros. + const IndexType theMax = n - midpoint; + for (IndexType j = 0; j < theMax; ++j) { + // IndexType is signed, so it's legit to compare >= 0. + for (IndexType k = j; k >= 0; k -= midpoint) { + if (keys[k + midpoint] >= keys[k]) { + break; + } + const KeyType tmpKey = keys[k + midpoint]; + keys[k + midpoint] = keys[k]; + keys[k] = tmpKey; + const ValueType tmpVal = values[k + midpoint]; + values[k + midpoint] = values[k]; + values[k] = tmpVal; + } } - keys[j] = x1; - values[j] = x2; - ++i; + midpoint = midpoint / 2; } } diff --git a/packages/tpetra/core/test/Sort/Sort.cpp b/packages/tpetra/core/test/Sort/Sort.cpp index ec2bf4b5f53b..2c1dacd21ac2 100644 --- a/packages/tpetra/core/test/Sort/Sort.cpp +++ b/packages/tpetra/core/test/Sort/Sort.cpp @@ -69,22 +69,24 @@ shellSortKeysAndValues (KeyType keys[], ValueType values[], const int n) { - int i = 0; - - while (i < n) { - auto x1 = keys[i]; - auto x2 = values[i]; - int j = i; - while (j >= 0 && keys[j-1] > x1) - { - keys[j] = keys[j-1]; - values[j] = values[j-1]; - --j; - } - keys[j] = x1; - values[j] = x2; - ++i; - } + const int ZERO = 0; + int midpoint = n / 2; + + while (midpoint > ZERO) { + // Avoid names like "max" in case they collide with macros. + const int theMax = n - midpoint; + for (int j = 0; j < theMax; ++j) { + // int is signed, so it's legit to compare >= 0. + for (int k = j; k >= 0; k -= midpoint) { + if (keys[k + midpoint] >= keys[k]) { + break; + } + std::swap (keys[k + midpoint], keys[k]); + std::swap (values[k + midpoint], values[k]); + } + } + midpoint = midpoint / 2; + } } // Is the given range of keys sorted? From e96d27181abe57515cdd1b1d7ac7d10807abbcb4 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Wed, 12 Jun 2024 07:58:12 -0600 Subject: [PATCH 14/68] Add RHEL8 GCC configuration Change the Spack-based SuperLU to turn off ML SuperLU support (effectively assume it is >= v5.0), and add -lm to the SuperLU configuration (otherwise it fails links and then the API detection things it's the older version). Signed-off-by: Samuel E. Browne --- packages/framework/ini-files/config-specs.ini | 33 +++++++++++++++++++ .../framework/ini-files/supported-envs.ini | 1 + 2 files changed, 34 insertions(+) diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index f917ccefa47a..b10e0a209fba 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -437,6 +437,8 @@ opt-set-cmake-var SuperLU_INCLUDE_DIRS PATH FORCE : ${SUPERLU_INC|ENV} opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV} opt-set-cmake-var SuperLU_LIBRARY_DIRS PATH FORCE : ${SUPERLU_LIB|ENV} opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV} +opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m +opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF # Metis opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so @@ -2802,6 +2804,37 @@ use RHEL7_POST use rhel7_sems-gnu-8.3.0-openmpi-1.10.7-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables use PACKAGE-ENABLES|ALL + +[rhel8_sems-gnu-8.5.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables] +use COMPILER|GNU +use NODE-TYPE|SERIAL +use BUILD-TYPE|RELEASE-DEBUG +use LIB-TYPE|SHARED +use KOKKOS-ARCH|NO-KOKKOS-ARCH +use USE-ASAN|NO +use USE-FPIC|NO +use USE-MPI|NO +use USE-PT|NO +use USE-COMPLEX|NO +use USE-RDC|NO +use USE-UVM|NO +use USE-DEPRECATED|YES +use PACKAGE-ENABLES|NO-PACKAGE-ENABLES + +use COMMON_SPACK_TPLS +opt-set-cmake-var TPL_ENABLE_ParMETIS BOOL FORCE : OFF +opt-set-cmake-var TPL_ENABLE_Scotch BOOL FORCE : OFF +opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : ${NETCDF_C_LIB|ENV}/libnetcdf.so + +opt-set-cmake-var Trilinos_ENABLE_Fortran OFF BOOL : OFF +opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-label -Werror=shadow -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS + +use GCC_PACKAGE_SPECIFIC_WARNING_FLAGS + +[rhel8_sems-gnu-8.5.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] +use rhel8_sems-gnu-8.5.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables +use PACKAGE-ENABLES|ALL + [rhel8_gcc-openmpi_debug_shared_no-kokkos-arch_no-asan_complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables] #uses a containerized environment use COMPILER|GNU diff --git a/packages/framework/ini-files/supported-envs.ini b/packages/framework/ini-files/supported-envs.ini index d3a27cfcb82e..eb6117fc85b4 100644 --- a/packages/framework/ini-files/supported-envs.ini +++ b/packages/framework/ini-files/supported-envs.ini @@ -177,6 +177,7 @@ oneapi-intelmpi gcc-openmpi gcc-serial aue-gcc-openmpi +sems-gnu-8.5.0-serial sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.1.4 sems-clang-11.0.1-openmpi-4.0.5-serial From 9e24a7d00a053aff0a0fed72c1d4f023a2bcf266 Mon Sep 17 00:00:00 2001 From: Kim Liegeois Date: Wed, 12 Jun 2024 12:53:26 -0600 Subject: [PATCH 15/68] Use std::stable_sort instead of insertion sort --- packages/tpetra/core/src/Tpetra_Util.hpp | 113 +++++++++++++---------- 1 file changed, 64 insertions(+), 49 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Util.hpp b/packages/tpetra/core/src/Tpetra_Util.hpp index 77c9b7998bc2..17f8aecc0908 100644 --- a/packages/tpetra/core/src/Tpetra_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Util.hpp @@ -57,6 +57,7 @@ #include "Teuchos_OrdinalTraits.hpp" #include "Teuchos_TypeNameTraits.hpp" #include "Teuchos_Utils.hpp" +#include #include #include #include @@ -476,75 +477,89 @@ namespace Tpetra { } /** - * \brief Sort the first array using insertion sort, and apply the resulting + * \brief Compute the permutation of the ordering that + * sorts the array using a stable sort. + */ + template + std::vector::difference_type> sort_indexes(IT1 first, IT1 last) { + + typedef typename std::iterator_traits::difference_type DT; + + DT length = last - first; + std::vector
idx(length); + std::iota(idx.begin(), idx.end(), 0); + + std::stable_sort(idx.begin(), idx.end(), + [&first](size_t i1, size_t i2) {return first[i1] < first[i2];}); + + return idx; + } + + /** + * \brief Apply a permutation of the ordering of an array in place. + */ + template + void + apply_permutation( + IT1 first, + IT1 last, + IT2 indices) + { + typedef typename std::iterator_traits::difference_type DT; + typedef typename std::iterator_traits::value_type T; + + DT n = last - first; + + Kokkos::View tmp(Kokkos::view_alloc(Kokkos::WithoutInitializing, "tmp"), n); + + Kokkos::parallel_for("apply_permutation_1", + Kokkos::RangePolicy(0, n), + KOKKOS_LAMBDA(const int j) { + tmp(j) = first[indices[j]]; + }); + Kokkos::parallel_for("apply_permutation_2", + Kokkos::RangePolicy(0, n), + KOKKOS_LAMBDA(const int j) { + first[j] = tmp(j); + }); + } + + /** + * \brief Sort the first array using std sort, and apply the resulting * permutation to the second array. * * All of the input argument iterators are random access iterators. */ template - void in_sort2(const IT1& first1, + void std_sort2(const IT1& first1, const IT1& last1, const IT2& first2, const IT2& last2) { - typedef typename std::iterator_traits::difference_type DT; - DT n = last1 - first1; - DT i = 0; - - while (i < n) - { - auto x1 = first1[i]; - auto x2 = first2[i]; - DT j = i; - while (j >= 0 && first1[j-1] > x1) - { - first1[j] = first1[j-1]; - first2[j] = first2[j-1]; - --j; - } - first1[j] = x1; - first2[j] = x2; - ++i; - } + auto indices = sort_indexes(first1, last1); + apply_permutation(first1, last1, indices); + apply_permutation(first2, last2, indices); } /** - * \brief Sort the first array using insertion sort, and apply the resulting + * \brief Sort the first array using std sort, and apply the resulting * permutation to the second and third arrays. * * All of the input argument iterators are random access iterators. */ template - void in_sort3( + void std_sort3( const IT1& first1, const IT1& last1, const IT2& first2, - const IT2& /* last2 */, + const IT2& last2, const IT3& first3, - const IT3& /* last3 */) + const IT3& last3) { - typedef typename std::iterator_traits::difference_type DT; - DT n = last1 - first1; - DT i = 0; - - while (i < n) - { - auto x1 = first1[i]; - auto x2 = first2[i]; - auto x3 = first3[i]; - DT j = i; - while (j >= 0 && first1[j-1] > x1) - { - first1[j] = first1[j-1]; - first2[j] = first2[j-1]; - first3[j] = first3[j-1]; - --j; - } - first1[j] = x1; - first2[j] = x2; - first3[j] = x3; - ++i; - } + auto indices = sort_indexes(first1, last1); + apply_permutation(first1, last1, indices); + apply_permutation(first2, last2, indices); + apply_permutation(first3, last3, indices); } } //end namespace SortDetails @@ -577,7 +592,7 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::in_sort2(first1, last1, first2, first2+(last1-first1)); + SortDetails::std_sort2(first1, last1, first2, first2+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG if(!SortDetails::isAlreadySorted(first1, last1)){ std::cout << "Trouble: sort() did not sort !!" << std::endl; @@ -678,7 +693,7 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::in_sort3(first1, last1, first2, first2+(last1-first1), first3, + SortDetails::std_sort3(first1, last1, first2, first2+(last1-first1), first3, first3+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG From 1a5356922b80a1f07f9857792a362d5490b268d5 Mon Sep 17 00:00:00 2001 From: malphil Date: Thu, 13 Jun 2024 12:51:12 -0600 Subject: [PATCH 16/68] Make small modifications required to fix Block G-S/MueLu related issue --- packages/teko/src/Teko_BlockLowerTriInverseOp.cpp | 9 ++++++--- packages/teko/src/Teko_BlockLowerTriInverseOp.hpp | 1 + packages/teko/src/Teko_BlockUpperTriInverseOp.cpp | 9 ++++++--- packages/teko/src/Teko_BlockUpperTriInverseOp.hpp | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp index 77a9cfe02cf5..32225bb8767f 100644 --- a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp @@ -69,9 +69,6 @@ BlockLowerTriInverseOp::BlockLowerTriInverseOp(BlockedLinearOp& L, // just flip flop them! productRange_ = L_->productDomain(); productDomain_ = L_->productRange(); - - srcScrap_ = toBlockedMultiVector(Thyra::createMember(*productDomain_)); - dstScrap_ = toBlockedMultiVector(Thyra::createMember(*productRange_)); } /** @brief Perform a matrix vector multiply with this operator. @@ -93,6 +90,12 @@ void BlockLowerTriInverseOp::implicitApply(const BlockedMultiVector& src, Blocke TEUCHOS_ASSERT(blocks == blockRowCount(L_)); TEUCHOS_ASSERT(blocks == blockCount(dst)); + if (!allocated) { + srcScrap_ = deepcopy(src); + dstScrap_ = deepcopy(dst); + allocated = true; + } + // build a scrap vector for storing work Thyra::assign(srcScrap_.ptr(), *src); BlockedMultiVector dstCopy; diff --git a/packages/teko/src/Teko_BlockLowerTriInverseOp.hpp b/packages/teko/src/Teko_BlockLowerTriInverseOp.hpp index a0893e6be9b0..3e41393b0c9b 100644 --- a/packages/teko/src/Teko_BlockLowerTriInverseOp.hpp +++ b/packages/teko/src/Teko_BlockLowerTriInverseOp.hpp @@ -116,6 +116,7 @@ class BlockLowerTriInverseOp : public BlockImplicitLinearOp { // scratch space...so we don't have to reallocate mutable BlockedMultiVector srcScrap_; mutable BlockedMultiVector dstScrap_; + mutable bool allocated = false; private: // hide me! diff --git a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp index 57a772e419b8..0849b072fe82 100644 --- a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp @@ -79,9 +79,6 @@ BlockUpperTriInverseOp::BlockUpperTriInverseOp(BlockedLinearOp& U, // just flip flop them! productRange_ = U->productDomain(); productDomain_ = U->productRange(); - - srcScrap_ = toBlockedMultiVector(Thyra::createMember(*productDomain_)); - dstScrap_ = toBlockedMultiVector(Thyra::createMember(*productRange_)); } void BlockUpperTriInverseOp::implicitApply(const BlockedMultiVector& src, BlockedMultiVector& dst, @@ -110,6 +107,12 @@ void BlockUpperTriInverseOp::implicitApply(const Thyra::EOpTransp M_trans, TEUCHOS_ASSERT(blocks == blockRowCount(U_)); TEUCHOS_ASSERT(blocks == blockCount(dst)); + if (!allocated) { + srcScrap_ = deepcopy(src); + dstScrap_ = deepcopy(dst); + allocated = true; + } + // build a scrap vector for storing work Thyra::assign(srcScrap_.ptr(), *src); BlockedMultiVector dstCopy; diff --git a/packages/teko/src/Teko_BlockUpperTriInverseOp.hpp b/packages/teko/src/Teko_BlockUpperTriInverseOp.hpp index a189d975b47b..6c79dc11827d 100644 --- a/packages/teko/src/Teko_BlockUpperTriInverseOp.hpp +++ b/packages/teko/src/Teko_BlockUpperTriInverseOp.hpp @@ -131,6 +131,7 @@ class BlockUpperTriInverseOp : public BlockImplicitLinearOp { // scratch space...so we don't have to reallocate mutable BlockedMultiVector srcScrap_; mutable BlockedMultiVector dstScrap_; + mutable bool allocated = false; private: // hide me! From 57b072f7b2080cd29ffc7c402bd30881a7a75973 Mon Sep 17 00:00:00 2001 From: Anderson Date: Thu, 13 Jun 2024 14:10:09 -0600 Subject: [PATCH 17/68] Add RHEL8 GCC OpenMPI serial configurations Add several rhel8-gcc-8.5.0-openmpi-4.1.6-serial configurations based on their rhel7 counterparts. Story ref: TRILFRAME-647 Signed-off-by: Anderson --- packages/framework/ini-files/config-specs.ini | 93 +++++++++++++++++++ .../framework/ini-files/supported-envs.ini | 2 +- 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index 83b7b1ffe064..6b054797e2d5 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -437,6 +437,8 @@ opt-set-cmake-var SuperLU_INCLUDE_DIRS PATH FORCE : ${SUPERLU_INC|ENV} opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV} opt-set-cmake-var SuperLU_LIBRARY_DIRS PATH FORCE : ${SUPERLU_LIB|ENV} opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV} +opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m +opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF # Metis opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so @@ -2949,6 +2951,97 @@ use RHEL7_POST use rhel7_sems-gnu-8.3.0-openmpi-1.10.7-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables use PACKAGE-ENABLES|ALL +[rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables] +#uses sems-archive modules +use COMPILER|GNU +use NODE-TYPE|SERIAL +use BUILD-TYPE|DEBUG +use LIB-TYPE|SHARED +use KOKKOS-ARCH|NO-KOKKOS-ARCH + +use USE-ASAN|NO +use USE-FPIC|NO +use USE-MPI|YES +use USE-PT|NO +opt-set-cmake-var SEACASAprepro_lib_aprepro_lib_array_test_DISABLE BOOL : ON + +use USE-COMPLEX|NO +use USE-RDC|NO +use USE-UVM|NO +use USE-DEPRECATED|YES +use PACKAGE-ENABLES|NO-PACKAGE-ENABLES + +use COMMON_SPACK_TPLS + +opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none --mca btl vader,self +opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON +opt-set-cmake-var KokkosKernels_blas_serial_MPI_1_DISABLE BOOL : ON +opt-set-cmake-var ROL_example_PDE-OPT_helmholtz_example_02_MPI_1_DISABLE BOOL : ON +opt-set-cmake-var Pliris_vector_random_MPI_3_DISABLE BOOL : ON +opt-set-cmake-var Pliris_vector_random_MPI_4_DISABLE BOOL : ON + +opt-set-cmake-var CMAKE_CXX_FLAGS STRING FORCE : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-error -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS + +# Test failures as of 11-28-22 +opt-set-cmake-var ROL_example_PDE-OPT_navier-stokes_example_01_MPI_4_DISABLE BOOL : ON + +# Under loading and debug, these Tempus run too long and timeout (fail). 2023-12-21 +opt-set-cmake-var Tempus_BackwardEuler_CDR_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_BackwardEuler_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_BackwardEuler_Staggered_FSA_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_BackwardEuler_VanDerPol_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_BackwardEuler_Combined_FSA_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_BDF2_CDR_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_BDF2_Combined_FSA_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_DIRK_ASA_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_DIRK_Combined_FSA_SDIRK_5_Stage_4th_Order_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_DIRK_Combined_FSA_SDIRK_5_Stage_5th_Order_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_DIRK_Staggered_FSA_SDIRK_5_Stage_4th_Order_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_DIRK_Staggered_FSA_SDIRK_5_Stage_5th_Order_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_ExplicitRK_ASA_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_HHTAlpha_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_IMEX_RK_Combined_FSA_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_IMEX_RK_Combined_FSA_Tangent_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_IMEX_RK_Partitioned_Combined_FSA_Partitioned_IMEX_RK_1st_Order_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_IMEX_RK_Partitioned_Staggered_FSA_General_Partioned_IMEX_RK_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_IMEX_RK_Partitioned_Staggered_FSA_Partitioned_IMEX_RK_1st_Order_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_IMEX_RK_Partitioned_Staggered_FSA_Tangent_Partitioned_IMEX_RK_1st_Order_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_IMEX_RK_Staggered_FSA_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_IMEX_RK_Staggered_FSA_Tangent_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_Newmark_MPI_1_DISABLE BOOL FORCE : ON +opt-set-cmake-var Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder_MPI_1_DISABLE BOOL FORCE : ON + +use GCC_PACKAGE_SPECIFIC_WARNING_FLAGS + +[rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] +#uses sems-archive modules +use rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables +use PACKAGE-ENABLES|ALL + +[rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all-no-epetra] +#uses sems-archive modules +use rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables +use PACKAGE-ENABLES|ALL-NO-EPETRA + +[rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug-coverage_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] +#uses sems-archive modules +use rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables +use BUILD-TYPE|DEBUG-COVERAGE-GNU +use PACKAGE-ENABLES|ALL + +[rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_complex-float_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables] +#uses sems-archive modules +use rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables +opt-set-cmake-var Trilinos_ENABLE_DOUBLE BOOL FORCE : OFF +opt-set-cmake-var Trilinos_ENABLE_COMPLEX_DOUBLE BOOL FORCE : OFF +opt-set-cmake-var Trilinos_ENABLE_FLOAT BOOL FORCE : ON +opt-set-cmake-var Trilinos_ENABLE_COMPLEX_FLOAT BOOL FORCE : ON + +[rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_complex-float_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] +#uses sems-archive modules +use rhel8_sems-gnu-8.5.0-openmpi-4.1.6-serial_debug_shared_no-kokkos-arch_no-asan_complex-float_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables +use PACKAGE-ENABLES|ALL + [rhel8_gcc-openmpi_debug_shared_no-kokkos-arch_no-asan_complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables] #uses a containerized environment use COMPILER|GNU diff --git a/packages/framework/ini-files/supported-envs.ini b/packages/framework/ini-files/supported-envs.ini index ee705eab5501..2a79122d95c2 100644 --- a/packages/framework/ini-files/supported-envs.ini +++ b/packages/framework/ini-files/supported-envs.ini @@ -180,7 +180,7 @@ aue-gcc-openmpi sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.1.4 sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6 sems-clang-11.0.1-openmpi-4.0.5-serial - +sems-gnu-8.5.0-openmpi-4.1.6-serial [ats2] cuda-11.2.152-gnu-8.3.1-spmpi-rolling From 9c284b4442d1d059bac1c6ddc458c6530a3e87f2 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Thu, 13 Jun 2024 14:14:03 -0600 Subject: [PATCH 18/68] Move SuperLU specs into specific build The settings I inserted didn't work for all Spack-based SEMS stacks (specifically it broke GCC 8.3.0 nompi. Signed-off-by: Samuel E. Browne --- packages/framework/ini-files/config-specs.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index b10e0a209fba..3a4e498e2f63 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -437,8 +437,6 @@ opt-set-cmake-var SuperLU_INCLUDE_DIRS PATH FORCE : ${SUPERLU_INC|ENV} opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV} opt-set-cmake-var SuperLU_LIBRARY_DIRS PATH FORCE : ${SUPERLU_LIB|ENV} opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV} -opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m -opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF # Metis opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so @@ -2822,6 +2820,8 @@ use USE-DEPRECATED|YES use PACKAGE-ENABLES|NO-PACKAGE-ENABLES use COMMON_SPACK_TPLS +opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING : superlu;m +opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF opt-set-cmake-var TPL_ENABLE_ParMETIS BOOL FORCE : OFF opt-set-cmake-var TPL_ENABLE_Scotch BOOL FORCE : OFF opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : ${NETCDF_C_LIB|ENV}/libnetcdf.so From d403c3ae5c7419a977a892f3ba8ac8dc70216b5a Mon Sep 17 00:00:00 2001 From: Anderson Date: Thu, 13 Jun 2024 14:25:46 -0600 Subject: [PATCH 19/68] Updated location of SuperLU_LIBRARY_NAMES configuration Updated location of SuperLU_LIBRARY_NAMES configuration to be localized within a build configurations rather than under COMMON_SPACK_TPLS to not disrupt other build configurations. Signed-off-by: Anderson --- packages/framework/ini-files/config-specs.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index 6b054797e2d5..41ddfc05153a 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -437,8 +437,6 @@ opt-set-cmake-var SuperLU_INCLUDE_DIRS PATH FORCE : ${SUPERLU_INC|ENV} opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV} opt-set-cmake-var SuperLU_LIBRARY_DIRS PATH FORCE : ${SUPERLU_LIB|ENV} opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV} -opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m -opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF # Metis opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so @@ -2973,6 +2971,9 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES use COMMON_SPACK_TPLS +opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m +opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF + opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none --mca btl vader,self opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL : ON opt-set-cmake-var KokkosKernels_blas_serial_MPI_1_DISABLE BOOL : ON From fecd3c490d16b42b870b2480205bd50ee790a335 Mon Sep 17 00:00:00 2001 From: Anderson Date: Thu, 13 Jun 2024 14:29:34 -0600 Subject: [PATCH 20/68] Removed previously disabled SEACASA test for rhel8-gcc-openmpi-serial This test was previously disabled due to issues with rhel7 configurations. Enable the test again for rhel8-gcc-openmpi-serial configuration to test if the test failure issues persist on our rhel8 environments. Signed-off-by: Anderson --- packages/framework/ini-files/config-specs.ini | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index 41ddfc05153a..4595cb852ff9 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -2961,8 +2961,6 @@ use USE-ASAN|NO use USE-FPIC|NO use USE-MPI|YES use USE-PT|NO -opt-set-cmake-var SEACASAprepro_lib_aprepro_lib_array_test_DISABLE BOOL : ON - use USE-COMPLEX|NO use USE-RDC|NO use USE-UVM|NO From e64a0037635b9f6ccae125b50965db9a7f47c9a5 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Tue, 11 Jun 2024 14:23:31 -0600 Subject: [PATCH 21/68] Tpetra: test that CrsMatrix::apply overwrites NaNs In CrsMatrix::apply, if beta==0 and y contains NaNs or Infs, these should be overwritten with the value alpha*A*x (not just multipled by 0, which would result in more NaNs in the final result). Test this for both the normal and imbalanced row paths, with single and multiple columns. --- .../test/CrsMatrix/CrsMatrix_UnitTests.cpp | 67 +++++++++++++++++-- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp index a54b9226be71..04521f661dc5 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp @@ -370,9 +370,13 @@ namespace { // (anonymous) //Input vector: elements are all 1s MV w(domainMap, numVecs, false); w.putScalar(ST::one()); - //Output vector: zero initially - //note: rowMap is non-overlapping so this is OK - MV v(rowMap, numVecs, true); + //Output vector: if Scalar is real or complex, fill with NaN to test that NaNs are correctly overwritten with beta=0. + //If Scalar is an integer, fill with ones instead to at least test that the output vector is zeroed. + MV v(rowMap, numVecs, false); + if constexpr(Kokkos::ArithTraits::is_integer) + v.putScalar(Kokkos::ArithTraits::one()); + else + v.putScalar(Kokkos::ArithTraits::nan()); //Do the apply. If cuSPARSE is enabled, the merge path algorithm will be used. Otherwise, this tests the fallback. imba.apply(w, v); Teuchos::Array vvals(numLocalRows * numVecs); @@ -393,7 +397,10 @@ namespace { // (anonymous) //Now run again, but on single vectors only (rank-1) auto wcol = w.getVector(0); auto vcol = v.getVectorNonConst(0); - vcol->putScalar(ST::zero()); + if constexpr(Kokkos::ArithTraits::is_integer) + vcol->putScalar(Kokkos::ArithTraits::one()); + else + vcol->putScalar(Kokkos::ArithTraits::nan()); imba.apply(*wcol, *vcol); vcol->get1dCopy(vvals(), numLocalRows); for(size_t i = 0; i < numLocalRows - 1; i++) @@ -414,6 +421,57 @@ namespace { // (anonymous) } } + TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL( CrsMatrix, ApplyOverwriteNan, LO, GO, Scalar, Node ) + { + typedef Teuchos::ScalarTraits ST; + // NaN is only representable for floating-point real and complex types + if constexpr(!ST::isOrdinal) { + typedef Tpetra::CrsMatrix MAT; + typedef Tpetra::MultiVector MV; + typedef Tpetra::Vector V; + typedef typename ST::magnitudeType Mag; + typedef Teuchos::ScalarTraits MT; + const GST INVALID = Teuchos::OrdinalTraits::invalid(); + // get a comm + RCP > comm = getDefaultComm(); + const size_t myImageID = comm->getRank(); + // create a Map + const size_t numLocal = 10; + const size_t numVecs = 5; + RCP > map = + createContigMapWithNode(INVALID,numLocal,comm); + // create the identity matrix + GO base = numLocal*myImageID; + RCP > eye; + { + RCP eye_crs = rcp(new MAT(map,numLocal)); + for (size_t i=0; iinsertGlobalValues(base+i,tuple(base+i),tuple(ST::one())); + } + eye_crs->fillComplete(); + eye = eye_crs; + } + MV mvrand(map,numVecs,false), mvres(map,numVecs,false); + mvrand.randomize(); + // because beta=0 (default argument), the NaN values in mvres should be overwritten + mvres.putScalar(Kokkos::ArithTraits::nan()); + eye->apply(mvrand, mvres); + mvres.update(-ST::one(), mvrand, ST::one()); + Array norms(numVecs), zeros(numVecs, MT::zero()); + mvres.norm1(norms()); + TEST_COMPARE_FLOATING_ARRAYS(norms, zeros, MT::zero()); + // Test with a single column as well + auto mvrand_col0 = mvrand.getVectorNonConst(0); + auto mvres_col0 = mvres.getVectorNonConst(0); + mvrand_col0->randomize(); + mvres_col0->putScalar(Kokkos::ArithTraits::nan()); + eye->apply(*mvrand_col0, *mvres_col0); + mvres_col0->update(-ST::one(), *mvrand_col0, ST::one()); + Array norm_col0(1), zeros_col0(1, MT::zero()); + mvres_col0->norm1(norm_col0()); + TEST_COMPARE_FLOATING_ARRAYS(norm_col0, zeros_col0, MT::zero()); + } + } TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL( CrsMatrix, InsertLocalValuesCombineModes, LO, GO, Scalar, Node ) { @@ -507,6 +565,7 @@ namespace { // (anonymous) TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, TheEyeOfTruth, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, ZeroMatrix, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, ImbalancedRowMatrix, LO, GO, SCALAR, NODE ) \ + TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, ApplyOverwriteNan, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, BadCalls, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, SimpleEigTest, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, InsertLocalValuesCombineModes, LO, GO, SCALAR, NODE ) From 644b8033ef187e5c8feb0c53190247f45732a184 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Fri, 14 Jun 2024 18:10:39 -0600 Subject: [PATCH 22/68] Tpetra: only call merge path if exec == Cuda --- .../tpetra/core/src/Tpetra_CrsMatrix_def.hpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp index df302e9f1d8e..c2bc60d33e23 100644 --- a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp @@ -5092,17 +5092,21 @@ CrsMatrix:: // The apply helper does not exist, so create it. // Decide now whether to use the imbalanced row path, or the default. bool useMergePath = false; - LocalOrdinal nrows = getLocalNumRows(); #ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE - LocalOrdinal maxRowImbalance = 0; - if(nrows != 0) - maxRowImbalance = getLocalMaxNumRowEntries() - (getLocalNumEntries() / nrows); //TODO: when https://github.com/kokkos/kokkos-kernels/issues/2166 is fixed and, //we can use SPMV_MERGE_PATH for the native spmv as well. //Take out this ifdef to enable that. + // + //Until then, only use SPMV_MERGE_PATH when calling cuSPARSE. + if constexpr(std::is_same_v) { + LocalOrdinal nrows = getLocalNumRows(); + LocalOrdinal maxRowImbalance = 0; + if(nrows != 0) + maxRowImbalance = getLocalMaxNumRowEntries() - (getLocalNumEntries() / nrows); - if(size_t(maxRowImbalance) >= Tpetra::Details::Behavior::rowImbalanceThreshold()) - useMergePath = true; + if(size_t(maxRowImbalance) >= Tpetra::Details::Behavior::rowImbalanceThreshold()) + useMergePath = true; + } #endif applyHelper = std::make_shared(A_lcl.nnz(), A_lcl.graph.row_map, useMergePath ? KokkosSparse::SPMV_MERGE_PATH : KokkosSparse::SPMV_DEFAULT); From bb91ca8a1a59ad570959388aed123fed9734851c Mon Sep 17 00:00:00 2001 From: Maarten Arnst Date: Sat, 15 Jun 2024 02:34:40 +0200 Subject: [PATCH 23/68] Minor updates CartesianConn/DOFMgr (#13072) --- .../test/cartesian_topology/CMakeLists.txt | 24 +-- .../CartesianConnManager.cpp | 54 ++--- .../CartesianConnManager.hpp | 23 +-- .../cartesian_topology/tCartesianDOFMgr.cpp | 51 +++-- .../tCartesianDOFMgr_DG.cpp | 34 ++-- .../tCartesianDOFMgr_DynRankView.cpp | 186 ++---------------- .../tCartesianDOFMgr_HighOrder.cpp | 52 +++-- .../test/cartesian_topology/tCartesianTop.cpp | 185 +++++++++-------- 8 files changed, 224 insertions(+), 385 deletions(-) diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/CMakeLists.txt b/packages/panzer/dof-mgr/test/cartesian_topology/CMakeLists.txt index 0a15245539c4..a08a3c8b55cf 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/CMakeLists.txt +++ b/packages/panzer/dof-mgr/test/cartesian_topology/CMakeLists.txt @@ -24,16 +24,16 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST( COMM serial mpi ) -#TRIBITS_ADD_EXECUTABLE_AND_TEST( -# tCartesianTop -# SOURCES tCartesianTop.cpp CartesianConnManager.cpp ${UNIT_TEST_DRIVER} -# NUM_MPI_PROCS 4 -# COMM serial mpi -# ) +TRIBITS_ADD_EXECUTABLE_AND_TEST( + tCartesianTop + SOURCES tCartesianTop.cpp CartesianConnManager.cpp ${UNIT_TEST_DRIVER} + NUM_MPI_PROCS 4 + COMM serial mpi + ) -#TRIBITS_ADD_EXECUTABLE_AND_TEST( -# tCartesianDOFMgr -# SOURCES tCartesianDOFMgr.cpp CartesianConnManager.cpp ${UNIT_TEST_DRIVER} -# NUM_MPI_PROCS 4 -# COMM serial mpi -# ) +TRIBITS_ADD_EXECUTABLE_AND_TEST( + tCartesianDOFMgr + SOURCES tCartesianDOFMgr.cpp CartesianConnManager.cpp ${UNIT_TEST_DRIVER} + NUM_MPI_PROCS 4 + COMM serial mpi + ) diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/CartesianConnManager.cpp b/packages/panzer/dof-mgr/test/cartesian_topology/CartesianConnManager.cpp index 3a3cf5f79d65..6cb4fad97cbe 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/CartesianConnManager.cpp +++ b/packages/panzer/dof-mgr/test/cartesian_topology/CartesianConnManager.cpp @@ -49,8 +49,7 @@ using Teuchos::rcp_dynamic_cast; using Teuchos::RCP; using Teuchos::rcpFromRef; -namespace panzer { -namespace unit_test { +namespace panzer::unit_test { void CartesianConnManager:: initialize(const Teuchos::MpiComm & comm,GlobalOrdinal nx, GlobalOrdinal ny, @@ -113,7 +112,7 @@ initialize(const Teuchos::MpiComm & comm,GlobalOrdinal nx, GlobalOrdinal ny { totalEdges_ = totalEdges_ + totalFaces_; totalFaces_ *= 2; - totalElements_ *= totalFaces_; + totalElements_ *= 2; numSubElemsPerBrickElement_ = 2; numSubSidesPerBrickSide_.assign(4,1); @@ -296,10 +295,12 @@ initialize(const Teuchos::MpiComm & comm,GlobalOrdinal nx, GlobalOrdinal ny void CartesianConnManager::buildConnectivity(const panzer::FieldPattern & fp) { TEUCHOS_ASSERT(isInitialized); - int numIds = fp.numberIds(); + numIds_ = fp.numberIds(); - connectivity_.clear(); - connectivity_.resize(totalElements_); + connectivity_ = connectivity_entries_host_view_type( + Kokkos::view_alloc("CartesianConnManager: connectivity - entries - host", Kokkos::WithoutInitializing), + totalElements_ * numIds_ + ); std::vector elementBlockIds; getElementBlockIds(elementBlockIds); @@ -311,20 +312,20 @@ void CartesianConnManager::buildConnectivity(const panzer::FieldPattern & fp) const std::vector & elmts = getElementBlock(elementBlockIds[i]); for(std::size_t e=0;e & conn = connectivity_[element]; + LocalOrdinal offset = 0; int ordered_dim[4] = { 0, 1, 2, 3 }; // this is the order of creation for(int d=0;d<4;d++) { int od = ordered_dim[d]; if(dim_==2) { if(od!=3) // ordered dimension in 2D is incorrect - updateConnectivity_2d(fp,od,element,conn); + updateConnectivity_2d(fp,od,element,offset); } else - updateConnectivity_3d(fp,od,element,conn); + updateConnectivity_3d(fp,od,element,offset); } - TEUCHOS_ASSERT_EQUALITY(numIds,Teuchos::as(conn.size())); + TEUCHOS_ASSERT_EQUALITY(offset, static_cast(numIds_)); } } } @@ -336,7 +337,7 @@ CartesianConnManager::noConnectivityClone() const using Teuchos::RCP; using Teuchos::rcp; - RCP clone = rcp(new CartesianConnManager); + auto clone = Teuchos::make_rcp(); clone->numProc_ = numProc_; clone->myRank_ = myRank_; @@ -696,7 +697,7 @@ void CartesianConnManager::updateConnectivity_2d(const panzer::FieldPattern & fp, int subcellDim, int localCellId, - std::vector & conn) const + LocalOrdinal& offset) const { int localElementId = localCellId/numSubElemsPerBrickElement_; int subElementId = localCellId%numSubElemsPerBrickElement_; @@ -716,7 +717,8 @@ CartesianConnManager::updateConnectivity_2d(const panzer::FieldPattern & fp, GlobalOrdinal node = (totalBrickElements_.x+1)*index.y + index.x + (n==1 || n==2) * 1 // shift for i+1 + (n==3 || n==2) * (totalBrickElements_.x+1); // shift for j+1 - conn.push_back(node); + connectivity_(localCellId * numIds_ + offset) = node; + offset++; } else if(subcellDim==1) { int e = subElemToBrickElementEdgesMap_[subElementId][c]; @@ -729,10 +731,13 @@ CartesianConnManager::updateConnectivity_2d(const panzer::FieldPattern & fp, if((elemTopology_.getKey()==shards::Triangle<3>::key) && (e == 4)) { edge = totalNodes_ + totalEdges_ - (totalBrickElements_.x * totalBrickElements_.y) + computeGlobalBrickElementIndex(index); } - conn.push_back(edge); + connectivity_(localCellId * numIds_ + offset) = edge; + offset++; + } + else if(subcellDim==2) { + connectivity_(localCellId * numIds_ + offset) = totalNodes_+totalEdges_+numSubElemsPerBrickElement_*computeGlobalBrickElementIndex(index)+subElementId; + offset++; } - else if(subcellDim==2) - conn.push_back(totalNodes_+totalEdges_+numSubElemsPerBrickElement_*computeGlobalBrickElementIndex(index)+subElementId); else { TEUCHOS_ASSERT(false); @@ -744,7 +749,7 @@ void CartesianConnManager::updateConnectivity_3d(const panzer::FieldPattern & fp, int subcellDim, int localCellId, - std::vector & conn) const + LocalOrdinal& offset) const { int localElementId = localCellId/numSubElemsPerBrickElement_; int subElementId = localCellId%numSubElemsPerBrickElement_; @@ -766,7 +771,8 @@ CartesianConnManager::updateConnectivity_3d(const panzer::FieldPattern & fp, + (n==3 || n==2 || n==6 || n==7) * (totalBrickElements_.x+1) // shift for j+1 + (n==4 || n==5 || n==6 || n==7) * (totalBrickElements_.y+1)*(totalBrickElements_.x+1); // shift for k+1 - conn.push_back(node); + connectivity_(localCellId * numIds_ + offset) = node; + offset++; } else if(subcellDim==1) { int e = subElemToBrickElementEdgesMap_[subElementId][c]; @@ -827,7 +833,8 @@ CartesianConnManager::updateConnectivity_3d(const panzer::FieldPattern & fp, if(e == 18) edge = totalNodes_ + totalEdges_ - totalBrickElements_.x * totalBrickElements_.y * totalBrickElements_.z + computeGlobalBrickElementIndex(index); } - conn.push_back(edge); + connectivity_(localCellId * numIds_ + offset) = edge; + offset++; } else if(subcellDim==2) { int f = subElemToBrickElementFacesMap_[subElementId][c]; @@ -880,10 +887,12 @@ CartesianConnManager::updateConnectivity_3d(const panzer::FieldPattern & fp, face += 6*computeGlobalBrickElementIndex(index)+(f-12); } } - conn.push_back(face); + connectivity_(localCellId * numIds_ + offset) = face; + offset++; } else if(subcellDim==3) { - conn.push_back(totalNodes_+totalEdges_+totalFaces_+numSubElemsPerBrickElement_*computeGlobalBrickElementIndex(index)+subElementId); + connectivity_(localCellId * numIds_ + offset) = totalNodes_+totalEdges_+totalFaces_+numSubElemsPerBrickElement_*computeGlobalBrickElementIndex(index)+subElementId; + offset++; } else { TEUCHOS_ASSERT(false); @@ -891,5 +900,4 @@ CartesianConnManager::updateConnectivity_3d(const panzer::FieldPattern & fp, } } -} // end unit test -} // end panzer +} // namespace panzer::unit_test diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/CartesianConnManager.hpp b/packages/panzer/dof-mgr/test/cartesian_topology/CartesianConnManager.hpp index 1115b0c2a212..ecaa11301a75 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/CartesianConnManager.hpp +++ b/packages/panzer/dof-mgr/test/cartesian_topology/CartesianConnManager.hpp @@ -53,8 +53,7 @@ #include "Shards_BasicTopologies.hpp" -namespace panzer { -namespace unit_test { +namespace panzer::unit_test { /** This class is used to construct the topology of a mesh that is cartesian. The coordinates * and ordinals follow the right hand rule in both 2D and 3D. Thus the indices look like @@ -82,7 +81,9 @@ namespace unit_test { */ class CartesianConnManager : public virtual panzer::ConnManager { public: + using connectivity_entries_host_view_type = Kokkos::View; +public: // A utility structure for storing triplet indices template struct Triplet { @@ -93,7 +94,7 @@ class CartesianConnManager : public virtual panzer::ConnManager { CartesianConnManager() {isInitialized = false, areBoundarySidesBuilt = false;} - ~CartesianConnManager() {} + ~CartesianConnManager() = default; /** Initialize a 2D topology. * @@ -203,7 +204,7 @@ class CartesianConnManager : public virtual panzer::ConnManager { * \returns Pointer to beginning of indices, with total size * equal to getConnectivitySize(localElmtId) */ - virtual const GlobalOrdinal * getConnectivity(LocalOrdinal localElmtId) const { return &connectivity_[localElmtId][0]; } + virtual const GlobalOrdinal * getConnectivity(LocalOrdinal localElmtId) const { return connectivity_.data() + localElmtId*numIds_; } /** How many mesh IDs are associated with this element? * @@ -212,7 +213,7 @@ class CartesianConnManager : public virtual panzer::ConnManager { * \returns Number of mesh IDs that are associated with this element. */ virtual LocalOrdinal getConnectivitySize(LocalOrdinal localElmtId) const - { return Teuchos::as(connectivity_[localElmtId].size()); } + { return numIds_; } /** Get the block ID for a particular element. @@ -274,13 +275,13 @@ class CartesianConnManager : public virtual panzer::ConnManager { // here using the i,j,k index of the local element. Also, this is where the ordering // of a cell is embedded into the system. void updateConnectivity_2d(const panzer::FieldPattern & fp,int subcellDim,int localElementId, - std::vector & conn) const; + LocalOrdinal& offset) const; // Update the connectivity vector with the field pattern. The connectivity is specified // here using the i,j,k index of the local element. Also, this is where the ordering // of a cell is embedded into the system. void updateConnectivity_3d(const panzer::FieldPattern & fp,int subcellDim,int localElementId, - std::vector & conn) const; + LocalOrdinal& offset) const; int numProc_; int myRank_; @@ -298,7 +299,8 @@ class CartesianConnManager : public virtual panzer::ConnManager { std::map > localElements_; // element vector to connectivity - std::vector > connectivity_; + connectivity_entries_host_view_type connectivity_; + int numIds_; GlobalOrdinal totalNodes_; GlobalOrdinal totalEdges_; @@ -331,7 +333,6 @@ class CartesianConnManager : public virtual panzer::ConnManager { }; -} // end unit test -} // end panzer +} // namespace panzer::unit_test -#endif +#endif // __CartesianConnManager_hpp__ diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr.cpp b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr.cpp index 823c6b2fb25f..acf18090ea4c 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr.cpp +++ b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr.cpp @@ -47,8 +47,7 @@ #include #include -// #include "Kokkos_DynRankView.hpp" -#include "Intrepid2_FieldContainer.hpp" +#include "Kokkos_DynRankView.hpp" #include "Intrepid2_HGRAD_HEX_C1_FEM.hpp" #include "Intrepid2_HGRAD_HEX_C2_FEM.hpp" @@ -69,34 +68,29 @@ using Teuchos::rcp_dynamic_cast; using Teuchos::RCP; using Teuchos::rcpFromRef; -namespace panzer { -namespace unit_test { +namespace panzer::unit_test { -typedef CartesianConnManager::Triplet Triplet; +using Triplet = CartesianConnManager::Triplet; -typedef Kokkos::DynRankView FieldContainer; - -template -RCP buildFieldPattern() -{ +RCP buildFieldPattern( + RCP> basis +) { // build a geometric pattern from a single basis - RCP > basis = rcp(new Intrepid2Type); - RCP pattern = rcp(new panzer::Intrepid2FieldPattern(basis)); - return pattern; + return Teuchos::make_rcp(basis); } -std::string getElementBlock(const Triplet & element, - const CartesianConnManager & connManager) - -{ +std::string getElementBlock( + const Triplet & element, + const CartesianConnManager & connManager +) { int localElmtId = connManager.computeLocalBrickElementIndex(element); return connManager.getBlockId(localElmtId); } TEUCHOS_UNIT_TEST(tCartesianDOFMgr, threed) { - typedef CartesianConnManager CCM; - typedef panzer::DOFManager DOFManager; + using CCM = CartesianConnManager; + using DOFManager = panzer::DOFManager; // build global (or serial communicator) #ifdef HAVE_MPI @@ -114,18 +108,18 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr, threed) int bx = 1, by = 2, bz = 1; // build velocity, temperature and pressure fields - RCP pattern_U = buildFieldPattern >(); - RCP pattern_P = buildFieldPattern >(); - RCP pattern_T = buildFieldPattern >(); - RCP pattern_B = buildFieldPattern >(); - RCP pattern_E = buildFieldPattern >(); + RCP pattern_U = buildFieldPattern(Teuchos::make_rcp>()); + RCP pattern_P = buildFieldPattern(Teuchos::make_rcp>()); + RCP pattern_T = buildFieldPattern(Teuchos::make_rcp>()); + RCP pattern_B = buildFieldPattern(Teuchos::make_rcp>()); + RCP pattern_E = buildFieldPattern(Teuchos::make_rcp>()); // build the topology - RCP connManager = rcp(new CCM); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,nz,px,py,pz,bx,by,bz); // build the dof manager, and assocaite with the topology - RCP dofManager = rcp(new DOFManager); + const auto dofManager = Teuchos::make_rcp(); dofManager->setConnManager(connManager,*comm.getRawMpiComm()); // add TEMPERATURE field to all element blocks (MHD and solid) @@ -309,7 +303,7 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr, threed) Teuchos::send(comm,Teuchos::as(gid_sub_l.size()),&gid_sub_l[0],rank-1); } - // recieve right, check + // receive right, check if(rank!=np-1) { std::vector gid_remote(gid_sub_r.size(),-1); Teuchos::receive(comm,rank+1,Teuchos::as(gid_sub_r.size()),&gid_remote[0]); @@ -321,5 +315,4 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr, threed) } -} // end unit test -} // end panzer +} // namespace panzer::unit_test diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_DG.cpp b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_DG.cpp index 7e8ba683c862..8334d7840a6a 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_DG.cpp +++ b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_DG.cpp @@ -85,15 +85,14 @@ namespace std { } } -namespace panzer { -namespace unit_test { +namespace panzer::unit_test { using Triplet = CartesianConnManager::Triplet; -std::string getElementBlock(const Triplet & element, - const CartesianConnManager & connManager) - -{ +std::string getElementBlock( + const Triplet & element, + const CartesianConnManager & connManager +) { int localElmtId = connManager.computeLocalBrickElementIndex(element); return connManager.getBlockId(localElmtId); } @@ -116,30 +115,30 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_DG, basic) // build the topology using CCM = CartesianConnManager; - RCP connManager = rcp(new CCM); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,nz,px,py,pz,bx,by,bz); // build the dof manager, and assocaite with the topology using DOFManager = panzer::DOFManager; - RCP dofManager = rcp(new DOFManager); + const auto dofManager = Teuchos::make_rcp(); dofManager->setConnManager(connManager,*comm.getRawMpiComm()); using Basis = Intrepid2::Basis; - RCP bhgrad2 = rcp(new Intrepid2::Basis_HGRAD_HEX_Cn_FEM(2)); - RCP hgrad2 = rcp(new Intrepid2FieldPattern(bhgrad2)); + RCP bhgrad2 = Teuchos::make_rcp>(2); + RCP hgrad2 = Teuchos::make_rcp(bhgrad2); out << "HGRAD2\n" << *hgrad2 << std::endl; - RCP bhgrad1 = rcp(new Intrepid2::Basis_HGRAD_HEX_Cn_FEM(1)); - RCP hgrad1 = rcp(new Intrepid2FieldPattern(bhgrad1)); + RCP bhgrad1 = Teuchos::make_rcp>(1); + RCP hgrad1 = Teuchos::make_rcp(bhgrad1); out << "HGRAD1\n" << *hgrad1 << std::endl; - RCP bhcurl = rcp(new Intrepid2::Basis_HCURL_HEX_In_FEM(1)); - RCP hcurl = rcp(new Intrepid2FieldPattern(bhcurl)); + RCP bhcurl = Teuchos::make_rcp>(1); + RCP hcurl = Teuchos::make_rcp(bhcurl); out << "HCURL2\n" << *hcurl << std::endl; - RCP bhdiv = rcp(new Intrepid2::Basis_HDIV_HEX_In_FEM(1)); - RCP hdiv = rcp(new Intrepid2FieldPattern(bhdiv)); + RCP bhdiv = Teuchos::make_rcp>(1); + RCP hdiv = Teuchos::make_rcp(bhdiv); out << "HDIV2\n" << *hdiv << std::endl; // Add fields. Use Hgrad2 for testing DG so that we have unknowns on @@ -479,5 +478,4 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_DG, basic) } -} // end unit test -} // end panzer +} // namespace panzer::unit test diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_DynRankView.cpp b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_DynRankView.cpp index e9f487c66c4c..9b5d58f336e1 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_DynRankView.cpp +++ b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_DynRankView.cpp @@ -70,24 +70,21 @@ using Teuchos::rcp_dynamic_cast; using Teuchos::RCP; using Teuchos::rcpFromRef; -namespace panzer { -namespace unit_test { +namespace panzer::unit_test { using Triplet = CartesianConnManager::Triplet; -template -RCP buildFieldPattern() -{ +RCP buildFieldPattern( + RCP> basis +) { // build a geometric pattern from a single basis - RCP > basis = rcp(new Intrepid2Type); - RCP pattern = rcp(new panzer::Intrepid2FieldPattern(basis)); - return pattern; + return Teuchos::make_rcp(basis); } -std::string getElementBlock(const Triplet & element, - const CartesianConnManager & connManager) - -{ +std::string getElementBlock( + const Triplet & element, + const CartesianConnManager & connManager +) { int localElmtId = connManager.computeLocalBrickElementIndex(element); return connManager.getBlockId(localElmtId); } @@ -113,18 +110,18 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_DynRankView, threed) int bx = 1, by = 2, bz = 1; // build velocity, temperature and pressure fields - RCP pattern_U = buildFieldPattern >(); - RCP pattern_P = buildFieldPattern >(); - RCP pattern_T = buildFieldPattern >(); - RCP pattern_B = buildFieldPattern >(); - RCP pattern_E = buildFieldPattern >(); + RCP pattern_U = buildFieldPattern(Teuchos::make_rcp>()); + RCP pattern_P = buildFieldPattern(Teuchos::make_rcp>()); + RCP pattern_T = buildFieldPattern(Teuchos::make_rcp>()); + RCP pattern_B = buildFieldPattern(Teuchos::make_rcp>()); + RCP pattern_E = buildFieldPattern(Teuchos::make_rcp>()); // build the topology - RCP connManager = rcp(new CCM); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,nz,px,py,pz,bx,by,bz); // build the dof manager, and assocaite with the topology - RCP dofManager = rcp(new DOFManager); + const auto dofManager = Teuchos::make_rcp(); dofManager->setConnManager(connManager,*comm.getRawMpiComm()); // add TEMPERATURE field to all element blocks (MHD and solid) @@ -170,154 +167,6 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_DynRankView, threed) out << "My Offset = " << myOffset.x << " " << myOffset.y << " " << myOffset.z << std::endl; out << "My myElements = " << myElements.x << " " << myElements.y << " " << myElements.z << std::endl; - // check sharing locally on this processor - { - // choose an element in the middle of the day - Triplet element; - element.x = myOffset.x + myElements.x/2-1; - element.y = myOffset.y + myElements.y/2-1; - element.z = myOffset.z + myElements.z/2-1; - - out << "Root element = " << element.x << " " << element.y << " " << element.z << std::endl; - - int localElmtId = connManager->computeLocalBrickElementIndex(element); - int localElmtId_px = connManager->computeLocalBrickElementIndex(Triplet(element.x+1,element.y,element.z)); - int localElmtId_py = connManager->computeLocalBrickElementIndex(Triplet(element.x,element.y+1,element.z)); - int localElmtId_pz = connManager->computeLocalBrickElementIndex(Triplet(element.x,element.y,element.z+1)); - - TEST_ASSERT(localElmtId>=0); - TEST_ASSERT(localElmtId_px>=0); - TEST_ASSERT(localElmtId_py>=0); - TEST_ASSERT(localElmtId_pz>=0); - - std::string eblock = getElementBlock(element,*connManager); - std::string eblock_px = getElementBlock(Triplet(element.x+1,element.y,element.z),*connManager); - std::string eblock_py = getElementBlock(Triplet(element.x,element.y+1,element.z),*connManager); - std::string eblock_pz = getElementBlock(Triplet(element.x,element.y,element.z+1),*connManager); - - std::vector gids, gids_px, gids_py, gids_pz; - - dofManager->getElementGIDs( localElmtId, gids); - dofManager->getElementGIDs(localElmtId_px,gids_px); - dofManager->getElementGIDs(localElmtId_py,gids_py); - dofManager->getElementGIDs(localElmtId_pz,gids_pz); - - { - out << "Elements " << localElmtId << " " << localElmtId_px << std::endl; - auto offsets = dofManager->getGIDFieldOffsets_closure( eblock,ux_num,2,1); // +x - auto offsets_n = dofManager->getGIDFieldOffsets_closure(eblock_px,ux_num,2,3); // -x - - TEST_EQUALITY(offsets.first.size(),offsets_n.first.size()); - - std::vector gid_sub, gid_sub_px; - for(std::size_t i=0;igetGIDFieldOffsets_closure( eblock,ux_num,2,2); // +y - auto offsets_n = dofManager->getGIDFieldOffsets_closure(eblock_py,ux_num,2,0); // -y - - TEST_EQUALITY(offsets.first.size(),offsets_n.first.size()); - - std::vector gid_sub, gid_sub_py; - for(std::size_t i=0;igetGIDFieldOffsets_closure( eblock,ux_num,2,5); // +z - auto offsets_n = dofManager->getGIDFieldOffsets_closure(eblock_pz,ux_num,2,4); // -z - - TEST_EQUALITY(offsets.first.size(),offsets_n.first.size()); - - std::vector gid_sub, gid_sub_pz; - for(std::size_t i=0;icomputeLocalBrickElementIndex(element_l); - int localElmtId_r = connManager->computeLocalBrickElementIndex(element_r); - - TEST_ASSERT(localElmtId_l>=0); - TEST_ASSERT(localElmtId_r>=0); - - std::vector gids_l, gids_r; - dofManager->getElementGIDs( localElmtId_l, gids_l); - dofManager->getElementGIDs( localElmtId_r, gids_r); - - std::string eblock_l = getElementBlock(element_l,*connManager); - std::string eblock_r = getElementBlock(element_r,*connManager); - - auto offsets_l = dofManager->getGIDFieldOffsets_closure( eblock_l,uy_num,2,3); // -x - auto offsets_r = dofManager->getGIDFieldOffsets_closure( eblock_r,uy_num,2,1); // +x - - TEST_EQUALITY(offsets_l.first.size(),offsets_r.first.size()); - - out << "Elements L/R " << localElmtId_l << " " << localElmtId_r << std::endl; - std::vector gid_sub_l, gid_sub_r; - for(std::size_t i=0;i(gid_sub_l.size()),&gid_sub_l[0],rank-1); - } - - // recieve right, check - if(rank!=np-1) { - std::vector gid_remote(gid_sub_r.size(),-1); - Teuchos::receive(comm,rank+1,Teuchos::as(gid_sub_r.size()),&gid_remote[0]); - - for(std::size_t i=0;igetFieldNum("B"); @@ -340,5 +189,4 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_DynRankView, threed) } -} // end unit test -} // end panzer +} // namespace panzer::unit test diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_HighOrder.cpp b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_HighOrder.cpp index 08f5490b7dbb..37c81f1c9948 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_HighOrder.cpp +++ b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianDOFMgr_HighOrder.cpp @@ -67,30 +67,29 @@ using Teuchos::rcp_dynamic_cast; using Teuchos::RCP; using Teuchos::rcpFromRef; -namespace panzer { -namespace unit_test { +namespace panzer::unit_test { using Triplet = CartesianConnManager::Triplet; -RCP buildFieldPattern(RCP > basis) -{ +RCP buildFieldPattern( + RCP> basis +) { // build a geometric pattern from a single basis - RCP pattern = rcp(new panzer::Intrepid2FieldPattern(basis)); - return pattern; + return Teuchos::make_rcp(basis); } -std::string getElementBlock(const Triplet & element, - const CartesianConnManager & connManager) - -{ +std::string getElementBlock( + const Triplet & element, + const CartesianConnManager & connManager +) { int localElmtId = connManager.computeLocalBrickElementIndex(element); return connManager.getBlockId(localElmtId); } TEUCHOS_UNIT_TEST(tCartesianDOFMgr_HighOrder, ho_gid_values) { - typedef CartesianConnManager CCM; - typedef panzer::DOFManager DOFManager; + using CCM = CartesianConnManager; + using DOFManager = panzer::DOFManager; // build global (or serial communicator) #ifdef HAVE_MPI @@ -106,19 +105,19 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_HighOrder, ho_gid_values) panzer::GlobalOrdinal nx = 8, ny = 4;//, nz = 4; //panzer::GlobalOrdinal nx = 4, ny = 3;//, nz = 4; int px = np, py = 1;//, pz = 1; // npx1 processor grids - int bx = 1, by = 1;//, bz = 1; // 1x2 blocks + int bx = 1, by = 1;//, bz = 1; // 1x1 blocks const int poly_U = 4; const int poly_P = 3; - RCP pattern_U = buildFieldPattern( rcp(new Intrepid2::Basis_HGRAD_QUAD_Cn_FEM( poly_U )) ); - RCP pattern_P = buildFieldPattern( rcp(new Intrepid2::Basis_HGRAD_QUAD_Cn_FEM( poly_P )) ); + RCP pattern_U = buildFieldPattern(Teuchos::make_rcp>(poly_U)); + RCP pattern_P = buildFieldPattern(Teuchos::make_rcp>(poly_P)); // build the topology - RCP connManager = rcp(new CCM); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,px,py,bx,by); // build the dof manager, and assocaite with the topology - RCP dofManager = rcp(new DOFManager); + const auto dofManager = Teuchos::make_rcp(); dofManager->setConnManager(connManager,*comm.getRawMpiComm()); // add velocity (U) and PRESSURE fields to the MHD element block @@ -203,14 +202,14 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_HighOrder, gid_values) // const int poly_U = 4, poly_P = 1, poly_T = 3; const int poly_U = 1; - RCP pattern_U = buildFieldPattern( rcp(new Intrepid2::Basis_HGRAD_QUAD_Cn_FEM( poly_U )) ); + RCP pattern_U = buildFieldPattern(Teuchos::make_rcp>(poly_U)); // build the topology - RCP connManager = rcp(new CCM); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,px,py,bx,by); // build the dof manager, and assocaite with the topology - RCP dofManager = rcp(new DOFManager); + const auto dofManager = Teuchos::make_rcp(); dofManager->setConnManager(connManager,*comm.getRawMpiComm()); // add velocity (U) and PRESSURE fields to the MHD element block @@ -302,16 +301,16 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_HighOrder, quad2d) // build velocity, temperature and pressure fields const int poly_U = 4, poly_P = 1, poly_T = 3; - RCP pattern_U = buildFieldPattern( rcp(new Intrepid2::Basis_HGRAD_QUAD_Cn_FEM( poly_U )) ); - RCP pattern_P = buildFieldPattern( rcp(new Intrepid2::Basis_HGRAD_QUAD_Cn_FEM( poly_P )) ); - RCP pattern_T = buildFieldPattern( rcp(new Intrepid2::Basis_HGRAD_QUAD_Cn_FEM( poly_T )) ); + RCP pattern_U = buildFieldPattern(Teuchos::make_rcp>(poly_U)); + RCP pattern_P = buildFieldPattern(Teuchos::make_rcp>(poly_P)); + RCP pattern_T = buildFieldPattern(Teuchos::make_rcp>(poly_T)); // build the topology - RCP connManager = rcp(new CCM); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,px,py,bx,by); // build the dof manager, and assocaite with the topology - RCP dofManager = rcp(new DOFManager); + const auto dofManager = Teuchos::make_rcp(); dofManager->setConnManager(connManager,*comm.getRawMpiComm()); // add TEMPERATURE field to all element blocks (MHD and solid) @@ -520,5 +519,4 @@ TEUCHOS_UNIT_TEST(tCartesianDOFMgr_HighOrder, quad2d) } -} // end unit test -} // end panzer +} // namespace panzer::unit_test diff --git a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianTop.cpp b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianTop.cpp index 796d0dac0608..98ad8d990959 100644 --- a/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianTop.cpp +++ b/packages/panzer/dof-mgr/test/cartesian_topology/tCartesianTop.cpp @@ -46,11 +46,12 @@ #include #include +#include "Kokkos_DynRankView.hpp" + #include "Intrepid2_HGRAD_QUAD_C1_FEM.hpp" #include "Intrepid2_HGRAD_QUAD_C2_FEM.hpp" #include "Intrepid2_HGRAD_HEX_C1_FEM.hpp" #include "Intrepid2_HGRAD_HEX_C2_FEM.hpp" -#include "Kokkos_DynRankView.hpp" #include "PanzerCore_config.hpp" @@ -64,24 +65,20 @@ using Teuchos::rcp_dynamic_cast; using Teuchos::RCP; using Teuchos::rcpFromRef; -namespace panzer { -namespace unit_test { +namespace panzer::unit_test { -typedef Kokkos::DynRankView FieldContainer; -template -RCP buildFieldPattern() -{ +RCP buildFieldPattern( + RCP> basis +) { // build a geometric pattern from a single basis - RCP > basis = rcp(new Intrepid2Type); - RCP pattern = rcp(new panzer::Intrepid2FieldPattern(basis)); - return pattern; + return Teuchos::make_rcp(basis); } // test that you can correctly compute a rank index from a global processor id TEUCHOS_UNIT_TEST(tCartesianTop, computeMyRankTriplet) { - typedef CartesianConnManager CCM; - typedef CCM::Triplet Triplet; + using CCM = CartesianConnManager; + using Triplet = typename CCM::Triplet; // test 2D { @@ -107,16 +104,16 @@ TEUCHOS_UNIT_TEST(tCartesianTop, computeMyRankTriplet) } // test that you can correctly compute a rank index from a grobal processor id -TEUCHOS_UNIT_TEST(tCartesianTop, computeLocalElementGlobalTriplet) +TEUCHOS_UNIT_TEST(tCartesianTop, computeLocalBrickElementGlobalTriplet) { - typedef CartesianConnManager CCM; - typedef CCM::Triplet Triplet; + using CCM = CartesianConnManager; + using Triplet = typename CCM::Triplet; // test 2D { - auto t0 = CCM::computeLocalElementGlobalTriplet( 1,Triplet(4,3,1),Triplet(7,2,0)); - auto t1 = CCM::computeLocalElementGlobalTriplet( 4,Triplet(4,3,1),Triplet(7,2,0)); - auto t2 = CCM::computeLocalElementGlobalTriplet(11,Triplet(4,3,1),Triplet(7,2,0)); + auto t0 = CCM::computeLocalBrickElementGlobalTriplet( 1,Triplet(4,3,1),Triplet(7,2,0)); + auto t1 = CCM::computeLocalBrickElementGlobalTriplet( 4,Triplet(4,3,1),Triplet(7,2,0)); + auto t2 = CCM::computeLocalBrickElementGlobalTriplet(11,Triplet(4,3,1),Triplet(7,2,0)); TEST_EQUALITY(t0.x,1+7); TEST_EQUALITY(t0.y,0+2); TEST_EQUALITY(t0.z,0); TEST_EQUALITY(t1.x,0+7); TEST_EQUALITY(t1.y,1+2); TEST_EQUALITY(t1.z,0); @@ -125,9 +122,9 @@ TEUCHOS_UNIT_TEST(tCartesianTop, computeLocalElementGlobalTriplet) // test 3D { - auto t0 = CCM::computeLocalElementGlobalTriplet( 1+2*12,Triplet(4,3,5),Triplet(7,2,3)); - auto t1 = CCM::computeLocalElementGlobalTriplet( 4+1*12,Triplet(4,3,5),Triplet(7,2,3)); - auto t2 = CCM::computeLocalElementGlobalTriplet(11+4*12,Triplet(4,3,5),Triplet(7,2,3)); + auto t0 = CCM::computeLocalBrickElementGlobalTriplet( 1+2*12,Triplet(4,3,5),Triplet(7,2,3)); + auto t1 = CCM::computeLocalBrickElementGlobalTriplet( 4+1*12,Triplet(4,3,5),Triplet(7,2,3)); + auto t2 = CCM::computeLocalBrickElementGlobalTriplet(11+4*12,Triplet(4,3,5),Triplet(7,2,3)); TEST_EQUALITY(t0.x,1+7); TEST_EQUALITY(t0.y,0+2); TEST_EQUALITY(t0.z,2+3); TEST_EQUALITY(t1.x,0+7); TEST_EQUALITY(t1.y,1+2); TEST_EQUALITY(t1.z,1+3); @@ -135,43 +132,43 @@ TEUCHOS_UNIT_TEST(tCartesianTop, computeLocalElementGlobalTriplet) } } -TEUCHOS_UNIT_TEST(tCartesianTop, computeLocalElementIndex) +TEUCHOS_UNIT_TEST(tCartesianTop, computeLocalBrickElementIndex) { - typedef CartesianConnManager CCM; - typedef CCM::Triplet Triplet; + using CCM = CartesianConnManager; + using Triplet = typename CCM::Triplet; // test 2D { - auto t0 = CCM::computeLocalElementGlobalTriplet( 1,Triplet(4,3,1),Triplet(7,2,0)); - auto t1 = CCM::computeLocalElementGlobalTriplet( 4,Triplet(4,3,1),Triplet(7,2,0)); - auto t2 = CCM::computeLocalElementGlobalTriplet(11,Triplet(4,3,1),Triplet(7,2,0)); + auto t0 = CCM::computeLocalBrickElementGlobalTriplet( 1,Triplet(4,3,1),Triplet(7,2,0)); + auto t1 = CCM::computeLocalBrickElementGlobalTriplet( 4,Triplet(4,3,1),Triplet(7,2,0)); + auto t2 = CCM::computeLocalBrickElementGlobalTriplet(11,Triplet(4,3,1),Triplet(7,2,0)); - TEST_EQUALITY(CCM::computeLocalElementIndex(t0,Triplet(4,3,1),Triplet(7,2,0)), 1); - TEST_EQUALITY(CCM::computeLocalElementIndex(t1,Triplet(4,3,1),Triplet(7,2,0)), 4); - TEST_EQUALITY(CCM::computeLocalElementIndex(t2,Triplet(4,3,1),Triplet(7,2,0)),11); + TEST_EQUALITY(CCM::computeLocalBrickElementIndex(t0,Triplet(4,3,1),Triplet(7,2,0)), 1); + TEST_EQUALITY(CCM::computeLocalBrickElementIndex(t1,Triplet(4,3,1),Triplet(7,2,0)), 4); + TEST_EQUALITY(CCM::computeLocalBrickElementIndex(t2,Triplet(4,3,1),Triplet(7,2,0)),11); } // test 3D { - auto t0 = CCM::computeLocalElementGlobalTriplet( 1+2*12,Triplet(4,3,5),Triplet(7,2,3)); - auto t1 = CCM::computeLocalElementGlobalTriplet( 4+1*12,Triplet(4,3,5),Triplet(7,2,3)); - auto t2 = CCM::computeLocalElementGlobalTriplet(11+4*12,Triplet(4,3,5),Triplet(7,2,3)); + auto t0 = CCM::computeLocalBrickElementGlobalTriplet( 1+2*12,Triplet(4,3,5),Triplet(7,2,3)); + auto t1 = CCM::computeLocalBrickElementGlobalTriplet( 4+1*12,Triplet(4,3,5),Triplet(7,2,3)); + auto t2 = CCM::computeLocalBrickElementGlobalTriplet(11+4*12,Triplet(4,3,5),Triplet(7,2,3)); - TEST_EQUALITY(CCM::computeLocalElementIndex(t0,Triplet(4,3,5),Triplet(7,2,3)), 1+2*12); - TEST_EQUALITY(CCM::computeLocalElementIndex(t1,Triplet(4,3,5),Triplet(7,2,3)), 4+1*12); - TEST_EQUALITY(CCM::computeLocalElementIndex(t2,Triplet(4,3,5),Triplet(7,2,3)),11+4*12); + TEST_EQUALITY(CCM::computeLocalBrickElementIndex(t0,Triplet(4,3,5),Triplet(7,2,3)), 1+2*12); + TEST_EQUALITY(CCM::computeLocalBrickElementIndex(t1,Triplet(4,3,5),Triplet(7,2,3)), 4+1*12); + TEST_EQUALITY(CCM::computeLocalBrickElementIndex(t2,Triplet(4,3,5),Triplet(7,2,3)),11+4*12); } } -TEUCHOS_UNIT_TEST(tCartesianTop, computeGlobalElementIndex) +TEUCHOS_UNIT_TEST(tCartesianTop, computeGlobalBrickElementIndex) { - typedef CartesianConnManager CCM; - typedef CCM::Triplet Triplet; + using CCM = CartesianConnManager; + using Triplet = typename CCM::Triplet; // test 2D { - panzer::GlobalOrdinal t0 = CCM::computeGlobalElementIndex(Triplet(1,1,0),Triplet(4,3,1)); - panzer::GlobalOrdinal t1 = CCM::computeGlobalElementIndex(Triplet(3,2,0),Triplet(4,3,1)); + panzer::GlobalOrdinal t0 = CCM::computeGlobalBrickElementIndex(Triplet(1,1,0),Triplet(4,3,1)); + panzer::GlobalOrdinal t1 = CCM::computeGlobalBrickElementIndex(Triplet(3,2,0),Triplet(4,3,1)); TEST_EQUALITY(t0, 5); TEST_EQUALITY(t1,11); @@ -179,8 +176,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, computeGlobalElementIndex) // test 3D { - panzer::GlobalOrdinal t0 = CCM::computeGlobalElementIndex(Triplet( 1,1,3),Triplet(4,3,6)); - panzer::GlobalOrdinal t1 = CCM::computeGlobalElementIndex(Triplet( 3,2,5),Triplet(4,3,6)); + panzer::GlobalOrdinal t0 = CCM::computeGlobalBrickElementIndex(Triplet( 1,1,3),Triplet(4,3,6)); + panzer::GlobalOrdinal t1 = CCM::computeGlobalBrickElementIndex(Triplet( 3,2,5),Triplet(4,3,6)); TEST_EQUALITY(t0, 5+3*12); TEST_EQUALITY(t1,11+5*12); @@ -190,8 +187,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, computeGlobalElementIndex) // This test checks functions used to generate the topology are correct TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart_helpers) { - typedef CartesianConnManager CCM; - typedef CCM::Triplet TripletGO; + using CCM = CartesianConnManager; + using Triplet = typename CCM::Triplet; // build global (or serial communicator) #ifdef HAVE_MPI @@ -204,15 +201,14 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart_helpers) int rank = comm.getRank(); // field pattern for basis required - RCP fp - = buildFieldPattern >(); - + RCP fp = buildFieldPattern(Teuchos::make_rcp>()); + // mesh description panzer::GlobalOrdinal nx = 10, ny = 7; int px = np, py = 1; int bx = 1, by = 2; - RCP > connManager = rcp(new CartesianConnManager); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,px,py,bx,by); // test element blocks are computed properly and sized appropriately @@ -230,8 +226,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart_helpers) // test that owned and offset elements are correct { - auto myElements = connManager->getMyElementsTriplet(); - auto myOffset = connManager->getMyOffsetTriplet(); + auto myElements = connManager->getMyBrickElementsTriplet(); + auto myOffset = connManager->getMyBrickOffsetTriplet(); panzer::GlobalOrdinal n = nx / px; panzer::GlobalOrdinal r = nx - n * px; @@ -249,15 +245,15 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart_helpers) // test that the elements are in the right blocks { panzer::GlobalOrdinal blk0[4],blk1[4]; - blk0[0] = connManager->computeLocalElementIndex(TripletGO(2,2,0)); - blk0[1] = connManager->computeLocalElementIndex(TripletGO(5,2,0)); - blk0[2] = connManager->computeLocalElementIndex(TripletGO(7,2,0)); - blk0[3] = connManager->computeLocalElementIndex(TripletGO(9,2,0)); + blk0[0] = connManager->computeLocalBrickElementIndex(Triplet(2,2,0)); + blk0[1] = connManager->computeLocalBrickElementIndex(Triplet(5,2,0)); + blk0[2] = connManager->computeLocalBrickElementIndex(Triplet(7,2,0)); + blk0[3] = connManager->computeLocalBrickElementIndex(Triplet(9,2,0)); - blk1[0] = connManager->computeLocalElementIndex(TripletGO(2,12,0)); - blk1[1] = connManager->computeLocalElementIndex(TripletGO(5,12,0)); - blk1[2] = connManager->computeLocalElementIndex(TripletGO(7,12,0)); - blk1[3] = connManager->computeLocalElementIndex(TripletGO(9,12,0)); + blk1[0] = connManager->computeLocalBrickElementIndex(Triplet(2,12,0)); + blk1[1] = connManager->computeLocalBrickElementIndex(Triplet(5,12,0)); + blk1[2] = connManager->computeLocalBrickElementIndex(Triplet(7,12,0)); + blk1[3] = connManager->computeLocalBrickElementIndex(Triplet(9,12,0)); bool found = false; for(int i=0;i<4;i++) { @@ -307,7 +303,7 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart_helpers) TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart) { - typedef CartesianConnManager CCM; + using CCM = CartesianConnManager; // build global (or serial communicator) #ifdef HAVE_MPI @@ -327,10 +323,10 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart) // test 2D nodal discretization { // field pattern for basis required - RCP fp = buildFieldPattern >(); - + RCP fp = buildFieldPattern(Teuchos::make_rcp>()); + // build the topology - RCP > connManager = rcp(new CartesianConnManager); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,px,py,bx,by); connManager->buildConnectivity(*fp); @@ -342,8 +338,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart) for(std::size_t i=0;igetConnectivitySize(elmts0[i]),4); - auto global = CCM::computeLocalElementGlobalTriplet(elmts0[i],connManager->getMyElementsTriplet(), - connManager->getMyOffsetTriplet()); + auto global = CCM::computeLocalBrickElementGlobalTriplet(elmts0[i],connManager->getMyBrickElementsTriplet(), + connManager->getMyBrickOffsetTriplet()); auto * conn = connManager->getConnectivity(elmts0[i]); TEST_ASSERT(conn!=0); @@ -361,10 +357,10 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart) panzer::GlobalOrdinal totalEdges = (bx*nx+1)*(by*ny)+(bx*nx)*(by*ny+1); // field pattern for basis required - RCP fp = buildFieldPattern >(); + RCP fp = buildFieldPattern(Teuchos::make_rcp>()); // build the topology - RCP > connManager = rcp(new CartesianConnManager); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,px,py,bx,by); connManager->buildConnectivity(*fp); @@ -376,8 +372,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart) for(std::size_t i=0;igetConnectivitySize(elmts0[i]),9); - auto global = CCM::computeLocalElementGlobalTriplet(elmts0[i],connManager->getMyElementsTriplet(), - connManager->getMyOffsetTriplet()); + auto global = CCM::computeLocalBrickElementGlobalTriplet(elmts0[i],connManager->getMyBrickElementsTriplet(), + connManager->getMyBrickOffsetTriplet()); auto * conn = connManager->getConnectivity(elmts0[i]); TEST_ASSERT(conn!=0); @@ -403,8 +399,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_2d_1dpart) // This test checks functions used to generate the topology are correct TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart_helpers) { - typedef CartesianConnManager CCM; - typedef CCM::Triplet TripletGO; + using CCM = CartesianConnManager; + using Triplet = typename CCM::Triplet; // build global (or serial communicator) #ifdef HAVE_MPI @@ -417,15 +413,14 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart_helpers) int rank = comm.getRank(); // field pattern for basis required - RCP fp - = buildFieldPattern >(); + RCP fp = buildFieldPattern(Teuchos::make_rcp>()); // mesh description panzer::GlobalOrdinal nx = 10, ny = 7, nz = 4; int px = np, py = 1, pz = 1; int bx = 1, by = 2, bz = 1; - RCP > connManager = rcp(new CartesianConnManager); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,nz,px,py,pz,bx,by,bz); // test element blocks are computed properly and sized appropriately @@ -443,8 +438,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart_helpers) // test that owned and offset elements are correct { - auto myElements = connManager->getMyElementsTriplet(); - auto myOffset = connManager->getMyOffsetTriplet(); + auto myElements = connManager->getMyBrickElementsTriplet(); + auto myOffset = connManager->getMyBrickOffsetTriplet(); panzer::GlobalOrdinal n = nx / px; panzer::GlobalOrdinal r = nx - n * px; @@ -462,15 +457,15 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart_helpers) // test that the elements are in the right blocks { panzer::GlobalOrdinal blk0[4],blk1[4]; - blk0[0] = connManager->computeLocalElementIndex(TripletGO(2,2,3)); - blk0[1] = connManager->computeLocalElementIndex(TripletGO(5,2,3)); - blk0[2] = connManager->computeLocalElementIndex(TripletGO(7,2,3)); - blk0[3] = connManager->computeLocalElementIndex(TripletGO(9,2,3)); + blk0[0] = connManager->computeLocalBrickElementIndex(Triplet(2,2,3)); + blk0[1] = connManager->computeLocalBrickElementIndex(Triplet(5,2,3)); + blk0[2] = connManager->computeLocalBrickElementIndex(Triplet(7,2,3)); + blk0[3] = connManager->computeLocalBrickElementIndex(Triplet(9,2,3)); - blk1[0] = connManager->computeLocalElementIndex(TripletGO(2,12,1)); - blk1[1] = connManager->computeLocalElementIndex(TripletGO(5,12,1)); - blk1[2] = connManager->computeLocalElementIndex(TripletGO(7,12,1)); - blk1[3] = connManager->computeLocalElementIndex(TripletGO(9,12,1)); + blk1[0] = connManager->computeLocalBrickElementIndex(Triplet(2,12,1)); + blk1[1] = connManager->computeLocalBrickElementIndex(Triplet(5,12,1)); + blk1[2] = connManager->computeLocalBrickElementIndex(Triplet(7,12,1)); + blk1[3] = connManager->computeLocalBrickElementIndex(Triplet(9,12,1)); bool found = false; for(int i=0;i<4;i++) { @@ -520,7 +515,7 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart_helpers) TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart) { - typedef CartesianConnManager CCM; + using CCM = CartesianConnManager; // build global (or serial communicator) #ifdef HAVE_MPI @@ -545,10 +540,10 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart) // test 3D nodal discretization { // field pattern for basis required - RCP fp = buildFieldPattern >(); + RCP fp = buildFieldPattern(Teuchos::make_rcp>()); // build the topology - RCP > connManager = rcp(new CartesianConnManager); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,nz,px,py,pz,bx,by,bz); connManager->buildConnectivity(*fp); @@ -560,8 +555,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart) for(std::size_t i=0;igetConnectivitySize(elmts0[i]),8); - auto global = CCM::computeLocalElementGlobalTriplet(elmts0[i],connManager->getMyElementsTriplet(), - connManager->getMyOffsetTriplet()); + auto global = CCM::computeLocalBrickElementGlobalTriplet(elmts0[i],connManager->getMyBrickElementsTriplet(), + connManager->getMyBrickOffsetTriplet()); auto * conn = connManager->getConnectivity(elmts0[i]); TEST_ASSERT(conn!=0); @@ -585,10 +580,10 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart) panzer::GlobalOrdinal totalFaces = (bx*nx+1)*(by*ny)*(bz*nz)+(bx*nx)*(by*ny+1)*(bz*nz)+(bx*nx)*(by*ny)*(bz*nz+1); // field pattern for basis required - RCP fp = buildFieldPattern >(); + RCP fp = buildFieldPattern(Teuchos::make_rcp>()); // build the topology - RCP > connManager = rcp(new CartesianConnManager); + const auto connManager = Teuchos::make_rcp(); connManager->initialize(comm,nx,ny,nz,px,py,pz,bx,by,bz); connManager->buildConnectivity(*fp); @@ -600,8 +595,8 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart) for(std::size_t i=0;igetConnectivitySize(elmts0[i]),27); - auto global = CCM::computeLocalElementGlobalTriplet(elmts0[i],connManager->getMyElementsTriplet(), - connManager->getMyOffsetTriplet()); + auto global = CCM::computeLocalBrickElementGlobalTriplet(elmts0[i],connManager->getMyBrickElementsTriplet(), + connManager->getMyBrickOffsetTriplet()); out << "Element Triplet: " << global.x << ", " << global.y << ", " << global.z << std::endl; auto * conn = connManager->getConnectivity(elmts0[i]); TEST_ASSERT(conn!=0); @@ -658,6 +653,4 @@ TEUCHOS_UNIT_TEST(tCartesianTop, connmanager_3d_1dpart) } } -} // end unit test -} // end panzer - +} // namespace panzer::unit test From a1cb4ec032b0ea53782263b704f2887b45bdd80a Mon Sep 17 00:00:00 2001 From: Christian Glusa Date: Mon, 17 Jun 2024 09:23:17 -0600 Subject: [PATCH 24/68] Additions to release notes --- RELEASE_NOTES | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index e75e9b40a736..bf4f8a9c280c 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -5,6 +5,37 @@ # # ############################################################################### +A large number of packages have been marked as deprecated in this release. +We are planning to remove them in the fall of 2025. The list of packages is + + - Amesos + - AztecOO + - Epetra + - EpetraExt + - Ifpack + - Intrepid + - Isorropia + - ML + - NewPackage + - Pliris + - PyTrilinos + - ShyLU_DDCore + - ThyraEpetraAdapters + - ThyraEpetraExtAdapters + - Triutils + +If you are a user of one of these packages, please transition to the newer +software stack. If you need guidance with finding an adequate replacement +or are missing a particular feature, please open an issue or a discussion +on Github. + + +Amesos2 + + - Add interface to MKL cluster sparse solver. + https://github.com/trilinos/Trilinos/pull/13073 + + Framework - Marked all deprecated packages as 'Secondary Tested'. @@ -19,8 +50,49 @@ Framework - Added deprecation warnings to all deprecated packages. The warnings are able to be disabled via the `Trilinos_SHOW_DEPRECATED_WARNINGS` option (this is also available as a per-package option). These warnings are intended to - notify users that pacakge capability they are using will be removed in upcoming + notify users that package capability they are using will be removed in upcoming releases. + https://github.com/trilinos/Trilinos/pull/12828 + + +Ifpack2 + + - RBILUK now supports Kokkos Kernels as a backend + https://github.com/trilinos/Trilinos/pull/12911 + + +Kokkos, Kokkos Kernels + + - Inclusion of version 4.3.1 of Kokkos and Kokkos Kernels + https://github.com/trilinos/Trilinos/pull/12995 + + +NOX + + - Added preconditioner reuse across multiple nonlinear solves. + https://github.com/trilinos/Trilinos/pull/12986 + + +Teko + + - Add Hierarchical Block Gauss-Seidel Capability + https://github.com/trilinos/Trilinos/pull/13040 + + +Tpetra + + - Some Tpetra features can be toggled via environment variables. + When an unrecognized variable is found, Tpetra now throws to alert + to potentially misspelled variables. + https://github.com/trilinos/Trilinos/pull/12944 + + - Add a test that checks that vendor TPLs for sparse matrix-vector product + are called. + https://github.com/trilinos/Trilinos/pull/13018 + + - Add team parallelism to kernels associated with matrix equilibration. + https://github.com/trilinos/Trilinos/pull/13017 + ############################################################################### # # From e9d69bf54fe23c67a64253dfda86a2870ec369f7 Mon Sep 17 00:00:00 2001 From: Sean Miller Date: Mon, 17 Jun 2024 10:54:00 -0500 Subject: [PATCH 25/68] Fixing some cmake/include paths for rocm components in ShyLu --- packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake | 4 ++-- .../shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake b/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake index dda2a56e87ba..ce973b06ea64 100644 --- a/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake +++ b/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake @@ -3,6 +3,6 @@ SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES Kokkos TrilinosSS) SET(TEST_OPTIONAL_DEP_PACKAGES) SET(LIB_REQUIRED_DEP_TPLS) -SET(LIB_OPTIONAL_DEP_TPLS METIS MKL LAPACK BLAS Pthread QTHREAD VTune CUSOLVER CUSPARSE CUBLAS CUDA ROCSOLVER ROCBLAS) +SET(LIB_OPTIONAL_DEP_TPLS METIS MKL LAPACK BLAS Pthread QTHREAD VTune CUSOLVER CUSPARSE CUBLAS CUDA ROCSOLVER ROCBLAS ROCSPARSE) SET(TEST_REQUIRED_DEP_TPLS Pthread BLAS LAPACK) -SET(TEST_OPTIONAL_DEP_TPLS METIS Cholmod MKL LAPACK BLAS Pthread QTHREAD CUSOLVER CUSPARSE CUBLAS CUDA ROCSOLVER ROCBLAS) +SET(TEST_OPTIONAL_DEP_TPLS METIS Cholmod MKL LAPACK BLAS Pthread QTHREAD CUSOLVER CUSPARSE CUBLAS CUDA ROCSOLVER ROCBLAS ROCSPARSE) diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp index 8b1f69bbea8f..dfdf28851be2 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp @@ -23,8 +23,12 @@ Sandia National Laboratories, Albuquerque, NM, USA #if defined(KOKKOS_ENABLE_CUDA) #include #elif defined(KOKKOS_ENABLE_HIP) - #include - #include + #if __has_include() + #include + #else + #include + #endif + #include #define ROCM_VERSION ROCM_VERSION_MAJOR * 10000 + ROCM_VERSION_MINOR * 100 + ROCM_VERSION_PATCH #endif From 41ac1ec7941bb47dcc00fbedf290d6a6d4e5b506 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Mon, 17 Jun 2024 10:41:51 -0600 Subject: [PATCH 26/68] Disable ROL test in COMMON_SPACK_TPLS History indicates a problem with Spack-built MPI, so move this directive into COMMON_SPACK_TPLS. Acute issue is seeing it fail (again) with the new Clang configuration. Signed-off-by: Samuel E. Browne --- packages/framework/ini-files/config-specs.ini | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index 834884da94f6..1197a3b0a0a5 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -445,6 +445,11 @@ opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.s opt-set-cmake-var Zlib_INCLUDE_DIRS PATH FORCE : ${ZLIB_INC|ENV} opt-set-cmake-var Zlib_LIBRARY_DIRS PATH FORCE : ${ZLIB_LIB|ENV} +# This is temporarily disabled because it seems to be particularly sensitive to the spack-built +# MPI issue (TRILFRAME-552) +opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON + + [COMMON_AUE_SPACK] use COMMON_SPACK_TPLS @@ -2183,11 +2188,6 @@ opt-set-cmake-var Tempus_IMEX_RK_Staggered_FSA_Tangent_MPI_1_DISABLE BOOL FORCE opt-set-cmake-var Tempus_Newmark_MPI_1_DISABLE BOOL FORCE : ON opt-set-cmake-var Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder_MPI_1_DISABLE BOOL FORCE : ON -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - - [rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] # uses sems-v2 modules use rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables @@ -2291,10 +2291,6 @@ opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678) opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - # This is run serially to try to prevent some unpredictable issues where these tests may be trying # overlap other executing tests on the same GPU after introducing usage for multiple GPUs for testing. # (https://github.com/trilinos/Trilinos/pull/11391) @@ -2348,10 +2344,6 @@ use PACKAGE-ENABLES|ALL-NO-EPETRA opt-set-cmake-var CMAKE_CXX_FLAGS STRING FORCE : -Wall -Wunused-parameter -Werror=unused-parameter -Wshadow -Werror=shadow -pedantic -Werror=pedantic -Werror=sign-compare -Werror=sign-compare -Wtype-limits -Werror=type-limits -Wuninitialized -Werror=uninitialized -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - [rhel8_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.1.4_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables] # uses sems-v2 modules use RHEL8_COMPILER|CUDA @@ -2448,10 +2440,6 @@ opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678) opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - use PACKAGE-ENABLES|NO-EPETRA use RHEL7_POST @@ -2593,10 +2581,6 @@ opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678) opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - use PACKAGE-ENABLES|NO-EPETRA use RHEL7_POST From 7e19a67a6ab3f27e76c0b7ccc9eccc158b3d87a6 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Mon, 17 Jun 2024 11:10:39 -0600 Subject: [PATCH 27/68] Tpetra: add getBlockCrsGraph free function to ETI Fixes #13076 Signed-off-by: Brian Kelley --- packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp b/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp index 21e000ba5e30..ea94c34ed258 100644 --- a/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp +++ b/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp @@ -1098,7 +1098,8 @@ namespace Tpetra { template Teuchos::RCP > convertToBlockCrsMatrix(const CrsMatrix& pointMatrix, const LO &blockSize, bool use_LID); \ template Teuchos::RCP > fillLogicalBlocks(const CrsMatrix& pointMatrix, const LO &blockSize); \ template Teuchos::RCP > unfillFormerBlockCrs(const CrsMatrix& pointMatrix); \ - template Teuchos::RCP > convertToCrsMatrix(const BlockCrsMatrix& blockMatrix); + template Teuchos::RCP > convertToCrsMatrix(const BlockCrsMatrix& blockMatrix); \ + template Teuchos::RCP> getBlockCrsGraph(const Tpetra::CrsMatrix& pointMatrix, const LO &blockSize, bool use_local_ID); // // Explicit instantiation macro for createMeshMap / createPointMap From 9dd4febd3eb5183dfc22980553f55d9d6a20cb6d Mon Sep 17 00:00:00 2001 From: iyamazaki Date: Mon, 17 Jun 2024 12:01:36 -0600 Subject: [PATCH 28/68] Amesos2::CSS : missing header file --- packages/amesos2/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/amesos2/src/CMakeLists.txt b/packages/amesos2/src/CMakeLists.txt index 04c1e1590233..446b58ee7bc7 100644 --- a/packages/amesos2/src/CMakeLists.txt +++ b/packages/amesos2/src/CMakeLists.txt @@ -398,6 +398,7 @@ IF (${PACKAGE_NAME}_ENABLE_PARDISO_MKL AND HAVE_MPI) APPEND_SET(HEADERS Amesos2_CssMKL.hpp Amesos2_CssMKL_FunctionMap.hpp + Amesos2_CssMKL_TypeMap.hpp Amesos2_CssMKL_decl.hpp Amesos2_CssMKL_def.hpp ) From 99b68ae2f9cc50317cba44707f3f0f7ab89c2710 Mon Sep 17 00:00:00 2001 From: iyamazaki Date: Mon, 17 Jun 2024 13:46:30 -0600 Subject: [PATCH 29/68] Amesos2::CSS : serial build --- packages/amesos2/src/Amesos2_Factory.hpp | 2 ++ packages/amesos2/src/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/amesos2/src/Amesos2_Factory.hpp b/packages/amesos2/src/Amesos2_Factory.hpp index 3f14e95e08ee..5f6546f76f67 100644 --- a/packages/amesos2/src/Amesos2_Factory.hpp +++ b/packages/amesos2/src/Amesos2_Factory.hpp @@ -126,8 +126,10 @@ #ifdef HAVE_AMESOS2_PARDISO_MKL // MKL version of Pardiso #include "Amesos2_PardisoMKL.hpp" +#ifdef HAVE_MPI #include "Amesos2_CssMKL.hpp" #endif +#endif #ifdef HAVE_AMESOS2_LAPACK #include "Amesos2_Lapack.hpp" diff --git a/packages/amesos2/src/CMakeLists.txt b/packages/amesos2/src/CMakeLists.txt index 446b58ee7bc7..50d5faafbca5 100644 --- a/packages/amesos2/src/CMakeLists.txt +++ b/packages/amesos2/src/CMakeLists.txt @@ -394,7 +394,7 @@ IF (${PACKAGE_NAME}_ENABLE_PARDISO_MKL) ) ENDIF() -IF (${PACKAGE_NAME}_ENABLE_PARDISO_MKL AND HAVE_MPI) +IF (${PACKAGE_NAME}_ENABLE_PARDISO_MKL AND TPL_ENABLE_MPI) APPEND_SET(HEADERS Amesos2_CssMKL.hpp Amesos2_CssMKL_FunctionMap.hpp From a42b1575b02cd858a677a3101e648c8de8398578 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 22:18:50 +0000 Subject: [PATCH 30/68] Bump actions/checkout from 4.1.6 to 4.1.7 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/a5ac7e51b41094c92402da3b24376905380afc29...692973e3d937129bcbf40652eb9f2f61becf3332) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/AT2.yml | 6 +++--- .github/workflows/clang_format.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/detect-git-lfs.yml | 2 +- .github/workflows/detect-mpi-comm-world.yml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/spack.yml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/AT2.yml b/.github/workflows/AT2.yml index 5b4cbfc92f08..f081d16c9b3d 100644 --- a/.github/workflows/AT2.yml +++ b/.github/workflows/AT2.yml @@ -41,7 +41,7 @@ jobs: mkdir -p /home/Trilinos/src/Trilinos mkdir -p /home/Trilinos/build - name: Clone trilinos - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - name: Repo status @@ -119,7 +119,7 @@ jobs: mkdir -p /home/Trilinos/src/Trilinos mkdir -p /home/Trilinos/build - name: Clone trilinos - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - name: Repo status @@ -197,7 +197,7 @@ jobs: mkdir -p /home/Trilinos/src/Trilinos mkdir -p /home/Trilinos/build - name: Clone trilinos - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - name: Repo status diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index 4a094e22f91f..640f7b0bfa13 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: DoozyX/clang-format-lint-action@11b773b1598aa4ae3b32f023701bca5201c3817d # v0.17 with: source: './packages/muelu ./packages/tempus ./packages/teko ./packages/xpetra' diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4a195bbf4e60..06728bc3baba 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -58,7 +58,7 @@ jobs: # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index b9113179704b..1792f0181c00 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: 'Dependency Review' uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3 diff --git a/.github/workflows/detect-git-lfs.yml b/.github/workflows/detect-git-lfs.yml index 621448862ece..9fe410cacdd3 100644 --- a/.github/workflows/detect-git-lfs.yml +++ b/.github/workflows/detect-git-lfs.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 diff --git a/.github/workflows/detect-mpi-comm-world.yml b/.github/workflows/detect-mpi-comm-world.yml index 7a1ba4501373..a3374b6d4fa3 100644 --- a/.github/workflows/detect-mpi-comm-world.yml +++ b/.github/workflows/detect-mpi-comm-world.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index ba2ac51e5ef4..b8a4fdb39eb8 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -31,7 +31,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false diff --git a/.github/workflows/spack.yml b/.github/workflows/spack.yml index 6edc8d0f4853..6d7b43e1f58e 100644 --- a/.github/workflows/spack.yml +++ b/.github/workflows/spack.yml @@ -24,7 +24,7 @@ jobs: with: access_token: ${{ github.token }} - name: Clone Trilinos - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 1 - name: Spack build From 7bddd7ba844baf71a31619e330747620b94d6e18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 22:19:01 +0000 Subject: [PATCH 31/68] Bump github/codeql-action from 3.25.8 to 3.25.10 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.8 to 3.25.10. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2e230e8fe0ad3a14a340ad0815ddb96d599d2aff...23acc5c183826b7a8a97bce3cecc52db901f8251) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4a195bbf4e60..1269c04de7b9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -62,7 +62,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} @@ -85,6 +85,6 @@ jobs: make -j 2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index ba2ac51e5ef4..b67d673a352e 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -66,6 +66,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10 with: sarif_file: results.sarif From 56643a2fd1434b9f6b7791867b50884bf3f7761f Mon Sep 17 00:00:00 2001 From: malphil Date: Thu, 30 May 2024 13:58:18 -0600 Subject: [PATCH 32/68] Add ability to precondition block solves within hierarchical block solver --- ...chicalGaussSeidelPreconditionerFactory.cpp | 38 +++++++++++++++---- ...chicalGaussSeidelPreconditionerFactory.hpp | 6 ++- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp index 144b82069411..ff87bf0c714d 100644 --- a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp +++ b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp @@ -271,24 +271,42 @@ LinearOp HierarchicalGaussSeidelPreconditionerFactory::buildPreconditionerOperat for (auto [hierarchicalBlockNum, blocks] : blockToRow) { auto A_bb = extractSubblockMatrix(blo, blocks, blocks); blockToInvOp[hierarchicalBlockNum] = this->buildBlockInverse( - *blockToInverse.at(hierarchicalBlockNum), A_bb, state, hierarchicalBlockNum); + *blockToInverse.at(hierarchicalBlockNum), blockToPreconditioner.at(hierarchicalBlockNum), + A_bb, state, hierarchicalBlockNum); } return Teuchos::rcp(new NestedBlockGS(blockToRow, blockToInvOp, blo, useLowerTriangle)); } LinearOp HierarchicalGaussSeidelPreconditionerFactory::buildBlockInverse( - const InverseFactory& invFact, const BlockedLinearOp& matrix, BlockPreconditionerState& state, + const InverseFactory& invFact, Teuchos::RCP& precFact, + const BlockedLinearOp& matrix, BlockPreconditionerState& state, int hierarchicalBlockNum) const { std::stringstream ss; ss << "hierarchical_block_" << hierarchicalBlockNum; - ModifiableLinearOp& invOp = state.getModifiableOp(ss.str()); + ModifiableLinearOp& invOp = state.getModifiableOp(ss.str()); + ModifiableLinearOp& precOp = state.getModifiableOp("prec_" + ss.str()); - if (invOp == Teuchos::null) { - invOp = buildInverse(invFact, matrix); - } else { - rebuildInverse(invFact, matrix, invOp); + if (precFact != Teuchos::null) { + if (precOp == Teuchos::null) { + precOp = precFact->buildInverse(matrix); + state.addModifiableOp("prec_" + ss.str(), precOp); + } else { + Teko::rebuildInverse(*precFact, matrix, precOp); + } + } + + if (invOp == Teuchos::null) + if (precOp.is_null()) + invOp = Teko::buildInverse(invFact, matrix); + else + invOp = Teko::buildInverse(invFact, matrix, precOp); + else { + if (precOp.is_null()) + Teko::rebuildInverse(invFact, matrix, invOp); + else + Teko::rebuildInverse(invFact, matrix, precOp, invOp); } return invOp; @@ -313,6 +331,12 @@ void HierarchicalGaussSeidelPreconditionerFactory::initializeFromParameterList( ss.str()); auto invStr = hierarchicalParams.get("Inverse Type"); blockToInverse[*hierarchicalBlockNumber] = invLib->getInverseFactory(invStr); + + blockToPreconditioner[*hierarchicalBlockNumber] = Teuchos::null; + if (hierarchicalParams.isParameter("Preconditioner Type")) { + auto precStr = hierarchicalParams.get("Preconditioner Type"); + blockToPreconditioner[*hierarchicalBlockNumber] = invLib->getInverseFactory(precStr); + } } useLowerTriangle = false; diff --git a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp index b0ab109c7607..6459cc83849b 100644 --- a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp +++ b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp @@ -104,11 +104,13 @@ class HierarchicalGaussSeidelPreconditionerFactory : public BlockPreconditionerF using BlockPreconditionerFactory::buildPreconditionerOperator; private: - LinearOp buildBlockInverse(const InverseFactory& invFact, const BlockedLinearOp& matrix, - BlockPreconditionerState& state, int hierarchicalBlockNum) const; + LinearOp buildBlockInverse(const InverseFactory& invFact, Teuchos::RCP& precFact, + const BlockedLinearOp& matrix, BlockPreconditionerState& state, + int hierarchicalBlockNum) const; std::map> blockToRow; std::map> blockToInverse; + std::map> blockToPreconditioner; mutable std::map blockToInvOp; bool useLowerTriangle = false; From 087cfa7b9d17f1bf40c6510fe1a27d26f6455dfe Mon Sep 17 00:00:00 2001 From: malphil Date: Thu, 30 May 2024 14:00:48 -0600 Subject: [PATCH 33/68] Attempt to use preconditioned block solves in SIMPLE unit test --- .../teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp b/packages/teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp index 6f880c95d84b..336e85df914b 100644 --- a/packages/teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp +++ b/packages/teko/tests/src/tSIMPLEPreconditionerFactory_tpetra.cpp @@ -781,10 +781,12 @@ bool tSIMPLEPreconditionerFactory_tpetra::test_hierarchicalSolves(int verbosity, ifl.sublist("HBGS").set("Type", "Hierarchical Block Gauss-Seidel"); ifl.sublist("HBGS").sublist("Hierarchical Block 1").set("Included Subblocks", "1,2"); - ifl.sublist("HBGS").sublist("Hierarchical Block 1").set("Inverse Type", "SIMPLE"); + ifl.sublist("HBGS").sublist("Hierarchical Block 1").set("Inverse Type", "Belos"); + ifl.sublist("HBGS").sublist("Hierarchical Block 1").set("Preconditioner Type", "SIMPLE"); ifl.sublist("HBGS").sublist("Hierarchical Block 2").set("Included Subblocks", "3"); - ifl.sublist("HBGS").sublist("Hierarchical Block 2").set("Inverse Type", "SINGLE_BGS"); + ifl.sublist("HBGS").sublist("Hierarchical Block 2").set("Inverse Type", "Belos"); + ifl.sublist("HBGS").sublist("Hierarchical Block 2").set("Preconditioner Type", "SINGLE_BGS"); ifl.sublist("SIMPLE").set("Type", "NS SIMPLE"); ifl.sublist("SIMPLE").set("Inverse Velocity Type", "Belos"); From a18492dfc162435375a07926b25b481c40e1fd05 Mon Sep 17 00:00:00 2001 From: malphil Date: Thu, 30 May 2024 14:12:32 -0600 Subject: [PATCH 34/68] Const-correctness fix --- .../src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp | 2 +- .../src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp index ff87bf0c714d..58b41ac1dc30 100644 --- a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp +++ b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.cpp @@ -279,7 +279,7 @@ LinearOp HierarchicalGaussSeidelPreconditionerFactory::buildPreconditionerOperat } LinearOp HierarchicalGaussSeidelPreconditionerFactory::buildBlockInverse( - const InverseFactory& invFact, Teuchos::RCP& precFact, + const InverseFactory& invFact, const Teuchos::RCP& precFact, const BlockedLinearOp& matrix, BlockPreconditionerState& state, int hierarchicalBlockNum) const { std::stringstream ss; diff --git a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp index 6459cc83849b..9b6ce28b1177 100644 --- a/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp +++ b/packages/teko/src/Teko_HierarchicalGaussSeidelPreconditionerFactory.hpp @@ -104,7 +104,8 @@ class HierarchicalGaussSeidelPreconditionerFactory : public BlockPreconditionerF using BlockPreconditionerFactory::buildPreconditionerOperator; private: - LinearOp buildBlockInverse(const InverseFactory& invFact, Teuchos::RCP& precFact, + LinearOp buildBlockInverse(const InverseFactory& invFact, + const Teuchos::RCP& precFact, const BlockedLinearOp& matrix, BlockPreconditionerState& state, int hierarchicalBlockNum) const; From 71a73c6b712c24d9d0cb5dab790f7303adff9375 Mon Sep 17 00:00:00 2001 From: malphil Date: Wed, 5 Jun 2024 13:25:40 -0600 Subject: [PATCH 35/68] Replace datacopy call with assignment, making sure to pre-allocate scratch vectors for Block G-S implicit operators --- packages/teko/src/Teko_BlockLowerTriInverseOp.cpp | 7 +++++-- packages/teko/src/Teko_BlockUpperTriInverseOp.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp index ed860406b87e..667457a37344 100644 --- a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp @@ -69,6 +69,9 @@ BlockLowerTriInverseOp::BlockLowerTriInverseOp(BlockedLinearOp& L, // just flip flop them! productRange_ = L_->productDomain(); productDomain_ = L_->productRange(); + + srcScrap_ = toBlockedMultiVector(Thyra::createMember(*productDomain_)); + dstScrap_ = toBlockedMultiVector(Thyra::createMember(*productRange_)); } /** @brief Perform a matrix vector multiply with this operator. @@ -91,10 +94,10 @@ void BlockLowerTriInverseOp::implicitApply(const BlockedMultiVector& src, Blocke TEUCHOS_ASSERT(blocks == blockCount(dst)); // build a scrap vector for storing work - srcScrap_ = datacopy(src, srcScrap_); + Thyra::assign(srcScrap_.ptr(), *src); BlockedMultiVector dstCopy; if (beta != 0.0) { - dstScrap_ = datacopy(dst, dstScrap_); + Thyra::assign(dstScrap_.ptr(), *dst); dstCopy = dstScrap_; } else dstCopy = dst; // shallow copy diff --git a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp index e3a852d6ba05..0be2f19ed85b 100644 --- a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp @@ -79,6 +79,9 @@ BlockUpperTriInverseOp::BlockUpperTriInverseOp(BlockedLinearOp& U, // just flip flop them! productRange_ = U->productDomain(); productDomain_ = U->productRange(); + + srcScrap_ = toBlockedMultiVector(Thyra::createMember(*productDomain_)); + dstScrap_ = toBlockedMultiVector(Thyra::createMember(*productRange_)); } void BlockUpperTriInverseOp::implicitApply(const BlockedMultiVector& src, BlockedMultiVector& dst, @@ -108,10 +111,10 @@ void BlockUpperTriInverseOp::implicitApply(const Thyra::EOpTransp M_trans, TEUCHOS_ASSERT(blocks == blockCount(dst)); // build a scrap vector for storing work - srcScrap_ = datacopy(src, srcScrap_); + Thyra::assign(srcScrap_.ptr(), *src); BlockedMultiVector dstCopy; if (beta != 0.0) { - dstScrap_ = datacopy(dst, dstScrap_); + Thyra::assign(dstScrap_.ptr(), *dst); dstCopy = dstScrap_; } else dstCopy = dst; // shallow copy From 50c8c0be7dac3d9f35d94cc15812725508108fd9 Mon Sep 17 00:00:00 2001 From: malphil Date: Wed, 5 Jun 2024 13:34:40 -0600 Subject: [PATCH 36/68] Apply clang formatting to changes --- packages/teko/src/Teko_BlockLowerTriInverseOp.cpp | 2 +- packages/teko/src/Teko_BlockUpperTriInverseOp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp index 667457a37344..77a9cfe02cf5 100644 --- a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp @@ -98,7 +98,7 @@ void BlockLowerTriInverseOp::implicitApply(const BlockedMultiVector& src, Blocke BlockedMultiVector dstCopy; if (beta != 0.0) { Thyra::assign(dstScrap_.ptr(), *dst); - dstCopy = dstScrap_; + dstCopy = dstScrap_; } else dstCopy = dst; // shallow copy diff --git a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp index 0be2f19ed85b..57a772e419b8 100644 --- a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp @@ -115,7 +115,7 @@ void BlockUpperTriInverseOp::implicitApply(const Thyra::EOpTransp M_trans, BlockedMultiVector dstCopy; if (beta != 0.0) { Thyra::assign(dstScrap_.ptr(), *dst); - dstCopy = dstScrap_; + dstCopy = dstScrap_; } else dstCopy = dst; // shallow copy From 340d658adfbde9afc32797061e14fe9eebfed58d Mon Sep 17 00:00:00 2001 From: malphil Date: Thu, 13 Jun 2024 12:51:12 -0600 Subject: [PATCH 37/68] Make small modifications required to fix Block G-S/MueLu related issue --- packages/teko/src/Teko_BlockLowerTriInverseOp.cpp | 9 ++++++--- packages/teko/src/Teko_BlockLowerTriInverseOp.hpp | 1 + packages/teko/src/Teko_BlockUpperTriInverseOp.cpp | 9 ++++++--- packages/teko/src/Teko_BlockUpperTriInverseOp.hpp | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp index 77a9cfe02cf5..32225bb8767f 100644 --- a/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockLowerTriInverseOp.cpp @@ -69,9 +69,6 @@ BlockLowerTriInverseOp::BlockLowerTriInverseOp(BlockedLinearOp& L, // just flip flop them! productRange_ = L_->productDomain(); productDomain_ = L_->productRange(); - - srcScrap_ = toBlockedMultiVector(Thyra::createMember(*productDomain_)); - dstScrap_ = toBlockedMultiVector(Thyra::createMember(*productRange_)); } /** @brief Perform a matrix vector multiply with this operator. @@ -93,6 +90,12 @@ void BlockLowerTriInverseOp::implicitApply(const BlockedMultiVector& src, Blocke TEUCHOS_ASSERT(blocks == blockRowCount(L_)); TEUCHOS_ASSERT(blocks == blockCount(dst)); + if (!allocated) { + srcScrap_ = deepcopy(src); + dstScrap_ = deepcopy(dst); + allocated = true; + } + // build a scrap vector for storing work Thyra::assign(srcScrap_.ptr(), *src); BlockedMultiVector dstCopy; diff --git a/packages/teko/src/Teko_BlockLowerTriInverseOp.hpp b/packages/teko/src/Teko_BlockLowerTriInverseOp.hpp index a0893e6be9b0..3e41393b0c9b 100644 --- a/packages/teko/src/Teko_BlockLowerTriInverseOp.hpp +++ b/packages/teko/src/Teko_BlockLowerTriInverseOp.hpp @@ -116,6 +116,7 @@ class BlockLowerTriInverseOp : public BlockImplicitLinearOp { // scratch space...so we don't have to reallocate mutable BlockedMultiVector srcScrap_; mutable BlockedMultiVector dstScrap_; + mutable bool allocated = false; private: // hide me! diff --git a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp index 57a772e419b8..0849b072fe82 100644 --- a/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp +++ b/packages/teko/src/Teko_BlockUpperTriInverseOp.cpp @@ -79,9 +79,6 @@ BlockUpperTriInverseOp::BlockUpperTriInverseOp(BlockedLinearOp& U, // just flip flop them! productRange_ = U->productDomain(); productDomain_ = U->productRange(); - - srcScrap_ = toBlockedMultiVector(Thyra::createMember(*productDomain_)); - dstScrap_ = toBlockedMultiVector(Thyra::createMember(*productRange_)); } void BlockUpperTriInverseOp::implicitApply(const BlockedMultiVector& src, BlockedMultiVector& dst, @@ -110,6 +107,12 @@ void BlockUpperTriInverseOp::implicitApply(const Thyra::EOpTransp M_trans, TEUCHOS_ASSERT(blocks == blockRowCount(U_)); TEUCHOS_ASSERT(blocks == blockCount(dst)); + if (!allocated) { + srcScrap_ = deepcopy(src); + dstScrap_ = deepcopy(dst); + allocated = true; + } + // build a scrap vector for storing work Thyra::assign(srcScrap_.ptr(), *src); BlockedMultiVector dstCopy; diff --git a/packages/teko/src/Teko_BlockUpperTriInverseOp.hpp b/packages/teko/src/Teko_BlockUpperTriInverseOp.hpp index a189d975b47b..6c79dc11827d 100644 --- a/packages/teko/src/Teko_BlockUpperTriInverseOp.hpp +++ b/packages/teko/src/Teko_BlockUpperTriInverseOp.hpp @@ -131,6 +131,7 @@ class BlockUpperTriInverseOp : public BlockImplicitLinearOp { // scratch space...so we don't have to reallocate mutable BlockedMultiVector srcScrap_; mutable BlockedMultiVector dstScrap_; + mutable bool allocated = false; private: // hide me! From 08d1efa4699c7cff1bdf2f458c29e315bf88e396 Mon Sep 17 00:00:00 2001 From: Christian Glusa Date: Mon, 17 Jun 2024 09:23:17 -0600 Subject: [PATCH 38/68] Additions to release notes --- RELEASE_NOTES | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index e75e9b40a736..bf4f8a9c280c 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -5,6 +5,37 @@ # # ############################################################################### +A large number of packages have been marked as deprecated in this release. +We are planning to remove them in the fall of 2025. The list of packages is + + - Amesos + - AztecOO + - Epetra + - EpetraExt + - Ifpack + - Intrepid + - Isorropia + - ML + - NewPackage + - Pliris + - PyTrilinos + - ShyLU_DDCore + - ThyraEpetraAdapters + - ThyraEpetraExtAdapters + - Triutils + +If you are a user of one of these packages, please transition to the newer +software stack. If you need guidance with finding an adequate replacement +or are missing a particular feature, please open an issue or a discussion +on Github. + + +Amesos2 + + - Add interface to MKL cluster sparse solver. + https://github.com/trilinos/Trilinos/pull/13073 + + Framework - Marked all deprecated packages as 'Secondary Tested'. @@ -19,8 +50,49 @@ Framework - Added deprecation warnings to all deprecated packages. The warnings are able to be disabled via the `Trilinos_SHOW_DEPRECATED_WARNINGS` option (this is also available as a per-package option). These warnings are intended to - notify users that pacakge capability they are using will be removed in upcoming + notify users that package capability they are using will be removed in upcoming releases. + https://github.com/trilinos/Trilinos/pull/12828 + + +Ifpack2 + + - RBILUK now supports Kokkos Kernels as a backend + https://github.com/trilinos/Trilinos/pull/12911 + + +Kokkos, Kokkos Kernels + + - Inclusion of version 4.3.1 of Kokkos and Kokkos Kernels + https://github.com/trilinos/Trilinos/pull/12995 + + +NOX + + - Added preconditioner reuse across multiple nonlinear solves. + https://github.com/trilinos/Trilinos/pull/12986 + + +Teko + + - Add Hierarchical Block Gauss-Seidel Capability + https://github.com/trilinos/Trilinos/pull/13040 + + +Tpetra + + - Some Tpetra features can be toggled via environment variables. + When an unrecognized variable is found, Tpetra now throws to alert + to potentially misspelled variables. + https://github.com/trilinos/Trilinos/pull/12944 + + - Add a test that checks that vendor TPLs for sparse matrix-vector product + are called. + https://github.com/trilinos/Trilinos/pull/13018 + + - Add team parallelism to kernels associated with matrix equilibration. + https://github.com/trilinos/Trilinos/pull/13017 + ############################################################################### # # From 3fa1fde74b30043a6742728121cb6da87be98daa Mon Sep 17 00:00:00 2001 From: Chris Siefert Date: Tue, 28 May 2024 10:32:04 -0600 Subject: [PATCH 39/68] Tpetra: Adding prorotype aztec ordering checker --- .../tpetra/core/src/Tpetra_Import_Util.hpp | 71 ++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/packages/tpetra/core/src/Tpetra_Import_Util.hpp b/packages/tpetra/core/src/Tpetra_Import_Util.hpp index 5c62cc43cb29..ce0cf642b034 100644 --- a/packages/tpetra/core/src/Tpetra_Import_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_Util.hpp @@ -229,7 +229,7 @@ getRemotePIDs (const Tpetra::Import& Importer, } } - + /* Check some of the validity of an Import object WARNING: This is a debugging routine only. */ template @@ -477,6 +477,75 @@ checkImportValidity (const Tpetra::Import& Impo } +/* Check to see that the import object's target map respects AztecOO/ML ordering */ +template +bool +checkAztecOOMLOrdering (const Tpetra::Import& Importer) +{ + + Teuchos::RCP > source = Importer.getSourceMap(); + Teuchos::RCP > target = Importer.getTargetMap(); + + // Get the (pid, gid) pairs (with locals flagged as -1) + Teuchos::Array > gpids; + getPidGidPairs (Importer, gpids, true); + + bool is_ok=true; + bool is_local = true; + int last_PID = -1; + GlobalOrdinal INVALID = Teuchos::OrdinalTraits::invalid(); + GlobalOrdinal last_GID = Teuchos::OrdinalTraits::invalid(); + + for(size_t i=0; i<(size_t) gpids.size(); i++) { + int pid = gpids[i].first; + GlobalOrdinal gid = gpids[i].second; + + if(is_local == false && pid == -1) { + // Out-of-order local + is_ok = false; + break; + } + else if(pid == --1) { + // Local, matching PID + if(source->getGlobalElement(i) != target->getGlobalElement(i) { + // GIDs don't match, though the PIDs do + is_ok == false; + break; + } + } + else { + // Off-rank section + is_local = false; + if(last_PID == -1) { + last_PID = pid; + last_GID = gid; + } + else if(pid < last_PID) { + // PIDs out of order + is_ok=false; + break; + } + else if(pid == last_PID) { + if(gid < last_GID) { + // Same rank, but gids out of order + is_ok=false; + break; + } + + } + else { + // New rank + last_PID = pid; + last_GID = gid; + } + } + } + + return is_ok; +} + + + } // namespace Import_Util } // namespace Tpetra From 2c89ab72d6c64567b06bcdd17280555fd08585b6 Mon Sep 17 00:00:00 2001 From: Chris Siefert Date: Wed, 29 May 2024 09:43:24 -0600 Subject: [PATCH 40/68] Tpetra: Minor Fixes --- packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp | 3 ++- packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp index 84a31d969815..ec7520ecaad7 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp @@ -1758,7 +1758,8 @@ namespace Tpetra { /// \param remotePIDs [out] The process ranks corresponding to the /// column Map's "remote" (not on the calling process in the /// domain Map) indices. - void makeColMap (Teuchos::Array& remotePIDs); + /// \param userDomainMap [in] User-provided alternative to the domainMap. + void makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap = getDomainMap()); /// \brief Convert column indices from global to local. /// diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp index 4cf1a13a7405..551a00646ba2 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp @@ -4384,7 +4384,7 @@ namespace Tpetra { template void CrsGraph:: - makeColMap (Teuchos::Array& remotePIDs) + makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap) { using Details::ProfilingRegion; using std::endl; @@ -4423,7 +4423,7 @@ namespace Tpetra { std::ostringstream errStrm; const int lclErrCode = Details::makeColMap (colMap, remotePIDs, - getDomainMap (), *this, sortEachProcsGids, &errStrm); + userDomainMap, *this, sortEachProcsGids, &errStrm); auto comm = this->getComm (); if (! comm.is_null ()) { const int lclSuccess = (lclErrCode == 0) ? 1 : 0; @@ -4443,7 +4443,7 @@ namespace Tpetra { } else { (void) Details::makeColMap (colMap, remotePIDs, - getDomainMap (), *this, sortEachProcsGids, nullptr); + userDomainMap, *this, sortEachProcsGids, nullptr); } // See above. We want to admit the possibility of makeColMap // actually revising an existing column Map, even though that From 49c7688e6dc52a3f539ed95cd4dfb023d7776f2a Mon Sep 17 00:00:00 2001 From: kliegeois Date: Wed, 29 May 2024 10:12:05 -0600 Subject: [PATCH 41/68] minor fixes in checkAztecOOMLOrdering --- .../tpetra/core/src/Tpetra_Import_Util.hpp | 83 +++++++++---------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Import_Util.hpp b/packages/tpetra/core/src/Tpetra_Import_Util.hpp index ce0cf642b034..71c92b4bbe49 100644 --- a/packages/tpetra/core/src/Tpetra_Import_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_Util.hpp @@ -487,7 +487,7 @@ checkAztecOOMLOrdering (const Tpetra::Import& I Teuchos::RCP > target = Importer.getTargetMap(); // Get the (pid, gid) pairs (with locals flagged as -1) - Teuchos::Array > gpids; + Teuchos::Array > gpids; getPidGidPairs (Importer, gpids, true); bool is_ok=true; @@ -497,48 +497,47 @@ checkAztecOOMLOrdering (const Tpetra::Import& I GlobalOrdinal last_GID = Teuchos::OrdinalTraits::invalid(); for(size_t i=0; i<(size_t) gpids.size(); i++) { - int pid = gpids[i].first; - GlobalOrdinal gid = gpids[i].second; + int pid = gpids[i].first; + GlobalOrdinal gid = gpids[i].second; - if(is_local == false && pid == -1) { - // Out-of-order local - is_ok = false; - break; - } - else if(pid == --1) { - // Local, matching PID - if(source->getGlobalElement(i) != target->getGlobalElement(i) { - // GIDs don't match, though the PIDs do - is_ok == false; - break; - } - } - else { - // Off-rank section - is_local = false; - if(last_PID == -1) { - last_PID = pid; - last_GID = gid; - } - else if(pid < last_PID) { - // PIDs out of order - is_ok=false; - break; - } - else if(pid == last_PID) { - if(gid < last_GID) { - // Same rank, but gids out of order - is_ok=false; - break; - } - - } - else { - // New rank - last_PID = pid; - last_GID = gid; - } - } + if(is_local == false && pid == -1) { + // Out-of-order local + is_ok = false; + break; + } + else if(pid == -1) { + // Local, matching PID + if(source->getGlobalElement(i) != target->getGlobalElement(i)) { + // GIDs don't match, though the PIDs do + is_ok = false; + break; + } + } + else { + // Off-rank section + is_local = false; + if(last_PID == -1) { + last_PID = pid; + last_GID = gid; + } + else if(pid < last_PID) { + // PIDs out of order + is_ok=false; + break; + } + else if(pid == last_PID) { + if(gid < last_GID) { + // Same rank, but gids out of order + is_ok=false; + break; + } + } + else { + // New rank + last_PID = pid; + last_GID = gid; + } + } } return is_ok; From 1d3aa5c303586eaef9ca54a849d550391f0594eb Mon Sep 17 00:00:00 2001 From: Chris Siefert Date: Wed, 29 May 2024 11:11:58 -0600 Subject: [PATCH 42/68] Tpetra: adding modifications --- packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp | 2 +- packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp | 8 ++++++-- packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp | 5 +++-- .../tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp index ec7520ecaad7..5face5335bf3 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp @@ -1759,7 +1759,7 @@ namespace Tpetra { /// column Map's "remote" (not on the calling process in the /// domain Map) indices. /// \param userDomainMap [in] User-provided alternative to the domainMap. - void makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap = getDomainMap()); + void makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap = Teuchos::null); /// \brief Convert column indices from global to local. /// diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp index 551a00646ba2..25a6e23d4d1d 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp @@ -4390,6 +4390,7 @@ namespace Tpetra { using std::endl; const char tfecfFuncName[] = "makeColMap"; + ProfilingRegion regionSortAndMerge ("Tpetra::CrsGraph::makeColMap"); std::unique_ptr prefix; if (verbose_) { @@ -4399,6 +4400,9 @@ namespace Tpetra { std::cerr << os.str(); } + // If the user doesn't provide a domainMap we use the one from this matrix + Teuchos::RCP myDomainMap = userDomainMap.is_null() ? getDomainMap() : userDomainMap; + // this->colMap_ should be null at this point, but we accept the // future possibility that it might not be (esp. if we decide // later to support graph structure changes after first @@ -4423,7 +4427,7 @@ namespace Tpetra { std::ostringstream errStrm; const int lclErrCode = Details::makeColMap (colMap, remotePIDs, - userDomainMap, *this, sortEachProcsGids, &errStrm); + myDomainMap, *this, sortEachProcsGids, &errStrm); auto comm = this->getComm (); if (! comm.is_null ()) { const int lclSuccess = (lclErrCode == 0) ? 1 : 0; @@ -4443,7 +4447,7 @@ namespace Tpetra { } else { (void) Details::makeColMap (colMap, remotePIDs, - userDomainMap, *this, sortEachProcsGids, nullptr); + myDomainMap, *this, sortEachProcsGids, nullptr); } // See above. We want to admit the possibility of makeColMap // actually revising an existing column Map, even though that diff --git a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp index 4e48fbc597ca..f056fb0ea453 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp @@ -260,10 +260,11 @@ void FECrsGraph::doOwnedPlusSharedToOwned(con this->doExport(*this,*ownedRowsImporter_,CM,true); // Under the "if you own an element, you own at least one of its nodes" assumption, - // we can start by making a columnmap for ownedPlusShared + // we can start by making a columnmap for ownedPlusShared. We use the ownedMap to + // ensure AztecOO/ML ordering of the final output colmap if(!this->hasColMap()) { Teuchos::Array remotePIDs (0); - this->makeColMap(remotePIDs); + this->makeColMap(remotePIDs,ownedDomainMap_); } // Now run CrsGraph's fillComplete to get the final importer diff --git a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp index 93c3cfb4f884..cff9d96c8e34 100644 --- a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp +++ b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp @@ -578,14 +578,17 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble2D_OPSDomain, LO, GO, Nod CG g11(pack.uniqueMap,9); g11.doExport(g0,import,Tpetra::INSERT); g11.fillComplete(pack.uniqueMap,pack.uniqueMap); + out<<"Comparing g11/g1"< Date: Wed, 5 Jun 2024 10:04:04 -0600 Subject: [PATCH 43/68] use stable insertion sort --- .../core/src/Tpetra_Details_shortSort.hpp | 32 ++++---- packages/tpetra/core/src/Tpetra_Util.hpp | 76 ++++++++++++++++++- packages/tpetra/core/test/Sort/Sort.cpp | 34 ++++----- 3 files changed, 103 insertions(+), 39 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp b/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp index 7befe85eb8ec..d8106b9c7ddd 100644 --- a/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp @@ -357,27 +357,21 @@ shellSortKeysAndValues (KeyType keys[], "This implementation does a count-down loop, " "and may thus loop forever " "if one attempts to use it with unsigned IndexType."); - constexpr IndexType ZERO = 0; - IndexType midpoint = n / static_cast (2); + IndexType i = 0; - while (midpoint > ZERO) { - // Avoid names like "max" in case they collide with macros. - const IndexType theMax = n - midpoint; - for (IndexType j = 0; j < theMax; ++j) { - // IndexType is signed, so it's legit to compare >= 0. - for (IndexType k = j; k >= 0; k -= midpoint) { - if (keys[k + midpoint] >= keys[k]) { - break; - } - const KeyType tmpKey = keys[k + midpoint]; - keys[k + midpoint] = keys[k]; - keys[k] = tmpKey; - const ValueType tmpVal = values[k + midpoint]; - values[k + midpoint] = values[k]; - values[k] = tmpVal; - } + while (i < n) { + auto x1 = keys[i]; + auto x2 = values[i]; + IndexType j = i; + while (j >= 0 && keys[j-1] > x1) + { + keys[j] = keys[j-1]; + values[j] = values[j-1]; + --j; } - midpoint = midpoint / 2; + keys[j] = x1; + values[j] = x2; + ++i; } } diff --git a/packages/tpetra/core/src/Tpetra_Util.hpp b/packages/tpetra/core/src/Tpetra_Util.hpp index 804878cb0c7a..77c9b7998bc2 100644 --- a/packages/tpetra/core/src/Tpetra_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Util.hpp @@ -475,6 +475,78 @@ namespace Tpetra { } } + /** + * \brief Sort the first array using insertion sort, and apply the resulting + * permutation to the second array. + * + * All of the input argument iterators are random access iterators. + */ + template + void in_sort2(const IT1& first1, + const IT1& last1, + const IT2& first2, + const IT2& last2) + { + typedef typename std::iterator_traits::difference_type DT; + DT n = last1 - first1; + DT i = 0; + + while (i < n) + { + auto x1 = first1[i]; + auto x2 = first2[i]; + DT j = i; + while (j >= 0 && first1[j-1] > x1) + { + first1[j] = first1[j-1]; + first2[j] = first2[j-1]; + --j; + } + first1[j] = x1; + first2[j] = x2; + ++i; + } + } + + /** + * \brief Sort the first array using insertion sort, and apply the resulting + * permutation to the second and third arrays. + * + * All of the input argument iterators are random access iterators. + */ + template + void in_sort3( + const IT1& first1, + const IT1& last1, + const IT2& first2, + const IT2& /* last2 */, + const IT3& first3, + const IT3& /* last3 */) + { + typedef typename std::iterator_traits::difference_type DT; + DT n = last1 - first1; + DT i = 0; + + while (i < n) + { + auto x1 = first1[i]; + auto x2 = first2[i]; + auto x3 = first3[i]; + DT j = i; + while (j >= 0 && first1[j-1] > x1) + { + first1[j] = first1[j-1]; + first2[j] = first2[j-1]; + first3[j] = first3[j-1]; + --j; + } + first1[j] = x1; + first2[j] = x2; + first3[j] = x3; + ++i; + } + } + } //end namespace SortDetails @@ -505,7 +577,7 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::sh_sort2(first1, last1, first2, first2+(last1-first1)); + SortDetails::in_sort2(first1, last1, first2, first2+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG if(!SortDetails::isAlreadySorted(first1, last1)){ std::cout << "Trouble: sort() did not sort !!" << std::endl; @@ -606,7 +678,7 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::sh_sort3(first1, last1, first2, first2+(last1-first1), first3, + SortDetails::in_sort3(first1, last1, first2, first2+(last1-first1), first3, first3+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG diff --git a/packages/tpetra/core/test/Sort/Sort.cpp b/packages/tpetra/core/test/Sort/Sort.cpp index 2c1dacd21ac2..ec2bf4b5f53b 100644 --- a/packages/tpetra/core/test/Sort/Sort.cpp +++ b/packages/tpetra/core/test/Sort/Sort.cpp @@ -69,24 +69,22 @@ shellSortKeysAndValues (KeyType keys[], ValueType values[], const int n) { - const int ZERO = 0; - int midpoint = n / 2; - - while (midpoint > ZERO) { - // Avoid names like "max" in case they collide with macros. - const int theMax = n - midpoint; - for (int j = 0; j < theMax; ++j) { - // int is signed, so it's legit to compare >= 0. - for (int k = j; k >= 0; k -= midpoint) { - if (keys[k + midpoint] >= keys[k]) { - break; - } - std::swap (keys[k + midpoint], keys[k]); - std::swap (values[k + midpoint], values[k]); - } - } - midpoint = midpoint / 2; - } + int i = 0; + + while (i < n) { + auto x1 = keys[i]; + auto x2 = values[i]; + int j = i; + while (j >= 0 && keys[j-1] > x1) + { + keys[j] = keys[j-1]; + values[j] = values[j-1]; + --j; + } + keys[j] = x1; + values[j] = x2; + ++i; + } } // Is the given range of keys sorted? From e5c17de0c3c82621614f20f7bf161e1412419019 Mon Sep 17 00:00:00 2001 From: Kim Liegeois Date: Wed, 29 May 2024 10:21:21 -0600 Subject: [PATCH 44/68] add checkAztecOOMLOrdering call to BTDS --- packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp index 30c9d79f1ea8..8e0f4890fd19 100644 --- a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp +++ b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp @@ -54,6 +54,7 @@ #include "Ifpack2_Parameters.hpp" #include "Teuchos_TimeMonitor.hpp" #include "Tpetra_BlockCrsMatrix_Helpers_decl.hpp" +#include "Tpetra_Import_Util.hpp" namespace Ifpack2 { @@ -180,6 +181,7 @@ getValidParameters () const validParams->set("partitioner: block size", -1); validParams->set("partitioner: print level", false); validParams->set("partitioner: explicit convert to BlockCrs", false); + validParams->set("partitioner: checkAztecOOMLOrdering", true); return validParams; } @@ -649,6 +651,13 @@ initialize () graph = A_->getGraph (); } else { + if ( !List_.isParameter("partitioner: checkAztecOOMLOrdering") || List_.get("partitioner: checkAztecOOMLOrdering")) { + if ( !A_->getGraph ()->getImporter().is_null()) { + TEUCHOS_TEST_FOR_EXCEPT_MSG + (!Tpetra::Import_Util::checkAztecOOMLOrdering(*(A_->getGraph ()->getImporter())), + "The pointwise graph of the input matrix A pointwise does not follow the AztecOOMLOrdering."); + } + } graph = Tpetra::getBlockCrsGraph(*Teuchos::rcp_dynamic_cast(A_), block_size, true); } Kokkos::DefaultExecutionSpace().fence(); From 8b9e597c88ef643ce856fec20797c48ffd20a3e0 Mon Sep 17 00:00:00 2001 From: kliegeois Date: Thu, 6 Jun 2024 21:35:52 -0600 Subject: [PATCH 45/68] add checkBlockConsistency --- .../src/Ifpack2_BlockRelaxation_def.hpp | 8 +++--- .../tpetra/core/src/Tpetra_CrsGraph_decl.hpp | 3 +-- .../tpetra/core/src/Tpetra_CrsGraph_def.hpp | 10 +++----- .../tpetra/core/src/Tpetra_FECrsGraph_def.hpp | 5 ++-- .../tpetra/core/src/Tpetra_Import_Util.hpp | 25 ++++++++++++++++++- .../test/FECrsGraph/FECrsGraph_UnitTests.cpp | 4 --- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp index 8e0f4890fd19..94974f41e020 100644 --- a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp +++ b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp @@ -181,7 +181,7 @@ getValidParameters () const validParams->set("partitioner: block size", -1); validParams->set("partitioner: print level", false); validParams->set("partitioner: explicit convert to BlockCrs", false); - validParams->set("partitioner: checkAztecOOMLOrdering", true); + validParams->set("partitioner: checkBlockConsistency", true); return validParams; } @@ -651,11 +651,11 @@ initialize () graph = A_->getGraph (); } else { - if ( !List_.isParameter("partitioner: checkAztecOOMLOrdering") || List_.get("partitioner: checkAztecOOMLOrdering")) { + if ( !List_.isParameter("partitioner: checkBlockConsistency") || List_.get("partitioner: checkBlockConsistency")) { if ( !A_->getGraph ()->getImporter().is_null()) { TEUCHOS_TEST_FOR_EXCEPT_MSG - (!Tpetra::Import_Util::checkAztecOOMLOrdering(*(A_->getGraph ()->getImporter())), - "The pointwise graph of the input matrix A pointwise does not follow the AztecOOMLOrdering."); + (!Tpetra::Import_Util::checkBlockConsistency(*(A_->getGraph ()->getColMap()), block_size), + "The pointwise graph of the input matrix A pointwise is not consistent with block_size."); } } graph = Tpetra::getBlockCrsGraph(*Teuchos::rcp_dynamic_cast(A_), block_size, true); diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp index 5face5335bf3..84a31d969815 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_decl.hpp @@ -1758,8 +1758,7 @@ namespace Tpetra { /// \param remotePIDs [out] The process ranks corresponding to the /// column Map's "remote" (not on the calling process in the /// domain Map) indices. - /// \param userDomainMap [in] User-provided alternative to the domainMap. - void makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap = Teuchos::null); + void makeColMap (Teuchos::Array& remotePIDs); /// \brief Convert column indices from global to local. /// diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp index 25a6e23d4d1d..4cf1a13a7405 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp @@ -4384,13 +4384,12 @@ namespace Tpetra { template void CrsGraph:: - makeColMap (Teuchos::Array& remotePIDs, const Teuchos::RCP userDomainMap) + makeColMap (Teuchos::Array& remotePIDs) { using Details::ProfilingRegion; using std::endl; const char tfecfFuncName[] = "makeColMap"; - ProfilingRegion regionSortAndMerge ("Tpetra::CrsGraph::makeColMap"); std::unique_ptr prefix; if (verbose_) { @@ -4400,9 +4399,6 @@ namespace Tpetra { std::cerr << os.str(); } - // If the user doesn't provide a domainMap we use the one from this matrix - Teuchos::RCP myDomainMap = userDomainMap.is_null() ? getDomainMap() : userDomainMap; - // this->colMap_ should be null at this point, but we accept the // future possibility that it might not be (esp. if we decide // later to support graph structure changes after first @@ -4427,7 +4423,7 @@ namespace Tpetra { std::ostringstream errStrm; const int lclErrCode = Details::makeColMap (colMap, remotePIDs, - myDomainMap, *this, sortEachProcsGids, &errStrm); + getDomainMap (), *this, sortEachProcsGids, &errStrm); auto comm = this->getComm (); if (! comm.is_null ()) { const int lclSuccess = (lclErrCode == 0) ? 1 : 0; @@ -4447,7 +4443,7 @@ namespace Tpetra { } else { (void) Details::makeColMap (colMap, remotePIDs, - myDomainMap, *this, sortEachProcsGids, nullptr); + getDomainMap (), *this, sortEachProcsGids, nullptr); } // See above. We want to admit the possibility of makeColMap // actually revising an existing column Map, even though that diff --git a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp index f056fb0ea453..4e48fbc597ca 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp @@ -260,11 +260,10 @@ void FECrsGraph::doOwnedPlusSharedToOwned(con this->doExport(*this,*ownedRowsImporter_,CM,true); // Under the "if you own an element, you own at least one of its nodes" assumption, - // we can start by making a columnmap for ownedPlusShared. We use the ownedMap to - // ensure AztecOO/ML ordering of the final output colmap + // we can start by making a columnmap for ownedPlusShared if(!this->hasColMap()) { Teuchos::Array remotePIDs (0); - this->makeColMap(remotePIDs,ownedDomainMap_); + this->makeColMap(remotePIDs); } // Now run CrsGraph's fillComplete to get the final importer diff --git a/packages/tpetra/core/src/Tpetra_Import_Util.hpp b/packages/tpetra/core/src/Tpetra_Import_Util.hpp index 71c92b4bbe49..18ca7f693866 100644 --- a/packages/tpetra/core/src/Tpetra_Import_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_Util.hpp @@ -229,7 +229,7 @@ getRemotePIDs (const Tpetra::Import& Importer, } } - + /* Check some of the validity of an Import object WARNING: This is a debugging routine only. */ template @@ -544,6 +544,29 @@ checkAztecOOMLOrdering (const Tpetra::Import& I } +/* Check to see that the import object's target map respects AztecOO/ML ordering */ +template +bool +checkBlockConsistency(const Tpetra::Map& map, size_t block_size) { + bool consistent_block = true; + + for (size_t lid = 0; lid < map.getLocalNumElements (); lid += block_size) { + auto lbid = floor(double(lid)/block_size); + auto gbid = floor(double(map.getGlobalElement(lid))/block_size); + + for (size_t lid2 = 1; lid2 < block_size; ++lid2) { + auto lbid_n = floor(double(lid+lid2)/block_size); + auto gbid_n = floor(double(map.getGlobalElement(lid+lid2))/block_size); + auto old_consistent_block = consistent_block; + if (consistent_block) + consistent_block = (lbid == lbid_n); + if (consistent_block) + consistent_block = (gbid == gbid_n); + } + } + + return consistent_block; +} } // namespace Import_Util diff --git a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp index cff9d96c8e34..93c3cfb4f884 100644 --- a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp +++ b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp @@ -578,17 +578,14 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FECrsGraph, Assemble2D_OPSDomain, LO, GO, Nod CG g11(pack.uniqueMap,9); g11.doExport(g0,import,Tpetra::INSERT); g11.fillComplete(pack.uniqueMap,pack.uniqueMap); - out<<"Comparing g11/g1"< Date: Fri, 7 Jun 2024 13:39:53 -0600 Subject: [PATCH 46/68] clean --- .../core/src/Tpetra_Details_shortSort.hpp | 32 ++++++++++------- packages/tpetra/core/test/Sort/Sort.cpp | 34 ++++++++++--------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp b/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp index d8106b9c7ddd..7befe85eb8ec 100644 --- a/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_shortSort.hpp @@ -357,21 +357,27 @@ shellSortKeysAndValues (KeyType keys[], "This implementation does a count-down loop, " "and may thus loop forever " "if one attempts to use it with unsigned IndexType."); - IndexType i = 0; + constexpr IndexType ZERO = 0; + IndexType midpoint = n / static_cast (2); - while (i < n) { - auto x1 = keys[i]; - auto x2 = values[i]; - IndexType j = i; - while (j >= 0 && keys[j-1] > x1) - { - keys[j] = keys[j-1]; - values[j] = values[j-1]; - --j; + while (midpoint > ZERO) { + // Avoid names like "max" in case they collide with macros. + const IndexType theMax = n - midpoint; + for (IndexType j = 0; j < theMax; ++j) { + // IndexType is signed, so it's legit to compare >= 0. + for (IndexType k = j; k >= 0; k -= midpoint) { + if (keys[k + midpoint] >= keys[k]) { + break; + } + const KeyType tmpKey = keys[k + midpoint]; + keys[k + midpoint] = keys[k]; + keys[k] = tmpKey; + const ValueType tmpVal = values[k + midpoint]; + values[k + midpoint] = values[k]; + values[k] = tmpVal; + } } - keys[j] = x1; - values[j] = x2; - ++i; + midpoint = midpoint / 2; } } diff --git a/packages/tpetra/core/test/Sort/Sort.cpp b/packages/tpetra/core/test/Sort/Sort.cpp index ec2bf4b5f53b..2c1dacd21ac2 100644 --- a/packages/tpetra/core/test/Sort/Sort.cpp +++ b/packages/tpetra/core/test/Sort/Sort.cpp @@ -69,22 +69,24 @@ shellSortKeysAndValues (KeyType keys[], ValueType values[], const int n) { - int i = 0; - - while (i < n) { - auto x1 = keys[i]; - auto x2 = values[i]; - int j = i; - while (j >= 0 && keys[j-1] > x1) - { - keys[j] = keys[j-1]; - values[j] = values[j-1]; - --j; - } - keys[j] = x1; - values[j] = x2; - ++i; - } + const int ZERO = 0; + int midpoint = n / 2; + + while (midpoint > ZERO) { + // Avoid names like "max" in case they collide with macros. + const int theMax = n - midpoint; + for (int j = 0; j < theMax; ++j) { + // int is signed, so it's legit to compare >= 0. + for (int k = j; k >= 0; k -= midpoint) { + if (keys[k + midpoint] >= keys[k]) { + break; + } + std::swap (keys[k + midpoint], keys[k]); + std::swap (values[k + midpoint], values[k]); + } + } + midpoint = midpoint / 2; + } } // Is the given range of keys sorted? From 11266971a80971367e0e14950674034f675f9c45 Mon Sep 17 00:00:00 2001 From: Kim Liegeois Date: Wed, 12 Jun 2024 12:53:26 -0600 Subject: [PATCH 47/68] Use std::stable_sort instead of insertion sort --- packages/tpetra/core/src/Tpetra_Util.hpp | 113 +++++++++++++---------- 1 file changed, 64 insertions(+), 49 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Util.hpp b/packages/tpetra/core/src/Tpetra_Util.hpp index 77c9b7998bc2..17f8aecc0908 100644 --- a/packages/tpetra/core/src/Tpetra_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Util.hpp @@ -57,6 +57,7 @@ #include "Teuchos_OrdinalTraits.hpp" #include "Teuchos_TypeNameTraits.hpp" #include "Teuchos_Utils.hpp" +#include #include #include #include @@ -476,75 +477,89 @@ namespace Tpetra { } /** - * \brief Sort the first array using insertion sort, and apply the resulting + * \brief Compute the permutation of the ordering that + * sorts the array using a stable sort. + */ + template + std::vector::difference_type> sort_indexes(IT1 first, IT1 last) { + + typedef typename std::iterator_traits::difference_type DT; + + DT length = last - first; + std::vector
idx(length); + std::iota(idx.begin(), idx.end(), 0); + + std::stable_sort(idx.begin(), idx.end(), + [&first](size_t i1, size_t i2) {return first[i1] < first[i2];}); + + return idx; + } + + /** + * \brief Apply a permutation of the ordering of an array in place. + */ + template + void + apply_permutation( + IT1 first, + IT1 last, + IT2 indices) + { + typedef typename std::iterator_traits::difference_type DT; + typedef typename std::iterator_traits::value_type T; + + DT n = last - first; + + Kokkos::View tmp(Kokkos::view_alloc(Kokkos::WithoutInitializing, "tmp"), n); + + Kokkos::parallel_for("apply_permutation_1", + Kokkos::RangePolicy(0, n), + KOKKOS_LAMBDA(const int j) { + tmp(j) = first[indices[j]]; + }); + Kokkos::parallel_for("apply_permutation_2", + Kokkos::RangePolicy(0, n), + KOKKOS_LAMBDA(const int j) { + first[j] = tmp(j); + }); + } + + /** + * \brief Sort the first array using std sort, and apply the resulting * permutation to the second array. * * All of the input argument iterators are random access iterators. */ template - void in_sort2(const IT1& first1, + void std_sort2(const IT1& first1, const IT1& last1, const IT2& first2, const IT2& last2) { - typedef typename std::iterator_traits::difference_type DT; - DT n = last1 - first1; - DT i = 0; - - while (i < n) - { - auto x1 = first1[i]; - auto x2 = first2[i]; - DT j = i; - while (j >= 0 && first1[j-1] > x1) - { - first1[j] = first1[j-1]; - first2[j] = first2[j-1]; - --j; - } - first1[j] = x1; - first2[j] = x2; - ++i; - } + auto indices = sort_indexes(first1, last1); + apply_permutation(first1, last1, indices); + apply_permutation(first2, last2, indices); } /** - * \brief Sort the first array using insertion sort, and apply the resulting + * \brief Sort the first array using std sort, and apply the resulting * permutation to the second and third arrays. * * All of the input argument iterators are random access iterators. */ template - void in_sort3( + void std_sort3( const IT1& first1, const IT1& last1, const IT2& first2, - const IT2& /* last2 */, + const IT2& last2, const IT3& first3, - const IT3& /* last3 */) + const IT3& last3) { - typedef typename std::iterator_traits::difference_type DT; - DT n = last1 - first1; - DT i = 0; - - while (i < n) - { - auto x1 = first1[i]; - auto x2 = first2[i]; - auto x3 = first3[i]; - DT j = i; - while (j >= 0 && first1[j-1] > x1) - { - first1[j] = first1[j-1]; - first2[j] = first2[j-1]; - first3[j] = first3[j-1]; - --j; - } - first1[j] = x1; - first2[j] = x2; - first3[j] = x3; - ++i; - } + auto indices = sort_indexes(first1, last1); + apply_permutation(first1, last1, indices); + apply_permutation(first2, last2, indices); + apply_permutation(first3, last3, indices); } } //end namespace SortDetails @@ -577,7 +592,7 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::in_sort2(first1, last1, first2, first2+(last1-first1)); + SortDetails::std_sort2(first1, last1, first2, first2+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG if(!SortDetails::isAlreadySorted(first1, last1)){ std::cout << "Trouble: sort() did not sort !!" << std::endl; @@ -678,7 +693,7 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::in_sort3(first1, last1, first2, first2+(last1-first1), first3, + SortDetails::std_sort3(first1, last1, first2, first2+(last1-first1), first3, first3+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG From 693d22f1edeba1b9af1c7792c02f86035adef325 Mon Sep 17 00:00:00 2001 From: "Samuel E. Browne" Date: Mon, 17 Jun 2024 10:41:51 -0600 Subject: [PATCH 48/68] Disable ROL test in COMMON_SPACK_TPLS History indicates a problem with Spack-built MPI, so move this directive into COMMON_SPACK_TPLS. Acute issue is seeing it fail (again) with the new Clang configuration. Signed-off-by: Samuel E. Browne --- packages/framework/ini-files/config-specs.ini | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index 834884da94f6..1197a3b0a0a5 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -445,6 +445,11 @@ opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.s opt-set-cmake-var Zlib_INCLUDE_DIRS PATH FORCE : ${ZLIB_INC|ENV} opt-set-cmake-var Zlib_LIBRARY_DIRS PATH FORCE : ${ZLIB_LIB|ENV} +# This is temporarily disabled because it seems to be particularly sensitive to the spack-built +# MPI issue (TRILFRAME-552) +opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON + + [COMMON_AUE_SPACK] use COMMON_SPACK_TPLS @@ -2183,11 +2188,6 @@ opt-set-cmake-var Tempus_IMEX_RK_Staggered_FSA_Tangent_MPI_1_DISABLE BOOL FORCE opt-set-cmake-var Tempus_Newmark_MPI_1_DISABLE BOOL FORCE : ON opt-set-cmake-var Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder_MPI_1_DISABLE BOOL FORCE : ON -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - - [rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all] # uses sems-v2 modules use rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables @@ -2291,10 +2291,6 @@ opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678) opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - # This is run serially to try to prevent some unpredictable issues where these tests may be trying # overlap other executing tests on the same GPU after introducing usage for multiple GPUs for testing. # (https://github.com/trilinos/Trilinos/pull/11391) @@ -2348,10 +2344,6 @@ use PACKAGE-ENABLES|ALL-NO-EPETRA opt-set-cmake-var CMAKE_CXX_FLAGS STRING FORCE : -Wall -Wunused-parameter -Werror=unused-parameter -Wshadow -Werror=shadow -pedantic -Werror=pedantic -Werror=sign-compare -Werror=sign-compare -Wtype-limits -Werror=type-limits -Wuninitialized -Werror=uninitialized -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - [rhel8_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.1.4_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables] # uses sems-v2 modules use RHEL8_COMPILER|CUDA @@ -2448,10 +2440,6 @@ opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678) opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - use PACKAGE-ENABLES|NO-EPETRA use RHEL7_POST @@ -2593,10 +2581,6 @@ opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678) opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON -# This is temporarily disabled because it seems to be particularly sensitive to the spack-built -# MPI issue (TRILFRAME-552) -opt-set-cmake-var ROL_example_PinT_parabolic-control_AugmentedSystem_test_MPI_2_DISABLE BOOL FORCE : ON - use PACKAGE-ENABLES|NO-EPETRA use RHEL7_POST From d3da60049254eed29f3f2ee86e41979579b72819 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Tue, 11 Jun 2024 14:23:31 -0600 Subject: [PATCH 49/68] Tpetra: test that CrsMatrix::apply overwrites NaNs In CrsMatrix::apply, if beta==0 and y contains NaNs or Infs, these should be overwritten with the value alpha*A*x (not just multipled by 0, which would result in more NaNs in the final result). Test this for both the normal and imbalanced row paths, with single and multiple columns. --- .../test/CrsMatrix/CrsMatrix_UnitTests.cpp | 67 +++++++++++++++++-- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp index a54b9226be71..04521f661dc5 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_UnitTests.cpp @@ -370,9 +370,13 @@ namespace { // (anonymous) //Input vector: elements are all 1s MV w(domainMap, numVecs, false); w.putScalar(ST::one()); - //Output vector: zero initially - //note: rowMap is non-overlapping so this is OK - MV v(rowMap, numVecs, true); + //Output vector: if Scalar is real or complex, fill with NaN to test that NaNs are correctly overwritten with beta=0. + //If Scalar is an integer, fill with ones instead to at least test that the output vector is zeroed. + MV v(rowMap, numVecs, false); + if constexpr(Kokkos::ArithTraits::is_integer) + v.putScalar(Kokkos::ArithTraits::one()); + else + v.putScalar(Kokkos::ArithTraits::nan()); //Do the apply. If cuSPARSE is enabled, the merge path algorithm will be used. Otherwise, this tests the fallback. imba.apply(w, v); Teuchos::Array vvals(numLocalRows * numVecs); @@ -393,7 +397,10 @@ namespace { // (anonymous) //Now run again, but on single vectors only (rank-1) auto wcol = w.getVector(0); auto vcol = v.getVectorNonConst(0); - vcol->putScalar(ST::zero()); + if constexpr(Kokkos::ArithTraits::is_integer) + vcol->putScalar(Kokkos::ArithTraits::one()); + else + vcol->putScalar(Kokkos::ArithTraits::nan()); imba.apply(*wcol, *vcol); vcol->get1dCopy(vvals(), numLocalRows); for(size_t i = 0; i < numLocalRows - 1; i++) @@ -414,6 +421,57 @@ namespace { // (anonymous) } } + TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL( CrsMatrix, ApplyOverwriteNan, LO, GO, Scalar, Node ) + { + typedef Teuchos::ScalarTraits ST; + // NaN is only representable for floating-point real and complex types + if constexpr(!ST::isOrdinal) { + typedef Tpetra::CrsMatrix MAT; + typedef Tpetra::MultiVector MV; + typedef Tpetra::Vector V; + typedef typename ST::magnitudeType Mag; + typedef Teuchos::ScalarTraits MT; + const GST INVALID = Teuchos::OrdinalTraits::invalid(); + // get a comm + RCP > comm = getDefaultComm(); + const size_t myImageID = comm->getRank(); + // create a Map + const size_t numLocal = 10; + const size_t numVecs = 5; + RCP > map = + createContigMapWithNode(INVALID,numLocal,comm); + // create the identity matrix + GO base = numLocal*myImageID; + RCP > eye; + { + RCP eye_crs = rcp(new MAT(map,numLocal)); + for (size_t i=0; iinsertGlobalValues(base+i,tuple(base+i),tuple(ST::one())); + } + eye_crs->fillComplete(); + eye = eye_crs; + } + MV mvrand(map,numVecs,false), mvres(map,numVecs,false); + mvrand.randomize(); + // because beta=0 (default argument), the NaN values in mvres should be overwritten + mvres.putScalar(Kokkos::ArithTraits::nan()); + eye->apply(mvrand, mvres); + mvres.update(-ST::one(), mvrand, ST::one()); + Array norms(numVecs), zeros(numVecs, MT::zero()); + mvres.norm1(norms()); + TEST_COMPARE_FLOATING_ARRAYS(norms, zeros, MT::zero()); + // Test with a single column as well + auto mvrand_col0 = mvrand.getVectorNonConst(0); + auto mvres_col0 = mvres.getVectorNonConst(0); + mvrand_col0->randomize(); + mvres_col0->putScalar(Kokkos::ArithTraits::nan()); + eye->apply(*mvrand_col0, *mvres_col0); + mvres_col0->update(-ST::one(), *mvrand_col0, ST::one()); + Array norm_col0(1), zeros_col0(1, MT::zero()); + mvres_col0->norm1(norm_col0()); + TEST_COMPARE_FLOATING_ARRAYS(norm_col0, zeros_col0, MT::zero()); + } + } TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL( CrsMatrix, InsertLocalValuesCombineModes, LO, GO, Scalar, Node ) { @@ -507,6 +565,7 @@ namespace { // (anonymous) TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, TheEyeOfTruth, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, ZeroMatrix, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, ImbalancedRowMatrix, LO, GO, SCALAR, NODE ) \ + TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, ApplyOverwriteNan, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, BadCalls, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, SimpleEigTest, LO, GO, SCALAR, NODE ) \ TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT( CrsMatrix, InsertLocalValuesCombineModes, LO, GO, SCALAR, NODE ) From 99decd5ab42858abd8dbb8c1a708d05e9cd872fc Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Fri, 14 Jun 2024 18:10:39 -0600 Subject: [PATCH 50/68] Tpetra: only call merge path if exec == Cuda --- .../tpetra/core/src/Tpetra_CrsMatrix_def.hpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp index df302e9f1d8e..c2bc60d33e23 100644 --- a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp @@ -5092,17 +5092,21 @@ CrsMatrix:: // The apply helper does not exist, so create it. // Decide now whether to use the imbalanced row path, or the default. bool useMergePath = false; - LocalOrdinal nrows = getLocalNumRows(); #ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE - LocalOrdinal maxRowImbalance = 0; - if(nrows != 0) - maxRowImbalance = getLocalMaxNumRowEntries() - (getLocalNumEntries() / nrows); //TODO: when https://github.com/kokkos/kokkos-kernels/issues/2166 is fixed and, //we can use SPMV_MERGE_PATH for the native spmv as well. //Take out this ifdef to enable that. + // + //Until then, only use SPMV_MERGE_PATH when calling cuSPARSE. + if constexpr(std::is_same_v) { + LocalOrdinal nrows = getLocalNumRows(); + LocalOrdinal maxRowImbalance = 0; + if(nrows != 0) + maxRowImbalance = getLocalMaxNumRowEntries() - (getLocalNumEntries() / nrows); - if(size_t(maxRowImbalance) >= Tpetra::Details::Behavior::rowImbalanceThreshold()) - useMergePath = true; + if(size_t(maxRowImbalance) >= Tpetra::Details::Behavior::rowImbalanceThreshold()) + useMergePath = true; + } #endif applyHelper = std::make_shared(A_lcl.nnz(), A_lcl.graph.row_map, useMergePath ? KokkosSparse::SPMV_MERGE_PATH : KokkosSparse::SPMV_DEFAULT); From 8f16336ee428dd931d319dcb37d6bbc7c46f8292 Mon Sep 17 00:00:00 2001 From: Sean Miller Date: Mon, 17 Jun 2024 10:54:00 -0500 Subject: [PATCH 51/68] Fixing some cmake/include paths for rocm components in ShyLu --- packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake | 4 ++-- .../shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake b/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake index dda2a56e87ba..ce973b06ea64 100644 --- a/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake +++ b/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake @@ -3,6 +3,6 @@ SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES Kokkos TrilinosSS) SET(TEST_OPTIONAL_DEP_PACKAGES) SET(LIB_REQUIRED_DEP_TPLS) -SET(LIB_OPTIONAL_DEP_TPLS METIS MKL LAPACK BLAS Pthread QTHREAD VTune CUSOLVER CUSPARSE CUBLAS CUDA ROCSOLVER ROCBLAS) +SET(LIB_OPTIONAL_DEP_TPLS METIS MKL LAPACK BLAS Pthread QTHREAD VTune CUSOLVER CUSPARSE CUBLAS CUDA ROCSOLVER ROCBLAS ROCSPARSE) SET(TEST_REQUIRED_DEP_TPLS Pthread BLAS LAPACK) -SET(TEST_OPTIONAL_DEP_TPLS METIS Cholmod MKL LAPACK BLAS Pthread QTHREAD CUSOLVER CUSPARSE CUBLAS CUDA ROCSOLVER ROCBLAS) +SET(TEST_OPTIONAL_DEP_TPLS METIS Cholmod MKL LAPACK BLAS Pthread QTHREAD CUSOLVER CUSPARSE CUBLAS CUDA ROCSOLVER ROCBLAS ROCSPARSE) diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp index 8b1f69bbea8f..dfdf28851be2 100644 --- a/packages/shylu/shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp +++ b/packages/shylu/shylu_node/tacho/src/impl/Tacho_SupernodeInfo.hpp @@ -23,8 +23,12 @@ Sandia National Laboratories, Albuquerque, NM, USA #if defined(KOKKOS_ENABLE_CUDA) #include #elif defined(KOKKOS_ENABLE_HIP) - #include - #include + #if __has_include() + #include + #else + #include + #endif + #include #define ROCM_VERSION ROCM_VERSION_MAJOR * 10000 + ROCM_VERSION_MINOR * 100 + ROCM_VERSION_PATCH #endif From 8de8defebc676b96dcc25c1daccf78e91107e95a Mon Sep 17 00:00:00 2001 From: "Curtis C. Ober" Date: Fri, 7 Jun 2024 15:04:36 -0600 Subject: [PATCH 52/68] Tempus: Updated Copyright and License Signed-off-by: Curtis C. Ober --- packages/tempus/CMakeLists.txt | 4 +- packages/tempus/COPYRIGHT | 9 +++++ packages/tempus/Copyright-header.txt | 7 ---- packages/tempus/Copyright.txt | 37 ------------------- packages/tempus/LICENSE | 30 +++++++++++++++ packages/tempus/README.md | 13 +++++++ packages/tempus/doc/index.doc | 13 ++++--- .../00_Basic_Problem/00_Basic_Problem.cpp | 13 ++++--- .../01_Utilize_Thyra/01_Utilize_Thyra.cpp | 13 ++++--- .../02_Use_ModelEvaluator.cpp | 13 ++++--- .../VanDerPol_ModelEvaluator_02.cpp | 13 ++++--- .../VanDerPol_ModelEvaluator_02.hpp | 13 ++++--- .../03_Intro_SolutionState.cpp | 13 ++++--- ...us_AdjointAuxSensitivityModelEvaluator.cpp | 13 ++++--- ...jointAuxSensitivityModelEvaluator_decl.hpp | 13 ++++--- ...jointAuxSensitivityModelEvaluator_impl.hpp | 13 ++++--- ...empus_AdjointSensitivityModelEvaluator.cpp | 13 ++++--- ..._AdjointSensitivityModelEvaluator_decl.hpp | 13 ++++--- ..._AdjointSensitivityModelEvaluator_impl.hpp | 13 ++++--- ...Tempus_AuxiliaryIntegralModelEvaluator.cpp | 13 ++++--- ...s_AuxiliaryIntegralModelEvaluator_decl.hpp | 13 ++++--- ...s_AuxiliaryIntegralModelEvaluator_impl.hpp | 13 ++++--- ...mbinedForwardSensitivityModelEvaluator.cpp | 13 ++++--- ...dForwardSensitivityModelEvaluator_decl.hpp | 13 ++++--- ...dForwardSensitivityModelEvaluator_impl.hpp | 13 ++++--- .../Tempus_ExplicitTemplateInstantiation.hpp | 13 ++++--- packages/tempus/src/Tempus_Integrator.hpp | 13 ++++--- .../Tempus_IntegratorAdjointSensitivity.cpp | 13 ++++--- ...mpus_IntegratorAdjointSensitivity_decl.hpp | 13 ++++--- ...mpus_IntegratorAdjointSensitivity_impl.hpp | 13 ++++--- .../tempus/src/Tempus_IntegratorBasic.cpp | 13 ++++--- .../src/Tempus_IntegratorBasic_decl.hpp | 13 ++++--- .../src/Tempus_IntegratorBasic_impl.hpp | 13 ++++--- .../Tempus_IntegratorForwardSensitivity.cpp | 13 ++++--- ...mpus_IntegratorForwardSensitivity_decl.hpp | 13 ++++--- ...mpus_IntegratorForwardSensitivity_impl.hpp | 13 ++++--- .../tempus/src/Tempus_IntegratorObserver.hpp | 13 ++++--- .../src/Tempus_IntegratorObserverBasic.cpp | 13 ++++--- .../Tempus_IntegratorObserverBasic_decl.hpp | 13 ++++--- .../Tempus_IntegratorObserverBasic_impl.hpp | 13 ++++--- .../Tempus_IntegratorObserverComposite.cpp | 13 ++++--- ...empus_IntegratorObserverComposite_decl.hpp | 13 ++++--- ...empus_IntegratorObserverComposite_impl.hpp | 13 ++++--- .../src/Tempus_IntegratorObserverLogging.cpp | 13 ++++--- .../Tempus_IntegratorObserverLogging_decl.hpp | 13 ++++--- .../Tempus_IntegratorObserverLogging_impl.hpp | 13 ++++--- .../src/Tempus_IntegratorObserverNoOp.cpp | 13 ++++--- .../Tempus_IntegratorObserverNoOp_decl.hpp | 13 ++++--- .../Tempus_IntegratorObserverNoOp_impl.hpp | 13 ++++--- .../Tempus_IntegratorObserverSubcycling.cpp | 13 ++++--- ...mpus_IntegratorObserverSubcycling_decl.hpp | 13 ++++--- ...mpus_IntegratorObserverSubcycling_impl.hpp | 13 ++++--- ...ratorPseudoTransientAdjointSensitivity.cpp | 13 ++++--- ...PseudoTransientAdjointSensitivity_decl.hpp | 13 ++++--- ...PseudoTransientAdjointSensitivity_impl.hpp | 13 ++++--- ...ratorPseudoTransientForwardSensitivity.cpp | 13 ++++--- ...PseudoTransientForwardSensitivity_decl.hpp | 13 ++++--- ...PseudoTransientForwardSensitivity_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_Interpolator.hpp | 13 ++++--- .../tempus/src/Tempus_InterpolatorFactory.hpp | 13 ++++--- .../src/Tempus_InterpolatorLagrange.cpp | 13 ++++--- .../src/Tempus_InterpolatorLagrange_decl.hpp | 13 ++++--- .../src/Tempus_InterpolatorLagrange_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_NumericalUtils.hpp | 13 ++++--- packages/tempus/src/Tempus_PhysicsState.cpp | 13 ++++--- .../tempus/src/Tempus_PhysicsState_decl.hpp | 13 ++++--- .../tempus/src/Tempus_PhysicsState_impl.hpp | 13 ++++--- .../tempus/src/Tempus_RKButcherTableau.hpp | 13 ++++--- .../Tempus_SensitivityModelEvaluatorBase.hpp | 13 ++++--- .../tempus/src/Tempus_SolutionHistory.cpp | 13 ++++--- .../src/Tempus_SolutionHistory_decl.hpp | 13 ++++--- .../src/Tempus_SolutionHistory_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_SolutionState.cpp | 13 ++++--- .../src/Tempus_SolutionStateMetaData.cpp | 13 ++++--- .../src/Tempus_SolutionStateMetaData_decl.hpp | 13 ++++--- .../src/Tempus_SolutionStateMetaData_impl.hpp | 13 ++++--- .../tempus/src/Tempus_SolutionState_decl.hpp | 13 ++++--- .../tempus/src/Tempus_SolutionState_impl.hpp | 13 ++++--- ...ggeredForwardSensitivityModelEvaluator.cpp | 13 ++++--- ...dForwardSensitivityModelEvaluator_decl.hpp | 13 ++++--- ...dForwardSensitivityModelEvaluator_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_Stepper.cpp | 13 ++++--- packages/tempus/src/Tempus_StepperBDF2.cpp | 13 ++++--- .../src/Tempus_StepperBDF2AppAction.hpp | 13 ++++--- .../Tempus_StepperBDF2AppActionComposite.hpp | 13 ++++--- .../src/Tempus_StepperBDF2ModifierBase.hpp | 13 ++++--- .../src/Tempus_StepperBDF2ModifierDefault.hpp | 13 ++++--- .../src/Tempus_StepperBDF2ModifierXBase.hpp | 13 ++++--- .../Tempus_StepperBDF2ModifierXDefault.hpp | 13 ++++--- .../src/Tempus_StepperBDF2ObserverBase.hpp | 13 ++++--- .../src/Tempus_StepperBDF2ObserverDefault.hpp | 13 ++++--- .../tempus/src/Tempus_StepperBDF2_decl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperBDF2_impl.hpp | 13 ++++--- .../src/Tempus_StepperBackwardEuler.cpp | 13 ++++--- .../Tempus_StepperBackwardEulerAppAction.hpp | 13 ++++--- ...StepperBackwardEulerAppActionComposite.hpp | 13 ++++--- ...empus_StepperBackwardEulerModifierBase.hpp | 13 ++++--- ...us_StepperBackwardEulerModifierDefault.hpp | 13 ++++--- ...mpus_StepperBackwardEulerModifierXBase.hpp | 13 ++++--- ...s_StepperBackwardEulerModifierXDefault.hpp | 13 ++++--- ...empus_StepperBackwardEulerObserverBase.hpp | 13 ++++--- ...us_StepperBackwardEulerObserverDefault.hpp | 13 ++++--- .../src/Tempus_StepperBackwardEuler_decl.hpp | 13 ++++--- .../src/Tempus_StepperBackwardEuler_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_StepperDIRK.cpp | 13 ++++--- .../tempus/src/Tempus_StepperDIRK_decl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperDIRK_impl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperExplicit.cpp | 13 ++++--- .../tempus/src/Tempus_StepperExplicitRK.cpp | 13 ++++--- .../src/Tempus_StepperExplicitRK_decl.hpp | 13 ++++--- .../src/Tempus_StepperExplicitRK_impl.hpp | 13 ++++--- .../src/Tempus_StepperExplicit_decl.hpp | 13 ++++--- .../src/Tempus_StepperExplicit_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_StepperFactory.cpp | 13 ++++--- .../tempus/src/Tempus_StepperFactory_decl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperFactory_impl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperForwardEuler.cpp | 13 ++++--- .../Tempus_StepperForwardEulerAppAction.hpp | 13 ++++--- ..._StepperForwardEulerAppActionComposite.hpp | 13 ++++--- ...Tempus_StepperForwardEulerModifierBase.hpp | 13 ++++--- ...pus_StepperForwardEulerModifierDefault.hpp | 13 ++++--- ...empus_StepperForwardEulerModifierXBase.hpp | 13 ++++--- ...us_StepperForwardEulerModifierXDefault.hpp | 13 ++++--- ...Tempus_StepperForwardEulerObserverBase.hpp | 13 ++++--- ...pus_StepperForwardEulerObserverDefault.hpp | 13 ++++--- .../src/Tempus_StepperForwardEuler_decl.hpp | 13 ++++--- .../src/Tempus_StepperForwardEuler_impl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperHHTAlpha.cpp | 13 ++++--- .../src/Tempus_StepperHHTAlphaAppAction.hpp | 13 ++++--- ...mpus_StepperHHTAlphaAppActionComposite.hpp | 13 ++++--- .../Tempus_StepperHHTAlphaModifierBase.hpp | 13 ++++--- .../Tempus_StepperHHTAlphaModifierDefault.hpp | 13 ++++--- .../Tempus_StepperHHTAlphaModifierXBase.hpp | 13 ++++--- ...Tempus_StepperHHTAlphaModifierXDefault.hpp | 13 ++++--- .../Tempus_StepperHHTAlphaObserverBase.hpp | 13 ++++--- .../Tempus_StepperHHTAlphaObserverDefault.hpp | 13 ++++--- .../src/Tempus_StepperHHTAlpha_decl.hpp | 13 ++++--- .../src/Tempus_StepperHHTAlpha_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_StepperIMEX_RK.cpp | 13 ++++--- .../src/Tempus_StepperIMEX_RK_Partition.cpp | 13 ++++--- .../Tempus_StepperIMEX_RK_Partition_decl.hpp | 13 ++++--- .../Tempus_StepperIMEX_RK_Partition_impl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperIMEX_RK_decl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperIMEX_RK_impl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperImplicit.cpp | 13 ++++--- .../src/Tempus_StepperImplicit_decl.hpp | 13 ++++--- .../src/Tempus_StepperImplicit_impl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperLeapfrog.cpp | 13 ++++--- .../src/Tempus_StepperLeapfrogAppAction.hpp | 13 ++++--- ...mpus_StepperLeapfrogAppActionComposite.hpp | 13 ++++--- .../Tempus_StepperLeapfrogModifierBase.hpp | 13 ++++--- .../Tempus_StepperLeapfrogModifierDefault.hpp | 13 ++++--- .../Tempus_StepperLeapfrogModifierXBase.hpp | 13 ++++--- ...Tempus_StepperLeapfrogModifierXDefault.hpp | 13 ++++--- .../Tempus_StepperLeapfrogObserverBase.hpp | 13 ++++--- .../Tempus_StepperLeapfrogObserverDefault.hpp | 13 ++++--- .../src/Tempus_StepperLeapfrog_decl.hpp | 13 ++++--- .../src/Tempus_StepperLeapfrog_impl.hpp | 13 ++++--- .../Tempus_StepperNewmarkExplicitAForm.cpp | 13 ++++--- ...s_StepperNewmarkExplicitAFormAppAction.hpp | 13 ++++--- ...NewmarkExplicitAFormAppActionComposite.hpp | 13 ++++--- ...tepperNewmarkExplicitAFormModifierBase.hpp | 13 ++++--- ...perNewmarkExplicitAFormModifierDefault.hpp | 13 ++++--- ...epperNewmarkExplicitAFormModifierXBase.hpp | 13 ++++--- ...erNewmarkExplicitAFormModifierXDefault.hpp | 13 ++++--- ...empus_StepperNewmarkExplicitAForm_decl.hpp | 13 ++++--- ...empus_StepperNewmarkExplicitAForm_impl.hpp | 13 ++++--- .../Tempus_StepperNewmarkImplicitAForm.cpp | 13 ++++--- ...s_StepperNewmarkImplicitAFormAppAction.hpp | 13 ++++--- ...NewmarkImplicitAFormAppActionComposite.hpp | 13 ++++--- ...tepperNewmarkImplicitAFormModifierBase.hpp | 13 ++++--- ...perNewmarkImplicitAFormModifierDefault.hpp | 13 ++++--- ...epperNewmarkImplicitAFormModifierXBase.hpp | 13 ++++--- ...erNewmarkImplicitAFormModifierXDefault.hpp | 13 ++++--- ...empus_StepperNewmarkImplicitAForm_decl.hpp | 13 ++++--- ...empus_StepperNewmarkImplicitAForm_impl.hpp | 13 ++++--- .../Tempus_StepperNewmarkImplicitDForm.cpp | 13 ++++--- ...s_StepperNewmarkImplicitDFormAppAction.hpp | 13 ++++--- ...NewmarkImplicitDFormAppActionComposite.hpp | 13 ++++--- ...tepperNewmarkImplicitDFormModifierBase.hpp | 13 ++++--- ...perNewmarkImplicitDFormModifierDefault.hpp | 13 ++++--- ...epperNewmarkImplicitDFormModifierXBase.hpp | 13 ++++--- ...erNewmarkImplicitDFormModifierXDefault.hpp | 13 ++++--- ...empus_StepperNewmarkImplicitDForm_decl.hpp | 13 ++++--- ...empus_StepperNewmarkImplicitDForm_impl.hpp | 13 ++++--- .../src/Tempus_StepperOperatorSplit.cpp | 13 ++++--- .../Tempus_StepperOperatorSplitAppAction.hpp | 13 ++++--- ...StepperOperatorSplitAppActionComposite.hpp | 13 ++++--- ...empus_StepperOperatorSplitModifierBase.hpp | 13 ++++--- ...us_StepperOperatorSplitModifierDefault.hpp | 13 ++++--- ...mpus_StepperOperatorSplitModifierXBase.hpp | 13 ++++--- ...s_StepperOperatorSplitModifierXDefault.hpp | 13 ++++--- ...empus_StepperOperatorSplitObserverBase.hpp | 13 ++++--- ...us_StepperOperatorSplitObserverDefault.hpp | 13 ++++--- .../src/Tempus_StepperOperatorSplit_decl.hpp | 13 ++++--- .../src/Tempus_StepperOperatorSplit_impl.hpp | 13 ++++--- .../Tempus_StepperOptimizationInterface.hpp | 13 ++++--- .../tempus/src/Tempus_StepperRKAppAction.hpp | 13 ++++--- .../Tempus_StepperRKAppActionComposite.hpp | 13 ++++--- packages/tempus/src/Tempus_StepperRKBase.hpp | 13 ++++--- .../src/Tempus_StepperRKButcherTableau.hpp | 13 ++++--- .../src/Tempus_StepperRKModifierBase.hpp | 13 ++++--- .../src/Tempus_StepperRKModifierDefault.hpp | 13 ++++--- .../src/Tempus_StepperRKModifierXBase.hpp | 13 ++++--- .../src/Tempus_StepperRKModifierXDefault.hpp | 13 ++++--- .../src/Tempus_StepperRKObserverBase.hpp | 13 ++++--- .../src/Tempus_StepperRKObserverDefault.hpp | 13 ++++--- ...pus_StepperStaggeredForwardSensitivity.cpp | 13 ++++--- ...tepperStaggeredForwardSensitivity_decl.hpp | 13 ++++--- ...tepperStaggeredForwardSensitivity_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_StepperState.hpp | 13 ++++--- .../tempus/src/Tempus_StepperSubcycling.cpp | 13 ++++--- .../src/Tempus_StepperSubcyclingAppAction.hpp | 13 ++++--- ...us_StepperSubcyclingAppActionComposite.hpp | 13 ++++--- .../Tempus_StepperSubcyclingModifierBase.hpp | 13 ++++--- ...empus_StepperSubcyclingModifierDefault.hpp | 13 ++++--- .../Tempus_StepperSubcyclingModifierXBase.hpp | 13 ++++--- ...mpus_StepperSubcyclingModifierXDefault.hpp | 13 ++++--- .../Tempus_StepperSubcyclingObserverBase.hpp | 13 ++++--- ...empus_StepperSubcyclingObserverDefault.hpp | 13 ++++--- .../src/Tempus_StepperSubcycling_decl.hpp | 13 ++++--- .../src/Tempus_StepperSubcycling_impl.hpp | 13 ++++--- .../tempus/src/Tempus_StepperTrapezoidal.cpp | 13 ++++--- .../Tempus_StepperTrapezoidalAppAction.hpp | 13 ++++--- ...s_StepperTrapezoidalAppActionComposite.hpp | 13 ++++--- .../Tempus_StepperTrapezoidalModifierBase.hpp | 13 ++++--- ...mpus_StepperTrapezoidalModifierDefault.hpp | 13 ++++--- ...Tempus_StepperTrapezoidalModifierXBase.hpp | 13 ++++--- ...pus_StepperTrapezoidalModifierXDefault.hpp | 13 ++++--- .../Tempus_StepperTrapezoidalObserverBase.hpp | 13 ++++--- ...mpus_StepperTrapezoidalObserverDefault.hpp | 13 ++++--- .../src/Tempus_StepperTrapezoidal_decl.hpp | 13 ++++--- .../src/Tempus_StepperTrapezoidal_impl.hpp | 13 ++++--- .../tempus/src/Tempus_Stepper_ErrorNorm.cpp | 13 ++++--- .../src/Tempus_Stepper_ErrorNorm_decl.hpp | 13 ++++--- .../src/Tempus_Stepper_ErrorNorm_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_Stepper_decl.hpp | 13 ++++--- packages/tempus/src/Tempus_Stepper_impl.hpp | 13 ++++--- .../tempus/src/Tempus_String_Utilities.cpp | 13 ++++--- .../tempus/src/Tempus_String_Utilities.hpp | 13 ++++--- packages/tempus/src/Tempus_TimeDerivative.hpp | 13 ++++--- packages/tempus/src/Tempus_TimeEventBase.hpp | 13 ++++--- .../tempus/src/Tempus_TimeEventComposite.hpp | 13 ++++--- packages/tempus/src/Tempus_TimeEventList.cpp | 13 ++++--- .../tempus/src/Tempus_TimeEventListIndex.cpp | 13 ++++--- .../src/Tempus_TimeEventListIndex_decl.hpp | 13 ++++--- .../src/Tempus_TimeEventListIndex_impl.hpp | 13 ++++--- .../tempus/src/Tempus_TimeEventList_decl.hpp | 13 ++++--- .../tempus/src/Tempus_TimeEventList_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_TimeEventRange.cpp | 13 ++++--- .../tempus/src/Tempus_TimeEventRangeIndex.cpp | 13 ++++--- .../src/Tempus_TimeEventRangeIndex_decl.hpp | 13 ++++--- .../src/Tempus_TimeEventRangeIndex_impl.hpp | 13 ++++--- .../tempus/src/Tempus_TimeEventRange_decl.hpp | 13 ++++--- .../tempus/src/Tempus_TimeEventRange_impl.hpp | 13 ++++--- .../tempus/src/Tempus_TimeStepControl.cpp | 13 ++++--- .../src/Tempus_TimeStepControlStrategy.hpp | 13 ++++--- .../Tempus_TimeStepControlStrategyBasicVS.hpp | 13 ++++--- ...empus_TimeStepControlStrategyComposite.hpp | 13 ++++--- ...Tempus_TimeStepControlStrategyConstant.hpp | 13 ++++--- ...eStepControlStrategyIntegralController.hpp | 13 ++++--- .../src/Tempus_TimeStepControl_decl.hpp | 13 ++++--- .../src/Tempus_TimeStepControl_impl.hpp | 13 ++++--- packages/tempus/src/Tempus_Types.hpp | 13 ++++--- packages/tempus/src/Tempus_Version.cpp | 13 ++++--- packages/tempus/src/Tempus_Version.hpp | 13 ++++--- .../Tempus_WrapCombinedFSAModelEvaluator.hpp | 13 ++++--- .../Tempus_WrapStaggeredFSAModelEvaluator.hpp | 13 ++++--- .../src/Tempus_WrapperModelEvaluator.hpp | 13 ++++--- .../src/Tempus_WrapperModelEvaluatorBasic.cpp | 13 ++++--- ...Tempus_WrapperModelEvaluatorBasic_decl.hpp | 13 ++++--- ...Tempus_WrapperModelEvaluatorBasic_impl.hpp | 13 ++++--- .../Tempus_WrapperModelEvaluatorPairIMEX.hpp | 13 ++++--- ...us_WrapperModelEvaluatorPairIMEX_Basic.cpp | 13 ++++--- ...apperModelEvaluatorPairIMEX_Basic_decl.hpp | 13 ++++--- ...apperModelEvaluatorPairIMEX_Basic_impl.hpp | 13 ++++--- ...pperModelEvaluatorPairIMEX_CombinedFSA.hpp | 13 ++++--- ...perModelEvaluatorPairIMEX_StaggeredFSA.hpp | 13 ++++--- ...rapperModelEvaluatorPairPartIMEX_Basic.cpp | 13 ++++--- ...rModelEvaluatorPairPartIMEX_Basic_decl.hpp | 13 ++++--- ...rModelEvaluatorPairPartIMEX_Basic_impl.hpp | 13 ++++--- ...ModelEvaluatorPairPartIMEX_CombinedFSA.cpp | 13 ++++--- ...EvaluatorPairPartIMEX_CombinedFSA_decl.hpp | 13 ++++--- ...EvaluatorPairPartIMEX_CombinedFSA_impl.hpp | 13 ++++--- ...odelEvaluatorPairPartIMEX_StaggeredFSA.cpp | 13 ++++--- ...valuatorPairPartIMEX_StaggeredFSA_decl.hpp | 13 ++++--- ...valuatorPairPartIMEX_StaggeredFSA_impl.hpp | 13 ++++--- ...empus_WrapperModelEvaluatorSecondOrder.cpp | 13 ++++--- ..._WrapperModelEvaluatorSecondOrder_decl.hpp | 13 ++++--- ..._WrapperModelEvaluatorSecondOrder_impl.hpp | 13 ++++--- .../Thyra_AdjointLinearOpWithSolveFactory.hpp | 13 ++++--- .../src/Thyra_AdjointPreconditioner.hpp | 13 ++++--- .../Thyra_AdjointPreconditionerFactory.hpp | 13 ++++--- ...ckedTriangularLinearOpWithSolveFactory.hpp | 13 ++++--- .../Thyra_ImplicitAdjointModelEvaluator.hpp | 13 ++++--- .../tempus/src/Thyra_MultiVectorLinearOp.hpp | 13 ++++--- ...ra_MultiVectorLinearOpWithSolveFactory.hpp | 13 ++++--- .../src/Thyra_MultiVectorPreconditioner.hpp | 13 ++++--- ...Thyra_MultiVectorPreconditionerFactory.hpp | 13 ++++--- .../Thyra_ReuseLinearOpWithSolveFactory.hpp | 13 ++++--- .../src/Thyra_ReusePreconditionerFactory.hpp | 13 ++++--- .../Thyra_ScaledIdentityLinearOpWithSolve.hpp | 13 ++++--- ...ScaledIdentityLinearOpWithSolveFactory.hpp | 13 ++++--- packages/tempus/test/BDF2/Tempus_BDF2_ASA.cpp | 13 ++++--- .../test/BDF2/Tempus_BDF2_Combined_FSA.cpp | 13 ++++--- packages/tempus/test/BDF2/Tempus_BDF2_FSA.hpp | 13 ++++--- .../BDF2/Tempus_BDF2_PseudoTransient_SA.cpp | 13 ++++--- .../test/BDF2/Tempus_BDF2_Staggered_FSA.cpp | 13 ++++--- .../tempus/test/BDF2/Tempus_Test_BDF2_CDR.cpp | 13 ++++--- .../test/BDF2/Tempus_Test_BDF2_SinCos.cpp | 13 ++++--- .../BDF2/Tempus_Test_BDF2_SinCosAdapt.cpp | 13 ++++--- .../test/BDF2/Tempus_Test_BDF2_VanDerPol.cpp | 13 ++++--- .../Tempus_BackwardEuler_ASA.cpp | 13 ++++--- .../Tempus_BackwardEuler_Combined_FSA.cpp | 13 ++++--- .../Tempus_BackwardEuler_FSA.hpp | 13 ++++--- ...empus_BackwardEuler_PseudoTransient_SA.cpp | 13 ++++--- .../Tempus_BackwardEuler_Staggered_FSA.cpp | 13 ++++--- .../Tempus_Test_BackwardEuler_CDR.cpp | 13 ++++--- ...Tempus_Test_BackwardEuler_OptInterface.cpp | 13 ++++--- .../Tempus_Test_BackwardEuler_SinCos.cpp | 13 ++++--- .../Tempus_Test_BackwardEuler_VanDerPol.cpp | 13 ++++--- packages/tempus/test/DIRK/Tempus_DIRKTest.cpp | 13 ++++--- packages/tempus/test/DIRK/Tempus_DIRK_ASA.cpp | 13 ++++--- .../test/DIRK/Tempus_DIRK_Combined_FSA.cpp | 13 ++++--- packages/tempus/test/DIRK/Tempus_DIRK_FSA.hpp | 13 ++++--- .../DIRK/Tempus_DIRK_PseudoTransient_SA.cpp | 13 ++++--- .../test/DIRK/Tempus_DIRK_Staggered_FSA.cpp | 13 ++++--- .../test/ExplicitRK/Tempus_ExplicitRKTest.cpp | 13 ++++--- .../test/ExplicitRK/Tempus_ExplicitRK_ASA.cpp | 13 ++++--- .../Tempus_ExplicitRK_Combined_FSA.cpp | 13 ++++--- .../test/ExplicitRK/Tempus_ExplicitRK_FSA.hpp | 13 ++++--- .../Tempus_ExplicitRK_PseudoTransient_SA.cpp | 13 ++++--- .../Tempus_ExplicitRK_Staggered_FSA.cpp | 13 ++++--- .../ForwardEuler/Tempus_ForwardEulerTest.cpp | 13 ++++--- .../test/HHTAlpha/Tempus_HHTAlphaTest.cpp | 13 ++++--- .../test/IMEX_RK/Tempus_IMEX_RKTest.cpp | 13 ++++--- .../IMEX_RK/Tempus_IMEX_RK_Combined_FSA.cpp | 13 ++++--- .../Tempus_IMEX_RK_Combined_FSA_Tangent.cpp | 13 ++++--- .../test/IMEX_RK/Tempus_IMEX_RK_FSA.hpp | 13 ++++--- .../IMEX_RK/Tempus_IMEX_RK_Staggered_FSA.cpp | 13 ++++--- .../Tempus_IMEX_RK_Staggered_FSA_Tangent.cpp | 13 ++++--- .../Tempus_IMEX_RK_PartitionedTest.cpp | 13 ++++--- ...empus_IMEX_RK_Partitioned_Combined_FSA.cpp | 13 ++++--- ...EX_RK_Partitioned_Combined_FSA_Tangent.cpp | 13 ++++--- .../Tempus_IMEX_RK_Partitioned_FSA.hpp | 13 ++++--- ...mpus_IMEX_RK_Partitioned_Staggered_FSA.cpp | 13 ++++--- ...X_RK_Partitioned_Staggered_FSA_Tangent.cpp | 13 ++++--- .../test/Leapfrog/Tempus_LeapfrogTest.cpp | 13 ++++--- ...est_NewmarkExplicitAForm_BallParabolic.cpp | 13 ++++--- ...xplicitAForm_HarmonicOscillator_Damped.cpp | 13 ++++--- ...empus_Test_NewmarkExplicitAForm_SinCos.cpp | 13 ++++--- ...m_HarmonicOscillator_Damped_FirstOrder.cpp | 13 ++++--- ..._HarmonicOscillator_Damped_SecondOrder.cpp | 13 ++++--- ..._HarmonicOscillator_Damped_SecondOrder.cpp | 13 ++++--- .../Tempus_OperatorSplitTest.cpp | 13 ++++--- .../Tempus_PhysicsStateCounter.hpp | 13 ++++--- .../PhysicsState/Tempus_PhysicsStateTest.cpp | 13 ++++--- ...s_PhysicsStateTest_StepperForwardEuler.hpp | 13 ++++--- .../test/Subcycling/Tempus_SubcyclingTest.cpp | 13 ++++--- packages/tempus/test/TestModels/CDR_Model.cpp | 13 ++++--- .../test/TestModels/CDR_Model_Functors.hpp | 9 +++++ .../test/TestModels/CDR_Model_Tpetra_decl.hpp | 13 ++++--- .../test/TestModels/CDR_Model_Tpetra_impl.hpp | 13 ++++--- .../tempus/test/TestModels/CDR_Model_decl.hpp | 13 ++++--- .../tempus/test/TestModels/CDR_Model_impl.hpp | 13 ++++--- .../test/TestModels/DahlquistTestModel.cpp | 13 ++++--- .../TestModels/DahlquistTestModel_decl.hpp | 13 ++++--- .../TestModels/DahlquistTestModel_impl.hpp | 13 ++++--- .../TestModels/HarmonicOscillatorModel.cpp | 13 ++++--- .../HarmonicOscillatorModel_decl.hpp | 13 ++++--- .../HarmonicOscillatorModel_impl.hpp | 13 ++++--- .../tempus/test/TestModels/SinCosModel.cpp | 13 ++++--- .../test/TestModels/SinCosModel_decl.hpp | 13 ++++--- .../test/TestModels/SinCosModel_impl.hpp | 13 ++++--- .../test/TestModels/SteadyQuadraticModel.cpp | 13 ++++--- .../TestModels/SteadyQuadraticModel_decl.hpp | 13 ++++--- .../TestModels/SteadyQuadraticModel_impl.hpp | 13 ++++--- .../tempus/test/TestModels/VanDerPolModel.cpp | 13 ++++--- .../test/TestModels/VanDerPolModel_decl.hpp | 13 ++++--- .../test/TestModels/VanDerPolModel_impl.hpp | 13 ++++--- .../VanDerPol_IMEXPart_ImplicitModel.cpp | 13 ++++--- .../VanDerPol_IMEXPart_ImplicitModel_decl.hpp | 13 ++++--- .../VanDerPol_IMEXPart_ImplicitModel_impl.hpp | 13 ++++--- .../VanDerPol_IMEX_ExplicitModel.cpp | 13 ++++--- .../VanDerPol_IMEX_ExplicitModel_decl.hpp | 13 ++++--- .../VanDerPol_IMEX_ExplicitModel_impl.hpp | 13 ++++--- .../VanDerPol_IMEX_ImplicitModel.cpp | 13 ++++--- .../VanDerPol_IMEX_ImplicitModel_decl.hpp | 13 ++++--- .../VanDerPol_IMEX_ImplicitModel_impl.hpp | 13 ++++--- .../TestUtils/Tempus_ConvergenceTestUtils.hpp | 13 ++++--- .../test/TestUtils/Tempus_UnitTestMain.cpp | 9 +++++ .../TestUtils/Tempus_UnitTestMainUtils.hpp | 13 ++++--- .../Trapezoidal/Tempus_TrapezoidalTest.cpp | 13 ++++--- packages/tempus/test/version/version.cpp | 13 ++++--- .../tempus/unit_test/Tempus_UnitTest_BDF2.cpp | 13 ++++--- .../Tempus_UnitTest_BackwardEuler.cpp | 13 ++++--- ...us_UnitTest_DIRK_1Stage1stOrderRadauIA.cpp | 13 ++++--- .../Tempus_UnitTest_DIRK_1StageTheta.cpp | 13 ++++--- ...nitTest_DIRK_2Stage2ndOrderLobattoIIIB.cpp | 13 ++++--- .../Tempus_UnitTest_DIRK_BackwardEuler.cpp | 13 ++++--- .../Tempus_UnitTest_DIRK_General.cpp | 13 ++++--- .../Tempus_UnitTest_EDIRK_2Stage3rdOrder.cpp | 13 ++++--- .../Tempus_UnitTest_EDIRK_2StageTheta.cpp | 13 ++++--- .../Tempus_UnitTest_EDIRK_TrapezoidalRule.cpp | 13 ++++--- .../tempus/unit_test/Tempus_UnitTest_ERK.cpp | 13 ++++--- .../Tempus_UnitTest_ERK_3Stage3rdOrder.cpp | 13 ++++--- ...Tempus_UnitTest_ERK_3Stage3rdOrderHeun.cpp | 13 ++++--- .../Tempus_UnitTest_ERK_3Stage3rdOrderTVD.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_ERK_3_8Rule.cpp | 13 ++++--- ...empus_UnitTest_ERK_4Stage3rdOrderRunge.cpp | 13 ++++--- .../Tempus_UnitTest_ERK_4Stage4thOrder.cpp | 13 ++++--- ...empus_UnitTest_ERK_5Stage3rdOrderKandG.cpp | 13 ++++--- .../Tempus_UnitTest_ERK_BogackiShampine32.cpp | 13 ++++--- .../Tempus_UnitTest_ERK_ForwardEuler.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_ERK_General.cpp | 13 ++++--- .../Tempus_UnitTest_ERK_Merson45.cpp | 13 ++++--- .../Tempus_UnitTest_ERK_Midpoint.cpp | 13 ++++--- .../Tempus_UnitTest_ERK_Trapezoidal.cpp | 13 ++++--- .../Tempus_UnitTest_ForwardEuler.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_HHTAlpha.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_IMEX_RK.cpp | 13 ++++--- .../Tempus_UnitTest_IMEX_RK_Partition.cpp | 13 ++++--- .../Tempus_UnitTest_IntegratorBasic.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_Leapfrog.cpp | 13 ++++--- .../Tempus_UnitTest_NewmarkExplicitAForm.cpp | 13 ++++--- .../Tempus_UnitTest_NewmarkImplicitAForm.cpp | 13 ++++--- .../Tempus_UnitTest_NewmarkImplicitDForm.cpp | 13 ++++--- .../Tempus_UnitTest_NumericalUtils.cpp | 13 ++++--- .../Tempus_UnitTest_OperatorSplit.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_RK_Utils.hpp | 13 ++++--- .../Tempus_UnitTest_SDIRK_21Pair.cpp | 13 ++++--- .../Tempus_UnitTest_SDIRK_2Stage2ndOrder.cpp | 13 ++++--- .../Tempus_UnitTest_SDIRK_2Stage3rdOrder.cpp | 13 ++++--- .../Tempus_UnitTest_SDIRK_3Stage2ndOrder.cpp | 13 ++++--- .../Tempus_UnitTest_SDIRK_3Stage4thOrder.cpp | 13 ++++--- .../Tempus_UnitTest_SDIRK_5Stage4thOrder.cpp | 13 ++++--- .../Tempus_UnitTest_SDIRK_5Stage5thOrder.cpp | 13 ++++--- ...Tempus_UnitTest_SDIRK_ImplicitMidpoint.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_SSPDIRK22.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_SSPDIRK23.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_SSPDIRK32.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_SSPDIRK33.cpp | 13 ++++--- .../Tempus_UnitTest_SolutionHistory.cpp | 13 ++++--- .../Tempus_UnitTest_Stepper_ErrorNorm.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_Subcycling.cpp | 13 ++++--- .../Tempus_UnitTest_TimeEventBase.cpp | 13 ++++--- .../Tempus_UnitTest_TimeEventComposite.cpp | 13 ++++--- .../Tempus_UnitTest_TimeEventList.cpp | 13 ++++--- .../Tempus_UnitTest_TimeEventListIndex.cpp | 13 ++++--- .../Tempus_UnitTest_TimeEventRange.cpp | 13 ++++--- .../Tempus_UnitTest_TimeEventRangeIndex.cpp | 13 ++++--- .../Tempus_UnitTest_TimeStepControl.cpp | 13 ++++--- ...nitTest_TimeStepControlStrategyBasicVS.cpp | 13 ++++--- ...tTest_TimeStepControlStrategyComposite.cpp | 13 ++++--- ...itTest_TimeStepControlStrategyConstant.cpp | 13 ++++--- ...eStepControlStrategyIntegralController.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_Trapezoidal.cpp | 13 ++++--- .../unit_test/Tempus_UnitTest_Utils.hpp | 13 ++++--- 458 files changed, 3222 insertions(+), 2746 deletions(-) create mode 100644 packages/tempus/COPYRIGHT delete mode 100644 packages/tempus/Copyright-header.txt delete mode 100644 packages/tempus/Copyright.txt create mode 100644 packages/tempus/LICENSE create mode 100644 packages/tempus/README.md diff --git a/packages/tempus/CMakeLists.txt b/packages/tempus/CMakeLists.txt index 944693412b4f..4ca62320b597 100644 --- a/packages/tempus/CMakeLists.txt +++ b/packages/tempus/CMakeLists.txt @@ -21,7 +21,7 @@ COMBINED_OPTION( TEMPUS_ENABLE_EPETRA_STACK " Defaults to ON if the Epetra, Stratimikos, and Belos are all enabled," " otherwise defaults to OFF." ) -MESSAGE(STATUS "Epetra Stack: ${TEMPUS_ENABLE_EPETRA_STACK}") +MESSAGE(STATUS "Tempus: Epetra Stack: ${TEMPUS_ENABLE_EPETRA_STACK}") COMBINED_OPTION( TEMPUS_ENABLE_TPETRA_STACK DEP_OPTIONS_NAMES Tempus_ENABLE_Tpetra @@ -33,7 +33,7 @@ COMBINED_OPTION( TEMPUS_ENABLE_TPETRA_STACK " Defaults to ON if the Tpetra, Stratimikos, and Belos are all enabled," " otherwise defaults to OFF." ) -MESSAGE(STATUS "Tpetra Stack: ${TEMPUS_ENABLE_TPETRA_STACK}") +MESSAGE(STATUS "Tempus: Tpetra Stack: ${TEMPUS_ENABLE_TPETRA_STACK}") # For use by Tempus unit tests GLOBAL_SET(TEMPUS_UNIT_TEST_MAIN diff --git a/packages/tempus/COPYRIGHT b/packages/tempus/COPYRIGHT new file mode 100644 index 000000000000..54b00c6ff82d --- /dev/null +++ b/packages/tempus/COPYRIGHT @@ -0,0 +1,9 @@ + + Tempus: Time Integration and Sensitivity Analysis Package + Copyright (c) 2017 NTESS + +Copyright 2017 National Technology & Engineering Solutions of Sandia, +LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the +U.S. Government retains certain rights in this software. + +Copyright the Tempus contributors. diff --git a/packages/tempus/Copyright-header.txt b/packages/tempus/Copyright-header.txt deleted file mode 100644 index fcf79bc2bb06..000000000000 --- a/packages/tempus/Copyright-header.txt +++ /dev/null @@ -1,7 +0,0 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation -// -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER diff --git a/packages/tempus/Copyright.txt b/packages/tempus/Copyright.txt deleted file mode 100644 index 731240cdefa6..000000000000 --- a/packages/tempus/Copyright.txt +++ /dev/null @@ -1,37 +0,0 @@ - - Tempus: Time Integration and Sensitivity Analysis Package - Copyright (2017) Sandia Corporation - -Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -the U.S. Government retains certain rights in this software. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -3. Neither the name of the Corporation nor the names of the -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Questions? Contact lead developers: - Curtis Ober (ccober@sandia.gov) - Roger Pawlowski (rppawlo@sandia.gov) diff --git a/packages/tempus/LICENSE b/packages/tempus/LICENSE new file mode 100644 index 000000000000..2251b35ed4e7 --- /dev/null +++ b/packages/tempus/LICENSE @@ -0,0 +1,30 @@ + +Copyright (c) 2017 NTESS and the Tempus contributors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + 3. Neither the name of the copyright holder nor the names of + its contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/tempus/README.md b/packages/tempus/README.md new file mode 100644 index 000000000000..8fa4a96fc7dd --- /dev/null +++ b/packages/tempus/README.md @@ -0,0 +1,13 @@ +# Tempus: Time Integration and Sensitivity Analysis Package + + +## Copyright and License +See tempus/COPYRIGHT, tempus/LICENSE, https://trilinos.github.io/license.html and individual file headers for additional information. + + +## Questions? +Contact lead developers: + +* Tempus team (GitHub handle: @trilinos/tempus) +* Curtis Ober (GitHub handle: [ccober6](https://github.com/ccober6) or ccober@sandia.gov) +* Roger Pawlowski (GitHub handle: [rppawlo](https://github.com/rppawlo) or rppawlo@sandia.gov) diff --git a/packages/tempus/doc/index.doc b/packages/tempus/doc/index.doc index 33c43849c984..2cf7b9aeaad5 100644 --- a/packages/tempus/doc/index.doc +++ b/packages/tempus/doc/index.doc @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER /* ************************************************************************ */ /* ************************************************************************ */ diff --git a/packages/tempus/examples/00_Basic_Problem/00_Basic_Problem.cpp b/packages/tempus/examples/00_Basic_Problem/00_Basic_Problem.cpp index c8b266abb601..c09c47de1cb2 100644 --- a/packages/tempus/examples/00_Basic_Problem/00_Basic_Problem.cpp +++ b/packages/tempus/examples/00_Basic_Problem/00_Basic_Problem.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include #include diff --git a/packages/tempus/examples/01_Utilize_Thyra/01_Utilize_Thyra.cpp b/packages/tempus/examples/01_Utilize_Thyra/01_Utilize_Thyra.cpp index df0c99e5bd4d..669cfa566815 100644 --- a/packages/tempus/examples/01_Utilize_Thyra/01_Utilize_Thyra.cpp +++ b/packages/tempus/examples/01_Utilize_Thyra/01_Utilize_Thyra.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include #include diff --git a/packages/tempus/examples/02_Use_ModelEvaluator/02_Use_ModelEvaluator.cpp b/packages/tempus/examples/02_Use_ModelEvaluator/02_Use_ModelEvaluator.cpp index 84b32544c8a2..aa224d4c1b7b 100644 --- a/packages/tempus/examples/02_Use_ModelEvaluator/02_Use_ModelEvaluator.cpp +++ b/packages/tempus/examples/02_Use_ModelEvaluator/02_Use_ModelEvaluator.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include #include diff --git a/packages/tempus/examples/02_Use_ModelEvaluator/VanDerPol_ModelEvaluator_02.cpp b/packages/tempus/examples/02_Use_ModelEvaluator/VanDerPol_ModelEvaluator_02.cpp index 231f7a7396f9..119153e2b899 100644 --- a/packages/tempus/examples/02_Use_ModelEvaluator/VanDerPol_ModelEvaluator_02.cpp +++ b/packages/tempus/examples/02_Use_ModelEvaluator/VanDerPol_ModelEvaluator_02.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Thyra_DefaultSpmdVectorSpace.hpp" #include "Thyra_DetachedVectorView.hpp" diff --git a/packages/tempus/examples/02_Use_ModelEvaluator/VanDerPol_ModelEvaluator_02.hpp b/packages/tempus/examples/02_Use_ModelEvaluator/VanDerPol_ModelEvaluator_02.hpp index 5c89faca4d41..2dfc602ce264 100644 --- a/packages/tempus/examples/02_Use_ModelEvaluator/VanDerPol_ModelEvaluator_02.hpp +++ b/packages/tempus/examples/02_Use_ModelEvaluator/VanDerPol_ModelEvaluator_02.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_VANDERPOL_MODELEVALUATOR_02_HPP #define TEMPUS_VANDERPOL_MODELEVALUATOR_02_HPP diff --git a/packages/tempus/examples/03_Intro_SolutionState/03_Intro_SolutionState.cpp b/packages/tempus/examples/03_Intro_SolutionState/03_Intro_SolutionState.cpp index 56ef53752153..5768f8acef81 100644 --- a/packages/tempus/examples/03_Intro_SolutionState/03_Intro_SolutionState.cpp +++ b/packages/tempus/examples/03_Intro_SolutionState/03_Intro_SolutionState.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include #include diff --git a/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator.cpp b/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator.cpp index d7b3ec765399..e6b5eec1efc0 100644 --- a/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator.cpp +++ b/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator_decl.hpp b/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator_decl.hpp index afcc2e57178d..ab4f2ab3d861 100644 --- a/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator_decl.hpp +++ b/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_AdjointAuxSensitivityModelEvaluator_decl_hpp #define Tempus_AdjointAuxSensitivityModelEvaluator_decl_hpp diff --git a/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator_impl.hpp b/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator_impl.hpp index c2f61d20c30b..83ec62f03945 100644 --- a/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator_impl.hpp +++ b/packages/tempus/src/Tempus_AdjointAuxSensitivityModelEvaluator_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_AdjointAuxSensitivityModelEvaluator_impl_hpp #define Tempus_AdjointAuxSensitivityModelEvaluator_impl_hpp diff --git a/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator.cpp b/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator.cpp index f7a2173f20c2..5baec24cc352 100644 --- a/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator.cpp +++ b/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator_decl.hpp b/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator_decl.hpp index 383330c2a13c..d7ce78250338 100644 --- a/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator_decl.hpp +++ b/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_AdjointSensitivityModelEvaluator_decl_hpp #define Tempus_AdjointSensitivityModelEvaluator_decl_hpp diff --git a/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator_impl.hpp b/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator_impl.hpp index d2fa3975aed3..dfe4a599c47f 100644 --- a/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator_impl.hpp +++ b/packages/tempus/src/Tempus_AdjointSensitivityModelEvaluator_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_AdjointSensitivityModelEvaluator_impl_hpp #define Tempus_AdjointSensitivityModelEvaluator_impl_hpp diff --git a/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator.cpp b/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator.cpp index 1c8b2bd8dfb5..4c87bc501aa6 100644 --- a/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator.cpp +++ b/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator_decl.hpp b/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator_decl.hpp index adb72829ed6b..3f10f0f12fa8 100644 --- a/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator_decl.hpp +++ b/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_AuxiliaryIntegralModelEvaluator_decl_hpp #define Tempus_AuxiliaryIntegralModelEvaluator_decl_hpp diff --git a/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator_impl.hpp b/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator_impl.hpp index 1a63dc1b2445..34155a4d4106 100644 --- a/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator_impl.hpp +++ b/packages/tempus/src/Tempus_AuxiliaryIntegralModelEvaluator_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_AuxiliaryIntegralModelEvaluator_impl_hpp #define Tempus_AuxiliaryIntegralModelEvaluator_impl_hpp diff --git a/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator.cpp b/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator.cpp index beaa2b9b23dd..7806448bfa66 100644 --- a/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator.cpp +++ b/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator_decl.hpp b/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator_decl.hpp index 425d7cd91ffb..43aadaa875f4 100644 --- a/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator_decl.hpp +++ b/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_CombinedForwardSensitivityModelEvaluator_decl_hpp #define Tempus_CombinedForwardSensitivityModelEvaluator_decl_hpp diff --git a/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator_impl.hpp b/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator_impl.hpp index b74cbee2b2eb..8df6a46d6416 100644 --- a/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator_impl.hpp +++ b/packages/tempus/src/Tempus_CombinedForwardSensitivityModelEvaluator_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_CombinedForwardSensitivityModelEvaluator_impl_hpp #define Tempus_CombinedForwardSensitivityModelEvaluator_impl_hpp diff --git a/packages/tempus/src/Tempus_ExplicitTemplateInstantiation.hpp b/packages/tempus/src/Tempus_ExplicitTemplateInstantiation.hpp index 989bb9efca18..a579aa66f56e 100644 --- a/packages/tempus/src/Tempus_ExplicitTemplateInstantiation.hpp +++ b/packages/tempus/src/Tempus_ExplicitTemplateInstantiation.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ExplicitTemplateInstantiation_hpp #define Tempus_ExplicitTemplateInstantiation_hpp diff --git a/packages/tempus/src/Tempus_Integrator.hpp b/packages/tempus/src/Tempus_Integrator.hpp index 39ba3ce62010..55843567a7d1 100644 --- a/packages/tempus/src/Tempus_Integrator.hpp +++ b/packages/tempus/src/Tempus_Integrator.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Integrator_hpp #define Tempus_Integrator_hpp diff --git a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity.cpp b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity.cpp index ab36e9ff72ea..bc0f75a5e447 100644 --- a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity.cpp +++ b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_decl.hpp b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_decl.hpp index 30bd43362504..c95d26671621 100644 --- a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorAdjointSensitivity_decl_hpp #define Tempus_IntegratorAdjointSensitivity_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_impl.hpp b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_impl.hpp index 825e961d7244..2e32f5f64093 100644 --- a/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorAdjointSensitivity_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorAdjointSensitivity_impl_hpp #define Tempus_IntegratorAdjointSensitivity_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorBasic.cpp b/packages/tempus/src/Tempus_IntegratorBasic.cpp index 96d71c3c0525..5eca2b1fb508 100644 --- a/packages/tempus/src/Tempus_IntegratorBasic.cpp +++ b/packages/tempus/src/Tempus_IntegratorBasic.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorBasic_decl.hpp b/packages/tempus/src/Tempus_IntegratorBasic_decl.hpp index 9f0c8e150818..b1214cb1d9e3 100644 --- a/packages/tempus/src/Tempus_IntegratorBasic_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorBasic_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorBasic_decl_hpp #define Tempus_IntegratorBasic_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorBasic_impl.hpp b/packages/tempus/src/Tempus_IntegratorBasic_impl.hpp index f062704a32f3..3f4e9cb72268 100644 --- a/packages/tempus/src/Tempus_IntegratorBasic_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorBasic_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorBasic_impl_hpp #define Tempus_IntegratorBasic_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorForwardSensitivity.cpp b/packages/tempus/src/Tempus_IntegratorForwardSensitivity.cpp index e53d9be1fc28..a0c626f86a1c 100644 --- a/packages/tempus/src/Tempus_IntegratorForwardSensitivity.cpp +++ b/packages/tempus/src/Tempus_IntegratorForwardSensitivity.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorForwardSensitivity_decl.hpp b/packages/tempus/src/Tempus_IntegratorForwardSensitivity_decl.hpp index 04efdc7fb63e..c1853f21e3c5 100644 --- a/packages/tempus/src/Tempus_IntegratorForwardSensitivity_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorForwardSensitivity_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorForwardSensitivity_decl_hpp #define Tempus_IntegratorForwardSensitivity_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorForwardSensitivity_impl.hpp b/packages/tempus/src/Tempus_IntegratorForwardSensitivity_impl.hpp index 7d0fd8c3dd9d..2f7821b3a3f5 100644 --- a/packages/tempus/src/Tempus_IntegratorForwardSensitivity_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorForwardSensitivity_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorForwardSensitivity_impl_hpp #define Tempus_IntegratorForwardSensitivity_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserver.hpp b/packages/tempus/src/Tempus_IntegratorObserver.hpp index ed86bf66c5fa..bb333286e099 100644 --- a/packages/tempus/src/Tempus_IntegratorObserver.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserver.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserver_hpp #define Tempus_IntegratorObserver_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverBasic.cpp b/packages/tempus/src/Tempus_IntegratorObserverBasic.cpp index c084d7b3e9d8..9346000e33aa 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverBasic.cpp +++ b/packages/tempus/src/Tempus_IntegratorObserverBasic.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorObserverBasic_decl.hpp b/packages/tempus/src/Tempus_IntegratorObserverBasic_decl.hpp index bf13ed938fb6..eb6907a701ea 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverBasic_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverBasic_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverBasic_decl_hpp #define Tempus_IntegratorObserverBasic_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverBasic_impl.hpp b/packages/tempus/src/Tempus_IntegratorObserverBasic_impl.hpp index 0988fe3d1c81..c0684c6aa019 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverBasic_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverBasic_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverBasic_impl_hpp #define Tempus_IntegratorObserverBasic_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverComposite.cpp b/packages/tempus/src/Tempus_IntegratorObserverComposite.cpp index 706a27fa9c92..ce299e7fdbd8 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverComposite.cpp +++ b/packages/tempus/src/Tempus_IntegratorObserverComposite.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorObserverComposite_decl.hpp b/packages/tempus/src/Tempus_IntegratorObserverComposite_decl.hpp index 6a324a6eb871..a90a0708560e 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverComposite_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverComposite_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverComposite_decl_hpp #define Tempus_IntegratorObserverComposite_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverComposite_impl.hpp b/packages/tempus/src/Tempus_IntegratorObserverComposite_impl.hpp index 022377345fac..52221abd848c 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverComposite_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverComposite_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverComposite_impl_hpp #define Tempus_IntegratorObserverComposite_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverLogging.cpp b/packages/tempus/src/Tempus_IntegratorObserverLogging.cpp index 8f2b4fa4e4d9..1c5f1f820907 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverLogging.cpp +++ b/packages/tempus/src/Tempus_IntegratorObserverLogging.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorObserverLogging_decl.hpp b/packages/tempus/src/Tempus_IntegratorObserverLogging_decl.hpp index c65783eb278b..947b08d0094e 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverLogging_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverLogging_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverLogging_decl_hpp #define Tempus_IntegratorObserverLogging_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverLogging_impl.hpp b/packages/tempus/src/Tempus_IntegratorObserverLogging_impl.hpp index d30f8feb79ef..6a21db87a2ce 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverLogging_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverLogging_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverLogging_impl_hpp #define Tempus_IntegratorObserverLogging_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverNoOp.cpp b/packages/tempus/src/Tempus_IntegratorObserverNoOp.cpp index 95e1c90f0198..a3887117489a 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverNoOp.cpp +++ b/packages/tempus/src/Tempus_IntegratorObserverNoOp.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorObserverNoOp_decl.hpp b/packages/tempus/src/Tempus_IntegratorObserverNoOp_decl.hpp index 6c267ba68cc5..7eb7f7e3ba30 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverNoOp_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverNoOp_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverNoOp_decl_hpp #define Tempus_IntegratorObserverNoOp_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverNoOp_impl.hpp b/packages/tempus/src/Tempus_IntegratorObserverNoOp_impl.hpp index 30c3c21855b4..95338e7a79bc 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverNoOp_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverNoOp_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverNoOp_impl_hpp #define Tempus_IntegratorObserverNoOp_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverSubcycling.cpp b/packages/tempus/src/Tempus_IntegratorObserverSubcycling.cpp index caae8fa43576..21d70ef870ee 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverSubcycling.cpp +++ b/packages/tempus/src/Tempus_IntegratorObserverSubcycling.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorObserverSubcycling_decl.hpp b/packages/tempus/src/Tempus_IntegratorObserverSubcycling_decl.hpp index c1f3087c3c67..d1526766f785 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverSubcycling_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverSubcycling_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverSubcycling_decl_hpp #define Tempus_IntegratorObserverSubcycling_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorObserverSubcycling_impl.hpp b/packages/tempus/src/Tempus_IntegratorObserverSubcycling_impl.hpp index 2bd2a86eff6c..aa2885e58f9e 100644 --- a/packages/tempus/src/Tempus_IntegratorObserverSubcycling_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorObserverSubcycling_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorObserverSubcycling_impl_hpp #define Tempus_IntegratorObserverSubcycling_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity.cpp b/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity.cpp index 3fc83574f5e7..a6b98a846dd9 100644 --- a/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity.cpp +++ b/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity_decl.hpp b/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity_decl.hpp index 37006b85bd22..c9b2945f3e5f 100644 --- a/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorPseudoTransientAdjointSensitivity_decl_hpp #define Tempus_IntegratorPseudoTransientAdjointSensitivity_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity_impl.hpp b/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity_impl.hpp index 312f24e9d8c9..3e78f60b5b10 100644 --- a/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorPseudoTransientAdjointSensitivity_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorPseudoTransientAdjointSensitivity_impl_hpp #define Tempus_IntegratorPseudoTransientAdjointSensitivity_impl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity.cpp b/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity.cpp index 57bdff0c106f..8d40005798ce 100644 --- a/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity.cpp +++ b/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity_decl.hpp b/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity_decl.hpp index 261904333b39..35b3705a85e2 100644 --- a/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity_decl.hpp +++ b/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorPseudoTransientForwardSensitivity_decl_hpp #define Tempus_IntegratorPseudoTransientForwardSensitivity_decl_hpp diff --git a/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity_impl.hpp b/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity_impl.hpp index a9416b7f5f42..a200e5c6a876 100644 --- a/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity_impl.hpp +++ b/packages/tempus/src/Tempus_IntegratorPseudoTransientForwardSensitivity_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_IntegratorPseudoTransientForwardSensitivity_impl_hpp #define Tempus_IntegratorPseudoTransientForwardSensitivity_impl_hpp diff --git a/packages/tempus/src/Tempus_Interpolator.hpp b/packages/tempus/src/Tempus_Interpolator.hpp index b7785084056a..3ea9ea1d82e6 100644 --- a/packages/tempus/src/Tempus_Interpolator.hpp +++ b/packages/tempus/src/Tempus_Interpolator.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Interpolator_hpp #define Tempus_Interpolator_hpp diff --git a/packages/tempus/src/Tempus_InterpolatorFactory.hpp b/packages/tempus/src/Tempus_InterpolatorFactory.hpp index ed387cdf5d0e..9bcbe3d10af6 100644 --- a/packages/tempus/src/Tempus_InterpolatorFactory.hpp +++ b/packages/tempus/src/Tempus_InterpolatorFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_InterpolatorFactory_hpp #define Tempus_InterpolatorFactory_hpp diff --git a/packages/tempus/src/Tempus_InterpolatorLagrange.cpp b/packages/tempus/src/Tempus_InterpolatorLagrange.cpp index e150bda753f0..14ffadcfef32 100644 --- a/packages/tempus/src/Tempus_InterpolatorLagrange.cpp +++ b/packages/tempus/src/Tempus_InterpolatorLagrange.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_InterpolatorLagrange_decl.hpp b/packages/tempus/src/Tempus_InterpolatorLagrange_decl.hpp index e73c07b10eb0..6102d7b871be 100644 --- a/packages/tempus/src/Tempus_InterpolatorLagrange_decl.hpp +++ b/packages/tempus/src/Tempus_InterpolatorLagrange_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_InterpolatorLagrange_decl_hpp #define Tempus_InterpolatorLagrange_decl_hpp diff --git a/packages/tempus/src/Tempus_InterpolatorLagrange_impl.hpp b/packages/tempus/src/Tempus_InterpolatorLagrange_impl.hpp index add12d309b2e..b5a870f5bea6 100644 --- a/packages/tempus/src/Tempus_InterpolatorLagrange_impl.hpp +++ b/packages/tempus/src/Tempus_InterpolatorLagrange_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_InterpolatorLagrange_impl_hpp #define Tempus_InterpolatorLagrange_impl_hpp diff --git a/packages/tempus/src/Tempus_NumericalUtils.hpp b/packages/tempus/src/Tempus_NumericalUtils.hpp index c7f8066cefe8..57b6c3a6c9e3 100644 --- a/packages/tempus/src/Tempus_NumericalUtils.hpp +++ b/packages/tempus/src/Tempus_NumericalUtils.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_NumericalUtils_hpp #define Tempus_NumericalUtils_hpp diff --git a/packages/tempus/src/Tempus_PhysicsState.cpp b/packages/tempus/src/Tempus_PhysicsState.cpp index 7c135e505fc4..d595cf369516 100644 --- a/packages/tempus/src/Tempus_PhysicsState.cpp +++ b/packages/tempus/src/Tempus_PhysicsState.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_PhysicsState_decl.hpp b/packages/tempus/src/Tempus_PhysicsState_decl.hpp index 2023f32fc529..b397c4ede6e6 100644 --- a/packages/tempus/src/Tempus_PhysicsState_decl.hpp +++ b/packages/tempus/src/Tempus_PhysicsState_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_PhysicsState_hpp #define Tempus_PhysicsState_hpp diff --git a/packages/tempus/src/Tempus_PhysicsState_impl.hpp b/packages/tempus/src/Tempus_PhysicsState_impl.hpp index 650900a973f5..a5f643e2012c 100644 --- a/packages/tempus/src/Tempus_PhysicsState_impl.hpp +++ b/packages/tempus/src/Tempus_PhysicsState_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_PhysicsState_impl_hpp #define Tempus_PhysicsState_impl_hpp diff --git a/packages/tempus/src/Tempus_RKButcherTableau.hpp b/packages/tempus/src/Tempus_RKButcherTableau.hpp index b7371b985cb5..3b6ea556c0f6 100644 --- a/packages/tempus/src/Tempus_RKButcherTableau.hpp +++ b/packages/tempus/src/Tempus_RKButcherTableau.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_RKButcherTableau_hpp #define Tempus_RKButcherTableau_hpp diff --git a/packages/tempus/src/Tempus_SensitivityModelEvaluatorBase.hpp b/packages/tempus/src/Tempus_SensitivityModelEvaluatorBase.hpp index 6d6b90837547..6dca31e12800 100644 --- a/packages/tempus/src/Tempus_SensitivityModelEvaluatorBase.hpp +++ b/packages/tempus/src/Tempus_SensitivityModelEvaluatorBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_SensitivityModelEvaluatorBase_hpp #define Tempus_SensitivityModelEvaluatorBase_hpp diff --git a/packages/tempus/src/Tempus_SolutionHistory.cpp b/packages/tempus/src/Tempus_SolutionHistory.cpp index d9afb358e869..614e664f42b3 100644 --- a/packages/tempus/src/Tempus_SolutionHistory.cpp +++ b/packages/tempus/src/Tempus_SolutionHistory.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_SolutionHistory_decl.hpp b/packages/tempus/src/Tempus_SolutionHistory_decl.hpp index 4ef03276f1e5..78f72e3da093 100644 --- a/packages/tempus/src/Tempus_SolutionHistory_decl.hpp +++ b/packages/tempus/src/Tempus_SolutionHistory_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_SolutionHistory_decl_hpp #define Tempus_SolutionHistory_decl_hpp diff --git a/packages/tempus/src/Tempus_SolutionHistory_impl.hpp b/packages/tempus/src/Tempus_SolutionHistory_impl.hpp index 19a1fd095db6..fae3ac664659 100644 --- a/packages/tempus/src/Tempus_SolutionHistory_impl.hpp +++ b/packages/tempus/src/Tempus_SolutionHistory_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_SolutionHistory_impl_hpp #define Tempus_SolutionHistory_impl_hpp diff --git a/packages/tempus/src/Tempus_SolutionState.cpp b/packages/tempus/src/Tempus_SolutionState.cpp index 26d27056101e..9c92d869d90e 100644 --- a/packages/tempus/src/Tempus_SolutionState.cpp +++ b/packages/tempus/src/Tempus_SolutionState.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_SolutionStateMetaData.cpp b/packages/tempus/src/Tempus_SolutionStateMetaData.cpp index 6251fcb162a2..8287bf88c42f 100644 --- a/packages/tempus/src/Tempus_SolutionStateMetaData.cpp +++ b/packages/tempus/src/Tempus_SolutionStateMetaData.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_SolutionStateMetaData_decl.hpp b/packages/tempus/src/Tempus_SolutionStateMetaData_decl.hpp index 2a31a856bace..f4a11d34c224 100644 --- a/packages/tempus/src/Tempus_SolutionStateMetaData_decl.hpp +++ b/packages/tempus/src/Tempus_SolutionStateMetaData_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_SolutionStateMetaData_decl_hpp #define Tempus_SolutionStateMetaData_decl_hpp diff --git a/packages/tempus/src/Tempus_SolutionStateMetaData_impl.hpp b/packages/tempus/src/Tempus_SolutionStateMetaData_impl.hpp index 4034fa8c4667..7b7b51b4445c 100644 --- a/packages/tempus/src/Tempus_SolutionStateMetaData_impl.hpp +++ b/packages/tempus/src/Tempus_SolutionStateMetaData_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_SolutionStateMetaData_impl_hpp #define Tempus_SolutionStateMetaData_impl_hpp diff --git a/packages/tempus/src/Tempus_SolutionState_decl.hpp b/packages/tempus/src/Tempus_SolutionState_decl.hpp index afb935f2b194..35bbbb00a7ee 100644 --- a/packages/tempus/src/Tempus_SolutionState_decl.hpp +++ b/packages/tempus/src/Tempus_SolutionState_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_SolutionState_decl_hpp #define Tempus_SolutionState_decl_hpp diff --git a/packages/tempus/src/Tempus_SolutionState_impl.hpp b/packages/tempus/src/Tempus_SolutionState_impl.hpp index d04dfd87b824..54ec7489940a 100644 --- a/packages/tempus/src/Tempus_SolutionState_impl.hpp +++ b/packages/tempus/src/Tempus_SolutionState_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_SolutionState_impl_hpp #define Tempus_SolutionState_impl_hpp diff --git a/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator.cpp b/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator.cpp index 3efef970741e..e66e9022a241 100644 --- a/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator.cpp +++ b/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator_decl.hpp b/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator_decl.hpp index 5e561218fe67..fc23599b4858 100644 --- a/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator_decl.hpp +++ b/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StaggeredForwardSensitivityModelEvaluator_decl_hpp #define Tempus_StaggeredForwardSensitivityModelEvaluator_decl_hpp diff --git a/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator_impl.hpp b/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator_impl.hpp index a5ffc478e2fa..e3ca501b60ee 100644 --- a/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator_impl.hpp +++ b/packages/tempus/src/Tempus_StaggeredForwardSensitivityModelEvaluator_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StaggeredForwardSensitivityModelEvaluator_impl_hpp #define Tempus_StaggeredForwardSensitivityModelEvaluator_impl_hpp diff --git a/packages/tempus/src/Tempus_Stepper.cpp b/packages/tempus/src/Tempus_Stepper.cpp index 8d53d8a61e5f..a93e6eca2f5e 100644 --- a/packages/tempus/src/Tempus_Stepper.cpp +++ b/packages/tempus/src/Tempus_Stepper.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperBDF2.cpp b/packages/tempus/src/Tempus_StepperBDF2.cpp index 615d0f091997..c8c645faae88 100644 --- a/packages/tempus/src/Tempus_StepperBDF2.cpp +++ b/packages/tempus/src/Tempus_StepperBDF2.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperBDF2AppAction.hpp b/packages/tempus/src/Tempus_StepperBDF2AppAction.hpp index f0ec0568ab79..b4fd1984ad9a 100644 --- a/packages/tempus/src/Tempus_StepperBDF2AppAction.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2AppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2AppAction_hpp #define Tempus_StepperBDF2AppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2AppActionComposite.hpp b/packages/tempus/src/Tempus_StepperBDF2AppActionComposite.hpp index fce37040c30c..e0f73fa1bbde 100644 --- a/packages/tempus/src/Tempus_StepperBDF2AppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2AppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2AppActionComposite_hpp #define Tempus_StepperBDF2AppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2ModifierBase.hpp b/packages/tempus/src/Tempus_StepperBDF2ModifierBase.hpp index 06894fa0fc9a..29a30ac02eaa 100644 --- a/packages/tempus/src/Tempus_StepperBDF2ModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2ModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2ModifierBase_hpp #define Tempus_StepperBDF2ModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2ModifierDefault.hpp b/packages/tempus/src/Tempus_StepperBDF2ModifierDefault.hpp index 6d8fb60fd7ea..d11adf0b2428 100644 --- a/packages/tempus/src/Tempus_StepperBDF2ModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2ModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2ModifierDefault_hpp #define Tempus_StepperBDF2ModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2ModifierXBase.hpp b/packages/tempus/src/Tempus_StepperBDF2ModifierXBase.hpp index c242f363d1cf..194f4218a9a4 100644 --- a/packages/tempus/src/Tempus_StepperBDF2ModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2ModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2ModifierXBase_hpp #define Tempus_StepperBDF2ModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2ModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperBDF2ModifierXDefault.hpp index 1a5d0dc5648f..5db462a1d2cd 100644 --- a/packages/tempus/src/Tempus_StepperBDF2ModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2ModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2ModifierX_hpp #define Tempus_StepperBDF2ModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2ObserverBase.hpp b/packages/tempus/src/Tempus_StepperBDF2ObserverBase.hpp index 60143043914a..19790bbe1cf7 100644 --- a/packages/tempus/src/Tempus_StepperBDF2ObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2ObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2ObserverBase_hpp #define Tempus_StepperBDF2ObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2ObserverDefault.hpp b/packages/tempus/src/Tempus_StepperBDF2ObserverDefault.hpp index 270d26a1f432..28d0cbd076cf 100644 --- a/packages/tempus/src/Tempus_StepperBDF2ObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2ObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2ObserverDefault_hpp #define Tempus_StepperBDF2ObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2_decl.hpp b/packages/tempus/src/Tempus_StepperBDF2_decl.hpp index ef8c570156c8..830cdb37dbab 100644 --- a/packages/tempus/src/Tempus_StepperBDF2_decl.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2_decl_hpp #define Tempus_StepperBDF2_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperBDF2_impl.hpp b/packages/tempus/src/Tempus_StepperBDF2_impl.hpp index a1889aa94424..09058828c48e 100644 --- a/packages/tempus/src/Tempus_StepperBDF2_impl.hpp +++ b/packages/tempus/src/Tempus_StepperBDF2_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBDF2_impl_hpp #define Tempus_StepperBDF2_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEuler.cpp b/packages/tempus/src/Tempus_StepperBackwardEuler.cpp index 504fbd66998d..0e48911fa5a8 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEuler.cpp +++ b/packages/tempus/src/Tempus_StepperBackwardEuler.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerAppAction.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerAppAction.hpp index e50215b93458..9c01e9f322f9 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEulerAppAction_hpp #define Tempus_StepperBackwardEulerAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerAppActionComposite.hpp index 637a6fe71532..c43cee1b3945 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEulerAppActionComposite_hpp #define Tempus_StepperBackwardEulerAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerModifierBase.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerModifierBase.hpp index 2f82997d4452..e27fca748771 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEulerModifierBase_hpp #define Tempus_StepperBackwardEulerModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerModifierDefault.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerModifierDefault.hpp index c58beb374bf6..da8de9782cda 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEulerModifierDefault_hpp #define Tempus_StepperBackwardEulerModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerModifierXBase.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerModifierXBase.hpp index fc01befc88c7..00f1a48aa0ba 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEulerModifierXBase_hpp #define Tempus_StepperBackwardEulerModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerModifierXDefault.hpp index 1b328f641585..52b1ade62a04 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEulerModifierX_hpp #define Tempus_StepperBackwardEulerModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerObserverBase.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerObserverBase.hpp index ddb93f86bfed..335273b85a97 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEulerObserverBase_hpp #define Tempus_StepperBackwardEulerObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEulerObserverDefault.hpp b/packages/tempus/src/Tempus_StepperBackwardEulerObserverDefault.hpp index ff5296978478..277fff869232 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEulerObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEulerObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEulerObserverDefault_hpp #define Tempus_StepperBackwardEulerObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEuler_decl.hpp b/packages/tempus/src/Tempus_StepperBackwardEuler_decl.hpp index 79e1f7bda6b2..c23fccd66b1f 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEuler_decl.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEuler_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEuler_decl_hpp #define Tempus_StepperBackwardEuler_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperBackwardEuler_impl.hpp b/packages/tempus/src/Tempus_StepperBackwardEuler_impl.hpp index 4b4a28fb582a..adeb4094d8ee 100644 --- a/packages/tempus/src/Tempus_StepperBackwardEuler_impl.hpp +++ b/packages/tempus/src/Tempus_StepperBackwardEuler_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperBackwardEuler_impl_hpp #define Tempus_StepperBackwardEuler_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperDIRK.cpp b/packages/tempus/src/Tempus_StepperDIRK.cpp index 5a639667d3db..cb20ae178276 100644 --- a/packages/tempus/src/Tempus_StepperDIRK.cpp +++ b/packages/tempus/src/Tempus_StepperDIRK.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperDIRK_decl.hpp b/packages/tempus/src/Tempus_StepperDIRK_decl.hpp index 987b0470f32e..b29fe551fbfb 100644 --- a/packages/tempus/src/Tempus_StepperDIRK_decl.hpp +++ b/packages/tempus/src/Tempus_StepperDIRK_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperDIRK_decl_hpp #define Tempus_StepperDIRK_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperDIRK_impl.hpp b/packages/tempus/src/Tempus_StepperDIRK_impl.hpp index 9c2281f100e0..d7afec1ca996 100644 --- a/packages/tempus/src/Tempus_StepperDIRK_impl.hpp +++ b/packages/tempus/src/Tempus_StepperDIRK_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperDIRK_impl_hpp #define Tempus_StepperDIRK_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperExplicit.cpp b/packages/tempus/src/Tempus_StepperExplicit.cpp index ab2247d00ff9..6aea3e1ae9ab 100644 --- a/packages/tempus/src/Tempus_StepperExplicit.cpp +++ b/packages/tempus/src/Tempus_StepperExplicit.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperExplicitRK.cpp b/packages/tempus/src/Tempus_StepperExplicitRK.cpp index ba1d92d17d41..e86056ac731f 100644 --- a/packages/tempus/src/Tempus_StepperExplicitRK.cpp +++ b/packages/tempus/src/Tempus_StepperExplicitRK.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperExplicitRK_decl.hpp b/packages/tempus/src/Tempus_StepperExplicitRK_decl.hpp index e03bee862843..455eaf475481 100644 --- a/packages/tempus/src/Tempus_StepperExplicitRK_decl.hpp +++ b/packages/tempus/src/Tempus_StepperExplicitRK_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperExplicitRK_decl_hpp #define Tempus_StepperExplicitRK_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperExplicitRK_impl.hpp b/packages/tempus/src/Tempus_StepperExplicitRK_impl.hpp index d66e0653f2e9..013a596df8d1 100644 --- a/packages/tempus/src/Tempus_StepperExplicitRK_impl.hpp +++ b/packages/tempus/src/Tempus_StepperExplicitRK_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperExplicitRK_impl_hpp #define Tempus_StepperExplicitRK_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperExplicit_decl.hpp b/packages/tempus/src/Tempus_StepperExplicit_decl.hpp index 4910b1375fb3..a55090f3883d 100644 --- a/packages/tempus/src/Tempus_StepperExplicit_decl.hpp +++ b/packages/tempus/src/Tempus_StepperExplicit_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperExplicit_decl_hpp #define Tempus_StepperExplicit_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperExplicit_impl.hpp b/packages/tempus/src/Tempus_StepperExplicit_impl.hpp index 3f765e871002..0a493c40c43f 100644 --- a/packages/tempus/src/Tempus_StepperExplicit_impl.hpp +++ b/packages/tempus/src/Tempus_StepperExplicit_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperExplicit_impl_hpp #define Tempus_StepperExplicit_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperFactory.cpp b/packages/tempus/src/Tempus_StepperFactory.cpp index 5760edbe5931..c9e1157b1e8f 100644 --- a/packages/tempus/src/Tempus_StepperFactory.cpp +++ b/packages/tempus/src/Tempus_StepperFactory.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperFactory_decl.hpp b/packages/tempus/src/Tempus_StepperFactory_decl.hpp index 5fad776dc396..f036c69451c4 100644 --- a/packages/tempus/src/Tempus_StepperFactory_decl.hpp +++ b/packages/tempus/src/Tempus_StepperFactory_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperFactory_decl_hpp #define Tempus_StepperFactory_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperFactory_impl.hpp b/packages/tempus/src/Tempus_StepperFactory_impl.hpp index 4f922c3d1d6c..0050256dff8d 100644 --- a/packages/tempus/src/Tempus_StepperFactory_impl.hpp +++ b/packages/tempus/src/Tempus_StepperFactory_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperFactory_impl_hpp #define Tempus_StepperFactory_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEuler.cpp b/packages/tempus/src/Tempus_StepperForwardEuler.cpp index 686c74f78937..ea1a97577e49 100644 --- a/packages/tempus/src/Tempus_StepperForwardEuler.cpp +++ b/packages/tempus/src/Tempus_StepperForwardEuler.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperForwardEulerAppAction.hpp b/packages/tempus/src/Tempus_StepperForwardEulerAppAction.hpp index 66ef43aae9c4..b7f6f561aa24 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEulerAppAction_hpp #define Tempus_StepperForwardEulerAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEulerAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperForwardEulerAppActionComposite.hpp index 1f4b1fea591b..1e6863af86f2 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEulerAppActionComposite_hpp #define Tempus_StepperForwardEulerAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEulerModifierBase.hpp b/packages/tempus/src/Tempus_StepperForwardEulerModifierBase.hpp index 148e123ee024..6d667cb37997 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEulerModifierBase_hpp #define Tempus_StepperForwardEulerModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEulerModifierDefault.hpp b/packages/tempus/src/Tempus_StepperForwardEulerModifierDefault.hpp index 501b8660c8c6..72faeed5614d 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEulerModifierDefault_hpp #define Tempus_StepperForwardEulerModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEulerModifierXBase.hpp b/packages/tempus/src/Tempus_StepperForwardEulerModifierXBase.hpp index b267608f03ed..e731e596c912 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEulerModifierXBase_hpp #define Tempus_StepperForwardEulerModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEulerModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperForwardEulerModifierXDefault.hpp index 61e93bcb6aea..65c9b6719493 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEulerModifierX_hpp #define Tempus_StepperForwardEulerModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEulerObserverBase.hpp b/packages/tempus/src/Tempus_StepperForwardEulerObserverBase.hpp index 763274050ab2..d227cb78b097 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEulerObserverBase_hpp #define Tempus_StepperForwardEulerObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEulerObserverDefault.hpp b/packages/tempus/src/Tempus_StepperForwardEulerObserverDefault.hpp index 160086aa122f..1eb6b31c40a9 100644 --- a/packages/tempus/src/Tempus_StepperForwardEulerObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEulerObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEulerObserverDefault_hpp #define Tempus_StepperForwardEulerObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEuler_decl.hpp b/packages/tempus/src/Tempus_StepperForwardEuler_decl.hpp index 4154132c8d9c..b4e9c3d85a93 100644 --- a/packages/tempus/src/Tempus_StepperForwardEuler_decl.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEuler_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEuler_decl_hpp #define Tempus_StepperForwardEuler_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperForwardEuler_impl.hpp b/packages/tempus/src/Tempus_StepperForwardEuler_impl.hpp index 5118cd1f8f88..3520b2ce0b26 100644 --- a/packages/tempus/src/Tempus_StepperForwardEuler_impl.hpp +++ b/packages/tempus/src/Tempus_StepperForwardEuler_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperForwardEuler_impl_hpp #define Tempus_StepperForwardEuler_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlpha.cpp b/packages/tempus/src/Tempus_StepperHHTAlpha.cpp index 00be39cf2b01..2882e0298638 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlpha.cpp +++ b/packages/tempus/src/Tempus_StepperHHTAlpha.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperHHTAlphaAppAction.hpp b/packages/tempus/src/Tempus_StepperHHTAlphaAppAction.hpp index 5c6f10c7b9c6..4bfb7ef1c7d5 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlphaAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlphaAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlphaAppAction_hpp #define Tempus_StepperHHTAlphaAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlphaAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperHHTAlphaAppActionComposite.hpp index 85e8ba209e65..1bca915098fd 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlphaAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlphaAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlphaAppActionComposite_hpp #define Tempus_StepperHHTAlphaAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlphaModifierBase.hpp b/packages/tempus/src/Tempus_StepperHHTAlphaModifierBase.hpp index 9123ccdc343c..3b5a2b8d15b4 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlphaModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlphaModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlphaModifierBase_hpp #define Tempus_StepperHHTAlphaModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlphaModifierDefault.hpp b/packages/tempus/src/Tempus_StepperHHTAlphaModifierDefault.hpp index 546cc2914507..ae97bbbbda77 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlphaModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlphaModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlphaModifierDefault_hpp #define Tempus_StepperHHTAlphaModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlphaModifierXBase.hpp b/packages/tempus/src/Tempus_StepperHHTAlphaModifierXBase.hpp index 52e7daec07df..4f52de5d5c51 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlphaModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlphaModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlphaModifierXBase_hpp #define Tempus_StepperHHTAlphaModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlphaModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperHHTAlphaModifierXDefault.hpp index 30f3af5d651d..3698c658a8a1 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlphaModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlphaModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlphaModifierX_hpp #define Tempus_StepperHHTAlphaModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlphaObserverBase.hpp b/packages/tempus/src/Tempus_StepperHHTAlphaObserverBase.hpp index 81904e8ce118..20bd04373e1f 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlphaObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlphaObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlphaObserverBase_hpp #define Tempus_StepperHHTAlphaObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlphaObserverDefault.hpp b/packages/tempus/src/Tempus_StepperHHTAlphaObserverDefault.hpp index c94b63e85db4..29da5e618c3f 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlphaObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlphaObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlphaObserverDefault_hpp #define Tempus_StepperHHTAlphaObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlpha_decl.hpp b/packages/tempus/src/Tempus_StepperHHTAlpha_decl.hpp index f3b8c74733a0..41650556675c 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlpha_decl.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlpha_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlpha_decl_hpp #define Tempus_StepperHHTAlpha_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperHHTAlpha_impl.hpp b/packages/tempus/src/Tempus_StepperHHTAlpha_impl.hpp index c86412ec46ef..490738f8e792 100644 --- a/packages/tempus/src/Tempus_StepperHHTAlpha_impl.hpp +++ b/packages/tempus/src/Tempus_StepperHHTAlpha_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperHHTAlpha_impl_hpp #define Tempus_StepperHHTAlpha_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK.cpp b/packages/tempus/src/Tempus_StepperIMEX_RK.cpp index f68e9283ac25..3efacb70ce80 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK.cpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition.cpp b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition.cpp index 2bae04e3172c..3fd1a21b1e5b 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition.cpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_decl.hpp b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_decl.hpp index afbbb4125b35..a5f962701e47 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_decl.hpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperIMEX_RK_Partition_decl_hpp #define Tempus_StepperIMEX_RK_Partition_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_impl.hpp b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_impl.hpp index cafad448ac53..e96534c465e6 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_impl.hpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_Partition_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperIMEX_RK_Partition_impl_hpp #define Tempus_StepperIMEX_RK_Partition_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_decl.hpp b/packages/tempus/src/Tempus_StepperIMEX_RK_decl.hpp index 26db6b2baabc..a537d0e339d0 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_decl.hpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperIMEX_RK_decl_hpp #define Tempus_StepperIMEX_RK_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperIMEX_RK_impl.hpp b/packages/tempus/src/Tempus_StepperIMEX_RK_impl.hpp index ef48414d77a2..41d245031ce1 100644 --- a/packages/tempus/src/Tempus_StepperIMEX_RK_impl.hpp +++ b/packages/tempus/src/Tempus_StepperIMEX_RK_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperIMEX_RK_impl_hpp #define Tempus_StepperIMEX_RK_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperImplicit.cpp b/packages/tempus/src/Tempus_StepperImplicit.cpp index 247f09cb99e6..1884cce79e5c 100644 --- a/packages/tempus/src/Tempus_StepperImplicit.cpp +++ b/packages/tempus/src/Tempus_StepperImplicit.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperImplicit_decl.hpp b/packages/tempus/src/Tempus_StepperImplicit_decl.hpp index f07f563a2aaa..046deecdc3cd 100644 --- a/packages/tempus/src/Tempus_StepperImplicit_decl.hpp +++ b/packages/tempus/src/Tempus_StepperImplicit_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperImplicit_decl_hpp #define Tempus_StepperImplicit_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperImplicit_impl.hpp b/packages/tempus/src/Tempus_StepperImplicit_impl.hpp index 12869e61f4a4..78be3d5415fd 100644 --- a/packages/tempus/src/Tempus_StepperImplicit_impl.hpp +++ b/packages/tempus/src/Tempus_StepperImplicit_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperImplicit_impl_hpp #define Tempus_StepperImplicit_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrog.cpp b/packages/tempus/src/Tempus_StepperLeapfrog.cpp index d958a28449ea..26448701ec59 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrog.cpp +++ b/packages/tempus/src/Tempus_StepperLeapfrog.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperLeapfrogAppAction.hpp b/packages/tempus/src/Tempus_StepperLeapfrogAppAction.hpp index a17901e0ab36..d79ccb7a312c 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrogAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrogAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrogAppAction_hpp #define Tempus_StepperLeapfrogAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrogAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperLeapfrogAppActionComposite.hpp index 29b2003c89e3..08f2ed410d84 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrogAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrogAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrogAppActionComposite_hpp #define Tempus_StepperLeapfrogAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrogModifierBase.hpp b/packages/tempus/src/Tempus_StepperLeapfrogModifierBase.hpp index 9dd0843705dd..ba05f299f205 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrogModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrogModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrogModifierBase_hpp #define Tempus_StepperLeapfrogModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrogModifierDefault.hpp b/packages/tempus/src/Tempus_StepperLeapfrogModifierDefault.hpp index 18272b4c4c84..b90eda8ea36f 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrogModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrogModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrogModifierDefault_hpp #define Tempus_StepperLeapfrogModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrogModifierXBase.hpp b/packages/tempus/src/Tempus_StepperLeapfrogModifierXBase.hpp index a35f08ccf9a4..78eb571d2b01 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrogModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrogModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrogModifierXBase_hpp #define Tempus_StepperLeapfrogModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrogModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperLeapfrogModifierXDefault.hpp index ab338b3325a9..178935c238ef 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrogModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrogModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrogModifierX_hpp #define Tempus_StepperLeapfrogModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrogObserverBase.hpp b/packages/tempus/src/Tempus_StepperLeapfrogObserverBase.hpp index 276cec897509..db0339e6f863 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrogObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrogObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrogObserverBase_hpp #define Tempus_StepperLeapfrogObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrogObserverDefault.hpp b/packages/tempus/src/Tempus_StepperLeapfrogObserverDefault.hpp index 232e18259a04..018459a76e35 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrogObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrogObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrogObserverDefault_hpp #define Tempus_StepperLeapfrogObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrog_decl.hpp b/packages/tempus/src/Tempus_StepperLeapfrog_decl.hpp index 7434a6eb6499..f550feed9261 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrog_decl.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrog_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrog_decl_hpp #define Tempus_StepperLeapfrog_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperLeapfrog_impl.hpp b/packages/tempus/src/Tempus_StepperLeapfrog_impl.hpp index 653c45d3f62f..99e1e92cacae 100644 --- a/packages/tempus/src/Tempus_StepperLeapfrog_impl.hpp +++ b/packages/tempus/src/Tempus_StepperLeapfrog_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperLeapfrog_impl_hpp #define Tempus_StepperLeapfrog_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm.cpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm.cpp index 6bd044e25305..3e0c77eb1532 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm.cpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormAppAction.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormAppAction.hpp index 2b94182deebd..c1bc04daa58c 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkExplicitAFormAppAction_hpp #define Tempus_StepperNewmarkExplicitAFormAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormAppActionComposite.hpp index 0956190c204f..d2bcf406f847 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkExplicitAFormAppActionComposite_hpp #define Tempus_StepperNewmarkExplicitAFormAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierBase.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierBase.hpp index 080a961b04f4..8b61a3b5b72e 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkExplicitAFormModifierBase_hpp #define Tempus_StepperNewmarkExplicitAFormModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierDefault.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierDefault.hpp index ed2bd3b2a2f3..58518185757e 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkExplicitAFormModifierDefault_hpp #define Tempus_StepperNewmarkExplicitAFormModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierXBase.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierXBase.hpp index 0b40498d7b37..2756b5ab0717 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkExplicitAFormModifierXBase_hpp #define Tempus_StepperNewmarkExplicitAFormModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierXDefault.hpp index 91e6e3096029..4aeb43136e93 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAFormModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkExplicitAFormModifierX_hpp #define Tempus_StepperNewmarkExplicitAFormModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_decl.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_decl.hpp index e69b43b0eb38..fb0a05163149 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_decl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkExplicitAForm_decl_hpp #define Tempus_StepperNewmarkExplicitAForm_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_impl.hpp b/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_impl.hpp index 7363bd247a27..71b02d6db6d2 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_impl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkExplicitAForm_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkExplicitAForm_impl_hpp #define Tempus_StepperNewmarkExplicitAForm_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm.cpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm.cpp index 42cad34ed3be..b45bf112359e 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm.cpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormAppAction.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormAppAction.hpp index af2907e968fc..6f9464a8d02f 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitAFormAppAction_hpp #define Tempus_StepperNewmarkImplicitAFormAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormAppActionComposite.hpp index 1c298c88db6b..cbe040cbbe0f 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitAFormAppActionComposite_hpp #define Tempus_StepperNewmarkImplicitAFormAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierBase.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierBase.hpp index 5d199efcfe43..cfbe73d6b46d 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitAFormModifierBase_hpp #define Tempus_StepperNewmarkImplicitAFormModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierDefault.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierDefault.hpp index 8174bc3a3f72..3eba4f1fef8c 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitAFormModifierDefault_hpp #define Tempus_StepperNewmarkImplicitAFormModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierXBase.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierXBase.hpp index b6e0b9cdaf3f..fa27c1ac0872 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitAFormModifierXBase_hpp #define Tempus_StepperNewmarkImplicitAFormModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierXDefault.hpp index 7f591647d4df..879fd9f27c1c 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAFormModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitAFormModifierX_hpp #define Tempus_StepperNewmarkImplicitAFormModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_decl.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_decl.hpp index 051a97a86640..c40f2398a978 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_decl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitAForm_decl_hpp #define Tempus_StepperNewmarkImplicitAForm_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_impl.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_impl.hpp index edd33f832850..ff5e043e3fef 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_impl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitAForm_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitAForm_impl_hpp #define Tempus_StepperNewmarkImplicitAForm_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm.cpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm.cpp index 2d914aa9ee05..773ddfb8a940 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm.cpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormAppAction.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormAppAction.hpp index 1de76c221dd3..680defb28bc7 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitDFormAppAction_hpp #define Tempus_StepperNewmarkImplicitDFormAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormAppActionComposite.hpp index 72002ce8c6ad..f9f80c996e2e 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitDFormAppActionComposite_hpp #define Tempus_StepperNewmarkImplicitDFormAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierBase.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierBase.hpp index 8e020f7ff4dc..b5d8c12fd132 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitDFormModifierBase_hpp #define Tempus_StepperNewmarkImplicitDFormModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierDefault.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierDefault.hpp index 48d6384104a6..ba88dd3aab7e 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitDFormModifierDefault_hpp #define Tempus_StepperNewmarkImplicitDFormModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierXBase.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierXBase.hpp index 2c6730d55a76..84087aa8eb3d 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitDFormModifierXBase_hpp #define Tempus_StepperNewmarkImplicitDFormModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierXDefault.hpp index cb602da71e59..bc77e2ab540b 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDFormModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitDFormModifierX_hpp #define Tempus_StepperNewmarkImplicitDFormModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_decl.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_decl.hpp index f87844b33f28..f26d9bf0286d 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_decl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitDForm_decl_hpp #define Tempus_StepperNewmarkImplicitDForm_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_impl.hpp b/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_impl.hpp index 98142e2f3f2b..3ab0eb6f5b6a 100644 --- a/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_impl.hpp +++ b/packages/tempus/src/Tempus_StepperNewmarkImplicitDForm_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperNewmarkImplicitDForm_impl_hpp #define Tempus_StepperNewmarkImplicitDForm_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplit.cpp b/packages/tempus/src/Tempus_StepperOperatorSplit.cpp index 8c9f7462e334..452af64d3e8a 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplit.cpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplit.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitAppAction.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitAppAction.hpp index 202d98106671..dd668768cb1f 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplitAppAction_hpp #define Tempus_StepperOperatorSplitAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitAppActionComposite.hpp index fb51cb7a7440..567c0725743e 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplitAppActionComposite_hpp #define Tempus_StepperOperatorSplitAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitModifierBase.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitModifierBase.hpp index b6f220fc5635..355c8edf66e2 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplitModifierBase_hpp #define Tempus_StepperOperatorSplitModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitModifierDefault.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitModifierDefault.hpp index 140e93b4c742..f1b777d68280 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplitModifierDefault_hpp #define Tempus_StepperOperatorSplitModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitModifierXBase.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitModifierXBase.hpp index 890888211767..899c3139a23b 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplitModifierXBase_hpp #define Tempus_StepperOperatorSplitModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitModifierXDefault.hpp index a806cc9d8355..f216790bcab5 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplitModifierXDefault_hpp #define Tempus_StepperOperatorSplitModifierXDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitObserverBase.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitObserverBase.hpp index f9f92d042e11..ac3443195086 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplitObserverBase_hpp #define Tempus_StepperOperatorSplitObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplitObserverDefault.hpp b/packages/tempus/src/Tempus_StepperOperatorSplitObserverDefault.hpp index 8b6e8905270f..15bb0c8f5712 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplitObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplitObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplitObserverDefault_hpp #define Tempus_StepperOperatorSplitObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplit_decl.hpp b/packages/tempus/src/Tempus_StepperOperatorSplit_decl.hpp index f59a32fc609d..aae0a503695d 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplit_decl.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplit_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplit_decl_hpp #define Tempus_StepperOperatorSplit_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperOperatorSplit_impl.hpp b/packages/tempus/src/Tempus_StepperOperatorSplit_impl.hpp index b188c5ceb0b5..90b21c2024f7 100644 --- a/packages/tempus/src/Tempus_StepperOperatorSplit_impl.hpp +++ b/packages/tempus/src/Tempus_StepperOperatorSplit_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperOperatorSplit_impl_hpp #define Tempus_StepperOperatorSplit_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperOptimizationInterface.hpp b/packages/tempus/src/Tempus_StepperOptimizationInterface.hpp index 432dbb623403..0a85eb687ba1 100644 --- a/packages/tempus/src/Tempus_StepperOptimizationInterface.hpp +++ b/packages/tempus/src/Tempus_StepperOptimizationInterface.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Stepper_Optimization_Interface_hpp #define Tempus_Stepper_Optimization_Interface_hpp diff --git a/packages/tempus/src/Tempus_StepperRKAppAction.hpp b/packages/tempus/src/Tempus_StepperRKAppAction.hpp index 397e61661ee8..4d961c8cee84 100644 --- a/packages/tempus/src/Tempus_StepperRKAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperRKAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKAppAction_hpp #define Tempus_StepperRKAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperRKAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperRKAppActionComposite.hpp index 7c87003ed008..9b03c9195623 100644 --- a/packages/tempus/src/Tempus_StepperRKAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperRKAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKAppActionComposite_hpp #define Tempus_StepperRKAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperRKBase.hpp b/packages/tempus/src/Tempus_StepperRKBase.hpp index 0d5c8c7a9e50..c56ea5b58e8b 100644 --- a/packages/tempus/src/Tempus_StepperRKBase.hpp +++ b/packages/tempus/src/Tempus_StepperRKBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKBase_hpp #define Tempus_StepperRKBase_hpp diff --git a/packages/tempus/src/Tempus_StepperRKButcherTableau.hpp b/packages/tempus/src/Tempus_StepperRKButcherTableau.hpp index 717f46dfd02b..44c38adeb1cb 100644 --- a/packages/tempus/src/Tempus_StepperRKButcherTableau.hpp +++ b/packages/tempus/src/Tempus_StepperRKButcherTableau.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKButcherTableau_hpp #define Tempus_StepperRKButcherTableau_hpp diff --git a/packages/tempus/src/Tempus_StepperRKModifierBase.hpp b/packages/tempus/src/Tempus_StepperRKModifierBase.hpp index a99351213515..c2f221b0bfe7 100644 --- a/packages/tempus/src/Tempus_StepperRKModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperRKModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKModifierBase_hpp #define Tempus_StepperRKModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperRKModifierDefault.hpp b/packages/tempus/src/Tempus_StepperRKModifierDefault.hpp index b118562b616a..b4c294cc5f38 100644 --- a/packages/tempus/src/Tempus_StepperRKModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperRKModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKModifierDefault_hpp #define Tempus_StepperRKModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperRKModifierXBase.hpp b/packages/tempus/src/Tempus_StepperRKModifierXBase.hpp index b04b9c755094..3451070317a1 100644 --- a/packages/tempus/src/Tempus_StepperRKModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperRKModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKModifierXBase_hpp #define Tempus_StepperRKModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperRKModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperRKModifierXDefault.hpp index f32702122b80..8a05dd78cce3 100644 --- a/packages/tempus/src/Tempus_StepperRKModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperRKModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKModifierX_hpp #define Tempus_StepperRKModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperRKObserverBase.hpp b/packages/tempus/src/Tempus_StepperRKObserverBase.hpp index 6fdbe9a49ce3..fd3b106b5b4e 100644 --- a/packages/tempus/src/Tempus_StepperRKObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperRKObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKObserverBase_hpp #define Tempus_StepperRKObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperRKObserverDefault.hpp b/packages/tempus/src/Tempus_StepperRKObserverDefault.hpp index 92857a664e97..fe1657ffd335 100644 --- a/packages/tempus/src/Tempus_StepperRKObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperRKObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperRKObserverDefault_hpp #define Tempus_StepperRKObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity.cpp b/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity.cpp index e4e303eea6b0..70afd7052e1f 100644 --- a/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity.cpp +++ b/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity_decl.hpp b/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity_decl.hpp index 036a32bad31c..292bdb984375 100644 --- a/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity_decl.hpp +++ b/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperStaggeredForwardSensitivity_decl_hpp #define Tempus_StepperStaggeredForwardSensitivity_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity_impl.hpp b/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity_impl.hpp index 583994f0bc5f..6db183a8020e 100644 --- a/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity_impl.hpp +++ b/packages/tempus/src/Tempus_StepperStaggeredForwardSensitivity_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperStaggeredForwardSensitivity_impl_hpp #define Tempus_StepperStaggeredForwardSensitivity_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperState.hpp b/packages/tempus/src/Tempus_StepperState.hpp index d7483099ab62..90a03f9c38be 100644 --- a/packages/tempus/src/Tempus_StepperState.hpp +++ b/packages/tempus/src/Tempus_StepperState.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperState_hpp #define Tempus_StepperState_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcycling.cpp b/packages/tempus/src/Tempus_StepperSubcycling.cpp index 5673d1f0a65b..362cbb465931 100644 --- a/packages/tempus/src/Tempus_StepperSubcycling.cpp +++ b/packages/tempus/src/Tempus_StepperSubcycling.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperSubcyclingAppAction.hpp b/packages/tempus/src/Tempus_StepperSubcyclingAppAction.hpp index dde3c6730ed0..53bf76f6caf3 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcyclingAppAction_hpp #define Tempus_StepperSubcyclingAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcyclingAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperSubcyclingAppActionComposite.hpp index 5edaa532c272..8c960d106b48 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcyclingAppActionComposite_hpp #define Tempus_StepperSubcyclingAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcyclingModifierBase.hpp b/packages/tempus/src/Tempus_StepperSubcyclingModifierBase.hpp index 784a7fc85fb4..5dc7b0621f95 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcyclingModifierBase_hpp #define Tempus_StepperSubcyclingModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcyclingModifierDefault.hpp b/packages/tempus/src/Tempus_StepperSubcyclingModifierDefault.hpp index 1f467b2a9abf..0bfe206a4cab 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcyclingModifierDefault_hpp #define Tempus_StepperSubcyclingModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcyclingModifierXBase.hpp b/packages/tempus/src/Tempus_StepperSubcyclingModifierXBase.hpp index 9dd97e3d8f5d..44aed2f65ed2 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcyclingModifierXBase_hpp #define Tempus_StepperSubcyclingModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcyclingModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperSubcyclingModifierXDefault.hpp index fe96d7451a8e..29aba40217b0 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcyclingModifierX_hpp #define Tempus_StepperSubcyclingModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcyclingObserverBase.hpp b/packages/tempus/src/Tempus_StepperSubcyclingObserverBase.hpp index bc6fd553af74..0797de711a03 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcyclingObserverBase_hpp #define Tempus_StepperSubcyclingObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcyclingObserverDefault.hpp b/packages/tempus/src/Tempus_StepperSubcyclingObserverDefault.hpp index 4c41527b7ac6..97864d27ad0b 100644 --- a/packages/tempus/src/Tempus_StepperSubcyclingObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperSubcyclingObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcyclingObserverDefault_hpp #define Tempus_StepperSubcyclingObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcycling_decl.hpp b/packages/tempus/src/Tempus_StepperSubcycling_decl.hpp index 5ab9268aee90..6b8c462eb816 100644 --- a/packages/tempus/src/Tempus_StepperSubcycling_decl.hpp +++ b/packages/tempus/src/Tempus_StepperSubcycling_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcycling_decl_hpp #define Tempus_StepperSubcycling_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperSubcycling_impl.hpp b/packages/tempus/src/Tempus_StepperSubcycling_impl.hpp index a826d8e2d1a7..0ab7bab69149 100644 --- a/packages/tempus/src/Tempus_StepperSubcycling_impl.hpp +++ b/packages/tempus/src/Tempus_StepperSubcycling_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperSubcycling_impl_hpp #define Tempus_StepperSubcycling_impl_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidal.cpp b/packages/tempus/src/Tempus_StepperTrapezoidal.cpp index 9b8f709ac464..1bb7b4adc8ae 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidal.cpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidal.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_StepperTrapezoidalAppAction.hpp b/packages/tempus/src/Tempus_StepperTrapezoidalAppAction.hpp index 50c9643a7105..ab67337f154d 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidalAppAction.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidalAppAction.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidalAppAction_hpp #define Tempus_StepperTrapezoidalAppAction_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidalAppActionComposite.hpp b/packages/tempus/src/Tempus_StepperTrapezoidalAppActionComposite.hpp index 43276680b486..1df6e73e018f 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidalAppActionComposite.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidalAppActionComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidalAppActionComposite_hpp #define Tempus_StepperTrapezoidalAppActionComposite_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidalModifierBase.hpp b/packages/tempus/src/Tempus_StepperTrapezoidalModifierBase.hpp index 8375358677a6..ee2cfee3569f 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidalModifierBase.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidalModifierBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidalModifierBase_hpp #define Tempus_StepperTrapezoidalModifierBase_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidalModifierDefault.hpp b/packages/tempus/src/Tempus_StepperTrapezoidalModifierDefault.hpp index 5e0e9b539f99..4c1b50655ec9 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidalModifierDefault.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidalModifierDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidalModifierDefault_hpp #define Tempus_StepperTrapezoidalModifierDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidalModifierXBase.hpp b/packages/tempus/src/Tempus_StepperTrapezoidalModifierXBase.hpp index 93a04631c339..f6281c0b6e71 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidalModifierXBase.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidalModifierXBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidalModifierXBase_hpp #define Tempus_StepperTrapezoidalModifierXBase_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidalModifierXDefault.hpp b/packages/tempus/src/Tempus_StepperTrapezoidalModifierXDefault.hpp index 12195670240b..8268f5a5a1fb 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidalModifierXDefault.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidalModifierXDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidalModifierX_hpp #define Tempus_StepperTrapezoidalModifierX_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidalObserverBase.hpp b/packages/tempus/src/Tempus_StepperTrapezoidalObserverBase.hpp index cc2732f549b9..50e56eae03ae 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidalObserverBase.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidalObserverBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidalObserverBase_hpp #define Tempus_StepperTrapezoidalObserverBase_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidalObserverDefault.hpp b/packages/tempus/src/Tempus_StepperTrapezoidalObserverDefault.hpp index 8e3c6e6b1965..016a168e2cd0 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidalObserverDefault.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidalObserverDefault.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidalObserverDefault_hpp #define Tempus_StepperTrapezoidalObserverDefault_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidal_decl.hpp b/packages/tempus/src/Tempus_StepperTrapezoidal_decl.hpp index ee963b331e0b..59f363cc03df 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidal_decl.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidal_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidal_decl_hpp #define Tempus_StepperTrapezoidal_decl_hpp diff --git a/packages/tempus/src/Tempus_StepperTrapezoidal_impl.hpp b/packages/tempus/src/Tempus_StepperTrapezoidal_impl.hpp index b4ef45bd0385..0c613b18ecb1 100644 --- a/packages/tempus/src/Tempus_StepperTrapezoidal_impl.hpp +++ b/packages/tempus/src/Tempus_StepperTrapezoidal_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_StepperTrapezoidal_impl_hpp #define Tempus_StepperTrapezoidal_impl_hpp diff --git a/packages/tempus/src/Tempus_Stepper_ErrorNorm.cpp b/packages/tempus/src/Tempus_Stepper_ErrorNorm.cpp index ffa71ae6e462..c4e5af06164c 100644 --- a/packages/tempus/src/Tempus_Stepper_ErrorNorm.cpp +++ b/packages/tempus/src/Tempus_Stepper_ErrorNorm.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_Stepper_ErrorNorm_decl.hpp b/packages/tempus/src/Tempus_Stepper_ErrorNorm_decl.hpp index 31f8c6b5427c..4f458439ca3f 100644 --- a/packages/tempus/src/Tempus_Stepper_ErrorNorm_decl.hpp +++ b/packages/tempus/src/Tempus_Stepper_ErrorNorm_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Stepper_ErrorNorm_decl_hpp #define Tempus_Stepper_ErrorNorm_decl_hpp diff --git a/packages/tempus/src/Tempus_Stepper_ErrorNorm_impl.hpp b/packages/tempus/src/Tempus_Stepper_ErrorNorm_impl.hpp index e2da51c6baeb..ba4184c1a571 100644 --- a/packages/tempus/src/Tempus_Stepper_ErrorNorm_impl.hpp +++ b/packages/tempus/src/Tempus_Stepper_ErrorNorm_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Stepper_ErrorNorm_impl_hpp #define Tempus_Stepper_ErrorNorm_impl_hpp diff --git a/packages/tempus/src/Tempus_Stepper_decl.hpp b/packages/tempus/src/Tempus_Stepper_decl.hpp index 9a275e1cfd21..71178970b7e3 100644 --- a/packages/tempus/src/Tempus_Stepper_decl.hpp +++ b/packages/tempus/src/Tempus_Stepper_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Stepper_decl_hpp #define Tempus_Stepper_decl_hpp diff --git a/packages/tempus/src/Tempus_Stepper_impl.hpp b/packages/tempus/src/Tempus_Stepper_impl.hpp index 75f6ec598968..ca7b76c318f6 100644 --- a/packages/tempus/src/Tempus_Stepper_impl.hpp +++ b/packages/tempus/src/Tempus_Stepper_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Stepper_impl_hpp #define Tempus_Stepper_impl_hpp diff --git a/packages/tempus/src/Tempus_String_Utilities.cpp b/packages/tempus/src/Tempus_String_Utilities.cpp index f387fb49edb7..dfdf45f7b3cc 100644 --- a/packages/tempus/src/Tempus_String_Utilities.cpp +++ b/packages/tempus/src/Tempus_String_Utilities.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_String_Utilities.hpp" #include diff --git a/packages/tempus/src/Tempus_String_Utilities.hpp b/packages/tempus/src/Tempus_String_Utilities.hpp index f8eb3af27e35..6dbc50787586 100644 --- a/packages/tempus/src/Tempus_String_Utilities.hpp +++ b/packages/tempus/src/Tempus_String_Utilities.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_String_Utilities_hpp #define Tempus_String_Utilities_hpp diff --git a/packages/tempus/src/Tempus_TimeDerivative.hpp b/packages/tempus/src/Tempus_TimeDerivative.hpp index 222782fcdcf9..0027d93825b0 100644 --- a/packages/tempus/src/Tempus_TimeDerivative.hpp +++ b/packages/tempus/src/Tempus_TimeDerivative.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeDerivative_hpp #define Tempus_TimeDerivative_hpp diff --git a/packages/tempus/src/Tempus_TimeEventBase.hpp b/packages/tempus/src/Tempus_TimeEventBase.hpp index 92e42bf8b46a..cb00eb899edd 100644 --- a/packages/tempus/src/Tempus_TimeEventBase.hpp +++ b/packages/tempus/src/Tempus_TimeEventBase.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventBase_decl_hpp #define Tempus_TimeEventBase_decl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventComposite.hpp b/packages/tempus/src/Tempus_TimeEventComposite.hpp index af70287274dc..19ab1df789d7 100644 --- a/packages/tempus/src/Tempus_TimeEventComposite.hpp +++ b/packages/tempus/src/Tempus_TimeEventComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventComposite_decl_hpp #define Tempus_TimeEventComposite_decl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventList.cpp b/packages/tempus/src/Tempus_TimeEventList.cpp index 9c8933a7a687..88dcb4b240e2 100644 --- a/packages/tempus/src/Tempus_TimeEventList.cpp +++ b/packages/tempus/src/Tempus_TimeEventList.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_TimeEventListIndex.cpp b/packages/tempus/src/Tempus_TimeEventListIndex.cpp index d0bb7b056df7..b84826665857 100644 --- a/packages/tempus/src/Tempus_TimeEventListIndex.cpp +++ b/packages/tempus/src/Tempus_TimeEventListIndex.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_TimeEventListIndex_decl.hpp b/packages/tempus/src/Tempus_TimeEventListIndex_decl.hpp index 17b3947a3703..45f2a3d815f8 100644 --- a/packages/tempus/src/Tempus_TimeEventListIndex_decl.hpp +++ b/packages/tempus/src/Tempus_TimeEventListIndex_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventListIndex_decl_hpp #define Tempus_TimeEventListIndex_decl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventListIndex_impl.hpp b/packages/tempus/src/Tempus_TimeEventListIndex_impl.hpp index 644b914fe18e..3b7ac2c159d1 100644 --- a/packages/tempus/src/Tempus_TimeEventListIndex_impl.hpp +++ b/packages/tempus/src/Tempus_TimeEventListIndex_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventListIndex_impl_hpp #define Tempus_TimeEventListIndex_impl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventList_decl.hpp b/packages/tempus/src/Tempus_TimeEventList_decl.hpp index 57760c2ca413..208ec6502bf2 100644 --- a/packages/tempus/src/Tempus_TimeEventList_decl.hpp +++ b/packages/tempus/src/Tempus_TimeEventList_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventList_decl_hpp #define Tempus_TimeEventList_decl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventList_impl.hpp b/packages/tempus/src/Tempus_TimeEventList_impl.hpp index 8cd114d0d203..b25e27d5d24c 100644 --- a/packages/tempus/src/Tempus_TimeEventList_impl.hpp +++ b/packages/tempus/src/Tempus_TimeEventList_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventList_impl_hpp #define Tempus_TimeEventList_impl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventRange.cpp b/packages/tempus/src/Tempus_TimeEventRange.cpp index 40b58d6c240b..383399c209a2 100644 --- a/packages/tempus/src/Tempus_TimeEventRange.cpp +++ b/packages/tempus/src/Tempus_TimeEventRange.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_TimeEventRangeIndex.cpp b/packages/tempus/src/Tempus_TimeEventRangeIndex.cpp index 11b1ad3e9a71..ffaa8b5eaa4e 100644 --- a/packages/tempus/src/Tempus_TimeEventRangeIndex.cpp +++ b/packages/tempus/src/Tempus_TimeEventRangeIndex.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_TimeEventRangeIndex_decl.hpp b/packages/tempus/src/Tempus_TimeEventRangeIndex_decl.hpp index a5210769ea72..a1593deacdd6 100644 --- a/packages/tempus/src/Tempus_TimeEventRangeIndex_decl.hpp +++ b/packages/tempus/src/Tempus_TimeEventRangeIndex_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventIndexRange_decl_hpp #define Tempus_TimeEventIndexRange_decl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventRangeIndex_impl.hpp b/packages/tempus/src/Tempus_TimeEventRangeIndex_impl.hpp index 9eb9b43ace95..24f2c3fab455 100644 --- a/packages/tempus/src/Tempus_TimeEventRangeIndex_impl.hpp +++ b/packages/tempus/src/Tempus_TimeEventRangeIndex_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventRangeIndex_impl_hpp #define Tempus_TimeEventRangeIndex_impl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventRange_decl.hpp b/packages/tempus/src/Tempus_TimeEventRange_decl.hpp index 69f0ae4912b7..1e407fc25e99 100644 --- a/packages/tempus/src/Tempus_TimeEventRange_decl.hpp +++ b/packages/tempus/src/Tempus_TimeEventRange_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventRange_decl_hpp #define Tempus_TimeEventRange_decl_hpp diff --git a/packages/tempus/src/Tempus_TimeEventRange_impl.hpp b/packages/tempus/src/Tempus_TimeEventRange_impl.hpp index 3aaa3009830e..0781798154a5 100644 --- a/packages/tempus/src/Tempus_TimeEventRange_impl.hpp +++ b/packages/tempus/src/Tempus_TimeEventRange_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeEventRange_impl_hpp #define Tempus_TimeEventRange_impl_hpp diff --git a/packages/tempus/src/Tempus_TimeStepControl.cpp b/packages/tempus/src/Tempus_TimeStepControl.cpp index cae80df4e27d..b891ab341f5e 100644 --- a/packages/tempus/src/Tempus_TimeStepControl.cpp +++ b/packages/tempus/src/Tempus_TimeStepControl.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_TimeStepControlStrategy.hpp b/packages/tempus/src/Tempus_TimeStepControlStrategy.hpp index ead93a6bf399..c18cf0c6557f 100644 --- a/packages/tempus/src/Tempus_TimeStepControlStrategy.hpp +++ b/packages/tempus/src/Tempus_TimeStepControlStrategy.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeStepControlStrategy_hpp #define Tempus_TimeStepControlStrategy_hpp diff --git a/packages/tempus/src/Tempus_TimeStepControlStrategyBasicVS.hpp b/packages/tempus/src/Tempus_TimeStepControlStrategyBasicVS.hpp index 4b9ae46037e0..8d1d9c67e38b 100644 --- a/packages/tempus/src/Tempus_TimeStepControlStrategyBasicVS.hpp +++ b/packages/tempus/src/Tempus_TimeStepControlStrategyBasicVS.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeStepControlStrategy_BasicVS_hpp #define Tempus_TimeStepControlStrategy_BasicVS_hpp diff --git a/packages/tempus/src/Tempus_TimeStepControlStrategyComposite.hpp b/packages/tempus/src/Tempus_TimeStepControlStrategyComposite.hpp index 612d60048920..422340b076ae 100644 --- a/packages/tempus/src/Tempus_TimeStepControlStrategyComposite.hpp +++ b/packages/tempus/src/Tempus_TimeStepControlStrategyComposite.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeStepControlStrategyComposite_hpp #define Tempus_TimeStepControlStrategyComposite_hpp diff --git a/packages/tempus/src/Tempus_TimeStepControlStrategyConstant.hpp b/packages/tempus/src/Tempus_TimeStepControlStrategyConstant.hpp index 712e191819f9..e665408b47ea 100644 --- a/packages/tempus/src/Tempus_TimeStepControlStrategyConstant.hpp +++ b/packages/tempus/src/Tempus_TimeStepControlStrategyConstant.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeStepControlStrategy_Constant_hpp #define Tempus_TimeStepControlStrategy_Constant_hpp diff --git a/packages/tempus/src/Tempus_TimeStepControlStrategyIntegralController.hpp b/packages/tempus/src/Tempus_TimeStepControlStrategyIntegralController.hpp index b9a005f6dd25..2034fad7f623 100644 --- a/packages/tempus/src/Tempus_TimeStepControlStrategyIntegralController.hpp +++ b/packages/tempus/src/Tempus_TimeStepControlStrategyIntegralController.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeStepControlStrategy_IntegralController_hpp #define Tempus_TimeStepControlStrategy_IntegralController_hpp diff --git a/packages/tempus/src/Tempus_TimeStepControl_decl.hpp b/packages/tempus/src/Tempus_TimeStepControl_decl.hpp index 54db9014fa0e..ce0bc729d36e 100644 --- a/packages/tempus/src/Tempus_TimeStepControl_decl.hpp +++ b/packages/tempus/src/Tempus_TimeStepControl_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeStepControl_decl_hpp #define Tempus_TimeStepControl_decl_hpp diff --git a/packages/tempus/src/Tempus_TimeStepControl_impl.hpp b/packages/tempus/src/Tempus_TimeStepControl_impl.hpp index 33e4df53b44e..3a114c34d593 100644 --- a/packages/tempus/src/Tempus_TimeStepControl_impl.hpp +++ b/packages/tempus/src/Tempus_TimeStepControl_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_TimeStepControl_impl_hpp #define Tempus_TimeStepControl_impl_hpp diff --git a/packages/tempus/src/Tempus_Types.hpp b/packages/tempus/src/Tempus_Types.hpp index c65b0adaad6e..a1ce5c1bff0d 100644 --- a/packages/tempus/src/Tempus_Types.hpp +++ b/packages/tempus/src/Tempus_Types.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Types_hpp #define Tempus_Types_hpp diff --git a/packages/tempus/src/Tempus_Version.cpp b/packages/tempus/src/Tempus_Version.cpp index 414fa8a035b8..c5cbfe55b713 100644 --- a/packages/tempus/src/Tempus_Version.cpp +++ b/packages/tempus/src/Tempus_Version.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_Version.hpp" diff --git a/packages/tempus/src/Tempus_Version.hpp b/packages/tempus/src/Tempus_Version.hpp index d6964ba0bc73..59ac97a7a577 100644 --- a/packages/tempus/src/Tempus_Version.hpp +++ b/packages/tempus/src/Tempus_Version.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_Version_hpp #define Tempus_Version_hpp diff --git a/packages/tempus/src/Tempus_WrapCombinedFSAModelEvaluator.hpp b/packages/tempus/src/Tempus_WrapCombinedFSAModelEvaluator.hpp index d3cfe79f5d66..7bb2bc85c449 100644 --- a/packages/tempus/src/Tempus_WrapCombinedFSAModelEvaluator.hpp +++ b/packages/tempus/src/Tempus_WrapCombinedFSAModelEvaluator.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_WrapCombinedFSAModelEvaluator_hpp #define Tempus_WrapCombinedFSAModelEvaluator_hpp diff --git a/packages/tempus/src/Tempus_WrapStaggeredFSAModelEvaluator.hpp b/packages/tempus/src/Tempus_WrapStaggeredFSAModelEvaluator.hpp index 9287ede9e2a1..0eeb2ad466e8 100644 --- a/packages/tempus/src/Tempus_WrapStaggeredFSAModelEvaluator.hpp +++ b/packages/tempus/src/Tempus_WrapStaggeredFSAModelEvaluator.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_WrapStaggeredFSAModelEvaluator_hpp #define Tempus_WrapStaggeredFSAModelEvaluator_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluator.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluator.hpp index 75e2e5829086..2f753d353a1e 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluator.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluator.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_WrapperModelEvaluator_hpp #define Tempus_WrapperModelEvaluator_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic.cpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic.cpp index 059eb2be4a2f..90587d059c0e 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic.cpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic_decl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic_decl.hpp index eaa9302e4077..6ca38a23b3d5 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic_decl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_WrapperModelEvaluatorBasic_decl_hpp #define Tempus_WrapperModelEvaluatorBasic_decl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic_impl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic_impl.hpp index 9e78c5c05640..c5f9f2794a70 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic_impl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorBasic_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_WrapperModelEvaluatorBasic_impl_hpp #define Tempus_WrapperModelEvaluatorBasic_impl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX.hpp index 3696186b7b82..164ba4967965 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairIMEX_hpp #define Tempus_ModelEvaluatorPairIMEX_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic.cpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic.cpp index fbe1674e4024..3b9d21f84f5f 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic.cpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic_decl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic_decl.hpp index 255798016c00..b7e254a59889 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic_decl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairIMEX_Basic_decl_hpp #define Tempus_ModelEvaluatorPairIMEX_Basic_decl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic_impl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic_impl.hpp index 21e39eda5630..bce3fc488ff4 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic_impl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_Basic_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorIMEXPair_Basic_impl_hpp #define Tempus_ModelEvaluatorIMEXPair_Basic_impl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_CombinedFSA.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_CombinedFSA.hpp index 36e090d41c52..910383329970 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_CombinedFSA.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_CombinedFSA.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairIMEX_CombinedFSA_hpp #define Tempus_ModelEvaluatorPairIMEX_CombinedFSA_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_StaggeredFSA.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_StaggeredFSA.hpp index 71322372b61d..d2a7b242023d 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_StaggeredFSA.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairIMEX_StaggeredFSA.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairIMEX_StaggeredFSA_hpp #define Tempus_ModelEvaluatorPairIMEX_StaggeredFSA_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic.cpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic.cpp index 11b35cd6131e..387a235f6f9a 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic.cpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_decl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_decl.hpp index bdbb95266196..c2457604472f 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_decl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairPartIMEX_Basic_decl_hpp #define Tempus_ModelEvaluatorPairPartIMEX_Basic_decl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_impl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_impl.hpp index f780263778b4..fe6481922657 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_impl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_Basic_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairPartIMEX_Basic_impl_hpp #define Tempus_ModelEvaluatorPairPartIMEX_Basic_impl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA.cpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA.cpp index f07648397da5..e4770dfccbf6 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA.cpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA_decl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA_decl.hpp index 4ce90306852e..769a5b97eeba 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA_decl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairPartIMEX_CombinedFSA_decl_hpp #define Tempus_ModelEvaluatorPairPartIMEX_CombinedFSA_decl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA_impl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA_impl.hpp index b864ebc3a56e..1b1e2d77a6b8 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA_impl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_CombinedFSA_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairPartIMEX_CombinedFSA_impl_hpp #define Tempus_ModelEvaluatorPairPartIMEX_CombinedFSA_impl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA.cpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA.cpp index 1cd8451c7058..01531173f29d 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA.cpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA_decl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA_decl.hpp index c2e081697fb2..34b7b45ff3ae 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA_decl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairPartIMEX_StaggeredFSA_decl_hpp #define Tempus_ModelEvaluatorPairPartIMEX_StaggeredFSA_decl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA_impl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA_impl.hpp index c0347dcd330d..0715d41a9bc8 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA_impl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorPairPartIMEX_StaggeredFSA_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_ModelEvaluatorPairPartIMEX_StaggeredFSA_impl_hpp #define Tempus_ModelEvaluatorPairPartIMEX_StaggeredFSA_impl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder.cpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder.cpp index 927bece7fbbe..61ce1e7eba18 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder.cpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder_decl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder_decl.hpp index 049b5ceb8d4d..fcd30f216f3a 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder_decl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_WrapperModelEvaluatorSecondOrder_decl_hpp #define Tempus_WrapperModelEvaluatorSecondOrder_decl_hpp diff --git a/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder_impl.hpp b/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder_impl.hpp index e2031947cd10..b6918d136438 100644 --- a/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder_impl.hpp +++ b/packages/tempus/src/Tempus_WrapperModelEvaluatorSecondOrder_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_WrapperModelEvaluatorSecondOrder_impl_hpp #define Tempus_WrapperModelEvaluatorSecondOrder_impl_hpp diff --git a/packages/tempus/src/Thyra_AdjointLinearOpWithSolveFactory.hpp b/packages/tempus/src/Thyra_AdjointLinearOpWithSolveFactory.hpp index 0ecfc5003426..3fef2c71516c 100644 --- a/packages/tempus/src/Thyra_AdjointLinearOpWithSolveFactory.hpp +++ b/packages/tempus/src/Thyra_AdjointLinearOpWithSolveFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_AdjointLinearOpWithSolveFactory_hpp #define Thyra_AdjointLinearOpWithSolveFactory_hpp diff --git a/packages/tempus/src/Thyra_AdjointPreconditioner.hpp b/packages/tempus/src/Thyra_AdjointPreconditioner.hpp index 514ee88eebab..69d7970d432b 100644 --- a/packages/tempus/src/Thyra_AdjointPreconditioner.hpp +++ b/packages/tempus/src/Thyra_AdjointPreconditioner.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_AdjointPreconditioner_hpp #define Thyra_AdjointPreconditioner_hpp diff --git a/packages/tempus/src/Thyra_AdjointPreconditionerFactory.hpp b/packages/tempus/src/Thyra_AdjointPreconditionerFactory.hpp index 6208dd2aab73..44a3a5a8611e 100644 --- a/packages/tempus/src/Thyra_AdjointPreconditionerFactory.hpp +++ b/packages/tempus/src/Thyra_AdjointPreconditionerFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_AdjointPreconditionerFactory_hpp #define Thyra_AdjointPreconditionerFactory_hpp diff --git a/packages/tempus/src/Thyra_BlockedTriangularLinearOpWithSolveFactory.hpp b/packages/tempus/src/Thyra_BlockedTriangularLinearOpWithSolveFactory.hpp index 9edd45c31278..0119357e3c38 100644 --- a/packages/tempus/src/Thyra_BlockedTriangularLinearOpWithSolveFactory.hpp +++ b/packages/tempus/src/Thyra_BlockedTriangularLinearOpWithSolveFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_BlockedTriangularLinearOpWithSolveFactory_hpp #define Thyra_BlockedTriangularLinearOpWithSolveFactory_hpp diff --git a/packages/tempus/src/Thyra_ImplicitAdjointModelEvaluator.hpp b/packages/tempus/src/Thyra_ImplicitAdjointModelEvaluator.hpp index 37ec7e523adf..869e5a44961b 100644 --- a/packages/tempus/src/Thyra_ImplicitAdjointModelEvaluator.hpp +++ b/packages/tempus/src/Thyra_ImplicitAdjointModelEvaluator.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_ImplicitAdjointModelEvaluator_hpp #define Thyra_ImplicitAdjointModelEvaluator_hpp diff --git a/packages/tempus/src/Thyra_MultiVectorLinearOp.hpp b/packages/tempus/src/Thyra_MultiVectorLinearOp.hpp index 26360389a0ac..4bc689c5c69b 100644 --- a/packages/tempus/src/Thyra_MultiVectorLinearOp.hpp +++ b/packages/tempus/src/Thyra_MultiVectorLinearOp.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_MultiVectorLinearOp_hpp #define Thyra_MultiVectorLinearOp_hpp diff --git a/packages/tempus/src/Thyra_MultiVectorLinearOpWithSolveFactory.hpp b/packages/tempus/src/Thyra_MultiVectorLinearOpWithSolveFactory.hpp index 9afb7f1ca37b..dfe31ab2ffd5 100644 --- a/packages/tempus/src/Thyra_MultiVectorLinearOpWithSolveFactory.hpp +++ b/packages/tempus/src/Thyra_MultiVectorLinearOpWithSolveFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_MultiVectorLinearOpWithSolveFactory_hpp #define Thyra_MultiVectorLinearOpWithSolveFactory_hpp diff --git a/packages/tempus/src/Thyra_MultiVectorPreconditioner.hpp b/packages/tempus/src/Thyra_MultiVectorPreconditioner.hpp index 49ae16f5d7a5..c760eb94dc51 100644 --- a/packages/tempus/src/Thyra_MultiVectorPreconditioner.hpp +++ b/packages/tempus/src/Thyra_MultiVectorPreconditioner.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_MultiVectorPreconditioner_hpp #define Thyra_MultiVectorPreconditioner_hpp diff --git a/packages/tempus/src/Thyra_MultiVectorPreconditionerFactory.hpp b/packages/tempus/src/Thyra_MultiVectorPreconditionerFactory.hpp index d9fc87e51906..76b60e0b666c 100644 --- a/packages/tempus/src/Thyra_MultiVectorPreconditionerFactory.hpp +++ b/packages/tempus/src/Thyra_MultiVectorPreconditionerFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_MultiVectorPreconditionerFactory_hpp #define Thyra_MultiVectorPreconditionerFactory_hpp diff --git a/packages/tempus/src/Thyra_ReuseLinearOpWithSolveFactory.hpp b/packages/tempus/src/Thyra_ReuseLinearOpWithSolveFactory.hpp index f888d36a14d3..ffbd7636560f 100644 --- a/packages/tempus/src/Thyra_ReuseLinearOpWithSolveFactory.hpp +++ b/packages/tempus/src/Thyra_ReuseLinearOpWithSolveFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_ReuseLinearOpWithSolveFactory_hpp #define Thyra_ReuseLinearOpWithSolveFactory_hpp diff --git a/packages/tempus/src/Thyra_ReusePreconditionerFactory.hpp b/packages/tempus/src/Thyra_ReusePreconditionerFactory.hpp index 3e6b6d4a41c9..f54332ed7784 100644 --- a/packages/tempus/src/Thyra_ReusePreconditionerFactory.hpp +++ b/packages/tempus/src/Thyra_ReusePreconditionerFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_ReusePreconditionerFactory_hpp #define Thyra_ReusePreconditionerFactory_hpp diff --git a/packages/tempus/src/Thyra_ScaledIdentityLinearOpWithSolve.hpp b/packages/tempus/src/Thyra_ScaledIdentityLinearOpWithSolve.hpp index e07c48712b65..d7b61a84a921 100644 --- a/packages/tempus/src/Thyra_ScaledIdentityLinearOpWithSolve.hpp +++ b/packages/tempus/src/Thyra_ScaledIdentityLinearOpWithSolve.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_ScaledIdentityLinearOpWithSolve_hpp #define Thyra_ScaledIdentityLinearOpWithSolve_hpp diff --git a/packages/tempus/src/Thyra_ScaledIdentityLinearOpWithSolveFactory.hpp b/packages/tempus/src/Thyra_ScaledIdentityLinearOpWithSolveFactory.hpp index b8be438bde8b..65c3b6ed070a 100644 --- a/packages/tempus/src/Thyra_ScaledIdentityLinearOpWithSolveFactory.hpp +++ b/packages/tempus/src/Thyra_ScaledIdentityLinearOpWithSolveFactory.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Thyra_ScaledIdentityLinearOpWithSolveFactory_hpp #define Thyra_ScaledIdentityLinearOpWithSolveFactory_hpp diff --git a/packages/tempus/test/BDF2/Tempus_BDF2_ASA.cpp b/packages/tempus/test/BDF2/Tempus_BDF2_ASA.cpp index 59ca70651f5f..90b8c5fe0f95 100644 --- a/packages/tempus/test/BDF2/Tempus_BDF2_ASA.cpp +++ b/packages/tempus/test/BDF2/Tempus_BDF2_ASA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BDF2/Tempus_BDF2_Combined_FSA.cpp b/packages/tempus/test/BDF2/Tempus_BDF2_Combined_FSA.cpp index 0e969e927e6d..cb9cab881774 100644 --- a/packages/tempus/test/BDF2/Tempus_BDF2_Combined_FSA.cpp +++ b/packages/tempus/test/BDF2/Tempus_BDF2_Combined_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_BDF2_FSA.hpp" diff --git a/packages/tempus/test/BDF2/Tempus_BDF2_FSA.hpp b/packages/tempus/test/BDF2/Tempus_BDF2_FSA.hpp index a4c047b908bb..c67ac08844af 100644 --- a/packages/tempus/test/BDF2/Tempus_BDF2_FSA.hpp +++ b/packages/tempus/test/BDF2/Tempus_BDF2_FSA.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BDF2/Tempus_BDF2_PseudoTransient_SA.cpp b/packages/tempus/test/BDF2/Tempus_BDF2_PseudoTransient_SA.cpp index adcd88d00df4..209dafba25d1 100644 --- a/packages/tempus/test/BDF2/Tempus_BDF2_PseudoTransient_SA.cpp +++ b/packages/tempus/test/BDF2/Tempus_BDF2_PseudoTransient_SA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BDF2/Tempus_BDF2_Staggered_FSA.cpp b/packages/tempus/test/BDF2/Tempus_BDF2_Staggered_FSA.cpp index 3a41c951ee2c..2977601c0df9 100644 --- a/packages/tempus/test/BDF2/Tempus_BDF2_Staggered_FSA.cpp +++ b/packages/tempus/test/BDF2/Tempus_BDF2_Staggered_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_BDF2_FSA.hpp" diff --git a/packages/tempus/test/BDF2/Tempus_Test_BDF2_CDR.cpp b/packages/tempus/test/BDF2/Tempus_Test_BDF2_CDR.cpp index 904ca7fa1523..13dc1381f19f 100644 --- a/packages/tempus/test/BDF2/Tempus_Test_BDF2_CDR.cpp +++ b/packages/tempus/test/BDF2/Tempus_Test_BDF2_CDR.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BDF2/Tempus_Test_BDF2_SinCos.cpp b/packages/tempus/test/BDF2/Tempus_Test_BDF2_SinCos.cpp index a9f601722791..1c7abae3e387 100644 --- a/packages/tempus/test/BDF2/Tempus_Test_BDF2_SinCos.cpp +++ b/packages/tempus/test/BDF2/Tempus_Test_BDF2_SinCos.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BDF2/Tempus_Test_BDF2_SinCosAdapt.cpp b/packages/tempus/test/BDF2/Tempus_Test_BDF2_SinCosAdapt.cpp index 45c7eb3f224e..28b6a3ac425a 100644 --- a/packages/tempus/test/BDF2/Tempus_Test_BDF2_SinCosAdapt.cpp +++ b/packages/tempus/test/BDF2/Tempus_Test_BDF2_SinCosAdapt.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BDF2/Tempus_Test_BDF2_VanDerPol.cpp b/packages/tempus/test/BDF2/Tempus_Test_BDF2_VanDerPol.cpp index aded9a011289..b6b42d036083 100644 --- a/packages/tempus/test/BDF2/Tempus_Test_BDF2_VanDerPol.cpp +++ b/packages/tempus/test/BDF2/Tempus_Test_BDF2_VanDerPol.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_ASA.cpp b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_ASA.cpp index 2e58bfa781e0..c138cb954635 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_ASA.cpp +++ b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_ASA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_Combined_FSA.cpp b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_Combined_FSA.cpp index 7e690faa0c84..1cefb4044a93 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_Combined_FSA.cpp +++ b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_Combined_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_BackwardEuler_FSA.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_FSA.hpp b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_FSA.hpp index 02cd4771deed..725b446eca9a 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_FSA.hpp +++ b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_FSA.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_PseudoTransient_SA.cpp b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_PseudoTransient_SA.cpp index 69b93322317b..8376db3af774 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_PseudoTransient_SA.cpp +++ b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_PseudoTransient_SA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_Staggered_FSA.cpp b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_Staggered_FSA.cpp index 525860279450..0fc9b3f64a37 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_Staggered_FSA.cpp +++ b/packages/tempus/test/BackwardEuler/Tempus_BackwardEuler_Staggered_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_BackwardEuler_FSA.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_CDR.cpp b/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_CDR.cpp index 64da85d14386..4aaaded4162b 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_CDR.cpp +++ b/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_CDR.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_OptInterface.cpp b/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_OptInterface.cpp index 73cf39d5cc04..af96c0f58345 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_OptInterface.cpp +++ b/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_OptInterface.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_SinCos.cpp b/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_SinCos.cpp index 9fba68036343..db0ed7fa3d40 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_SinCos.cpp +++ b/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_SinCos.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_VanDerPol.cpp b/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_VanDerPol.cpp index 4000ce801c61..98b02faf580f 100644 --- a/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_VanDerPol.cpp +++ b/packages/tempus/test/BackwardEuler/Tempus_Test_BackwardEuler_VanDerPol.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/DIRK/Tempus_DIRKTest.cpp b/packages/tempus/test/DIRK/Tempus_DIRKTest.cpp index 7c39177c5d4d..06950a7fa758 100644 --- a/packages/tempus/test/DIRK/Tempus_DIRKTest.cpp +++ b/packages/tempus/test/DIRK/Tempus_DIRKTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/DIRK/Tempus_DIRK_ASA.cpp b/packages/tempus/test/DIRK/Tempus_DIRK_ASA.cpp index 404c87cbde63..ea2c5dbdf366 100644 --- a/packages/tempus/test/DIRK/Tempus_DIRK_ASA.cpp +++ b/packages/tempus/test/DIRK/Tempus_DIRK_ASA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/DIRK/Tempus_DIRK_Combined_FSA.cpp b/packages/tempus/test/DIRK/Tempus_DIRK_Combined_FSA.cpp index 3f3f575d8839..556f4489586c 100644 --- a/packages/tempus/test/DIRK/Tempus_DIRK_Combined_FSA.cpp +++ b/packages/tempus/test/DIRK/Tempus_DIRK_Combined_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_DIRK_FSA.hpp" diff --git a/packages/tempus/test/DIRK/Tempus_DIRK_FSA.hpp b/packages/tempus/test/DIRK/Tempus_DIRK_FSA.hpp index 349ffbd8774b..d319faf9f4a7 100644 --- a/packages/tempus/test/DIRK/Tempus_DIRK_FSA.hpp +++ b/packages/tempus/test/DIRK/Tempus_DIRK_FSA.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/DIRK/Tempus_DIRK_PseudoTransient_SA.cpp b/packages/tempus/test/DIRK/Tempus_DIRK_PseudoTransient_SA.cpp index 1f1495ca8926..7887f5877268 100644 --- a/packages/tempus/test/DIRK/Tempus_DIRK_PseudoTransient_SA.cpp +++ b/packages/tempus/test/DIRK/Tempus_DIRK_PseudoTransient_SA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/DIRK/Tempus_DIRK_Staggered_FSA.cpp b/packages/tempus/test/DIRK/Tempus_DIRK_Staggered_FSA.cpp index 6fc31c52d6de..cc5a7daddf3c 100644 --- a/packages/tempus/test/DIRK/Tempus_DIRK_Staggered_FSA.cpp +++ b/packages/tempus/test/DIRK/Tempus_DIRK_Staggered_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_DIRK_FSA.hpp" diff --git a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRKTest.cpp b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRKTest.cpp index da4b8b57084c..8f793bb50ef8 100644 --- a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRKTest.cpp +++ b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRKTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_ASA.cpp b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_ASA.cpp index 8d6f527e54bb..f2789c0a3a2b 100644 --- a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_ASA.cpp +++ b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_ASA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_Combined_FSA.cpp b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_Combined_FSA.cpp index cd9af88807b0..88beedf79fd2 100644 --- a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_Combined_FSA.cpp +++ b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_Combined_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitRK_FSA.hpp" diff --git a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_FSA.hpp b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_FSA.hpp index 520dfa8051d7..12cc3c04f322 100644 --- a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_FSA.hpp +++ b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_FSA.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_PseudoTransient_SA.cpp b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_PseudoTransient_SA.cpp index 56510ab301a3..b3960313a887 100644 --- a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_PseudoTransient_SA.cpp +++ b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_PseudoTransient_SA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_Staggered_FSA.cpp b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_Staggered_FSA.cpp index d495a3136b7c..003f802383cf 100644 --- a/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_Staggered_FSA.cpp +++ b/packages/tempus/test/ExplicitRK/Tempus_ExplicitRK_Staggered_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitRK_FSA.hpp" diff --git a/packages/tempus/test/ForwardEuler/Tempus_ForwardEulerTest.cpp b/packages/tempus/test/ForwardEuler/Tempus_ForwardEulerTest.cpp index 8ceba305279b..b9b9b21422d6 100644 --- a/packages/tempus/test/ForwardEuler/Tempus_ForwardEulerTest.cpp +++ b/packages/tempus/test/ForwardEuler/Tempus_ForwardEulerTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/HHTAlpha/Tempus_HHTAlphaTest.cpp b/packages/tempus/test/HHTAlpha/Tempus_HHTAlphaTest.cpp index 30da388f4460..f27348c9e27b 100644 --- a/packages/tempus/test/HHTAlpha/Tempus_HHTAlphaTest.cpp +++ b/packages/tempus/test/HHTAlpha/Tempus_HHTAlphaTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RKTest.cpp b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RKTest.cpp index 320144c44f19..64e06ebc2577 100644 --- a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RKTest.cpp +++ b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RKTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Combined_FSA.cpp b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Combined_FSA.cpp index 91e212c6b505..cf51829359ff 100644 --- a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Combined_FSA.cpp +++ b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Combined_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_IMEX_RK_FSA.hpp" diff --git a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Combined_FSA_Tangent.cpp b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Combined_FSA_Tangent.cpp index 3352b67c7cd8..f3180d24e66d 100644 --- a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Combined_FSA_Tangent.cpp +++ b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Combined_FSA_Tangent.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_IMEX_RK_FSA.hpp" diff --git a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_FSA.hpp b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_FSA.hpp index 48ac2595d970..e00ff4c1a4ac 100644 --- a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_FSA.hpp +++ b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_FSA.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Staggered_FSA.cpp b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Staggered_FSA.cpp index b62b8881e13d..4e4d1ecd088f 100644 --- a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Staggered_FSA.cpp +++ b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Staggered_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_IMEX_RK_FSA.hpp" diff --git a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Staggered_FSA_Tangent.cpp b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Staggered_FSA_Tangent.cpp index 7a7f1ee0077b..12a53dc1be0a 100644 --- a/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Staggered_FSA_Tangent.cpp +++ b/packages/tempus/test/IMEX_RK/Tempus_IMEX_RK_Staggered_FSA_Tangent.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_IMEX_RK_FSA.hpp" diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_PartitionedTest.cpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_PartitionedTest.cpp index 96bc01051059..26d4ca77fad5 100644 --- a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_PartitionedTest.cpp +++ b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_PartitionedTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA.cpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA.cpp index e55460311641..9a6cd4fb7013 100644 --- a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA.cpp +++ b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_IMEX_RK_Partitioned_FSA.hpp" diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA_Tangent.cpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA_Tangent.cpp index 35390a367e29..cad30c51c69d 100644 --- a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA_Tangent.cpp +++ b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA_Tangent.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_IMEX_RK_Partitioned_FSA.hpp" diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_FSA.hpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_FSA.hpp index a972dee47bab..c356ea545d22 100644 --- a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_FSA.hpp +++ b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_FSA.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA.cpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA.cpp index 6edf571a2e3f..b90c7ab713fb 100644 --- a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA.cpp +++ b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_IMEX_RK_Partitioned_FSA.hpp" diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA_Tangent.cpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA_Tangent.cpp index 1f854e1baf9c..c19d7786d3e2 100644 --- a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA_Tangent.cpp +++ b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA_Tangent.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_IMEX_RK_Partitioned_FSA.hpp" diff --git a/packages/tempus/test/Leapfrog/Tempus_LeapfrogTest.cpp b/packages/tempus/test/Leapfrog/Tempus_LeapfrogTest.cpp index aeb0676c04ea..925adefcf84b 100644 --- a/packages/tempus/test/Leapfrog/Tempus_LeapfrogTest.cpp +++ b/packages/tempus/test/Leapfrog/Tempus_LeapfrogTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_BallParabolic.cpp b/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_BallParabolic.cpp index cdc5c17adb7b..7dc3a3c6dc0d 100644 --- a/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_BallParabolic.cpp +++ b/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_BallParabolic.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_HarmonicOscillator_Damped.cpp b/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_HarmonicOscillator_Damped.cpp index 1bd9973b756a..fe327c85ba17 100644 --- a/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_HarmonicOscillator_Damped.cpp +++ b/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_HarmonicOscillator_Damped.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_SinCos.cpp b/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_SinCos.cpp index 2b3f5a887f23..977d835c6483 100644 --- a/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_SinCos.cpp +++ b/packages/tempus/test/Newmark/Tempus_Test_NewmarkExplicitAForm_SinCos.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder.cpp b/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder.cpp index 5bb2f2489c75..98fdfa308c3c 100644 --- a/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder.cpp +++ b/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_FirstOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_SecondOrder.cpp b/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_SecondOrder.cpp index 8d3edd963b83..847297c25a76 100644 --- a/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_SecondOrder.cpp +++ b/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitAForm_HarmonicOscillator_Damped_SecondOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitDForm_HarmonicOscillator_Damped_SecondOrder.cpp b/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitDForm_HarmonicOscillator_Damped_SecondOrder.cpp index 5147cdf35649..1abfc897ee1e 100644 --- a/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitDForm_HarmonicOscillator_Damped_SecondOrder.cpp +++ b/packages/tempus/test/Newmark/Tempus_Test_NewmarkImplicitDForm_HarmonicOscillator_Damped_SecondOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/OperatorSplit/Tempus_OperatorSplitTest.cpp b/packages/tempus/test/OperatorSplit/Tempus_OperatorSplitTest.cpp index bff784ea44ac..c956f69799c0 100644 --- a/packages/tempus/test/OperatorSplit/Tempus_OperatorSplitTest.cpp +++ b/packages/tempus/test/OperatorSplit/Tempus_OperatorSplitTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/PhysicsState/Tempus_PhysicsStateCounter.hpp b/packages/tempus/test/PhysicsState/Tempus_PhysicsStateCounter.hpp index 83ded710b26d..d25f7c9d5abd 100644 --- a/packages/tempus/test/PhysicsState/Tempus_PhysicsStateCounter.hpp +++ b/packages/tempus/test/PhysicsState/Tempus_PhysicsStateCounter.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_PhysicsStateCounter_hpp #define Tempus_PhysicsStateCounter_hpp diff --git a/packages/tempus/test/PhysicsState/Tempus_PhysicsStateTest.cpp b/packages/tempus/test/PhysicsState/Tempus_PhysicsStateTest.cpp index f9c16344beb1..29967ecdf319 100644 --- a/packages/tempus/test/PhysicsState/Tempus_PhysicsStateTest.cpp +++ b/packages/tempus/test/PhysicsState/Tempus_PhysicsStateTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/PhysicsState/Tempus_PhysicsStateTest_StepperForwardEuler.hpp b/packages/tempus/test/PhysicsState/Tempus_PhysicsStateTest_StepperForwardEuler.hpp index bd009b92bc11..f77c976f1057 100644 --- a/packages/tempus/test/PhysicsState/Tempus_PhysicsStateTest_StepperForwardEuler.hpp +++ b/packages/tempus/test/PhysicsState/Tempus_PhysicsStateTest_StepperForwardEuler.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_PhysicsStateTest_StepperForwardEuler_hpp #define Tempus_PhysicsStateTest_StepperForwardEuler_hpp diff --git a/packages/tempus/test/Subcycling/Tempus_SubcyclingTest.cpp b/packages/tempus/test/Subcycling/Tempus_SubcyclingTest.cpp index f9b272c7abb0..e7f9188152e0 100644 --- a/packages/tempus/test/Subcycling/Tempus_SubcyclingTest.cpp +++ b/packages/tempus/test/Subcycling/Tempus_SubcyclingTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/TestModels/CDR_Model.cpp b/packages/tempus/test/TestModels/CDR_Model.cpp index c0728387eb72..0add2675b03f 100644 --- a/packages/tempus/test/TestModels/CDR_Model.cpp +++ b/packages/tempus/test/TestModels/CDR_Model.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/CDR_Model_Functors.hpp b/packages/tempus/test/TestModels/CDR_Model_Functors.hpp index 35de59943c8b..eee7828dd914 100644 --- a/packages/tempus/test/TestModels/CDR_Model_Functors.hpp +++ b/packages/tempus/test/TestModels/CDR_Model_Functors.hpp @@ -1,3 +1,12 @@ +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package +// +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER + #ifndef TEMPUS_CDR_MODEL_FUNCTORS_HPP #define TEMPUS_CDR_MODEL_FUNCTORS_HPP diff --git a/packages/tempus/test/TestModels/CDR_Model_Tpetra_decl.hpp b/packages/tempus/test/TestModels/CDR_Model_Tpetra_decl.hpp index fda48e834cab..1b9474f6e5f4 100644 --- a/packages/tempus/test/TestModels/CDR_Model_Tpetra_decl.hpp +++ b/packages/tempus/test/TestModels/CDR_Model_Tpetra_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_CDR_MODEL_TPETRA_DECL_HPP #define TEMPUS_CDR_MODEL_TPETRA_DECL_HPP diff --git a/packages/tempus/test/TestModels/CDR_Model_Tpetra_impl.hpp b/packages/tempus/test/TestModels/CDR_Model_Tpetra_impl.hpp index d2d9f34e6c50..5d309024fadc 100644 --- a/packages/tempus/test/TestModels/CDR_Model_Tpetra_impl.hpp +++ b/packages/tempus/test/TestModels/CDR_Model_Tpetra_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_CDR_MODEL_TPETRA_IMPL_HPP #define TEMPUS_CDR_MODEL_TPETRA_IMPL_HPP diff --git a/packages/tempus/test/TestModels/CDR_Model_decl.hpp b/packages/tempus/test/TestModels/CDR_Model_decl.hpp index dbaed76906b2..3cb85753d083 100644 --- a/packages/tempus/test/TestModels/CDR_Model_decl.hpp +++ b/packages/tempus/test/TestModels/CDR_Model_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_CDR_MODEL_DECL_HPP #define TEMPUS_CDR_MODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/CDR_Model_impl.hpp b/packages/tempus/test/TestModels/CDR_Model_impl.hpp index 23d664240240..bacdce22156d 100644 --- a/packages/tempus/test/TestModels/CDR_Model_impl.hpp +++ b/packages/tempus/test/TestModels/CDR_Model_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef NOX_THYRA_MODEL_EVALUATOR_1DFEM_DEF_HPP #define NOX_THYRA_MODEL_EVALUATOR_1DFEM_DEF_HPP diff --git a/packages/tempus/test/TestModels/DahlquistTestModel.cpp b/packages/tempus/test/TestModels/DahlquistTestModel.cpp index 169fb3a4d5d0..3c554dc35254 100644 --- a/packages/tempus/test/TestModels/DahlquistTestModel.cpp +++ b/packages/tempus/test/TestModels/DahlquistTestModel.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/DahlquistTestModel_decl.hpp b/packages/tempus/test/TestModels/DahlquistTestModel_decl.hpp index 8a8651d2b6ec..b9177c2635fd 100644 --- a/packages/tempus/test/TestModels/DahlquistTestModel_decl.hpp +++ b/packages/tempus/test/TestModels/DahlquistTestModel_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_DAHLQUIST_TEST_MODEL_DECL_HPP #define TEMPUS_TEST_DAHLQUIST_TEST_MODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/DahlquistTestModel_impl.hpp b/packages/tempus/test/TestModels/DahlquistTestModel_impl.hpp index 0e09c957972e..d2d985981b9c 100644 --- a/packages/tempus/test/TestModels/DahlquistTestModel_impl.hpp +++ b/packages/tempus/test/TestModels/DahlquistTestModel_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_DAHLQUIST_TEST_MODEL_IMPL_HPP #define TEMPUS_TEST_DAHLQUIST_TEST_MODEL_IMPL_HPP diff --git a/packages/tempus/test/TestModels/HarmonicOscillatorModel.cpp b/packages/tempus/test/TestModels/HarmonicOscillatorModel.cpp index 5ca9541bd49e..f33c23ea4d9e 100644 --- a/packages/tempus/test/TestModels/HarmonicOscillatorModel.cpp +++ b/packages/tempus/test/TestModels/HarmonicOscillatorModel.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/HarmonicOscillatorModel_decl.hpp b/packages/tempus/test/TestModels/HarmonicOscillatorModel_decl.hpp index 7e8543428e89..12495f284619 100644 --- a/packages/tempus/test/TestModels/HarmonicOscillatorModel_decl.hpp +++ b/packages/tempus/test/TestModels/HarmonicOscillatorModel_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_HARMONIC_OSCILLATOR_MODEL_DECL_HPP #define TEMPUS_TEST_HARMONIC_OSCILLATOR_MODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/HarmonicOscillatorModel_impl.hpp b/packages/tempus/test/TestModels/HarmonicOscillatorModel_impl.hpp index 74ed8165663a..2b96aceca8dd 100644 --- a/packages/tempus/test/TestModels/HarmonicOscillatorModel_impl.hpp +++ b/packages/tempus/test/TestModels/HarmonicOscillatorModel_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_HARMONIC_OSCILLATOR_MODEL_IMPL_HPP #define TEMPUS_TEST_HARMONIC_OSCILLATOR_MODEL_IMPL_HPP diff --git a/packages/tempus/test/TestModels/SinCosModel.cpp b/packages/tempus/test/TestModels/SinCosModel.cpp index eca012c1d81b..b4f3f8ef6e44 100644 --- a/packages/tempus/test/TestModels/SinCosModel.cpp +++ b/packages/tempus/test/TestModels/SinCosModel.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/SinCosModel_decl.hpp b/packages/tempus/test/TestModels/SinCosModel_decl.hpp index 1b83b2861428..5851765b7cf9 100644 --- a/packages/tempus/test/TestModels/SinCosModel_decl.hpp +++ b/packages/tempus/test/TestModels/SinCosModel_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_SINCOS_MODEL_DECL_HPP #define TEMPUS_TEST_SINCOS_MODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/SinCosModel_impl.hpp b/packages/tempus/test/TestModels/SinCosModel_impl.hpp index e85d07c7ad38..d1c0f19eb9a9 100644 --- a/packages/tempus/test/TestModels/SinCosModel_impl.hpp +++ b/packages/tempus/test/TestModels/SinCosModel_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_SINCOS_MODEL_IMPL_HPP #define TEMPUS_TEST_SINCOS_MODEL_IMPL_HPP diff --git a/packages/tempus/test/TestModels/SteadyQuadraticModel.cpp b/packages/tempus/test/TestModels/SteadyQuadraticModel.cpp index c0eb447831f9..27c06fea6415 100644 --- a/packages/tempus/test/TestModels/SteadyQuadraticModel.cpp +++ b/packages/tempus/test/TestModels/SteadyQuadraticModel.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/SteadyQuadraticModel_decl.hpp b/packages/tempus/test/TestModels/SteadyQuadraticModel_decl.hpp index d7182e971354..35cc7a49c5ba 100644 --- a/packages/tempus/test/TestModels/SteadyQuadraticModel_decl.hpp +++ b/packages/tempus/test/TestModels/SteadyQuadraticModel_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_STEADY_QUADRATIC_MODEL_DECL_HPP #define TEMPUS_TEST_STEADY_QUADRATIC_MODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/SteadyQuadraticModel_impl.hpp b/packages/tempus/test/TestModels/SteadyQuadraticModel_impl.hpp index cec9b7ed64c3..f4ffb28b65e5 100644 --- a/packages/tempus/test/TestModels/SteadyQuadraticModel_impl.hpp +++ b/packages/tempus/test/TestModels/SteadyQuadraticModel_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_STEADY_QUADRATIC_MODEL_IMPL_HPP #define TEMPUS_TEST_STEADY_QUADRATIC_MODEL_IMPL_HPP diff --git a/packages/tempus/test/TestModels/VanDerPolModel.cpp b/packages/tempus/test/TestModels/VanDerPolModel.cpp index fba089521938..5b8d440b584c 100644 --- a/packages/tempus/test/TestModels/VanDerPolModel.cpp +++ b/packages/tempus/test/TestModels/VanDerPolModel.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/VanDerPolModel_decl.hpp b/packages/tempus/test/TestModels/VanDerPolModel_decl.hpp index e390ebe5ec88..f8550a57630a 100644 --- a/packages/tempus/test/TestModels/VanDerPolModel_decl.hpp +++ b/packages/tempus/test/TestModels/VanDerPolModel_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_VANDERPOL_MODEL_DECL_HPP #define TEMPUS_TEST_VANDERPOL_MODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/VanDerPolModel_impl.hpp b/packages/tempus/test/TestModels/VanDerPolModel_impl.hpp index 3e2e8b0e67f5..754ea189a8b7 100644 --- a/packages/tempus/test/TestModels/VanDerPolModel_impl.hpp +++ b/packages/tempus/test/TestModels/VanDerPolModel_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_VANDERPOL_MODEL_IMPL_HPP #define TEMPUS_TEST_VANDERPOL_MODEL_IMPL_HPP diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel.cpp b/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel.cpp index 09a57d94d47c..663bcfe1bc94 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel.cpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel_decl.hpp b/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel_decl.hpp index b49cbfc392cb..9730e0656eca 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel_decl.hpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_VANDERPOL_IMEXPart_ImplicitMODEL_DECL_HPP #define TEMPUS_TEST_VANDERPOL_IMEXPart_ImplicitMODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel_impl.hpp b/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel_impl.hpp index c9bc9af938a1..c4088b3f7534 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel_impl.hpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEXPart_ImplicitModel_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_VANDERPOL_IMEXPart_IMPLICITMODEL_IMPL_HPP #define TEMPUS_TEST_VANDERPOL_IMEXPart_IMPLICITMODEL_IMPL_HPP diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel.cpp b/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel.cpp index 44d703dd5d49..047fb337e241 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel.cpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel_decl.hpp b/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel_decl.hpp index 2647e4fa2624..976697259e2c 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel_decl.hpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_VANDERPOL_IMEX_EXPLICITMODEL_DECL_HPP #define TEMPUS_TEST_VANDERPOL_IMEX_EXPLICITMODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel_impl.hpp b/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel_impl.hpp index 23f87eeb3768..dcd3a8d10093 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel_impl.hpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEX_ExplicitModel_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_VANDERPOL_IMEX_EXPLICITMODEL_IMPL_HPP #define TEMPUS_TEST_VANDERPOL_IMEX_EXPLICITMODEL_IMPL_HPP diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel.cpp b/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel.cpp index cf5a7124e1d1..9303dae1a151 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel.cpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_ExplicitTemplateInstantiation.hpp" diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel_decl.hpp b/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel_decl.hpp index cb49cb409ba3..4a55a9c60044 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel_decl.hpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel_decl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_VANDERPOL_IMEX_ImplicitMODEL_DECL_HPP #define TEMPUS_TEST_VANDERPOL_IMEX_ImplicitMODEL_DECL_HPP diff --git a/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel_impl.hpp b/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel_impl.hpp index aa05aba75d48..f0802c04fbd2 100644 --- a/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel_impl.hpp +++ b/packages/tempus/test/TestModels/VanDerPol_IMEX_ImplicitModel_impl.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_TEST_VANDERPOL_IMEX_IMPLICITMODEL_IMPL_HPP #define TEMPUS_TEST_VANDERPOL_IMEX_IMPLICITMODEL_IMPL_HPP diff --git a/packages/tempus/test/TestUtils/Tempus_ConvergenceTestUtils.hpp b/packages/tempus/test/TestUtils/Tempus_ConvergenceTestUtils.hpp index 795978488212..657aa8e91adb 100644 --- a/packages/tempus/test/TestUtils/Tempus_ConvergenceTestUtils.hpp +++ b/packages/tempus/test/TestUtils/Tempus_ConvergenceTestUtils.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_CONVERGENCE_TEST_UTILS_HPP #define TEMPUS_CONVERGENCE_TEST_UTILS_HPP diff --git a/packages/tempus/test/TestUtils/Tempus_UnitTestMain.cpp b/packages/tempus/test/TestUtils/Tempus_UnitTestMain.cpp index c5a85a91cf9b..2ec3bab20fc8 100644 --- a/packages/tempus/test/TestUtils/Tempus_UnitTestMain.cpp +++ b/packages/tempus/test/TestUtils/Tempus_UnitTestMain.cpp @@ -1,3 +1,12 @@ +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package +// +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER + #include "Teuchos_UnitTestRepository.hpp" #include "Teuchos_GlobalMPISession.hpp" #include "Tempus_UnitTestMainUtils.hpp" diff --git a/packages/tempus/test/TestUtils/Tempus_UnitTestMainUtils.hpp b/packages/tempus/test/TestUtils/Tempus_UnitTestMainUtils.hpp index 7fb2ea113d96..79dbc9c1437c 100644 --- a/packages/tempus/test/TestUtils/Tempus_UnitTestMainUtils.hpp +++ b/packages/tempus/test/TestUtils/Tempus_UnitTestMainUtils.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef TEMPUS_UNIT_TEST_MAIN_UTILS_HPP #define TEMPUS_UNIT_TEST_MAIN_UTILS_HPP diff --git a/packages/tempus/test/Trapezoidal/Tempus_TrapezoidalTest.cpp b/packages/tempus/test/Trapezoidal/Tempus_TrapezoidalTest.cpp index 57fb64c7de4c..f58715ba0daf 100644 --- a/packages/tempus/test/Trapezoidal/Tempus_TrapezoidalTest.cpp +++ b/packages/tempus/test/Trapezoidal/Tempus_TrapezoidalTest.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Teuchos_UnitTestHarness.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/test/version/version.cpp b/packages/tempus/test/version/version.cpp index b3c0296403e9..c3804c45803d 100644 --- a/packages/tempus/test/version/version.cpp +++ b/packages/tempus/test/version/version.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include #include "Tempus_Version.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_BDF2.cpp b/packages/tempus/unit_test/Tempus_UnitTest_BDF2.cpp index c27a08a96cbe..a0c55f8e9b0b 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_BDF2.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_BDF2.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_BackwardEuler.cpp b/packages/tempus/unit_test/Tempus_UnitTest_BackwardEuler.cpp index cf572925dcea..3c160aa17249 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_BackwardEuler.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_BackwardEuler.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_1Stage1stOrderRadauIA.cpp b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_1Stage1stOrderRadauIA.cpp index 523a402640ce..6eb749c56a2c 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_1Stage1stOrderRadauIA.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_1Stage1stOrderRadauIA.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_1StageTheta.cpp b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_1StageTheta.cpp index aa6a175b5144..001e50e340d9 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_1StageTheta.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_1StageTheta.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_2Stage2ndOrderLobattoIIIB.cpp b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_2Stage2ndOrderLobattoIIIB.cpp index 83973efa23e5..be670d69ae5a 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_2Stage2ndOrderLobattoIIIB.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_2Stage2ndOrderLobattoIIIB.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_BackwardEuler.cpp b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_BackwardEuler.cpp index 769fb6bed755..e68ed543d559 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_BackwardEuler.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_BackwardEuler.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_General.cpp b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_General.cpp index b7aa86d58454..e6f30aa257af 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_DIRK_General.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_DIRK_General.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_2Stage3rdOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_2Stage3rdOrder.cpp index 5bf32c0fa46d..af70f004d64e 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_2Stage3rdOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_2Stage3rdOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_2StageTheta.cpp b/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_2StageTheta.cpp index 5de79548fa10..01b1227c5d99 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_2StageTheta.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_2StageTheta.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_TrapezoidalRule.cpp b/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_TrapezoidalRule.cpp index 65476f3bb456..feb18fdd612d 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_TrapezoidalRule.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_EDIRK_TrapezoidalRule.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK.cpp index c79d97f2f44f..2d893e50941f 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrder.cpp index b7b375695a10..194b323d4d8a 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrderHeun.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrderHeun.cpp index ecc91ff0a782..71273ffdede4 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrderHeun.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrderHeun.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrderTVD.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrderTVD.cpp index 2ab718fc3cdd..ce977f1c8d0f 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrderTVD.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_3Stage3rdOrderTVD.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_3_8Rule.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_3_8Rule.cpp index b4ca78ac0807..223ed7d41e15 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_3_8Rule.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_3_8Rule.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_4Stage3rdOrderRunge.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_4Stage3rdOrderRunge.cpp index eed75ceee8f0..79cc35494c38 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_4Stage3rdOrderRunge.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_4Stage3rdOrderRunge.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_4Stage4thOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_4Stage4thOrder.cpp index 9746e4156737..2adf89231bb3 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_4Stage4thOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_4Stage4thOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_5Stage3rdOrderKandG.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_5Stage3rdOrderKandG.cpp index acf730f6eb8b..bd5a2bddd33a 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_5Stage3rdOrderKandG.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_5Stage3rdOrderKandG.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_BogackiShampine32.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_BogackiShampine32.cpp index 7d95a571ca10..3fcf2581415e 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_BogackiShampine32.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_BogackiShampine32.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_ForwardEuler.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_ForwardEuler.cpp index ac129353949c..472f97a9bdcb 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_ForwardEuler.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_ForwardEuler.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_General.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_General.cpp index b80b1702a705..6378911e2f23 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_General.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_General.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_Merson45.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_Merson45.cpp index e1cd0272f26f..5c1d646b3d56 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_Merson45.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_Merson45.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_Midpoint.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_Midpoint.cpp index b991fa851ece..c3fca95d4f1c 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_Midpoint.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_Midpoint.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ERK_Trapezoidal.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ERK_Trapezoidal.cpp index 37547fe5c88b..4c7102bf84f7 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ERK_Trapezoidal.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ERK_Trapezoidal.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_ForwardEuler.cpp b/packages/tempus/unit_test/Tempus_UnitTest_ForwardEuler.cpp index c2f3c299f11c..06282c0a70ef 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_ForwardEuler.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_ForwardEuler.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" #include "Tempus_StepperRKButcherTableau.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_HHTAlpha.cpp b/packages/tempus/unit_test/Tempus_UnitTest_HHTAlpha.cpp index c296c6299242..151fd0e415fd 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_HHTAlpha.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_HHTAlpha.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK.cpp b/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK.cpp index 85a248f8c21c..761b39c8e382 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK_Partition.cpp b/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK_Partition.cpp index 39f027ecc416..b40a8be4e067 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK_Partition.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_IMEX_RK_Partition.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_IntegratorBasic.cpp b/packages/tempus/unit_test/Tempus_UnitTest_IntegratorBasic.cpp index f84473bb9598..c2b4902c4ae9 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_IntegratorBasic.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_IntegratorBasic.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" #include "Teuchos_XMLParameterListHelpers.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_Leapfrog.cpp b/packages/tempus/unit_test/Tempus_UnitTest_Leapfrog.cpp index a442253a3b13..edb154a85be1 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_Leapfrog.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_Leapfrog.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_NewmarkExplicitAForm.cpp b/packages/tempus/unit_test/Tempus_UnitTest_NewmarkExplicitAForm.cpp index c01b99ccf0c9..b24e8c9d981b 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_NewmarkExplicitAForm.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_NewmarkExplicitAForm.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_NewmarkImplicitAForm.cpp b/packages/tempus/unit_test/Tempus_UnitTest_NewmarkImplicitAForm.cpp index a83ef67d36b5..1b7d1cc9984e 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_NewmarkImplicitAForm.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_NewmarkImplicitAForm.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_NewmarkImplicitDForm.cpp b/packages/tempus/unit_test/Tempus_UnitTest_NewmarkImplicitDForm.cpp index 216ba8e74c4a..2a244ae82b36 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_NewmarkImplicitDForm.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_NewmarkImplicitDForm.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_NumericalUtils.cpp b/packages/tempus/unit_test/Tempus_UnitTest_NumericalUtils.cpp index 49d60c4beab7..7f044fe38993 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_NumericalUtils.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_NumericalUtils.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_OperatorSplit.cpp b/packages/tempus/unit_test/Tempus_UnitTest_OperatorSplit.cpp index eda802e2dd41..90cbf3a63ef6 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_OperatorSplit.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_OperatorSplit.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_RK_Utils.hpp b/packages/tempus/unit_test/Tempus_UnitTest_RK_Utils.hpp index a5ec52d2c4fd..abfb0891c98f 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_RK_Utils.hpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_RK_Utils.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_UnitTest_RK_Utils_hpp #define Tempus_UnitTest_RK_Utils_hpp diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_21Pair.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_21Pair.cpp index 224ec8333207..e0b75dcf8f1f 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_21Pair.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_21Pair.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_2Stage2ndOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_2Stage2ndOrder.cpp index dfcdff2a945b..00160cd26612 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_2Stage2ndOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_2Stage2ndOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_2Stage3rdOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_2Stage3rdOrder.cpp index c651b2a66c9f..f56f0e057b3e 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_2Stage3rdOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_2Stage3rdOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_3Stage2ndOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_3Stage2ndOrder.cpp index 2fba97574cbc..ac6dc55568b6 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_3Stage2ndOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_3Stage2ndOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_3Stage4thOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_3Stage4thOrder.cpp index 359e30215e8e..94955ebfcd49 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_3Stage4thOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_3Stage4thOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_5Stage4thOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_5Stage4thOrder.cpp index 7a3bcfef3658..a76893c3cb40 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_5Stage4thOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_5Stage4thOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_5Stage5thOrder.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_5Stage5thOrder.cpp index e36549a2f457..97bd07392605 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_5Stage5thOrder.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_5Stage5thOrder.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_ImplicitMidpoint.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_ImplicitMidpoint.cpp index c3cb5a209dc4..d8df58f8880b 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_ImplicitMidpoint.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SDIRK_ImplicitMidpoint.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK22.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK22.cpp index e1ac2eaf0d92..c4b9f666af00 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK22.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK22.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK23.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK23.cpp index d52680ce7482..8cf434a5444f 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK23.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK23.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK32.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK32.cpp index ef7393a7aedc..2d04ffa349a1 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK32.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK32.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK33.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK33.cpp index 2ae12e849947..6dd1713f6afb 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK33.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SSPDIRK33.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_RK_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_SolutionHistory.cpp b/packages/tempus/unit_test/Tempus_UnitTest_SolutionHistory.cpp index f5456eb27014..30620a8afac4 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_SolutionHistory.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_SolutionHistory.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_Stepper_ErrorNorm.cpp b/packages/tempus/unit_test/Tempus_UnitTest_Stepper_ErrorNorm.cpp index 7d13f3990b08..efd8575c1abb 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_Stepper_ErrorNorm.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_Stepper_ErrorNorm.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_Subcycling.cpp b/packages/tempus/unit_test/Tempus_UnitTest_Subcycling.cpp index 8fb4cc7e7095..d7489a6e69ab 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_Subcycling.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_Subcycling.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventBase.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventBase.cpp index 26d029075ce5..0bb8b64019d6 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventBase.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventBase.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventComposite.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventComposite.cpp index 63319a7e4a34..a5ddc1abf2c7 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventComposite.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventComposite.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventList.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventList.cpp index 63c4873b2b6d..4266addc22da 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventList.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventList.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" #include "Tempus_TimeEventList.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventListIndex.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventListIndex.cpp index 0fb29db62da5..e973ecb2000e 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventListIndex.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventListIndex.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventRange.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventRange.cpp index 50b12ea90ebc..d4d978f1b54f 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventRange.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventRange.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" #include "Tempus_TimeEventRange.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventRangeIndex.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventRangeIndex.cpp index b4aa6685ecd9..63aac78444ae 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeEventRangeIndex.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeEventRangeIndex.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControl.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControl.cpp index d61a9e90a8f2..6d915788a347 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControl.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControl.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyBasicVS.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyBasicVS.cpp index b92d4dd64551..4878abdd33ba 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyBasicVS.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyBasicVS.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyComposite.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyComposite.cpp index 33fe1578ba32..16f3223d57fe 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyComposite.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyComposite.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyConstant.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyConstant.cpp index 8354c7955170..fb8a67d9aefe 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyConstant.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyConstant.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyIntegralController.cpp b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyIntegralController.cpp index 7a7ac9e96ae7..834934b9053f 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyIntegralController.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_TimeStepControlStrategyIntegralController.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_Trapezoidal.cpp b/packages/tempus/unit_test/Tempus_UnitTest_Trapezoidal.cpp index b0859413d21c..1875a59590d7 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_Trapezoidal.cpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_Trapezoidal.cpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #include "Tempus_UnitTest_Utils.hpp" diff --git a/packages/tempus/unit_test/Tempus_UnitTest_Utils.hpp b/packages/tempus/unit_test/Tempus_UnitTest_Utils.hpp index 4545d32d054c..71cc28d41be5 100644 --- a/packages/tempus/unit_test/Tempus_UnitTest_Utils.hpp +++ b/packages/tempus/unit_test/Tempus_UnitTest_Utils.hpp @@ -1,10 +1,11 @@ -// @HEADER -// **************************************************************************** -// Tempus: Copyright (2017) Sandia Corporation +//@HEADER +// ***************************************************************************** +// Tempus: Time Integration and Sensitivity Analysis Package // -// Distributed under BSD 3-clause license (See accompanying file Copyright.txt) -// **************************************************************************** -// @HEADER +// Copyright 2017 NTESS and the Tempus contributors. +// SPDX-License-Identifier: BSD-3-Clause +// ***************************************************************************** +//@HEADER #ifndef Tempus_UnitTest_Utils_hpp #define Tempus_UnitTest_Utils_hpp From 9ce11b76b3d8ff30fb98c2af876e2d16a2755121 Mon Sep 17 00:00:00 2001 From: Kim Liegeois Date: Tue, 18 Jun 2024 10:46:37 -0600 Subject: [PATCH 53/68] Use a stable sort only for makeColMap and makeOptimizedColMap --- .../core/src/Tpetra_Details_makeColMap_def.hpp | 2 +- .../src/Tpetra_Details_makeOptimizedColMap.hpp | 2 +- packages/tpetra/core/src/Tpetra_Util.hpp | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/tpetra/core/src/Tpetra_Details_makeColMap_def.hpp b/packages/tpetra/core/src/Tpetra_Details_makeColMap_def.hpp index f27718868f46..2aca4398f5dd 100644 --- a/packages/tpetra/core/src/Tpetra_Details_makeColMap_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_makeColMap_def.hpp @@ -195,7 +195,7 @@ makeColMapImpl(Teuchos::RCP>& colMap, // NOTE (mfh 02 Sep 2014) This needs to be a stable sort, so that // it respects either of the possible orderings of GIDs (sorted, // or original order) specified above. - sort2 (remotePIDs.begin (), remotePIDs.end (), remoteColGIDs.begin ()); + sort2 (remotePIDs.begin (), remotePIDs.end (), remoteColGIDs.begin (), true); // Copy the local GIDs into myColumns. Two cases: // 1. If the number of Local column GIDs is the same as the number diff --git a/packages/tpetra/core/src/Tpetra_Details_makeOptimizedColMap.hpp b/packages/tpetra/core/src/Tpetra_Details_makeOptimizedColMap.hpp index 0702241b70a1..fc7b8498d3c1 100644 --- a/packages/tpetra/core/src/Tpetra_Details_makeOptimizedColMap.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_makeOptimizedColMap.hpp @@ -274,7 +274,7 @@ namespace Details { out << os.str (); } using Tpetra::sort2; - sort2 (remotePids.begin (), remotePids.end (), remoteGids.begin ()); + sort2 (remotePids.begin (), remotePids.end (), remoteGids.begin (), true); if (verbose) { std::ostringstream os; os << *verboseHeader << "- After sort2:" << endl diff --git a/packages/tpetra/core/src/Tpetra_Util.hpp b/packages/tpetra/core/src/Tpetra_Util.hpp index 17f8aecc0908..197d04bc5d05 100644 --- a/packages/tpetra/core/src/Tpetra_Util.hpp +++ b/packages/tpetra/core/src/Tpetra_Util.hpp @@ -584,7 +584,7 @@ namespace Tpetra { * first N elements of the second array. */ template - void sort2(const IT1 &first1, const IT1 &last1, const IT2 &first2) { + void sort2(const IT1 &first1, const IT1 &last1, const IT2 &first2, const bool stableSort=false) { // Quicksort uses best-case N log N time whether or not the input // data is sorted. However, the common case in Tpetra is that the // input data are sorted, so we first check whether this is the @@ -592,7 +592,10 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::std_sort2(first1, last1, first2, first2+(last1-first1)); + if(stableSort) + SortDetails::std_sort2(first1, last1, first2, first2+(last1-first1)); + else + SortDetails::sh_sort2(first1, last1, first2, first2+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG if(!SortDetails::isAlreadySorted(first1, last1)){ std::cout << "Trouble: sort() did not sort !!" << std::endl; @@ -684,7 +687,7 @@ namespace Tpetra { */ template void sort3(const IT1 &first1, const IT1 &last1, const IT2 &first2, - const IT3 &first3) + const IT3 &first3, const bool stableSort=false) { // Quicksort uses best-case N log N time whether or not the input // data is sorted. However, the common case in Tpetra is that the @@ -693,9 +696,12 @@ namespace Tpetra { if(SortDetails::isAlreadySorted(first1, last1)){ return; } - SortDetails::std_sort3(first1, last1, first2, first2+(last1-first1), first3, - first3+(last1-first1)); - + if(stableSort) + SortDetails::std_sort3(first1, last1, first2, first2+(last1-first1), first3, + first3+(last1-first1)); + else + SortDetails::sh_sort3(first1, last1, first2, first2+(last1-first1), first3, + first3+(last1-first1)); #ifdef HAVE_TPETRA_DEBUG if(!SortDetails::isAlreadySorted(first1, last1)){ std::cout << " Trouble sort did not actually sort... !!!!!!" << From 8347069330681aab163bd58f2467e6a93592a47a Mon Sep 17 00:00:00 2001 From: Nathan Ellingwood Date: Tue, 18 Jun 2024 14:03:35 -0600 Subject: [PATCH 54/68] zoltan2: replace use of char* code with std::string with istringstream Replace the use of char* code with a std::string in the readChacoGraphHeaderInfo routine This resolves compilation errors with cuda/12.4+gcc/13.2.0 with c++20: ``` /home/ndellin/Trilinos/packages/zoltan2/test/core/unit/input/XpetraMultiVectorInput.cpp(179): error: no operator ">>" matches these operands operand types are: std::basic_istream> >> char * issHeader >> nIDs >> nEdges >> code; ``` The `char* code` variable is not used outside of the readChacoGraphHeaderInfo routine, so it was removed from the function signature and the corresponding input variable were removed as well, replaced by use of `std::string s_code` variable within the routine to receive the istringstream input and for comparison (via c_str()) --- .../test/core/unit/input/XpetraMultiVectorInput.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/zoltan2/test/core/unit/input/XpetraMultiVectorInput.cpp b/packages/zoltan2/test/core/unit/input/XpetraMultiVectorInput.cpp index 890200a00659..d86a88b06f1e 100644 --- a/packages/zoltan2/test/core/unit/input/XpetraMultiVectorInput.cpp +++ b/packages/zoltan2/test/core/unit/input/XpetraMultiVectorInput.cpp @@ -168,7 +168,6 @@ void readChacoGraphHeaderInfo( std::ifstream &fp, size_t &nIDs, size_t &nEdges, - char *code, int &nWgts) { // Read the header info from a Chaco .graph file @@ -176,8 +175,9 @@ void readChacoGraphHeaderInfo( std::getline(fp, line); while (line[0]=='#') std::getline(fp, line); // skip comments std::istringstream issHeader(line); - issHeader >> nIDs >> nEdges >> code; - if (!strcmp(code, "010") || !strcmp(code, "011")) { + std::string s_code; + issHeader >> nIDs >> nEdges >> s_code; + if (!strcmp(s_code.c_str(), "010") || !strcmp(s_code.c_str(), "011")) { if (!(issHeader >> nWgts)) nWgts = 1; } } @@ -205,7 +205,6 @@ int verifyGenerateFiles( size_t nIDsGen, nIDsInp; size_t nEdgesGen, nEdgesInp; - char codeGen[4], codeInp[4]; int nWgtsGen = 0, nWgtsInp = 0; std::string lineGen, lineInp; @@ -217,11 +216,11 @@ int verifyGenerateFiles( // Read header info from generated file fpGen.open(graphFilenameGen.c_str(), std::ios::in); - readChacoGraphHeaderInfo(fpGen, nIDsGen, nEdgesGen, codeGen, nWgtsGen); + readChacoGraphHeaderInfo(fpGen, nIDsGen, nEdgesGen, nWgtsGen); // Read header info from input file fpInp.open(graphFilenameInp.c_str(), std::ios::in); - readChacoGraphHeaderInfo(fpInp, nIDsInp, nEdgesInp, codeInp, nWgtsInp); + readChacoGraphHeaderInfo(fpInp, nIDsInp, nEdgesInp, nWgtsInp); // input file and generated file should have same number of IDs if (nIDsGen != nIDsInp) { From 4c2c77595fa7c3c22dd609491e33d6b011692fb9 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Tue, 18 Jun 2024 14:31:18 -0600 Subject: [PATCH 55/68] Ifpack2: Fix #13118 and cleanup copy-pasted function makeLocalFilter was copy-pasted verbatim from RILUK (private static member) to RBILUK_def (free function). #13118 was because this also caused ambiguous name lookup. Instead, just make the function public static in RILUK so that it can replace all usages of the copy in RBILUK. --- .../src/Ifpack2_Experimental_RBILUK_def.hpp | 37 +------------------ packages/ifpack2/src/Ifpack2_RILUK_decl.hpp | 16 ++++---- 2 files changed, 10 insertions(+), 43 deletions(-) diff --git a/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_def.hpp b/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_def.hpp index 479299ecf90d..aa71fb3f7916 100644 --- a/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_def.hpp +++ b/packages/ifpack2/src/Ifpack2_Experimental_RBILUK_def.hpp @@ -233,39 +233,6 @@ void RBILUK::allocate_L_and_U_blocks () namespace { -template -Teuchos::RCP::row_matrix_type> -makeLocalFilter (const Teuchos::RCP::row_matrix_type>& A) -{ - using row_matrix_type = typename RBILUK::row_matrix_type; - using Teuchos::RCP; - using Teuchos::rcp; - using Teuchos::rcp_dynamic_cast; - using Teuchos::rcp_implicit_cast; - - // If A_'s communicator only has one process, or if its column and - // row Maps are the same, then it is already local, so use it - // directly. - if (A->getRowMap ()->getComm ()->getSize () == 1 || - A->getRowMap ()->isSameAs (* (A->getColMap ()))) { - return A; - } - - // If A_ is already a LocalFilter, then use it directly. This - // should be the case if RILUK is being used through - // AdditiveSchwarz, for example. - RCP > A_lf_r = - rcp_dynamic_cast > (A); - if (! A_lf_r.is_null ()) { - return rcp_implicit_cast (A_lf_r); - } - else { - // A_'s communicator has more than one process, its row Map and - // its column Map differ, and A_ is not a LocalFilter. Thus, we - // have to wrap it in a LocalFilter. - return rcp (new LocalFilter (A)); - } -} template Teuchos::RCP::crs_graph_type> @@ -281,7 +248,7 @@ getBlockCrsGraph(const Teuchos::RCP::row_matri using crs_graph_type = typename RBILUK::crs_graph_type; using block_crs_matrix_type = typename RBILUK::block_crs_matrix_type; - auto A_local = makeLocalFilter(A); + auto A_local = RBILUK::makeLocalFilter(A); { RCP > filteredA = @@ -363,7 +330,7 @@ void RBILUK::initialize () "underlying graph is fill complete."); blockSize_ = this->A_->getBlockSize(); - this->A_local_ = makeLocalFilter(this->A_); + this->A_local_ = this->makeLocalFilter(this->A_); Teuchos::Time timer ("RBILUK::initialize"); double startTime = timer.wallTime(); diff --git a/packages/ifpack2/src/Ifpack2_RILUK_decl.hpp b/packages/ifpack2/src/Ifpack2_RILUK_decl.hpp index 509e884dc815..b03145d8b860 100644 --- a/packages/ifpack2/src/Ifpack2_RILUK_decl.hpp +++ b/packages/ifpack2/src/Ifpack2_RILUK_decl.hpp @@ -568,6 +568,14 @@ class RILUK: //! Return the input matrix A as a Tpetra::CrsMatrix, if possible; else throws. Teuchos::RCP getCrsMatrix () const; + /// \brief Return A, wrapped in a LocalFilter, if necessary. + /// + /// "If necessary" means that if A is already a LocalFilter, or if + /// its communicator only has one process, then we don't need to + /// wrap it, so we just return A. + static Teuchos::RCP + makeLocalFilter (const Teuchos::RCP& A); + private: typedef Tpetra::MultiVector MV; typedef Teuchos::ScalarTraits STS; @@ -589,14 +597,6 @@ class RILUK: private: #endif - /// \brief Return A, wrapped in a LocalFilter, if necessary. - /// - /// "If necessary" means that if A is already a LocalFilter, or if - /// its communicator only has one process, then we don't need to - /// wrap it, so we just return A. - static Teuchos::RCP - makeLocalFilter (const Teuchos::RCP& A); - protected: typedef Tpetra::Vector vec_type; From 91ca080eb8d11eee059e249f188e94163749cd2b Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Fri, 14 Jun 2024 14:26:30 -0600 Subject: [PATCH 56/68] SEACAS: Make the local fmt symlinks to ioss embedded version Signed-off-by: Greg Sjaardema --- packages/seacas/libraries/aprepro_lib/fmt | 1 + .../seacas/libraries/aprepro_lib/fmt/args.h | 234 - .../seacas/libraries/aprepro_lib/fmt/chrono.h | 2097 -------- .../seacas/libraries/aprepro_lib/fmt/color.h | 655 --- .../libraries/aprepro_lib/fmt/compile.h | 611 --- .../seacas/libraries/aprepro_lib/fmt/core.h | 3343 ------------- .../libraries/aprepro_lib/fmt/format-inl.h | 1759 ------- .../seacas/libraries/aprepro_lib/fmt/format.h | 4312 ----------------- .../seacas/libraries/aprepro_lib/fmt/locale.h | 2 - .../seacas/libraries/aprepro_lib/fmt/os.h | 460 -- .../libraries/aprepro_lib/fmt/ostream.h | 237 - .../seacas/libraries/aprepro_lib/fmt/printf.h | 640 --- .../seacas/libraries/aprepro_lib/fmt/ranges.h | 722 --- .../seacas/libraries/aprepro_lib/fmt/std.h | 289 -- .../seacas/libraries/aprepro_lib/fmt/xchar.h | 250 - packages/seacas/libraries/suplib_cpp/fmt | 1 + .../seacas/libraries/suplib_cpp/fmt/args.h | 234 - .../seacas/libraries/suplib_cpp/fmt/chrono.h | 2097 -------- .../seacas/libraries/suplib_cpp/fmt/color.h | 655 --- .../seacas/libraries/suplib_cpp/fmt/compile.h | 611 --- .../seacas/libraries/suplib_cpp/fmt/core.h | 3343 ------------- .../libraries/suplib_cpp/fmt/format-inl.h | 1759 ------- .../seacas/libraries/suplib_cpp/fmt/format.h | 4312 ----------------- .../seacas/libraries/suplib_cpp/fmt/locale.h | 2 - packages/seacas/libraries/suplib_cpp/fmt/os.h | 460 -- .../seacas/libraries/suplib_cpp/fmt/ostream.h | 237 - .../seacas/libraries/suplib_cpp/fmt/printf.h | 640 --- .../seacas/libraries/suplib_cpp/fmt/ranges.h | 722 --- .../seacas/libraries/suplib_cpp/fmt/std.h | 289 -- .../seacas/libraries/suplib_cpp/fmt/xchar.h | 250 - 30 files changed, 2 insertions(+), 31222 deletions(-) create mode 120000 packages/seacas/libraries/aprepro_lib/fmt delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/args.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/chrono.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/color.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/compile.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/core.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/format-inl.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/format.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/locale.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/os.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/ostream.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/printf.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/ranges.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/std.h delete mode 100644 packages/seacas/libraries/aprepro_lib/fmt/xchar.h create mode 120000 packages/seacas/libraries/suplib_cpp/fmt delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/args.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/chrono.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/color.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/compile.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/core.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/format-inl.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/format.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/locale.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/os.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/ostream.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/printf.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/ranges.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/std.h delete mode 100644 packages/seacas/libraries/suplib_cpp/fmt/xchar.h diff --git a/packages/seacas/libraries/aprepro_lib/fmt b/packages/seacas/libraries/aprepro_lib/fmt new file mode 120000 index 000000000000..0e60d1195ea8 --- /dev/null +++ b/packages/seacas/libraries/aprepro_lib/fmt @@ -0,0 +1 @@ +../ioss/src/private_copy_fmt/fmt/ \ No newline at end of file diff --git a/packages/seacas/libraries/aprepro_lib/fmt/args.h b/packages/seacas/libraries/aprepro_lib/fmt/args.h deleted file mode 100644 index a3966d140719..000000000000 --- a/packages/seacas/libraries/aprepro_lib/fmt/args.h +++ /dev/null @@ -1,234 +0,0 @@ -// Formatting library for C++ - dynamic format arguments -// -// Copyright (c) 2012 - present, Victor Zverovich -// All rights reserved. -// -// For the license information refer to format.h. - -#ifndef FMT_ARGS_H_ -#define FMT_ARGS_H_ - -#include // std::reference_wrapper -#include // std::unique_ptr -#include - -#include "core.h" - -FMT_BEGIN_NAMESPACE - -namespace detail { - -template struct is_reference_wrapper : std::false_type {}; -template -struct is_reference_wrapper> : std::true_type {}; - -template const T& unwrap(const T& v) { return v; } -template const T& unwrap(const std::reference_wrapper& v) { - return static_cast(v); -} - -class dynamic_arg_list { - // Workaround for clang's -Wweak-vtables. Unlike for regular classes, for - // templates it doesn't complain about inability to deduce single translation - // unit for placing vtable. So storage_node_base is made a fake template. - template struct node { - virtual ~node() = default; - std::unique_ptr> next; - }; - - template struct typed_node : node<> { - T value; - - template - FMT_CONSTEXPR typed_node(const Arg& arg) : value(arg) {} - - template - FMT_CONSTEXPR typed_node(const basic_string_view& arg) - : value(arg.data(), arg.size()) {} - }; - - std::unique_ptr> head_; - - public: - template const T& push(const Arg& arg) { - auto new_node = std::unique_ptr>(new typed_node(arg)); - auto& value = new_node->value; - new_node->next = std::move(head_); - head_ = std::move(new_node); - return value; - } -}; -} // namespace detail - -/** - \rst - A dynamic version of `fmt::format_arg_store`. - It's equipped with a storage to potentially temporary objects which lifetimes - could be shorter than the format arguments object. - - It can be implicitly converted into `~fmt::basic_format_args` for passing - into type-erased formatting functions such as `~fmt::vformat`. - \endrst - */ -template -class dynamic_format_arg_store -#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 - // Workaround a GCC template argument substitution bug. - : public basic_format_args -#endif -{ - private: - using char_type = typename Context::char_type; - - template struct need_copy { - static constexpr detail::type mapped_type = - detail::mapped_type_constant::value; - - enum { - value = !(detail::is_reference_wrapper::value || - std::is_same>::value || - std::is_same>::value || - (mapped_type != detail::type::cstring_type && - mapped_type != detail::type::string_type && - mapped_type != detail::type::custom_type)) - }; - }; - - template - using stored_type = conditional_t< - std::is_convertible>::value && - !detail::is_reference_wrapper::value, - std::basic_string, T>; - - // Storage of basic_format_arg must be contiguous. - std::vector> data_; - std::vector> named_info_; - - // Storage of arguments not fitting into basic_format_arg must grow - // without relocation because items in data_ refer to it. - detail::dynamic_arg_list dynamic_args_; - - friend class basic_format_args; - - unsigned long long get_types() const { - return detail::is_unpacked_bit | data_.size() | - (named_info_.empty() - ? 0ULL - : static_cast(detail::has_named_args_bit)); - } - - const basic_format_arg* data() const { - return named_info_.empty() ? data_.data() : data_.data() + 1; - } - - template void emplace_arg(const T& arg) { - data_.emplace_back(detail::make_arg(arg)); - } - - template - void emplace_arg(const detail::named_arg& arg) { - if (named_info_.empty()) { - constexpr const detail::named_arg_info* zero_ptr{nullptr}; - data_.insert(data_.begin(), {zero_ptr, 0}); - } - data_.emplace_back(detail::make_arg(detail::unwrap(arg.value))); - auto pop_one = [](std::vector>* data) { - data->pop_back(); - }; - std::unique_ptr>, decltype(pop_one)> - guard{&data_, pop_one}; - named_info_.push_back({arg.name, static_cast(data_.size() - 2u)}); - data_[0].value_.named_args = {named_info_.data(), named_info_.size()}; - guard.release(); - } - - public: - constexpr dynamic_format_arg_store() = default; - - /** - \rst - Adds an argument into the dynamic store for later passing to a formatting - function. - - Note that custom types and string types (but not string views) are copied - into the store dynamically allocating memory if necessary. - - **Example**:: - - fmt::dynamic_format_arg_store store; - store.push_back(42); - store.push_back("abc"); - store.push_back(1.5f); - std::string result = fmt::vformat("{} and {} and {}", store); - \endrst - */ - template void push_back(const T& arg) { - if (detail::const_check(need_copy::value)) - emplace_arg(dynamic_args_.push>(arg)); - else - emplace_arg(detail::unwrap(arg)); - } - - /** - \rst - Adds a reference to the argument into the dynamic store for later passing to - a formatting function. - - **Example**:: - - fmt::dynamic_format_arg_store store; - char band[] = "Rolling Stones"; - store.push_back(std::cref(band)); - band[9] = 'c'; // Changing str affects the output. - std::string result = fmt::vformat("{}", store); - // result == "Rolling Scones" - \endrst - */ - template void push_back(std::reference_wrapper arg) { - static_assert( - need_copy::value, - "objects of built-in types and string views are always copied"); - emplace_arg(arg.get()); - } - - /** - Adds named argument into the dynamic store for later passing to a formatting - function. ``std::reference_wrapper`` is supported to avoid copying of the - argument. The name is always copied into the store. - */ - template - void push_back(const detail::named_arg& arg) { - const char_type* arg_name = - dynamic_args_.push>(arg.name).c_str(); - if (detail::const_check(need_copy::value)) { - emplace_arg( - fmt::arg(arg_name, dynamic_args_.push>(arg.value))); - } else { - emplace_arg(fmt::arg(arg_name, arg.value)); - } - } - - /** Erase all elements from the store */ - void clear() { - data_.clear(); - named_info_.clear(); - dynamic_args_ = detail::dynamic_arg_list(); - } - - /** - \rst - Reserves space to store at least *new_cap* arguments including - *new_cap_named* named arguments. - \endrst - */ - void reserve(size_t new_cap, size_t new_cap_named) { - FMT_ASSERT(new_cap >= new_cap_named, - "Set of arguments includes set of named arguments"); - data_.reserve(new_cap); - named_info_.reserve(new_cap_named); - } -}; - -FMT_END_NAMESPACE - -#endif // FMT_ARGS_H_ diff --git a/packages/seacas/libraries/aprepro_lib/fmt/chrono.h b/packages/seacas/libraries/aprepro_lib/fmt/chrono.h deleted file mode 100644 index 1a8d8d04c2aa..000000000000 --- a/packages/seacas/libraries/aprepro_lib/fmt/chrono.h +++ /dev/null @@ -1,2097 +0,0 @@ -// Formatting library for C++ - chrono support -// -// Copyright (c) 2012 - present, Victor Zverovich -// All rights reserved. -// -// For the license information refer to format.h. - -#ifndef FMT_CHRONO_H_ -#define FMT_CHRONO_H_ - -#include -#include -#include // std::isfinite -#include // std::memcpy -#include -#include -#include -#include -#include - -#include "format.h" - -FMT_BEGIN_NAMESPACE - -// Check if std::chrono::utc_timestamp is available. -#ifndef FMT_USE_UTC_TIME -# ifdef __cpp_lib_chrono -# define FMT_USE_UTC_TIME (__cpp_lib_chrono >= 201907L) -# else -# define FMT_USE_UTC_TIME 0 -# endif -#endif - -// Enable tzset. -#ifndef FMT_USE_TZSET -// UWP doesn't provide _tzset. -# if FMT_HAS_INCLUDE("winapifamily.h") -# include -# endif -# if defined(_WIN32) && (!defined(WINAPI_FAMILY) || \ - (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)) -# define FMT_USE_TZSET 1 -# else -# define FMT_USE_TZSET 0 -# endif -#endif - -// Enable safe chrono durations, unless explicitly disabled. -#ifndef FMT_SAFE_DURATION_CAST -# define FMT_SAFE_DURATION_CAST 1 -#endif -#if FMT_SAFE_DURATION_CAST - -// For conversion between std::chrono::durations without undefined -// behaviour or erroneous results. -// This is a stripped down version of duration_cast, for inclusion in fmt. -// See https://github.com/pauldreik/safe_duration_cast -// -// Copyright Paul Dreik 2019 -namespace safe_duration_cast { - -template ::value && - std::numeric_limits::is_signed == - std::numeric_limits::is_signed)> -FMT_CONSTEXPR To lossless_integral_conversion(const From from, int& ec) { - ec = 0; - using F = std::numeric_limits; - using T = std::numeric_limits; - static_assert(F::is_integer, "From must be integral"); - static_assert(T::is_integer, "To must be integral"); - - // A and B are both signed, or both unsigned. - if (detail::const_check(F::digits <= T::digits)) { - // From fits in To without any problem. - } else { - // From does not always fit in To, resort to a dynamic check. - if (from < (T::min)() || from > (T::max)()) { - // outside range. - ec = 1; - return {}; - } - } - return static_cast(from); -} - -/** - * converts From to To, without loss. If the dynamic value of from - * can't be converted to To without loss, ec is set. - */ -template ::value && - std::numeric_limits::is_signed != - std::numeric_limits::is_signed)> -FMT_CONSTEXPR To lossless_integral_conversion(const From from, int& ec) { - ec = 0; - using F = std::numeric_limits; - using T = std::numeric_limits; - static_assert(F::is_integer, "From must be integral"); - static_assert(T::is_integer, "To must be integral"); - - if (detail::const_check(F::is_signed && !T::is_signed)) { - // From may be negative, not allowed! - if (fmt::detail::is_negative(from)) { - ec = 1; - return {}; - } - // From is positive. Can it always fit in To? - if (detail::const_check(F::digits > T::digits) && - from > static_cast(detail::max_value())) { - ec = 1; - return {}; - } - } - - if (detail::const_check(!F::is_signed && T::is_signed && - F::digits >= T::digits) && - from > static_cast(detail::max_value())) { - ec = 1; - return {}; - } - return static_cast(from); // Lossless conversion. -} - -template ::value)> -FMT_CONSTEXPR To lossless_integral_conversion(const From from, int& ec) { - ec = 0; - return from; -} // function - -// clang-format off -/** - * converts From to To if possible, otherwise ec is set. - * - * input | output - * ---------------------------------|--------------- - * NaN | NaN - * Inf | Inf - * normal, fits in output | converted (possibly lossy) - * normal, does not fit in output | ec is set - * subnormal | best effort - * -Inf | -Inf - */ -// clang-format on -template ::value)> -FMT_CONSTEXPR To safe_float_conversion(const From from, int& ec) { - ec = 0; - using T = std::numeric_limits; - static_assert(std::is_floating_point::value, "From must be floating"); - static_assert(std::is_floating_point::value, "To must be floating"); - - // catch the only happy case - if (std::isfinite(from)) { - if (from >= T::lowest() && from <= (T::max)()) { - return static_cast(from); - } - // not within range. - ec = 1; - return {}; - } - - // nan and inf will be preserved - return static_cast(from); -} // function - -template ::value)> -FMT_CONSTEXPR To safe_float_conversion(const From from, int& ec) { - ec = 0; - static_assert(std::is_floating_point::value, "From must be floating"); - return from; -} - -/** - * safe duration cast between integral durations - */ -template ::value), - FMT_ENABLE_IF(std::is_integral::value)> -To safe_duration_cast(std::chrono::duration from, - int& ec) { - using From = std::chrono::duration; - ec = 0; - // the basic idea is that we need to convert from count() in the from type - // to count() in the To type, by multiplying it with this: - struct Factor - : std::ratio_divide {}; - - static_assert(Factor::num > 0, "num must be positive"); - static_assert(Factor::den > 0, "den must be positive"); - - // the conversion is like this: multiply from.count() with Factor::num - // /Factor::den and convert it to To::rep, all this without - // overflow/underflow. let's start by finding a suitable type that can hold - // both To, From and Factor::num - using IntermediateRep = - typename std::common_type::type; - - // safe conversion to IntermediateRep - IntermediateRep count = - lossless_integral_conversion(from.count(), ec); - if (ec) return {}; - // multiply with Factor::num without overflow or underflow - if (detail::const_check(Factor::num != 1)) { - const auto max1 = detail::max_value() / Factor::num; - if (count > max1) { - ec = 1; - return {}; - } - const auto min1 = - (std::numeric_limits::min)() / Factor::num; - if (!std::is_unsigned::value && count < min1) { - ec = 1; - return {}; - } - count *= Factor::num; - } - - if (detail::const_check(Factor::den != 1)) count /= Factor::den; - auto tocount = lossless_integral_conversion(count, ec); - return ec ? To() : To(tocount); -} - -/** - * safe duration_cast between floating point durations - */ -template ::value), - FMT_ENABLE_IF(std::is_floating_point::value)> -To safe_duration_cast(std::chrono::duration from, - int& ec) { - using From = std::chrono::duration; - ec = 0; - if (std::isnan(from.count())) { - // nan in, gives nan out. easy. - return To{std::numeric_limits::quiet_NaN()}; - } - // maybe we should also check if from is denormal, and decide what to do about - // it. - - // +-inf should be preserved. - if (std::isinf(from.count())) { - return To{from.count()}; - } - - // the basic idea is that we need to convert from count() in the from type - // to count() in the To type, by multiplying it with this: - struct Factor - : std::ratio_divide {}; - - static_assert(Factor::num > 0, "num must be positive"); - static_assert(Factor::den > 0, "den must be positive"); - - // the conversion is like this: multiply from.count() with Factor::num - // /Factor::den and convert it to To::rep, all this without - // overflow/underflow. let's start by finding a suitable type that can hold - // both To, From and Factor::num - using IntermediateRep = - typename std::common_type::type; - - // force conversion of From::rep -> IntermediateRep to be safe, - // even if it will never happen be narrowing in this context. - IntermediateRep count = - safe_float_conversion(from.count(), ec); - if (ec) { - return {}; - } - - // multiply with Factor::num without overflow or underflow - if (detail::const_check(Factor::num != 1)) { - constexpr auto max1 = detail::max_value() / - static_cast(Factor::num); - if (count > max1) { - ec = 1; - return {}; - } - constexpr auto min1 = std::numeric_limits::lowest() / - static_cast(Factor::num); - if (count < min1) { - ec = 1; - return {}; - } - count *= static_cast(Factor::num); - } - - // this can't go wrong, right? den>0 is checked earlier. - if (detail::const_check(Factor::den != 1)) { - using common_t = typename std::common_type::type; - count /= static_cast(Factor::den); - } - - // convert to the to type, safely - using ToRep = typename To::rep; - - const ToRep tocount = safe_float_conversion(count, ec); - if (ec) { - return {}; - } - return To{tocount}; -} -} // namespace safe_duration_cast -#endif - -// Prevents expansion of a preceding token as a function-style macro. -// Usage: f FMT_NOMACRO() -#define FMT_NOMACRO - -namespace detail { -template struct null {}; -inline null<> localtime_r FMT_NOMACRO(...) { return null<>(); } -inline null<> localtime_s(...) { return null<>(); } -inline null<> gmtime_r(...) { return null<>(); } -inline null<> gmtime_s(...) { return null<>(); } - -inline const std::locale& get_classic_locale() { - static const auto& locale = std::locale::classic(); - return locale; -} - -template struct codecvt_result { - static constexpr const size_t max_size = 32; - CodeUnit buf[max_size]; - CodeUnit* end; -}; -template -constexpr const size_t codecvt_result::max_size; - -template -void write_codecvt(codecvt_result& out, string_view in_buf, - const std::locale& loc) { -#if FMT_CLANG_VERSION -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wdeprecated" - auto& f = std::use_facet>(loc); -# pragma clang diagnostic pop -#else - auto& f = std::use_facet>(loc); -#endif - auto mb = std::mbstate_t(); - const char* from_next = nullptr; - auto result = f.in(mb, in_buf.begin(), in_buf.end(), from_next, - std::begin(out.buf), std::end(out.buf), out.end); - if (result != std::codecvt_base::ok) - FMT_THROW(format_error("failed to format time")); -} - -template -auto write_encoded_tm_str(OutputIt out, string_view in, const std::locale& loc) - -> OutputIt { - if (detail::is_utf8() && loc != get_classic_locale()) { - // char16_t and char32_t codecvts are broken in MSVC (linkage errors) and - // gcc-4. -#if FMT_MSC_VERSION != 0 || \ - (defined(__GLIBCXX__) && !defined(_GLIBCXX_USE_DUAL_ABI)) - // The _GLIBCXX_USE_DUAL_ABI macro is always defined in libstdc++ from gcc-5 - // and newer. - using code_unit = wchar_t; -#else - using code_unit = char32_t; -#endif - - using unit_t = codecvt_result; - unit_t unit; - write_codecvt(unit, in, loc); - // In UTF-8 is used one to four one-byte code units. - auto&& buf = basic_memory_buffer(); - for (code_unit* p = unit.buf; p != unit.end; ++p) { - uint32_t c = static_cast(*p); - if (sizeof(code_unit) == 2 && c >= 0xd800 && c <= 0xdfff) { - // surrogate pair - ++p; - if (p == unit.end || (c & 0xfc00) != 0xd800 || - (*p & 0xfc00) != 0xdc00) { - FMT_THROW(format_error("failed to format time")); - } - c = (c << 10) + static_cast(*p) - 0x35fdc00; - } - if (c < 0x80) { - buf.push_back(static_cast(c)); - } else if (c < 0x800) { - buf.push_back(static_cast(0xc0 | (c >> 6))); - buf.push_back(static_cast(0x80 | (c & 0x3f))); - } else if ((c >= 0x800 && c <= 0xd7ff) || (c >= 0xe000 && c <= 0xffff)) { - buf.push_back(static_cast(0xe0 | (c >> 12))); - buf.push_back(static_cast(0x80 | ((c & 0xfff) >> 6))); - buf.push_back(static_cast(0x80 | (c & 0x3f))); - } else if (c >= 0x10000 && c <= 0x10ffff) { - buf.push_back(static_cast(0xf0 | (c >> 18))); - buf.push_back(static_cast(0x80 | ((c & 0x3ffff) >> 12))); - buf.push_back(static_cast(0x80 | ((c & 0xfff) >> 6))); - buf.push_back(static_cast(0x80 | (c & 0x3f))); - } else { - FMT_THROW(format_error("failed to format time")); - } - } - return copy_str(buf.data(), buf.data() + buf.size(), out); - } - return copy_str(in.data(), in.data() + in.size(), out); -} - -template ::value)> -auto write_tm_str(OutputIt out, string_view sv, const std::locale& loc) - -> OutputIt { - codecvt_result unit; - write_codecvt(unit, sv, loc); - return copy_str(unit.buf, unit.end, out); -} - -template ::value)> -auto write_tm_str(OutputIt out, string_view sv, const std::locale& loc) - -> OutputIt { - return write_encoded_tm_str(out, sv, loc); -} - -template -inline void do_write(buffer& buf, const std::tm& time, - const std::locale& loc, char format, char modifier) { - auto&& format_buf = formatbuf>(buf); - auto&& os = std::basic_ostream(&format_buf); - os.imbue(loc); - using iterator = std::ostreambuf_iterator; - const auto& facet = std::use_facet>(loc); - auto end = facet.put(os, os, Char(' '), &time, format, modifier); - if (end.failed()) FMT_THROW(format_error("failed to format time")); -} - -template ::value)> -auto write(OutputIt out, const std::tm& time, const std::locale& loc, - char format, char modifier = 0) -> OutputIt { - auto&& buf = get_buffer(out); - do_write(buf, time, loc, format, modifier); - return get_iterator(buf, out); -} - -template ::value)> -auto write(OutputIt out, const std::tm& time, const std::locale& loc, - char format, char modifier = 0) -> OutputIt { - auto&& buf = basic_memory_buffer(); - do_write(buf, time, loc, format, modifier); - return write_encoded_tm_str(out, string_view(buf.data(), buf.size()), loc); -} - -} // namespace detail - -FMT_MODULE_EXPORT_BEGIN - -/** - Converts given time since epoch as ``std::time_t`` value into calendar time, - expressed in local time. Unlike ``std::localtime``, this function is - thread-safe on most platforms. - */ -inline std::tm localtime(std::time_t time) { - struct dispatcher { - std::time_t time_; - std::tm tm_; - - dispatcher(std::time_t t) : time_(t) {} - - bool run() { - using namespace fmt::detail; - return handle(localtime_r(&time_, &tm_)); - } - - bool handle(std::tm* tm) { return tm != nullptr; } - - bool handle(detail::null<>) { - using namespace fmt::detail; - return fallback(localtime_s(&tm_, &time_)); - } - - bool fallback(int res) { return res == 0; } - -#if !FMT_MSC_VERSION - bool fallback(detail::null<>) { - using namespace fmt::detail; - std::tm* tm = std::localtime(&time_); - if (tm) tm_ = *tm; - return tm != nullptr; - } -#endif - }; - dispatcher lt(time); - // Too big time values may be unsupported. - if (!lt.run()) FMT_THROW(format_error("time_t value out of range")); - return lt.tm_; -} - -inline std::tm localtime( - std::chrono::time_point time_point) { - return localtime(std::chrono::system_clock::to_time_t(time_point)); -} - -/** - Converts given time since epoch as ``std::time_t`` value into calendar time, - expressed in Coordinated Universal Time (UTC). Unlike ``std::gmtime``, this - function is thread-safe on most platforms. - */ -inline std::tm gmtime(std::time_t time) { - struct dispatcher { - std::time_t time_; - std::tm tm_; - - dispatcher(std::time_t t) : time_(t) {} - - bool run() { - using namespace fmt::detail; - return handle(gmtime_r(&time_, &tm_)); - } - - bool handle(std::tm* tm) { return tm != nullptr; } - - bool handle(detail::null<>) { - using namespace fmt::detail; - return fallback(gmtime_s(&tm_, &time_)); - } - - bool fallback(int res) { return res == 0; } - -#if !FMT_MSC_VERSION - bool fallback(detail::null<>) { - std::tm* tm = std::gmtime(&time_); - if (tm) tm_ = *tm; - return tm != nullptr; - } -#endif - }; - dispatcher gt(time); - // Too big time values may be unsupported. - if (!gt.run()) FMT_THROW(format_error("time_t value out of range")); - return gt.tm_; -} - -inline std::tm gmtime( - std::chrono::time_point time_point) { - return gmtime(std::chrono::system_clock::to_time_t(time_point)); -} - -FMT_BEGIN_DETAIL_NAMESPACE - -// Writes two-digit numbers a, b and c separated by sep to buf. -// The method by Pavel Novikov based on -// https://johnnylee-sde.github.io/Fast-unsigned-integer-to-time-string/. -inline void write_digit2_separated(char* buf, unsigned a, unsigned b, - unsigned c, char sep) { - unsigned long long digits = - a | (b << 24) | (static_cast(c) << 48); - // Convert each value to BCD. - // We have x = a * 10 + b and we want to convert it to BCD y = a * 16 + b. - // The difference is - // y - x = a * 6 - // a can be found from x: - // a = floor(x / 10) - // then - // y = x + a * 6 = x + floor(x / 10) * 6 - // floor(x / 10) is (x * 205) >> 11 (needs 16 bits). - digits += (((digits * 205) >> 11) & 0x000f00000f00000f) * 6; - // Put low nibbles to high bytes and high nibbles to low bytes. - digits = ((digits & 0x00f00000f00000f0) >> 4) | - ((digits & 0x000f00000f00000f) << 8); - auto usep = static_cast(sep); - // Add ASCII '0' to each digit byte and insert separators. - digits |= 0x3030003030003030 | (usep << 16) | (usep << 40); - - constexpr const size_t len = 8; - if (const_check(is_big_endian())) { - char tmp[len]; - std::memcpy(tmp, &digits, len); - std::reverse_copy(tmp, tmp + len, buf); - } else { - std::memcpy(buf, &digits, len); - } -} - -template FMT_CONSTEXPR inline const char* get_units() { - if (std::is_same::value) return "as"; - if (std::is_same::value) return "fs"; - if (std::is_same::value) return "ps"; - if (std::is_same::value) return "ns"; - if (std::is_same::value) return "µs"; - if (std::is_same::value) return "ms"; - if (std::is_same::value) return "cs"; - if (std::is_same::value) return "ds"; - if (std::is_same>::value) return "s"; - if (std::is_same::value) return "das"; - if (std::is_same::value) return "hs"; - if (std::is_same::value) return "ks"; - if (std::is_same::value) return "Ms"; - if (std::is_same::value) return "Gs"; - if (std::is_same::value) return "Ts"; - if (std::is_same::value) return "Ps"; - if (std::is_same::value) return "Es"; - if (std::is_same>::value) return "m"; - if (std::is_same>::value) return "h"; - return nullptr; -} - -enum class numeric_system { - standard, - // Alternative numeric system, e.g. å二 instead of 12 in ja_JP locale. - alternative -}; - -// Parses a put_time-like format string and invokes handler actions. -template -FMT_CONSTEXPR const Char* parse_chrono_format(const Char* begin, - const Char* end, - Handler&& handler) { - auto ptr = begin; - while (ptr != end) { - auto c = *ptr; - if (c == '}') break; - if (c != '%') { - ++ptr; - continue; - } - if (begin != ptr) handler.on_text(begin, ptr); - ++ptr; // consume '%' - if (ptr == end) FMT_THROW(format_error("invalid format")); - c = *ptr++; - switch (c) { - case '%': - handler.on_text(ptr - 1, ptr); - break; - case 'n': { - const Char newline[] = {'\n'}; - handler.on_text(newline, newline + 1); - break; - } - case 't': { - const Char tab[] = {'\t'}; - handler.on_text(tab, tab + 1); - break; - } - // Year: - case 'Y': - handler.on_year(numeric_system::standard); - break; - case 'y': - handler.on_short_year(numeric_system::standard); - break; - case 'C': - handler.on_century(numeric_system::standard); - break; - case 'G': - handler.on_iso_week_based_year(); - break; - case 'g': - handler.on_iso_week_based_short_year(); - break; - // Day of the week: - case 'a': - handler.on_abbr_weekday(); - break; - case 'A': - handler.on_full_weekday(); - break; - case 'w': - handler.on_dec0_weekday(numeric_system::standard); - break; - case 'u': - handler.on_dec1_weekday(numeric_system::standard); - break; - // Month: - case 'b': - case 'h': - handler.on_abbr_month(); - break; - case 'B': - handler.on_full_month(); - break; - case 'm': - handler.on_dec_month(numeric_system::standard); - break; - // Day of the year/month: - case 'U': - handler.on_dec0_week_of_year(numeric_system::standard); - break; - case 'W': - handler.on_dec1_week_of_year(numeric_system::standard); - break; - case 'V': - handler.on_iso_week_of_year(numeric_system::standard); - break; - case 'j': - handler.on_day_of_year(); - break; - case 'd': - handler.on_day_of_month(numeric_system::standard); - break; - case 'e': - handler.on_day_of_month_space(numeric_system::standard); - break; - // Hour, minute, second: - case 'H': - handler.on_24_hour(numeric_system::standard); - break; - case 'I': - handler.on_12_hour(numeric_system::standard); - break; - case 'M': - handler.on_minute(numeric_system::standard); - break; - case 'S': - handler.on_second(numeric_system::standard); - break; - // Other: - case 'c': - handler.on_datetime(numeric_system::standard); - break; - case 'x': - handler.on_loc_date(numeric_system::standard); - break; - case 'X': - handler.on_loc_time(numeric_system::standard); - break; - case 'D': - handler.on_us_date(); - break; - case 'F': - handler.on_iso_date(); - break; - case 'r': - handler.on_12_hour_time(); - break; - case 'R': - handler.on_24_hour_time(); - break; - case 'T': - handler.on_iso_time(); - break; - case 'p': - handler.on_am_pm(); - break; - case 'Q': - handler.on_duration_value(); - break; - case 'q': - handler.on_duration_unit(); - break; - case 'z': - handler.on_utc_offset(); - break; - case 'Z': - handler.on_tz_name(); - break; - // Alternative representation: - case 'E': { - if (ptr == end) FMT_THROW(format_error("invalid format")); - c = *ptr++; - switch (c) { - case 'Y': - handler.on_year(numeric_system::alternative); - break; - case 'y': - handler.on_offset_year(); - break; - case 'C': - handler.on_century(numeric_system::alternative); - break; - case 'c': - handler.on_datetime(numeric_system::alternative); - break; - case 'x': - handler.on_loc_date(numeric_system::alternative); - break; - case 'X': - handler.on_loc_time(numeric_system::alternative); - break; - default: - FMT_THROW(format_error("invalid format")); - } - break; - } - case 'O': - if (ptr == end) FMT_THROW(format_error("invalid format")); - c = *ptr++; - switch (c) { - case 'y': - handler.on_short_year(numeric_system::alternative); - break; - case 'm': - handler.on_dec_month(numeric_system::alternative); - break; - case 'U': - handler.on_dec0_week_of_year(numeric_system::alternative); - break; - case 'W': - handler.on_dec1_week_of_year(numeric_system::alternative); - break; - case 'V': - handler.on_iso_week_of_year(numeric_system::alternative); - break; - case 'd': - handler.on_day_of_month(numeric_system::alternative); - break; - case 'e': - handler.on_day_of_month_space(numeric_system::alternative); - break; - case 'w': - handler.on_dec0_weekday(numeric_system::alternative); - break; - case 'u': - handler.on_dec1_weekday(numeric_system::alternative); - break; - case 'H': - handler.on_24_hour(numeric_system::alternative); - break; - case 'I': - handler.on_12_hour(numeric_system::alternative); - break; - case 'M': - handler.on_minute(numeric_system::alternative); - break; - case 'S': - handler.on_second(numeric_system::alternative); - break; - default: - FMT_THROW(format_error("invalid format")); - } - break; - default: - FMT_THROW(format_error("invalid format")); - } - begin = ptr; - } - if (begin != ptr) handler.on_text(begin, ptr); - return ptr; -} - -template struct null_chrono_spec_handler { - FMT_CONSTEXPR void unsupported() { - static_cast(this)->unsupported(); - } - FMT_CONSTEXPR void on_year(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_short_year(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_offset_year() { unsupported(); } - FMT_CONSTEXPR void on_century(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_iso_week_based_year() { unsupported(); } - FMT_CONSTEXPR void on_iso_week_based_short_year() { unsupported(); } - FMT_CONSTEXPR void on_abbr_weekday() { unsupported(); } - FMT_CONSTEXPR void on_full_weekday() { unsupported(); } - FMT_CONSTEXPR void on_dec0_weekday(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_dec1_weekday(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_abbr_month() { unsupported(); } - FMT_CONSTEXPR void on_full_month() { unsupported(); } - FMT_CONSTEXPR void on_dec_month(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_dec1_week_of_year(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_iso_week_of_year(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_day_of_year() { unsupported(); } - FMT_CONSTEXPR void on_day_of_month(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_day_of_month_space(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_24_hour(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_12_hour(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_minute(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_second(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_datetime(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_loc_date(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_loc_time(numeric_system) { unsupported(); } - FMT_CONSTEXPR void on_us_date() { unsupported(); } - FMT_CONSTEXPR void on_iso_date() { unsupported(); } - FMT_CONSTEXPR void on_12_hour_time() { unsupported(); } - FMT_CONSTEXPR void on_24_hour_time() { unsupported(); } - FMT_CONSTEXPR void on_iso_time() { unsupported(); } - FMT_CONSTEXPR void on_am_pm() { unsupported(); } - FMT_CONSTEXPR void on_duration_value() { unsupported(); } - FMT_CONSTEXPR void on_duration_unit() { unsupported(); } - FMT_CONSTEXPR void on_utc_offset() { unsupported(); } - FMT_CONSTEXPR void on_tz_name() { unsupported(); } -}; - -struct tm_format_checker : null_chrono_spec_handler { - FMT_NORETURN void unsupported() { FMT_THROW(format_error("no format")); } - - template - FMT_CONSTEXPR void on_text(const Char*, const Char*) {} - FMT_CONSTEXPR void on_year(numeric_system) {} - FMT_CONSTEXPR void on_short_year(numeric_system) {} - FMT_CONSTEXPR void on_offset_year() {} - FMT_CONSTEXPR void on_century(numeric_system) {} - FMT_CONSTEXPR void on_iso_week_based_year() {} - FMT_CONSTEXPR void on_iso_week_based_short_year() {} - FMT_CONSTEXPR void on_abbr_weekday() {} - FMT_CONSTEXPR void on_full_weekday() {} - FMT_CONSTEXPR void on_dec0_weekday(numeric_system) {} - FMT_CONSTEXPR void on_dec1_weekday(numeric_system) {} - FMT_CONSTEXPR void on_abbr_month() {} - FMT_CONSTEXPR void on_full_month() {} - FMT_CONSTEXPR void on_dec_month(numeric_system) {} - FMT_CONSTEXPR void on_dec0_week_of_year(numeric_system) {} - FMT_CONSTEXPR void on_dec1_week_of_year(numeric_system) {} - FMT_CONSTEXPR void on_iso_week_of_year(numeric_system) {} - FMT_CONSTEXPR void on_day_of_year() {} - FMT_CONSTEXPR void on_day_of_month(numeric_system) {} - FMT_CONSTEXPR void on_day_of_month_space(numeric_system) {} - FMT_CONSTEXPR void on_24_hour(numeric_system) {} - FMT_CONSTEXPR void on_12_hour(numeric_system) {} - FMT_CONSTEXPR void on_minute(numeric_system) {} - FMT_CONSTEXPR void on_second(numeric_system) {} - FMT_CONSTEXPR void on_datetime(numeric_system) {} - FMT_CONSTEXPR void on_loc_date(numeric_system) {} - FMT_CONSTEXPR void on_loc_time(numeric_system) {} - FMT_CONSTEXPR void on_us_date() {} - FMT_CONSTEXPR void on_iso_date() {} - FMT_CONSTEXPR void on_12_hour_time() {} - FMT_CONSTEXPR void on_24_hour_time() {} - FMT_CONSTEXPR void on_iso_time() {} - FMT_CONSTEXPR void on_am_pm() {} - FMT_CONSTEXPR void on_utc_offset() {} - FMT_CONSTEXPR void on_tz_name() {} -}; - -inline const char* tm_wday_full_name(int wday) { - static constexpr const char* full_name_list[] = { - "Sunday", "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday"}; - return wday >= 0 && wday <= 6 ? full_name_list[wday] : "?"; -} -inline const char* tm_wday_short_name(int wday) { - static constexpr const char* short_name_list[] = {"Sun", "Mon", "Tue", "Wed", - "Thu", "Fri", "Sat"}; - return wday >= 0 && wday <= 6 ? short_name_list[wday] : "???"; -} - -inline const char* tm_mon_full_name(int mon) { - static constexpr const char* full_name_list[] = { - "January", "February", "March", "April", "May", "June", - "July", "August", "September", "October", "November", "December"}; - return mon >= 0 && mon <= 11 ? full_name_list[mon] : "?"; -} -inline const char* tm_mon_short_name(int mon) { - static constexpr const char* short_name_list[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", - }; - return mon >= 0 && mon <= 11 ? short_name_list[mon] : "???"; -} - -template -struct has_member_data_tm_gmtoff : std::false_type {}; -template -struct has_member_data_tm_gmtoff> - : std::true_type {}; - -template -struct has_member_data_tm_zone : std::false_type {}; -template -struct has_member_data_tm_zone> - : std::true_type {}; - -#if FMT_USE_TZSET -inline void tzset_once() { - static bool init = []() -> bool { - _tzset(); - return true; - }(); - ignore_unused(init); -} -#endif - -template class tm_writer { - private: - static constexpr int days_per_week = 7; - - const std::locale& loc_; - const bool is_classic_; - OutputIt out_; - const std::tm& tm_; - - auto tm_sec() const noexcept -> int { - FMT_ASSERT(tm_.tm_sec >= 0 && tm_.tm_sec <= 61, ""); - return tm_.tm_sec; - } - auto tm_min() const noexcept -> int { - FMT_ASSERT(tm_.tm_min >= 0 && tm_.tm_min <= 59, ""); - return tm_.tm_min; - } - auto tm_hour() const noexcept -> int { - FMT_ASSERT(tm_.tm_hour >= 0 && tm_.tm_hour <= 23, ""); - return tm_.tm_hour; - } - auto tm_mday() const noexcept -> int { - FMT_ASSERT(tm_.tm_mday >= 1 && tm_.tm_mday <= 31, ""); - return tm_.tm_mday; - } - auto tm_mon() const noexcept -> int { - FMT_ASSERT(tm_.tm_mon >= 0 && tm_.tm_mon <= 11, ""); - return tm_.tm_mon; - } - auto tm_year() const noexcept -> long long { return 1900ll + tm_.tm_year; } - auto tm_wday() const noexcept -> int { - FMT_ASSERT(tm_.tm_wday >= 0 && tm_.tm_wday <= 6, ""); - return tm_.tm_wday; - } - auto tm_yday() const noexcept -> int { - FMT_ASSERT(tm_.tm_yday >= 0 && tm_.tm_yday <= 365, ""); - return tm_.tm_yday; - } - - auto tm_hour12() const noexcept -> int { - const auto h = tm_hour(); - const auto z = h < 12 ? h : h - 12; - return z == 0 ? 12 : z; - } - - // POSIX and the C Standard are unclear or inconsistent about what %C and %y - // do if the year is negative or exceeds 9999. Use the convention that %C - // concatenated with %y yields the same output as %Y, and that %Y contains at - // least 4 characters, with more only if necessary. - auto split_year_lower(long long year) const noexcept -> int { - auto l = year % 100; - if (l < 0) l = -l; // l in [0, 99] - return static_cast(l); - } - - // Algorithm: - // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_the_week_number_from_a_month_and_day_of_the_month_or_ordinal_date - auto iso_year_weeks(long long curr_year) const noexcept -> int { - const auto prev_year = curr_year - 1; - const auto curr_p = - (curr_year + curr_year / 4 - curr_year / 100 + curr_year / 400) % - days_per_week; - const auto prev_p = - (prev_year + prev_year / 4 - prev_year / 100 + prev_year / 400) % - days_per_week; - return 52 + ((curr_p == 4 || prev_p == 3) ? 1 : 0); - } - auto iso_week_num(int tm_yday, int tm_wday) const noexcept -> int { - return (tm_yday + 11 - (tm_wday == 0 ? days_per_week : tm_wday)) / - days_per_week; - } - auto tm_iso_week_year() const noexcept -> long long { - const auto year = tm_year(); - const auto w = iso_week_num(tm_yday(), tm_wday()); - if (w < 1) return year - 1; - if (w > iso_year_weeks(year)) return year + 1; - return year; - } - auto tm_iso_week_of_year() const noexcept -> int { - const auto year = tm_year(); - const auto w = iso_week_num(tm_yday(), tm_wday()); - if (w < 1) return iso_year_weeks(year - 1); - if (w > iso_year_weeks(year)) return 1; - return w; - } - - void write1(int value) { - *out_++ = static_cast('0' + to_unsigned(value) % 10); - } - void write2(int value) { - const char* d = digits2(to_unsigned(value) % 100); - *out_++ = *d++; - *out_++ = *d; - } - - void write_year_extended(long long year) { - // At least 4 characters. - int width = 4; - if (year < 0) { - *out_++ = '-'; - year = 0 - year; - --width; - } - uint32_or_64_or_128_t n = to_unsigned(year); - const int num_digits = count_digits(n); - if (width > num_digits) out_ = std::fill_n(out_, width - num_digits, '0'); - out_ = format_decimal(out_, n, num_digits).end; - } - void write_year(long long year) { - if (year >= 0 && year < 10000) { - write2(static_cast(year / 100)); - write2(static_cast(year % 100)); - } else { - write_year_extended(year); - } - } - - void write_utc_offset(long offset) { - if (offset < 0) { - *out_++ = '-'; - offset = -offset; - } else { - *out_++ = '+'; - } - offset /= 60; - write2(static_cast(offset / 60)); - write2(static_cast(offset % 60)); - } - template ::value)> - void format_utc_offset_impl(const T& tm) { - write_utc_offset(tm.tm_gmtoff); - } - template ::value)> - void format_utc_offset_impl(const T& tm) { -#if defined(_WIN32) && defined(_UCRT) -# if FMT_USE_TZSET - tzset_once(); -# endif - long offset = 0; - _get_timezone(&offset); - if (tm.tm_isdst) { - long dstbias = 0; - _get_dstbias(&dstbias); - offset += dstbias; - } - write_utc_offset(-offset); -#else - ignore_unused(tm); - format_localized('z'); -#endif - } - - template ::value)> - void format_tz_name_impl(const T& tm) { - if (is_classic_) - out_ = write_tm_str(out_, tm.tm_zone, loc_); - else - format_localized('Z'); - } - template ::value)> - void format_tz_name_impl(const T&) { - format_localized('Z'); - } - - void format_localized(char format, char modifier = 0) { - out_ = write(out_, tm_, loc_, format, modifier); - } - - public: - tm_writer(const std::locale& loc, OutputIt out, const std::tm& tm) - : loc_(loc), - is_classic_(loc_ == get_classic_locale()), - out_(out), - tm_(tm) {} - - OutputIt out() const { return out_; } - - FMT_CONSTEXPR void on_text(const Char* begin, const Char* end) { - out_ = copy_str(begin, end, out_); - } - - void on_abbr_weekday() { - if (is_classic_) - out_ = write(out_, tm_wday_short_name(tm_wday())); - else - format_localized('a'); - } - void on_full_weekday() { - if (is_classic_) - out_ = write(out_, tm_wday_full_name(tm_wday())); - else - format_localized('A'); - } - void on_dec0_weekday(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) return write1(tm_wday()); - format_localized('w', 'O'); - } - void on_dec1_weekday(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) { - auto wday = tm_wday(); - write1(wday == 0 ? days_per_week : wday); - } else { - format_localized('u', 'O'); - } - } - - void on_abbr_month() { - if (is_classic_) - out_ = write(out_, tm_mon_short_name(tm_mon())); - else - format_localized('b'); - } - void on_full_month() { - if (is_classic_) - out_ = write(out_, tm_mon_full_name(tm_mon())); - else - format_localized('B'); - } - - void on_datetime(numeric_system ns) { - if (is_classic_) { - on_abbr_weekday(); - *out_++ = ' '; - on_abbr_month(); - *out_++ = ' '; - on_day_of_month_space(numeric_system::standard); - *out_++ = ' '; - on_iso_time(); - *out_++ = ' '; - on_year(numeric_system::standard); - } else { - format_localized('c', ns == numeric_system::standard ? '\0' : 'E'); - } - } - void on_loc_date(numeric_system ns) { - if (is_classic_) - on_us_date(); - else - format_localized('x', ns == numeric_system::standard ? '\0' : 'E'); - } - void on_loc_time(numeric_system ns) { - if (is_classic_) - on_iso_time(); - else - format_localized('X', ns == numeric_system::standard ? '\0' : 'E'); - } - void on_us_date() { - char buf[8]; - write_digit2_separated(buf, to_unsigned(tm_mon() + 1), - to_unsigned(tm_mday()), - to_unsigned(split_year_lower(tm_year())), '/'); - out_ = copy_str(std::begin(buf), std::end(buf), out_); - } - void on_iso_date() { - auto year = tm_year(); - char buf[10]; - size_t offset = 0; - if (year >= 0 && year < 10000) { - copy2(buf, digits2(static_cast(year / 100))); - } else { - offset = 4; - write_year_extended(year); - year = 0; - } - write_digit2_separated(buf + 2, static_cast(year % 100), - to_unsigned(tm_mon() + 1), to_unsigned(tm_mday()), - '-'); - out_ = copy_str(std::begin(buf) + offset, std::end(buf), out_); - } - - void on_utc_offset() { format_utc_offset_impl(tm_); } - void on_tz_name() { format_tz_name_impl(tm_); } - - void on_year(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) - return write_year(tm_year()); - format_localized('Y', 'E'); - } - void on_short_year(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) - return write2(split_year_lower(tm_year())); - format_localized('y', 'O'); - } - void on_offset_year() { - if (is_classic_) return write2(split_year_lower(tm_year())); - format_localized('y', 'E'); - } - - void on_century(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) { - auto year = tm_year(); - auto upper = year / 100; - if (year >= -99 && year < 0) { - // Zero upper on negative year. - *out_++ = '-'; - *out_++ = '0'; - } else if (upper >= 0 && upper < 100) { - write2(static_cast(upper)); - } else { - out_ = write(out_, upper); - } - } else { - format_localized('C', 'E'); - } - } - - void on_dec_month(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) - return write2(tm_mon() + 1); - format_localized('m', 'O'); - } - - void on_dec0_week_of_year(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) - return write2((tm_yday() + days_per_week - tm_wday()) / days_per_week); - format_localized('U', 'O'); - } - void on_dec1_week_of_year(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) { - auto wday = tm_wday(); - write2((tm_yday() + days_per_week - - (wday == 0 ? (days_per_week - 1) : (wday - 1))) / - days_per_week); - } else { - format_localized('W', 'O'); - } - } - void on_iso_week_of_year(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) - return write2(tm_iso_week_of_year()); - format_localized('V', 'O'); - } - - void on_iso_week_based_year() { write_year(tm_iso_week_year()); } - void on_iso_week_based_short_year() { - write2(split_year_lower(tm_iso_week_year())); - } - - void on_day_of_year() { - auto yday = tm_yday() + 1; - write1(yday / 100); - write2(yday % 100); - } - void on_day_of_month(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) return write2(tm_mday()); - format_localized('d', 'O'); - } - void on_day_of_month_space(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) { - auto mday = to_unsigned(tm_mday()) % 100; - const char* d2 = digits2(mday); - *out_++ = mday < 10 ? ' ' : d2[0]; - *out_++ = d2[1]; - } else { - format_localized('e', 'O'); - } - } - - void on_24_hour(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) return write2(tm_hour()); - format_localized('H', 'O'); - } - void on_12_hour(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) - return write2(tm_hour12()); - format_localized('I', 'O'); - } - void on_minute(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) return write2(tm_min()); - format_localized('M', 'O'); - } - void on_second(numeric_system ns) { - if (is_classic_ || ns == numeric_system::standard) return write2(tm_sec()); - format_localized('S', 'O'); - } - - void on_12_hour_time() { - if (is_classic_) { - char buf[8]; - write_digit2_separated(buf, to_unsigned(tm_hour12()), - to_unsigned(tm_min()), to_unsigned(tm_sec()), ':'); - out_ = copy_str(std::begin(buf), std::end(buf), out_); - *out_++ = ' '; - on_am_pm(); - } else { - format_localized('r'); - } - } - void on_24_hour_time() { - write2(tm_hour()); - *out_++ = ':'; - write2(tm_min()); - } - void on_iso_time() { - char buf[8]; - write_digit2_separated(buf, to_unsigned(tm_hour()), to_unsigned(tm_min()), - to_unsigned(tm_sec()), ':'); - out_ = copy_str(std::begin(buf), std::end(buf), out_); - } - - void on_am_pm() { - if (is_classic_) { - *out_++ = tm_hour() < 12 ? 'A' : 'P'; - *out_++ = 'M'; - } else { - format_localized('p'); - } - } - - // These apply to chrono durations but not tm. - void on_duration_value() {} - void on_duration_unit() {} -}; - -struct chrono_format_checker : null_chrono_spec_handler { - FMT_NORETURN void unsupported() { FMT_THROW(format_error("no date")); } - - template - FMT_CONSTEXPR void on_text(const Char*, const Char*) {} - FMT_CONSTEXPR void on_24_hour(numeric_system) {} - FMT_CONSTEXPR void on_12_hour(numeric_system) {} - FMT_CONSTEXPR void on_minute(numeric_system) {} - FMT_CONSTEXPR void on_second(numeric_system) {} - FMT_CONSTEXPR void on_12_hour_time() {} - FMT_CONSTEXPR void on_24_hour_time() {} - FMT_CONSTEXPR void on_iso_time() {} - FMT_CONSTEXPR void on_am_pm() {} - FMT_CONSTEXPR void on_duration_value() {} - FMT_CONSTEXPR void on_duration_unit() {} -}; - -template ::value)> -inline bool isfinite(T) { - return true; -} - -// Converts value to Int and checks that it's in the range [0, upper). -template ::value)> -inline Int to_nonnegative_int(T value, Int upper) { - FMT_ASSERT(std::is_unsigned::value || - (value >= 0 && to_unsigned(value) <= to_unsigned(upper)), - "invalid value"); - (void)upper; - return static_cast(value); -} -template ::value)> -inline Int to_nonnegative_int(T value, Int upper) { - if (value < 0 || value > static_cast(upper)) - FMT_THROW(format_error("invalid value")); - return static_cast(value); -} - -template ::value)> -inline T mod(T x, int y) { - return x % static_cast(y); -} -template ::value)> -inline T mod(T x, int y) { - return std::fmod(x, static_cast(y)); -} - -// If T is an integral type, maps T to its unsigned counterpart, otherwise -// leaves it unchanged (unlike std::make_unsigned). -template ::value> -struct make_unsigned_or_unchanged { - using type = T; -}; - -template struct make_unsigned_or_unchanged { - using type = typename std::make_unsigned::type; -}; - -#if FMT_SAFE_DURATION_CAST -// throwing version of safe_duration_cast -template -To fmt_safe_duration_cast(std::chrono::duration from) { - int ec; - To to = safe_duration_cast::safe_duration_cast(from, ec); - if (ec) FMT_THROW(format_error("cannot format duration")); - return to; -} -#endif - -template ::value)> -inline std::chrono::duration get_milliseconds( - std::chrono::duration d) { - // this may overflow and/or the result may not fit in the - // target type. -#if FMT_SAFE_DURATION_CAST - using CommonSecondsType = - typename std::common_type::type; - const auto d_as_common = fmt_safe_duration_cast(d); - const auto d_as_whole_seconds = - fmt_safe_duration_cast(d_as_common); - // this conversion should be nonproblematic - const auto diff = d_as_common - d_as_whole_seconds; - const auto ms = - fmt_safe_duration_cast>(diff); - return ms; -#else - auto s = std::chrono::duration_cast(d); - return std::chrono::duration_cast(d - s); -#endif -} - -// Counts the number of fractional digits in the range [0, 18] according to the -// C++20 spec. If more than 18 fractional digits are required then returns 6 for -// microseconds precision. -template () / 10)> -struct count_fractional_digits { - static constexpr int value = - Num % Den == 0 ? N : count_fractional_digits::value; -}; - -// Base case that doesn't instantiate any more templates -// in order to avoid overflow. -template -struct count_fractional_digits { - static constexpr int value = (Num % Den == 0) ? N : 6; -}; - -constexpr long long pow10(std::uint32_t n) { - return n == 0 ? 1 : 10 * pow10(n - 1); -} - -template ::is_signed)> -constexpr std::chrono::duration abs( - std::chrono::duration d) { - // We need to compare the duration using the count() method directly - // due to a compiler bug in clang-11 regarding the spaceship operator, - // when -Wzero-as-null-pointer-constant is enabled. - // In clang-12 the bug has been fixed. See - // https://bugs.llvm.org/show_bug.cgi?id=46235 and the reproducible example: - // https://www.godbolt.org/z/Knbb5joYx. - return d.count() >= d.zero().count() ? d : -d; -} - -template ::is_signed)> -constexpr std::chrono::duration abs( - std::chrono::duration d) { - return d; -} - -template ::value)> -OutputIt format_duration_value(OutputIt out, Rep val, int) { - return write(out, val); -} - -template ::value)> -OutputIt format_duration_value(OutputIt out, Rep val, int precision) { - auto specs = basic_format_specs(); - specs.precision = precision; - specs.type = precision >= 0 ? presentation_type::fixed_lower - : presentation_type::general_lower; - return write(out, val, specs); -} - -template -OutputIt copy_unit(string_view unit, OutputIt out, Char) { - return std::copy(unit.begin(), unit.end(), out); -} - -template -OutputIt copy_unit(string_view unit, OutputIt out, wchar_t) { - // This works when wchar_t is UTF-32 because units only contain characters - // that have the same representation in UTF-16 and UTF-32. - utf8_to_utf16 u(unit); - return std::copy(u.c_str(), u.c_str() + u.size(), out); -} - -template -OutputIt format_duration_unit(OutputIt out) { - if (const char* unit = get_units()) - return copy_unit(string_view(unit), out, Char()); - *out++ = '['; - out = write(out, Period::num); - if (const_check(Period::den != 1)) { - *out++ = '/'; - out = write(out, Period::den); - } - *out++ = ']'; - *out++ = 's'; - return out; -} - -class get_locale { - private: - union { - std::locale locale_; - }; - bool has_locale_ = false; - - public: - get_locale(bool localized, locale_ref loc) : has_locale_(localized) { - if (localized) - ::new (&locale_) std::locale(loc.template get()); - } - ~get_locale() { - if (has_locale_) locale_.~locale(); - } - operator const std::locale&() const { - return has_locale_ ? locale_ : get_classic_locale(); - } -}; - -template -struct chrono_formatter { - FormatContext& context; - OutputIt out; - int precision; - bool localized = false; - // rep is unsigned to avoid overflow. - using rep = - conditional_t::value && sizeof(Rep) < sizeof(int), - unsigned, typename make_unsigned_or_unchanged::type>; - rep val; - using seconds = std::chrono::duration; - seconds s; - using milliseconds = std::chrono::duration; - bool negative; - - using char_type = typename FormatContext::char_type; - using tm_writer_type = tm_writer; - - chrono_formatter(FormatContext& ctx, OutputIt o, - std::chrono::duration d) - : context(ctx), - out(o), - val(static_cast(d.count())), - negative(false) { - if (d.count() < 0) { - val = 0 - val; - negative = true; - } - - // this may overflow and/or the result may not fit in the - // target type. -#if FMT_SAFE_DURATION_CAST - // might need checked conversion (rep!=Rep) - auto tmpval = std::chrono::duration(val); - s = fmt_safe_duration_cast(tmpval); -#else - s = std::chrono::duration_cast( - std::chrono::duration(val)); -#endif - } - - // returns true if nan or inf, writes to out. - bool handle_nan_inf() { - if (isfinite(val)) { - return false; - } - if (isnan(val)) { - write_nan(); - return true; - } - // must be +-inf - if (val > 0) { - write_pinf(); - } else { - write_ninf(); - } - return true; - } - - Rep hour() const { return static_cast(mod((s.count() / 3600), 24)); } - - Rep hour12() const { - Rep hour = static_cast(mod((s.count() / 3600), 12)); - return hour <= 0 ? 12 : hour; - } - - Rep minute() const { return static_cast(mod((s.count() / 60), 60)); } - Rep second() const { return static_cast(mod(s.count(), 60)); } - - std::tm time() const { - auto time = std::tm(); - time.tm_hour = to_nonnegative_int(hour(), 24); - time.tm_min = to_nonnegative_int(minute(), 60); - time.tm_sec = to_nonnegative_int(second(), 60); - return time; - } - - void write_sign() { - if (negative) { - *out++ = '-'; - negative = false; - } - } - - void write(Rep value, int width) { - write_sign(); - if (isnan(value)) return write_nan(); - uint32_or_64_or_128_t n = - to_unsigned(to_nonnegative_int(value, max_value())); - int num_digits = detail::count_digits(n); - if (width > num_digits) out = std::fill_n(out, width - num_digits, '0'); - out = format_decimal(out, n, num_digits).end; - } - - template void write_fractional_seconds(Duration d) { - FMT_ASSERT(!std::is_floating_point::value, ""); - constexpr auto num_fractional_digits = - count_fractional_digits::value; - - using subsecond_precision = std::chrono::duration< - typename std::common_type::type, - std::ratio<1, detail::pow10(num_fractional_digits)>>; - if (std::ratio_less::value) { - *out++ = '.'; - auto fractional = - detail::abs(d) - std::chrono::duration_cast(d); - auto subseconds = - std::chrono::treat_as_floating_point< - typename subsecond_precision::rep>::value - ? fractional.count() - : std::chrono::duration_cast(fractional) - .count(); - uint32_or_64_or_128_t n = - to_unsigned(to_nonnegative_int(subseconds, max_value())); - int num_digits = detail::count_digits(n); - if (num_fractional_digits > num_digits) - out = std::fill_n(out, num_fractional_digits - num_digits, '0'); - out = format_decimal(out, n, num_digits).end; - } - } - - void write_nan() { std::copy_n("nan", 3, out); } - void write_pinf() { std::copy_n("inf", 3, out); } - void write_ninf() { std::copy_n("-inf", 4, out); } - - template - void format_tm(const tm& time, Callback cb, Args... args) { - if (isnan(val)) return write_nan(); - get_locale loc(localized, context.locale()); - auto w = tm_writer_type(loc, out, time); - (w.*cb)(args...); - out = w.out(); - } - - void on_text(const char_type* begin, const char_type* end) { - std::copy(begin, end, out); - } - - // These are not implemented because durations don't have date information. - void on_abbr_weekday() {} - void on_full_weekday() {} - void on_dec0_weekday(numeric_system) {} - void on_dec1_weekday(numeric_system) {} - void on_abbr_month() {} - void on_full_month() {} - void on_datetime(numeric_system) {} - void on_loc_date(numeric_system) {} - void on_loc_time(numeric_system) {} - void on_us_date() {} - void on_iso_date() {} - void on_utc_offset() {} - void on_tz_name() {} - void on_year(numeric_system) {} - void on_short_year(numeric_system) {} - void on_offset_year() {} - void on_century(numeric_system) {} - void on_iso_week_based_year() {} - void on_iso_week_based_short_year() {} - void on_dec_month(numeric_system) {} - void on_dec0_week_of_year(numeric_system) {} - void on_dec1_week_of_year(numeric_system) {} - void on_iso_week_of_year(numeric_system) {} - void on_day_of_year() {} - void on_day_of_month(numeric_system) {} - void on_day_of_month_space(numeric_system) {} - - void on_24_hour(numeric_system ns) { - if (handle_nan_inf()) return; - - if (ns == numeric_system::standard) return write(hour(), 2); - auto time = tm(); - time.tm_hour = to_nonnegative_int(hour(), 24); - format_tm(time, &tm_writer_type::on_24_hour, ns); - } - - void on_12_hour(numeric_system ns) { - if (handle_nan_inf()) return; - - if (ns == numeric_system::standard) return write(hour12(), 2); - auto time = tm(); - time.tm_hour = to_nonnegative_int(hour12(), 12); - format_tm(time, &tm_writer_type::on_12_hour, ns); - } - - void on_minute(numeric_system ns) { - if (handle_nan_inf()) return; - - if (ns == numeric_system::standard) return write(minute(), 2); - auto time = tm(); - time.tm_min = to_nonnegative_int(minute(), 60); - format_tm(time, &tm_writer_type::on_minute, ns); - } - - void on_second(numeric_system ns) { - if (handle_nan_inf()) return; - - if (ns == numeric_system::standard) { - if (std::is_floating_point::value) { - constexpr auto num_fractional_digits = - count_fractional_digits::value; - auto buf = memory_buffer(); - format_to(std::back_inserter(buf), runtime("{:.{}f}"), - std::fmod(val * static_cast(Period::num) / - static_cast(Period::den), - static_cast(60)), - num_fractional_digits); - if (negative) *out++ = '-'; - if (buf.size() < 2 || buf[1] == '.') *out++ = '0'; - out = std::copy(buf.begin(), buf.end(), out); - } else { - write(second(), 2); - write_fractional_seconds(std::chrono::duration(val)); - } - return; - } - auto time = tm(); - time.tm_sec = to_nonnegative_int(second(), 60); - format_tm(time, &tm_writer_type::on_second, ns); - } - - void on_12_hour_time() { - if (handle_nan_inf()) return; - format_tm(time(), &tm_writer_type::on_12_hour_time); - } - - void on_24_hour_time() { - if (handle_nan_inf()) { - *out++ = ':'; - handle_nan_inf(); - return; - } - - write(hour(), 2); - *out++ = ':'; - write(minute(), 2); - } - - void on_iso_time() { - on_24_hour_time(); - *out++ = ':'; - if (handle_nan_inf()) return; - on_second(numeric_system::standard); - } - - void on_am_pm() { - if (handle_nan_inf()) return; - format_tm(time(), &tm_writer_type::on_am_pm); - } - - void on_duration_value() { - if (handle_nan_inf()) return; - write_sign(); - out = format_duration_value(out, val, precision); - } - - void on_duration_unit() { - out = format_duration_unit(out); - } -}; - -FMT_END_DETAIL_NAMESPACE - -#if defined(__cpp_lib_chrono) && __cpp_lib_chrono >= 201907 -using weekday = std::chrono::weekday; -#else -// A fallback version of weekday. -class weekday { - private: - unsigned char value; - - public: - weekday() = default; - explicit constexpr weekday(unsigned wd) noexcept - : value(static_cast(wd != 7 ? wd : 0)) {} - constexpr unsigned c_encoding() const noexcept { return value; } -}; - -class year_month_day {}; -#endif - -// A rudimentary weekday formatter. -template struct formatter { - private: - bool localized = false; - - public: - FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) - -> decltype(ctx.begin()) { - auto begin = ctx.begin(), end = ctx.end(); - if (begin != end && *begin == 'L') { - ++begin; - localized = true; - } - return begin; - } - - template - auto format(weekday wd, FormatContext& ctx) const -> decltype(ctx.out()) { - auto time = std::tm(); - time.tm_wday = static_cast(wd.c_encoding()); - detail::get_locale loc(localized, ctx.locale()); - auto w = detail::tm_writer(loc, ctx.out(), time); - w.on_abbr_weekday(); - return w.out(); - } -}; - -template -struct formatter, Char> { - private: - basic_format_specs specs; - int precision = -1; - using arg_ref_type = detail::arg_ref; - arg_ref_type width_ref; - arg_ref_type precision_ref; - bool localized = false; - basic_string_view format_str; - using duration = std::chrono::duration; - - struct spec_handler { - formatter& f; - basic_format_parse_context& context; - basic_string_view format_str; - - template FMT_CONSTEXPR arg_ref_type make_arg_ref(Id arg_id) { - context.check_arg_id(arg_id); - return arg_ref_type(arg_id); - } - - FMT_CONSTEXPR arg_ref_type make_arg_ref(basic_string_view arg_id) { - context.check_arg_id(arg_id); - return arg_ref_type(arg_id); - } - - FMT_CONSTEXPR arg_ref_type make_arg_ref(detail::auto_id) { - return arg_ref_type(context.next_arg_id()); - } - - void on_error(const char* msg) { FMT_THROW(format_error(msg)); } - FMT_CONSTEXPR void on_fill(basic_string_view fill) { - f.specs.fill = fill; - } - FMT_CONSTEXPR void on_align(align_t align) { f.specs.align = align; } - FMT_CONSTEXPR void on_width(int width) { f.specs.width = width; } - FMT_CONSTEXPR void on_precision(int _precision) { - f.precision = _precision; - } - FMT_CONSTEXPR void end_precision() {} - - template FMT_CONSTEXPR void on_dynamic_width(Id arg_id) { - f.width_ref = make_arg_ref(arg_id); - } - - template FMT_CONSTEXPR void on_dynamic_precision(Id arg_id) { - f.precision_ref = make_arg_ref(arg_id); - } - }; - - using iterator = typename basic_format_parse_context::iterator; - struct parse_range { - iterator begin; - iterator end; - }; - - FMT_CONSTEXPR parse_range do_parse(basic_format_parse_context& ctx) { - auto begin = ctx.begin(), end = ctx.end(); - if (begin == end || *begin == '}') return {begin, begin}; - spec_handler handler{*this, ctx, format_str}; - begin = detail::parse_align(begin, end, handler); - if (begin == end) return {begin, begin}; - begin = detail::parse_width(begin, end, handler); - if (begin == end) return {begin, begin}; - if (*begin == '.') { - if (std::is_floating_point::value) - begin = detail::parse_precision(begin, end, handler); - else - handler.on_error("precision not allowed for this argument type"); - } - if (begin != end && *begin == 'L') { - ++begin; - localized = true; - } - end = detail::parse_chrono_format(begin, end, - detail::chrono_format_checker()); - return {begin, end}; - } - - public: - FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) - -> decltype(ctx.begin()) { - auto range = do_parse(ctx); - format_str = basic_string_view( - &*range.begin, detail::to_unsigned(range.end - range.begin)); - return range.end; - } - - template - auto format(const duration& d, FormatContext& ctx) const - -> decltype(ctx.out()) { - auto specs_copy = specs; - auto precision_copy = precision; - auto begin = format_str.begin(), end = format_str.end(); - // As a possible future optimization, we could avoid extra copying if width - // is not specified. - basic_memory_buffer buf; - auto out = std::back_inserter(buf); - detail::handle_dynamic_spec(specs_copy.width, - width_ref, ctx); - detail::handle_dynamic_spec(precision_copy, - precision_ref, ctx); - if (begin == end || *begin == '}') { - out = detail::format_duration_value(out, d.count(), precision_copy); - detail::format_duration_unit(out); - } else { - detail::chrono_formatter f( - ctx, out, d); - f.precision = precision_copy; - f.localized = localized; - detail::parse_chrono_format(begin, end, f); - } - return detail::write( - ctx.out(), basic_string_view(buf.data(), buf.size()), specs_copy); - } -}; - -template -struct formatter, - Char> : formatter { - FMT_CONSTEXPR formatter() { - basic_string_view default_specs = - detail::string_literal{}; - this->do_parse(default_specs.begin(), default_specs.end()); - } - - template - auto format(std::chrono::time_point val, - FormatContext& ctx) const -> decltype(ctx.out()) { - return formatter::format(localtime(val), ctx); - } -}; - -#if FMT_USE_UTC_TIME -template -struct formatter, - Char> : formatter { - FMT_CONSTEXPR formatter() { - basic_string_view default_specs = - detail::string_literal{}; - this->do_parse(default_specs.begin(), default_specs.end()); - } - - template - auto format(std::chrono::time_point val, - FormatContext& ctx) const -> decltype(ctx.out()) { - return formatter::format( - localtime(std::chrono::utc_clock::to_sys(val)), ctx); - } -}; -#endif - -template struct formatter { - private: - enum class spec { - unknown, - year_month_day, - hh_mm_ss, - }; - spec spec_ = spec::unknown; - basic_string_view specs; - - protected: - template FMT_CONSTEXPR auto do_parse(It begin, It end) -> It { - if (begin != end && *begin == ':') ++begin; - end = detail::parse_chrono_format(begin, end, detail::tm_format_checker()); - // Replace default spec only if the new spec is not empty. - if (end != begin) specs = {begin, detail::to_unsigned(end - begin)}; - return end; - } - - public: - FMT_CONSTEXPR auto parse(basic_format_parse_context& ctx) - -> decltype(ctx.begin()) { - auto end = this->do_parse(ctx.begin(), ctx.end()); - // basic_string_view<>::compare isn't constexpr before C++17. - if (specs.size() == 2 && specs[0] == Char('%')) { - if (specs[1] == Char('F')) - spec_ = spec::year_month_day; - else if (specs[1] == Char('T')) - spec_ = spec::hh_mm_ss; - } - return end; - } - - template - auto format(const std::tm& tm, FormatContext& ctx) const - -> decltype(ctx.out()) { - const auto loc_ref = ctx.locale(); - detail::get_locale loc(static_cast(loc_ref), loc_ref); - auto w = detail::tm_writer(loc, ctx.out(), tm); - if (spec_ == spec::year_month_day) - w.on_iso_date(); - else if (spec_ == spec::hh_mm_ss) - w.on_iso_time(); - else - detail::parse_chrono_format(specs.begin(), specs.end(), w); - return w.out(); - } -}; - -FMT_MODULE_EXPORT_END -FMT_END_NAMESPACE - -#endif // FMT_CHRONO_H_ diff --git a/packages/seacas/libraries/aprepro_lib/fmt/color.h b/packages/seacas/libraries/aprepro_lib/fmt/color.h deleted file mode 100644 index e9b880ad431c..000000000000 --- a/packages/seacas/libraries/aprepro_lib/fmt/color.h +++ /dev/null @@ -1,655 +0,0 @@ -// Formatting library for C++ - color support -// -// Copyright (c) 2018 - present, Victor Zverovich and fmt contributors -// All rights reserved. -// -// For the license information refer to format.h. - -#ifndef FMT_COLOR_H_ -#define FMT_COLOR_H_ - -#include "format.h" - -FMT_BEGIN_NAMESPACE -FMT_MODULE_EXPORT_BEGIN - -enum class color : uint32_t { - alice_blue = 0xF0F8FF, // rgb(240,248,255) - antique_white = 0xFAEBD7, // rgb(250,235,215) - aqua = 0x00FFFF, // rgb(0,255,255) - aquamarine = 0x7FFFD4, // rgb(127,255,212) - azure = 0xF0FFFF, // rgb(240,255,255) - beige = 0xF5F5DC, // rgb(245,245,220) - bisque = 0xFFE4C4, // rgb(255,228,196) - black = 0x000000, // rgb(0,0,0) - blanched_almond = 0xFFEBCD, // rgb(255,235,205) - blue = 0x0000FF, // rgb(0,0,255) - blue_violet = 0x8A2BE2, // rgb(138,43,226) - brown = 0xA52A2A, // rgb(165,42,42) - burly_wood = 0xDEB887, // rgb(222,184,135) - cadet_blue = 0x5F9EA0, // rgb(95,158,160) - chartreuse = 0x7FFF00, // rgb(127,255,0) - chocolate = 0xD2691E, // rgb(210,105,30) - coral = 0xFF7F50, // rgb(255,127,80) - cornflower_blue = 0x6495ED, // rgb(100,149,237) - cornsilk = 0xFFF8DC, // rgb(255,248,220) - crimson = 0xDC143C, // rgb(220,20,60) - cyan = 0x00FFFF, // rgb(0,255,255) - dark_blue = 0x00008B, // rgb(0,0,139) - dark_cyan = 0x008B8B, // rgb(0,139,139) - dark_golden_rod = 0xB8860B, // rgb(184,134,11) - dark_gray = 0xA9A9A9, // rgb(169,169,169) - dark_green = 0x006400, // rgb(0,100,0) - dark_khaki = 0xBDB76B, // rgb(189,183,107) - dark_magenta = 0x8B008B, // rgb(139,0,139) - dark_olive_green = 0x556B2F, // rgb(85,107,47) - dark_orange = 0xFF8C00, // rgb(255,140,0) - dark_orchid = 0x9932CC, // rgb(153,50,204) - dark_red = 0x8B0000, // rgb(139,0,0) - dark_salmon = 0xE9967A, // rgb(233,150,122) - dark_sea_green = 0x8FBC8F, // rgb(143,188,143) - dark_slate_blue = 0x483D8B, // rgb(72,61,139) - dark_slate_gray = 0x2F4F4F, // rgb(47,79,79) - dark_turquoise = 0x00CED1, // rgb(0,206,209) - dark_violet = 0x9400D3, // rgb(148,0,211) - deep_pink = 0xFF1493, // rgb(255,20,147) - deep_sky_blue = 0x00BFFF, // rgb(0,191,255) - dim_gray = 0x696969, // rgb(105,105,105) - dodger_blue = 0x1E90FF, // rgb(30,144,255) - fire_brick = 0xB22222, // rgb(178,34,34) - floral_white = 0xFFFAF0, // rgb(255,250,240) - forest_green = 0x228B22, // rgb(34,139,34) - fuchsia = 0xFF00FF, // rgb(255,0,255) - gainsboro = 0xDCDCDC, // rgb(220,220,220) - ghost_white = 0xF8F8FF, // rgb(248,248,255) - gold = 0xFFD700, // rgb(255,215,0) - golden_rod = 0xDAA520, // rgb(218,165,32) - gray = 0x808080, // rgb(128,128,128) - green = 0x008000, // rgb(0,128,0) - green_yellow = 0xADFF2F, // rgb(173,255,47) - honey_dew = 0xF0FFF0, // rgb(240,255,240) - hot_pink = 0xFF69B4, // rgb(255,105,180) - indian_red = 0xCD5C5C, // rgb(205,92,92) - indigo = 0x4B0082, // rgb(75,0,130) - ivory = 0xFFFFF0, // rgb(255,255,240) - khaki = 0xF0E68C, // rgb(240,230,140) - lavender = 0xE6E6FA, // rgb(230,230,250) - lavender_blush = 0xFFF0F5, // rgb(255,240,245) - lawn_green = 0x7CFC00, // rgb(124,252,0) - lemon_chiffon = 0xFFFACD, // rgb(255,250,205) - light_blue = 0xADD8E6, // rgb(173,216,230) - light_coral = 0xF08080, // rgb(240,128,128) - light_cyan = 0xE0FFFF, // rgb(224,255,255) - light_golden_rod_yellow = 0xFAFAD2, // rgb(250,250,210) - light_gray = 0xD3D3D3, // rgb(211,211,211) - light_green = 0x90EE90, // rgb(144,238,144) - light_pink = 0xFFB6C1, // rgb(255,182,193) - light_salmon = 0xFFA07A, // rgb(255,160,122) - light_sea_green = 0x20B2AA, // rgb(32,178,170) - light_sky_blue = 0x87CEFA, // rgb(135,206,250) - light_slate_gray = 0x778899, // rgb(119,136,153) - light_steel_blue = 0xB0C4DE, // rgb(176,196,222) - light_yellow = 0xFFFFE0, // rgb(255,255,224) - lime = 0x00FF00, // rgb(0,255,0) - lime_green = 0x32CD32, // rgb(50,205,50) - linen = 0xFAF0E6, // rgb(250,240,230) - magenta = 0xFF00FF, // rgb(255,0,255) - maroon = 0x800000, // rgb(128,0,0) - medium_aquamarine = 0x66CDAA, // rgb(102,205,170) - medium_blue = 0x0000CD, // rgb(0,0,205) - medium_orchid = 0xBA55D3, // rgb(186,85,211) - medium_purple = 0x9370DB, // rgb(147,112,219) - medium_sea_green = 0x3CB371, // rgb(60,179,113) - medium_slate_blue = 0x7B68EE, // rgb(123,104,238) - medium_spring_green = 0x00FA9A, // rgb(0,250,154) - medium_turquoise = 0x48D1CC, // rgb(72,209,204) - medium_violet_red = 0xC71585, // rgb(199,21,133) - midnight_blue = 0x191970, // rgb(25,25,112) - mint_cream = 0xF5FFFA, // rgb(245,255,250) - misty_rose = 0xFFE4E1, // rgb(255,228,225) - moccasin = 0xFFE4B5, // rgb(255,228,181) - navajo_white = 0xFFDEAD, // rgb(255,222,173) - navy = 0x000080, // rgb(0,0,128) - old_lace = 0xFDF5E6, // rgb(253,245,230) - olive = 0x808000, // rgb(128,128,0) - olive_drab = 0x6B8E23, // rgb(107,142,35) - orange = 0xFFA500, // rgb(255,165,0) - orange_red = 0xFF4500, // rgb(255,69,0) - orchid = 0xDA70D6, // rgb(218,112,214) - pale_golden_rod = 0xEEE8AA, // rgb(238,232,170) - pale_green = 0x98FB98, // rgb(152,251,152) - pale_turquoise = 0xAFEEEE, // rgb(175,238,238) - pale_violet_red = 0xDB7093, // rgb(219,112,147) - papaya_whip = 0xFFEFD5, // rgb(255,239,213) - peach_puff = 0xFFDAB9, // rgb(255,218,185) - peru = 0xCD853F, // rgb(205,133,63) - pink = 0xFFC0CB, // rgb(255,192,203) - plum = 0xDDA0DD, // rgb(221,160,221) - powder_blue = 0xB0E0E6, // rgb(176,224,230) - purple = 0x800080, // rgb(128,0,128) - rebecca_purple = 0x663399, // rgb(102,51,153) - red = 0xFF0000, // rgb(255,0,0) - rosy_brown = 0xBC8F8F, // rgb(188,143,143) - royal_blue = 0x4169E1, // rgb(65,105,225) - saddle_brown = 0x8B4513, // rgb(139,69,19) - salmon = 0xFA8072, // rgb(250,128,114) - sandy_brown = 0xF4A460, // rgb(244,164,96) - sea_green = 0x2E8B57, // rgb(46,139,87) - sea_shell = 0xFFF5EE, // rgb(255,245,238) - sienna = 0xA0522D, // rgb(160,82,45) - silver = 0xC0C0C0, // rgb(192,192,192) - sky_blue = 0x87CEEB, // rgb(135,206,235) - slate_blue = 0x6A5ACD, // rgb(106,90,205) - slate_gray = 0x708090, // rgb(112,128,144) - snow = 0xFFFAFA, // rgb(255,250,250) - spring_green = 0x00FF7F, // rgb(0,255,127) - steel_blue = 0x4682B4, // rgb(70,130,180) - tan = 0xD2B48C, // rgb(210,180,140) - teal = 0x008080, // rgb(0,128,128) - thistle = 0xD8BFD8, // rgb(216,191,216) - tomato = 0xFF6347, // rgb(255,99,71) - turquoise = 0x40E0D0, // rgb(64,224,208) - violet = 0xEE82EE, // rgb(238,130,238) - wheat = 0xF5DEB3, // rgb(245,222,179) - white = 0xFFFFFF, // rgb(255,255,255) - white_smoke = 0xF5F5F5, // rgb(245,245,245) - yellow = 0xFFFF00, // rgb(255,255,0) - yellow_green = 0x9ACD32 // rgb(154,205,50) -}; // enum class color - -enum class terminal_color : uint8_t { - black = 30, - red, - green, - yellow, - blue, - magenta, - cyan, - white, - bright_black = 90, - bright_red, - bright_green, - bright_yellow, - bright_blue, - bright_magenta, - bright_cyan, - bright_white -}; - -enum class emphasis : uint8_t { - bold = 1, - faint = 1 << 1, - italic = 1 << 2, - underline = 1 << 3, - blink = 1 << 4, - reverse = 1 << 5, - conceal = 1 << 6, - strikethrough = 1 << 7, -}; - -// rgb is a struct for red, green and blue colors. -// Using the name "rgb" makes some editors show the color in a tooltip. -struct rgb { - FMT_CONSTEXPR rgb() : r(0), g(0), b(0) {} - FMT_CONSTEXPR rgb(uint8_t r_, uint8_t g_, uint8_t b_) : r(r_), g(g_), b(b_) {} - FMT_CONSTEXPR rgb(uint32_t hex) - : r((hex >> 16) & 0xFF), g((hex >> 8) & 0xFF), b(hex & 0xFF) {} - FMT_CONSTEXPR rgb(color hex) - : r((uint32_t(hex) >> 16) & 0xFF), - g((uint32_t(hex) >> 8) & 0xFF), - b(uint32_t(hex) & 0xFF) {} - uint8_t r; - uint8_t g; - uint8_t b; -}; - -FMT_BEGIN_DETAIL_NAMESPACE - -// color is a struct of either a rgb color or a terminal color. -struct color_type { - FMT_CONSTEXPR color_type() noexcept : is_rgb(), value{} {} - FMT_CONSTEXPR color_type(color rgb_color) noexcept : is_rgb(true), value{} { - value.rgb_color = static_cast(rgb_color); - } - FMT_CONSTEXPR color_type(rgb rgb_color) noexcept : is_rgb(true), value{} { - value.rgb_color = (static_cast(rgb_color.r) << 16) | - (static_cast(rgb_color.g) << 8) | rgb_color.b; - } - FMT_CONSTEXPR color_type(terminal_color term_color) noexcept - : is_rgb(), value{} { - value.term_color = static_cast(term_color); - } - bool is_rgb; - union color_union { - uint8_t term_color; - uint32_t rgb_color; - } value; -}; - -FMT_END_DETAIL_NAMESPACE - -/** A text style consisting of foreground and background colors and emphasis. */ -class text_style { - public: - FMT_CONSTEXPR text_style(emphasis em = emphasis()) noexcept - : set_foreground_color(), set_background_color(), ems(em) {} - - FMT_CONSTEXPR text_style& operator|=(const text_style& rhs) { - if (!set_foreground_color) { - set_foreground_color = rhs.set_foreground_color; - foreground_color = rhs.foreground_color; - } else if (rhs.set_foreground_color) { - if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb) - FMT_THROW(format_error("can't OR a terminal color")); - foreground_color.value.rgb_color |= rhs.foreground_color.value.rgb_color; - } - - if (!set_background_color) { - set_background_color = rhs.set_background_color; - background_color = rhs.background_color; - } else if (rhs.set_background_color) { - if (!background_color.is_rgb || !rhs.background_color.is_rgb) - FMT_THROW(format_error("can't OR a terminal color")); - background_color.value.rgb_color |= rhs.background_color.value.rgb_color; - } - - ems = static_cast(static_cast(ems) | - static_cast(rhs.ems)); - return *this; - } - - friend FMT_CONSTEXPR text_style operator|(text_style lhs, - const text_style& rhs) { - return lhs |= rhs; - } - - FMT_CONSTEXPR bool has_foreground() const noexcept { - return set_foreground_color; - } - FMT_CONSTEXPR bool has_background() const noexcept { - return set_background_color; - } - FMT_CONSTEXPR bool has_emphasis() const noexcept { - return static_cast(ems) != 0; - } - FMT_CONSTEXPR detail::color_type get_foreground() const noexcept { - FMT_ASSERT(has_foreground(), "no foreground specified for this style"); - return foreground_color; - } - FMT_CONSTEXPR detail::color_type get_background() const noexcept { - FMT_ASSERT(has_background(), "no background specified for this style"); - return background_color; - } - FMT_CONSTEXPR emphasis get_emphasis() const noexcept { - FMT_ASSERT(has_emphasis(), "no emphasis specified for this style"); - return ems; - } - - private: - FMT_CONSTEXPR text_style(bool is_foreground, - detail::color_type text_color) noexcept - : set_foreground_color(), set_background_color(), ems() { - if (is_foreground) { - foreground_color = text_color; - set_foreground_color = true; - } else { - background_color = text_color; - set_background_color = true; - } - } - - friend FMT_CONSTEXPR text_style fg(detail::color_type foreground) noexcept; - - friend FMT_CONSTEXPR text_style bg(detail::color_type background) noexcept; - - detail::color_type foreground_color; - detail::color_type background_color; - bool set_foreground_color; - bool set_background_color; - emphasis ems; -}; - -/** Creates a text style from the foreground (text) color. */ -FMT_CONSTEXPR inline text_style fg(detail::color_type foreground) noexcept { - return text_style(true, foreground); -} - -/** Creates a text style from the background color. */ -FMT_CONSTEXPR inline text_style bg(detail::color_type background) noexcept { - return text_style(false, background); -} - -FMT_CONSTEXPR inline text_style operator|(emphasis lhs, emphasis rhs) noexcept { - return text_style(lhs) | rhs; -} - -FMT_BEGIN_DETAIL_NAMESPACE - -template struct ansi_color_escape { - FMT_CONSTEXPR ansi_color_escape(detail::color_type text_color, - const char* esc) noexcept { - // If we have a terminal color, we need to output another escape code - // sequence. - if (!text_color.is_rgb) { - bool is_background = esc == string_view("\x1b[48;2;"); - uint32_t value = text_color.value.term_color; - // Background ASCII codes are the same as the foreground ones but with - // 10 more. - if (is_background) value += 10u; - - size_t index = 0; - buffer[index++] = static_cast('\x1b'); - buffer[index++] = static_cast('['); - - if (value >= 100u) { - buffer[index++] = static_cast('1'); - value %= 100u; - } - buffer[index++] = static_cast('0' + value / 10u); - buffer[index++] = static_cast('0' + value % 10u); - - buffer[index++] = static_cast('m'); - buffer[index++] = static_cast('\0'); - return; - } - - for (int i = 0; i < 7; i++) { - buffer[i] = static_cast(esc[i]); - } - rgb color(text_color.value.rgb_color); - to_esc(color.r, buffer + 7, ';'); - to_esc(color.g, buffer + 11, ';'); - to_esc(color.b, buffer + 15, 'm'); - buffer[19] = static_cast(0); - } - FMT_CONSTEXPR ansi_color_escape(emphasis em) noexcept { - uint8_t em_codes[num_emphases] = {}; - if (has_emphasis(em, emphasis::bold)) em_codes[0] = 1; - if (has_emphasis(em, emphasis::faint)) em_codes[1] = 2; - if (has_emphasis(em, emphasis::italic)) em_codes[2] = 3; - if (has_emphasis(em, emphasis::underline)) em_codes[3] = 4; - if (has_emphasis(em, emphasis::blink)) em_codes[4] = 5; - if (has_emphasis(em, emphasis::reverse)) em_codes[5] = 7; - if (has_emphasis(em, emphasis::conceal)) em_codes[6] = 8; - if (has_emphasis(em, emphasis::strikethrough)) em_codes[7] = 9; - - size_t index = 0; - for (size_t i = 0; i < num_emphases; ++i) { - if (!em_codes[i]) continue; - buffer[index++] = static_cast('\x1b'); - buffer[index++] = static_cast('['); - buffer[index++] = static_cast('0' + em_codes[i]); - buffer[index++] = static_cast('m'); - } - buffer[index++] = static_cast(0); - } - FMT_CONSTEXPR operator const Char*() const noexcept { return buffer; } - - FMT_CONSTEXPR const Char* begin() const noexcept { return buffer; } - FMT_CONSTEXPR_CHAR_TRAITS const Char* end() const noexcept { - return buffer + std::char_traits::length(buffer); - } - - private: - static constexpr size_t num_emphases = 8; - Char buffer[7u + 3u * num_emphases + 1u]; - - static FMT_CONSTEXPR void to_esc(uint8_t c, Char* out, - char delimiter) noexcept { - out[0] = static_cast('0' + c / 100); - out[1] = static_cast('0' + c / 10 % 10); - out[2] = static_cast('0' + c % 10); - out[3] = static_cast(delimiter); - } - static FMT_CONSTEXPR bool has_emphasis(emphasis em, emphasis mask) noexcept { - return static_cast(em) & static_cast(mask); - } -}; - -template -FMT_CONSTEXPR ansi_color_escape make_foreground_color( - detail::color_type foreground) noexcept { - return ansi_color_escape(foreground, "\x1b[38;2;"); -} - -template -FMT_CONSTEXPR ansi_color_escape make_background_color( - detail::color_type background) noexcept { - return ansi_color_escape(background, "\x1b[48;2;"); -} - -template -FMT_CONSTEXPR ansi_color_escape make_emphasis(emphasis em) noexcept { - return ansi_color_escape(em); -} - -template inline void fputs(const Char* chars, FILE* stream) { - int result = std::fputs(chars, stream); -#if !__NVCC__ - if (result < 0) - FMT_THROW(system_error(errno, FMT_STRING("cannot write to file"))); -#endif -} - -template <> inline void fputs(const wchar_t* chars, FILE* stream) { - int result = std::fputws(chars, stream); -#if !__NVCC__ - if (result < 0) - FMT_THROW(system_error(errno, FMT_STRING("cannot write to file"))); -#endif -} - -template inline void reset_color(FILE* stream) { - fputs("\x1b[0m", stream); -} - -template <> inline void reset_color(FILE* stream) { - fputs(L"\x1b[0m", stream); -} - -template inline void reset_color(buffer& buffer) { - auto reset_color = string_view("\x1b[0m"); - buffer.append(reset_color.begin(), reset_color.end()); -} - -template struct styled_arg { - const T& value; - text_style style; -}; - -template -void vformat_to(buffer& buf, const text_style& ts, - basic_string_view format_str, - basic_format_args>> args) { - bool has_style = false; - if (ts.has_emphasis()) { - has_style = true; - auto emphasis = detail::make_emphasis(ts.get_emphasis()); - buf.append(emphasis.begin(), emphasis.end()); - } - if (ts.has_foreground()) { - has_style = true; - auto foreground = detail::make_foreground_color(ts.get_foreground()); - buf.append(foreground.begin(), foreground.end()); - } - if (ts.has_background()) { - has_style = true; - auto background = detail::make_background_color(ts.get_background()); - buf.append(background.begin(), background.end()); - } - detail::vformat_to(buf, format_str, args, {}); - if (has_style) detail::reset_color(buf); -} - -FMT_END_DETAIL_NAMESPACE - -template > -void vprint(std::FILE* f, const text_style& ts, const S& format, - basic_format_args>> args) { - basic_memory_buffer buf; - detail::vformat_to(buf, ts, detail::to_string_view(format), args); - if (detail::is_utf8()) { - detail::print(f, basic_string_view(buf.begin(), buf.size())); - } else { - buf.push_back(Char(0)); - detail::fputs(buf.data(), f); - } -} - -/** - \rst - Formats a string and prints it to the specified file stream using ANSI - escape sequences to specify text formatting. - - **Example**:: - - fmt::print(fmt::emphasis::bold | fg(fmt::color::red), - "Elapsed time: {0:.2f} seconds", 1.23); - \endrst - */ -template ::value)> -void print(std::FILE* f, const text_style& ts, const S& format_str, - const Args&... args) { - vprint(f, ts, format_str, - fmt::make_format_args>>(args...)); -} - -/** - \rst - Formats a string and prints it to stdout using ANSI escape sequences to - specify text formatting. - - **Example**:: - - fmt::print(fmt::emphasis::bold | fg(fmt::color::red), - "Elapsed time: {0:.2f} seconds", 1.23); - \endrst - */ -template ::value)> -void print(const text_style& ts, const S& format_str, const Args&... args) { - return print(stdout, ts, format_str, args...); -} - -template > -inline std::basic_string vformat( - const text_style& ts, const S& format_str, - basic_format_args>> args) { - basic_memory_buffer buf; - detail::vformat_to(buf, ts, detail::to_string_view(format_str), args); - return fmt::to_string(buf); -} - -/** - \rst - Formats arguments and returns the result as a string using ANSI - escape sequences to specify text formatting. - - **Example**:: - - #include - std::string message = fmt::format(fmt::emphasis::bold | fg(fmt::color::red), - "The answer is {}", 42); - \endrst -*/ -template > -inline std::basic_string format(const text_style& ts, const S& format_str, - const Args&... args) { - return fmt::vformat(ts, detail::to_string_view(format_str), - fmt::make_format_args>(args...)); -} - -/** - Formats a string with the given text_style and writes the output to ``out``. - */ -template ::value)> -OutputIt vformat_to( - OutputIt out, const text_style& ts, basic_string_view format_str, - basic_format_args>> args) { - auto&& buf = detail::get_buffer(out); - detail::vformat_to(buf, ts, format_str, args); - return detail::get_iterator(buf, out); -} - -/** - \rst - Formats arguments with the given text_style, writes the result to the output - iterator ``out`` and returns the iterator past the end of the output range. - - **Example**:: - - std::vector out; - fmt::format_to(std::back_inserter(out), - fmt::emphasis::bold | fg(fmt::color::red), "{}", 42); - \endrst -*/ -template >::value&& - detail::is_string::value> -inline auto format_to(OutputIt out, const text_style& ts, const S& format_str, - Args&&... args) -> - typename std::enable_if::type { - return vformat_to(out, ts, detail::to_string_view(format_str), - fmt::make_format_args>>(args...)); -} - -template -struct formatter, Char> : formatter { - template - auto format(const detail::styled_arg& arg, FormatContext& ctx) const - -> decltype(ctx.out()) { - const auto& ts = arg.style; - const auto& value = arg.value; - auto out = ctx.out(); - - bool has_style = false; - if (ts.has_emphasis()) { - has_style = true; - auto emphasis = detail::make_emphasis(ts.get_emphasis()); - out = std::copy(emphasis.begin(), emphasis.end(), out); - } - if (ts.has_foreground()) { - has_style = true; - auto foreground = - detail::make_foreground_color(ts.get_foreground()); - out = std::copy(foreground.begin(), foreground.end(), out); - } - if (ts.has_background()) { - has_style = true; - auto background = - detail::make_background_color(ts.get_background()); - out = std::copy(background.begin(), background.end(), out); - } - out = formatter::format(value, ctx); - if (has_style) { - auto reset_color = string_view("\x1b[0m"); - out = std::copy(reset_color.begin(), reset_color.end(), out); - } - return out; - } -}; - -/** - \rst - Returns an argument that will be formatted using ANSI escape sequences, - to be used in a formatting function. - - **Example**:: - - fmt::print("Elapsed time: {0:.2f} seconds", - fmt::styled(1.23, fmt::fg(fmt::color::green) | - fmt::bg(fmt::color::blue))); - \endrst - */ -template -FMT_CONSTEXPR auto styled(const T& value, text_style ts) - -> detail::styled_arg> { - return detail::styled_arg>{value, ts}; -} - -FMT_MODULE_EXPORT_END -FMT_END_NAMESPACE - -#endif // FMT_COLOR_H_ diff --git a/packages/seacas/libraries/aprepro_lib/fmt/compile.h b/packages/seacas/libraries/aprepro_lib/fmt/compile.h deleted file mode 100644 index 933668c41c3e..000000000000 --- a/packages/seacas/libraries/aprepro_lib/fmt/compile.h +++ /dev/null @@ -1,611 +0,0 @@ -// Formatting library for C++ - experimental format string compilation -// -// Copyright (c) 2012 - present, Victor Zverovich and fmt contributors -// All rights reserved. -// -// For the license information refer to format.h. - -#ifndef FMT_COMPILE_H_ -#define FMT_COMPILE_H_ - -#include "format.h" - -FMT_BEGIN_NAMESPACE -namespace detail { - -template -FMT_CONSTEXPR inline counting_iterator copy_str(InputIt begin, InputIt end, - counting_iterator it) { - return it + (end - begin); -} - -template class truncating_iterator_base { - protected: - OutputIt out_; - size_t limit_; - size_t count_ = 0; - - truncating_iterator_base() : out_(), limit_(0) {} - - truncating_iterator_base(OutputIt out, size_t limit) - : out_(out), limit_(limit) {} - - public: - using iterator_category = std::output_iterator_tag; - using value_type = typename std::iterator_traits::value_type; - using difference_type = std::ptrdiff_t; - using pointer = void; - using reference = void; - FMT_UNCHECKED_ITERATOR(truncating_iterator_base); - - OutputIt base() const { return out_; } - size_t count() const { return count_; } -}; - -// An output iterator that truncates the output and counts the number of objects -// written to it. -template ::value_type>::type> -class truncating_iterator; - -template -class truncating_iterator - : public truncating_iterator_base { - mutable typename truncating_iterator_base::value_type blackhole_; - - public: - using value_type = typename truncating_iterator_base::value_type; - - truncating_iterator() = default; - - truncating_iterator(OutputIt out, size_t limit) - : truncating_iterator_base(out, limit) {} - - truncating_iterator& operator++() { - if (this->count_++ < this->limit_) ++this->out_; - return *this; - } - - truncating_iterator operator++(int) { - auto it = *this; - ++*this; - return it; - } - - value_type& operator*() const { - return this->count_ < this->limit_ ? *this->out_ : blackhole_; - } -}; - -template -class truncating_iterator - : public truncating_iterator_base { - public: - truncating_iterator() = default; - - truncating_iterator(OutputIt out, size_t limit) - : truncating_iterator_base(out, limit) {} - - template truncating_iterator& operator=(T val) { - if (this->count_++ < this->limit_) *this->out_++ = val; - return *this; - } - - truncating_iterator& operator++() { return *this; } - truncating_iterator& operator++(int) { return *this; } - truncating_iterator& operator*() { return *this; } -}; - -// A compile-time string which is compiled into fast formatting code. -class compiled_string {}; - -template -struct is_compiled_string : std::is_base_of {}; - -/** - \rst - Converts a string literal *s* into a format string that will be parsed at - compile time and converted into efficient formatting code. Requires C++17 - ``constexpr if`` compiler support. - - **Example**:: - - // Converts 42 into std::string using the most efficient method and no - // runtime format string processing. - std::string s = fmt::format(FMT_COMPILE("{}"), 42); - \endrst - */ -#if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction) -# define FMT_COMPILE(s) \ - FMT_STRING_IMPL(s, fmt::detail::compiled_string, explicit) -#else -# define FMT_COMPILE(s) FMT_STRING(s) -#endif - -#if FMT_USE_NONTYPE_TEMPLATE_ARGS -template Str> -struct udl_compiled_string : compiled_string { - using char_type = Char; - explicit constexpr operator basic_string_view() const { - return {Str.data, N - 1}; - } -}; -#endif - -template -const T& first(const T& value, const Tail&...) { - return value; -} - -#if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction) -template struct type_list {}; - -// Returns a reference to the argument at index N from [first, rest...]. -template -constexpr const auto& get([[maybe_unused]] const T& first, - [[maybe_unused]] const Args&... rest) { - static_assert(N < 1 + sizeof...(Args), "index is out of bounds"); - if constexpr (N == 0) - return first; - else - return detail::get(rest...); -} - -template -constexpr int get_arg_index_by_name(basic_string_view name, - type_list) { - return get_arg_index_by_name(name); -} - -template struct get_type_impl; - -template struct get_type_impl> { - using type = - remove_cvref_t(std::declval()...))>; -}; - -template -using get_type = typename get_type_impl::type; - -template struct is_compiled_format : std::false_type {}; - -template struct text { - basic_string_view data; - using char_type = Char; - - template - constexpr OutputIt format(OutputIt out, const Args&...) const { - return write(out, data); - } -}; - -template -struct is_compiled_format> : std::true_type {}; - -template -constexpr text make_text(basic_string_view s, size_t pos, - size_t size) { - return {{&s[pos], size}}; -} - -template struct code_unit { - Char value; - using char_type = Char; - - template - constexpr OutputIt format(OutputIt out, const Args&...) const { - return write(out, value); - } -}; - -// This ensures that the argument type is convertible to `const T&`. -template -constexpr const T& get_arg_checked(const Args&... args) { - const auto& arg = detail::get(args...); - if constexpr (detail::is_named_arg>()) { - return arg.value; - } else { - return arg; - } -} - -template -struct is_compiled_format> : std::true_type {}; - -// A replacement field that refers to argument N. -template struct field { - using char_type = Char; - - template - constexpr OutputIt format(OutputIt out, const Args&... args) const { - return write(out, get_arg_checked(args...)); - } -}; - -template -struct is_compiled_format> : std::true_type {}; - -// A replacement field that refers to argument with name. -template struct runtime_named_field { - using char_type = Char; - basic_string_view name; - - template - constexpr static bool try_format_argument( - OutputIt& out, - // [[maybe_unused]] due to unused-but-set-parameter warning in GCC 7,8,9 - [[maybe_unused]] basic_string_view arg_name, const T& arg) { - if constexpr (is_named_arg::type>::value) { - if (arg_name == arg.name) { - out = write(out, arg.value); - return true; - } - } - return false; - } - - template - constexpr OutputIt format(OutputIt out, const Args&... args) const { - bool found = (try_format_argument(out, name, args) || ...); - if (!found) { - FMT_THROW(format_error("argument with specified name is not found")); - } - return out; - } -}; - -template -struct is_compiled_format> : std::true_type {}; - -// A replacement field that refers to argument N and has format specifiers. -template struct spec_field { - using char_type = Char; - formatter fmt; - - template - constexpr FMT_INLINE OutputIt format(OutputIt out, - const Args&... args) const { - const auto& vargs = - fmt::make_format_args>(args...); - basic_format_context ctx(out, vargs); - return fmt.format(get_arg_checked(args...), ctx); - } -}; - -template -struct is_compiled_format> : std::true_type {}; - -template struct concat { - L lhs; - R rhs; - using char_type = typename L::char_type; - - template - constexpr OutputIt format(OutputIt out, const Args&... args) const { - out = lhs.format(out, args...); - return rhs.format(out, args...); - } -}; - -template -struct is_compiled_format> : std::true_type {}; - -template -constexpr concat make_concat(L lhs, R rhs) { - return {lhs, rhs}; -} - -struct unknown_format {}; - -template -constexpr size_t parse_text(basic_string_view str, size_t pos) { - for (size_t size = str.size(); pos != size; ++pos) { - if (str[pos] == '{' || str[pos] == '}') break; - } - return pos; -} - -template -constexpr auto compile_format_string(S format_str); - -template -constexpr auto parse_tail(T head, S format_str) { - if constexpr (POS != - basic_string_view(format_str).size()) { - constexpr auto tail = compile_format_string(format_str); - if constexpr (std::is_same, - unknown_format>()) - return tail; - else - return make_concat(head, tail); - } else { - return head; - } -} - -template struct parse_specs_result { - formatter fmt; - size_t end; - int next_arg_id; -}; - -constexpr int manual_indexing_id = -1; - -template -constexpr parse_specs_result parse_specs(basic_string_view str, - size_t pos, int next_arg_id) { - str.remove_prefix(pos); - auto ctx = compile_parse_context(str, max_value(), nullptr, {}, - next_arg_id); - auto f = formatter(); - auto end = f.parse(ctx); - return {f, pos + fmt::detail::to_unsigned(end - str.data()), - next_arg_id == 0 ? manual_indexing_id : ctx.next_arg_id()}; -} - -template struct arg_id_handler { - arg_ref arg_id; - - constexpr int operator()() { - FMT_ASSERT(false, "handler cannot be used with automatic indexing"); - return 0; - } - constexpr int operator()(int id) { - arg_id = arg_ref(id); - return 0; - } - constexpr int operator()(basic_string_view id) { - arg_id = arg_ref(id); - return 0; - } - - constexpr void on_error(const char* message) { - FMT_THROW(format_error(message)); - } -}; - -template struct parse_arg_id_result { - arg_ref arg_id; - const Char* arg_id_end; -}; - -template -constexpr auto parse_arg_id(const Char* begin, const Char* end) { - auto handler = arg_id_handler{arg_ref{}}; - auto arg_id_end = parse_arg_id(begin, end, handler); - return parse_arg_id_result{handler.arg_id, arg_id_end}; -} - -template struct field_type { - using type = remove_cvref_t; -}; - -template -struct field_type::value>> { - using type = remove_cvref_t; -}; - -template -constexpr auto parse_replacement_field_then_tail(S format_str) { - using char_type = typename S::char_type; - constexpr auto str = basic_string_view(format_str); - constexpr char_type c = END_POS != str.size() ? str[END_POS] : char_type(); - if constexpr (c == '}') { - return parse_tail( - field::type, ARG_INDEX>(), - format_str); - } else if constexpr (c != ':') { - FMT_THROW(format_error("expected ':'")); - } else { - constexpr auto result = parse_specs::type>( - str, END_POS + 1, NEXT_ID == manual_indexing_id ? 0 : NEXT_ID); - if constexpr (result.end >= str.size() || str[result.end] != '}') { - FMT_THROW(format_error("expected '}'")); - return 0; - } else { - return parse_tail( - spec_field::type, ARG_INDEX>{ - result.fmt}, - format_str); - } - } -} - -// Compiles a non-empty format string and returns the compiled representation -// or unknown_format() on unrecognized input. -template -constexpr auto compile_format_string(S format_str) { - using char_type = typename S::char_type; - constexpr auto str = basic_string_view(format_str); - if constexpr (str[POS] == '{') { - if constexpr (POS + 1 == str.size()) - FMT_THROW(format_error("unmatched '{' in format string")); - if constexpr (str[POS + 1] == '{') { - return parse_tail(make_text(str, POS, 1), format_str); - } else if constexpr (str[POS + 1] == '}' || str[POS + 1] == ':') { - static_assert(ID != manual_indexing_id, - "cannot switch from manual to automatic argument indexing"); - constexpr auto next_id = - ID != manual_indexing_id ? ID + 1 : manual_indexing_id; - return parse_replacement_field_then_tail, Args, - POS + 1, ID, next_id>( - format_str); - } else { - constexpr auto arg_id_result = - parse_arg_id(str.data() + POS + 1, str.data() + str.size()); - constexpr auto arg_id_end_pos = arg_id_result.arg_id_end - str.data(); - constexpr char_type c = - arg_id_end_pos != str.size() ? str[arg_id_end_pos] : char_type(); - static_assert(c == '}' || c == ':', "missing '}' in format string"); - if constexpr (arg_id_result.arg_id.kind == arg_id_kind::index) { - static_assert( - ID == manual_indexing_id || ID == 0, - "cannot switch from automatic to manual argument indexing"); - constexpr auto arg_index = arg_id_result.arg_id.val.index; - return parse_replacement_field_then_tail, - Args, arg_id_end_pos, - arg_index, manual_indexing_id>( - format_str); - } else if constexpr (arg_id_result.arg_id.kind == arg_id_kind::name) { - constexpr auto arg_index = - get_arg_index_by_name(arg_id_result.arg_id.val.name, Args{}); - if constexpr (arg_index != invalid_arg_index) { - constexpr auto next_id = - ID != manual_indexing_id ? ID + 1 : manual_indexing_id; - return parse_replacement_field_then_tail< - decltype(get_type::value), Args, arg_id_end_pos, - arg_index, next_id>(format_str); - } else { - if constexpr (c == '}') { - return parse_tail( - runtime_named_field{arg_id_result.arg_id.val.name}, - format_str); - } else if constexpr (c == ':') { - return unknown_format(); // no type info for specs parsing - } - } - } - } - } else if constexpr (str[POS] == '}') { - if constexpr (POS + 1 == str.size()) - FMT_THROW(format_error("unmatched '}' in format string")); - return parse_tail(make_text(str, POS, 1), format_str); - } else { - constexpr auto end = parse_text(str, POS + 1); - if constexpr (end - POS > 1) { - return parse_tail(make_text(str, POS, end - POS), - format_str); - } else { - return parse_tail(code_unit{str[POS]}, - format_str); - } - } -} - -template ::value)> -constexpr auto compile(S format_str) { - constexpr auto str = basic_string_view(format_str); - if constexpr (str.size() == 0) { - return detail::make_text(str, 0, 0); - } else { - constexpr auto result = - detail::compile_format_string, 0, 0>( - format_str); - return result; - } -} -#endif // defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction) -} // namespace detail - -FMT_MODULE_EXPORT_BEGIN - -#if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction) - -template ::value)> -FMT_INLINE std::basic_string format(const CompiledFormat& cf, - const Args&... args) { - auto s = std::basic_string(); - cf.format(std::back_inserter(s), args...); - return s; -} - -template ::value)> -constexpr FMT_INLINE OutputIt format_to(OutputIt out, const CompiledFormat& cf, - const Args&... args) { - return cf.format(out, args...); -} - -template ::value)> -FMT_INLINE std::basic_string format(const S&, - Args&&... args) { - if constexpr (std::is_same::value) { - constexpr auto str = basic_string_view(S()); - if constexpr (str.size() == 2 && str[0] == '{' && str[1] == '}') { - const auto& first = detail::first(args...); - if constexpr (detail::is_named_arg< - remove_cvref_t>::value) { - return fmt::to_string(first.value); - } else { - return fmt::to_string(first); - } - } - } - constexpr auto compiled = detail::compile(S()); - if constexpr (std::is_same, - detail::unknown_format>()) { - return fmt::format( - static_cast>(S()), - std::forward(args)...); - } else { - return fmt::format(compiled, std::forward(args)...); - } -} - -template ::value)> -FMT_CONSTEXPR OutputIt format_to(OutputIt out, const S&, Args&&... args) { - constexpr auto compiled = detail::compile(S()); - if constexpr (std::is_same, - detail::unknown_format>()) { - return fmt::format_to( - out, static_cast>(S()), - std::forward(args)...); - } else { - return fmt::format_to(out, compiled, std::forward(args)...); - } -} -#endif - -template ::value)> -format_to_n_result format_to_n(OutputIt out, size_t n, - const S& format_str, Args&&... args) { - auto it = fmt::format_to(detail::truncating_iterator(out, n), - format_str, std::forward(args)...); - return {it.base(), it.count()}; -} - -template ::value)> -FMT_CONSTEXPR20 size_t formatted_size(const S& format_str, - const Args&... args) { - return fmt::format_to(detail::counting_iterator(), format_str, args...) - .count(); -} - -template ::value)> -void print(std::FILE* f, const S& format_str, const Args&... args) { - memory_buffer buffer; - fmt::format_to(std::back_inserter(buffer), format_str, args...); - detail::print(f, {buffer.data(), buffer.size()}); -} - -template ::value)> -void print(const S& format_str, const Args&... args) { - print(stdout, format_str, args...); -} - -#if FMT_USE_NONTYPE_TEMPLATE_ARGS -inline namespace literals { -template constexpr auto operator""_cf() { - using char_t = remove_cvref_t; - return detail::udl_compiled_string(); -} -} // namespace literals -#endif - -FMT_MODULE_EXPORT_END -FMT_END_NAMESPACE - -#endif // FMT_COMPILE_H_ diff --git a/packages/seacas/libraries/aprepro_lib/fmt/core.h b/packages/seacas/libraries/aprepro_lib/fmt/core.h deleted file mode 100644 index af61b22c44ec..000000000000 --- a/packages/seacas/libraries/aprepro_lib/fmt/core.h +++ /dev/null @@ -1,3343 +0,0 @@ -// Formatting library for C++ - the core API for char/UTF-8 -// -// Copyright (c) 2012 - present, Victor Zverovich -// All rights reserved. -// -// For the license information refer to format.h. - -#ifndef FMT_CORE_H_ -#define FMT_CORE_H_ - -#include // std::byte -#include // std::FILE -#include // std::strlen -#include -#include -#include -#include - -// The fmt library version in the form major * 10000 + minor * 100 + patch. -#define FMT_VERSION 90101 - -#define FMT_HEADER_ONLY - -#if defined(__clang__) && !defined(__ibmxl__) -# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) -#else -# define FMT_CLANG_VERSION 0 -#endif - -#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && \ - !defined(__NVCOMPILER) -# define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) -#else -# define FMT_GCC_VERSION 0 -#endif - -#ifndef FMT_GCC_PRAGMA -// Workaround _Pragma bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59884. -# if FMT_GCC_VERSION >= 504 -# define FMT_GCC_PRAGMA(arg) _Pragma(arg) -# else -# define FMT_GCC_PRAGMA(arg) -# endif -#endif - -#ifdef __ICL -# define FMT_ICC_VERSION __ICL -#elif defined(__INTEL_COMPILER) -# define FMT_ICC_VERSION __INTEL_COMPILER -#else -# define FMT_ICC_VERSION 0 -#endif - -#ifdef _MSC_VER -# define FMT_MSC_VERSION _MSC_VER -# define FMT_MSC_WARNING(...) __pragma(warning(__VA_ARGS__)) -#else -# define FMT_MSC_VERSION 0 -# define FMT_MSC_WARNING(...) -#endif - -#ifdef _MSVC_LANG -# define FMT_CPLUSPLUS _MSVC_LANG -#else -# define FMT_CPLUSPLUS __cplusplus -#endif - -#ifdef __has_feature -# define FMT_HAS_FEATURE(x) __has_feature(x) -#else -# define FMT_HAS_FEATURE(x) 0 -#endif - -#if defined(__has_include) || FMT_ICC_VERSION >= 1600 || FMT_MSC_VERSION > 1900 -# define FMT_HAS_INCLUDE(x) __has_include(x) -#else -# define FMT_HAS_INCLUDE(x) 0 -#endif - -#ifdef __has_cpp_attribute -# define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) -#else -# define FMT_HAS_CPP_ATTRIBUTE(x) 0 -#endif - -#define FMT_HAS_CPP14_ATTRIBUTE(attribute) \ - (FMT_CPLUSPLUS >= 201402L && FMT_HAS_CPP_ATTRIBUTE(attribute)) - -#define FMT_HAS_CPP17_ATTRIBUTE(attribute) \ - (FMT_CPLUSPLUS >= 201703L && FMT_HAS_CPP_ATTRIBUTE(attribute)) - -// Check if relaxed C++14 constexpr is supported. -// GCC doesn't allow throw in constexpr until version 6 (bug 67371). -#ifndef FMT_USE_CONSTEXPR -# if (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VERSION >= 1912 || \ - (FMT_GCC_VERSION >= 600 && FMT_CPLUSPLUS >= 201402L)) && \ - !FMT_ICC_VERSION && !defined(__NVCC__) -# define FMT_USE_CONSTEXPR 1 -# else -# define FMT_USE_CONSTEXPR 0 -# endif -#endif -#if FMT_USE_CONSTEXPR -# define FMT_CONSTEXPR constexpr -#else -# define FMT_CONSTEXPR -#endif - -#if ((FMT_CPLUSPLUS >= 202002L) && \ - (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE > 9)) || \ - (FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002) -# define FMT_CONSTEXPR20 constexpr -#else -# define FMT_CONSTEXPR20 -#endif - -// Check if constexpr std::char_traits<>::{compare,length} are supported. -#if defined(__GLIBCXX__) -# if FMT_CPLUSPLUS >= 201703L && defined(_GLIBCXX_RELEASE) && \ - _GLIBCXX_RELEASE >= 7 // GCC 7+ libstdc++ has _GLIBCXX_RELEASE. -# define FMT_CONSTEXPR_CHAR_TRAITS constexpr -# endif -#elif defined(_LIBCPP_VERSION) && FMT_CPLUSPLUS >= 201703L && \ - _LIBCPP_VERSION >= 4000 -# define FMT_CONSTEXPR_CHAR_TRAITS constexpr -#elif FMT_MSC_VERSION >= 1914 && FMT_CPLUSPLUS >= 201703L -# define FMT_CONSTEXPR_CHAR_TRAITS constexpr -#endif -#ifndef FMT_CONSTEXPR_CHAR_TRAITS -# define FMT_CONSTEXPR_CHAR_TRAITS -#endif - -// Check if exceptions are disabled. -#ifndef FMT_EXCEPTIONS -# if (defined(__GNUC__) && !defined(__EXCEPTIONS)) || \ - (FMT_MSC_VERSION && !_HAS_EXCEPTIONS) -# define FMT_EXCEPTIONS 0 -# else -# define FMT_EXCEPTIONS 1 -# endif -#endif - -#ifndef FMT_DEPRECATED -# if FMT_HAS_CPP14_ATTRIBUTE(deprecated) || FMT_MSC_VERSION >= 1900 -# define FMT_DEPRECATED [[deprecated]] -# else -# if (defined(__GNUC__) && !defined(__LCC__)) || defined(__clang__) -# define FMT_DEPRECATED __attribute__((deprecated)) -# elif FMT_MSC_VERSION -# define FMT_DEPRECATED __declspec(deprecated) -# else -# define FMT_DEPRECATED /* deprecated */ -# endif -# endif -#endif - -// [[noreturn]] is disabled on MSVC and NVCC because of bogus unreachable code -// warnings. -#if FMT_EXCEPTIONS && FMT_HAS_CPP_ATTRIBUTE(noreturn) && !FMT_MSC_VERSION && \ - !defined(__NVCC__) -# define FMT_NORETURN [[noreturn]] -#else -# define FMT_NORETURN -#endif - -#if FMT_HAS_CPP17_ATTRIBUTE(fallthrough) -# define FMT_FALLTHROUGH [[fallthrough]] -#elif defined(__clang__) -# define FMT_FALLTHROUGH [[clang::fallthrough]] -#elif FMT_GCC_VERSION >= 700 && \ - (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 520) -# define FMT_FALLTHROUGH [[gnu::fallthrough]] -#else -# define FMT_FALLTHROUGH -#endif - -#ifndef FMT_NODISCARD -# if FMT_HAS_CPP17_ATTRIBUTE(nodiscard) -# define FMT_NODISCARD [[nodiscard]] -# else -# define FMT_NODISCARD -# endif -#endif - -#ifndef FMT_USE_FLOAT -# define FMT_USE_FLOAT 1 -#endif -#ifndef FMT_USE_DOUBLE -# define FMT_USE_DOUBLE 1 -#endif -#ifndef FMT_USE_LONG_DOUBLE -# define FMT_USE_LONG_DOUBLE 1 -#endif - -#ifndef FMT_INLINE -# if FMT_GCC_VERSION || FMT_CLANG_VERSION -# define FMT_INLINE inline __attribute__((always_inline)) -# else -# define FMT_INLINE inline -# endif -#endif - -// An inline std::forward replacement. -#define FMT_FORWARD(...) static_cast(__VA_ARGS__) - -#ifdef _MSC_VER -# define FMT_UNCHECKED_ITERATOR(It) \ - using _Unchecked_type = It // Mark iterator as checked. -#else -# define FMT_UNCHECKED_ITERATOR(It) using unchecked_type = It -#endif - -#ifndef FMT_BEGIN_NAMESPACE -# define FMT_BEGIN_NAMESPACE \ - namespace fmt { \ - inline namespace v9 { -# define FMT_END_NAMESPACE \ - } \ - } -#endif - -#ifndef FMT_MODULE_EXPORT -# define FMT_MODULE_EXPORT -# define FMT_MODULE_EXPORT_BEGIN -# define FMT_MODULE_EXPORT_END -# define FMT_BEGIN_DETAIL_NAMESPACE namespace detail { -# define FMT_END_DETAIL_NAMESPACE } -#endif - -#if !defined(FMT_HEADER_ONLY) && defined(_WIN32) -# define FMT_CLASS_API FMT_MSC_WARNING(suppress : 4275) -# ifdef FMT_EXPORT -# define FMT_API __declspec(dllexport) -# elif defined(FMT_SHARED) -# define FMT_API __declspec(dllimport) -# endif -#else -# define FMT_CLASS_API -# if defined(FMT_EXPORT) || defined(FMT_SHARED) -# if defined(__GNUC__) || defined(__clang__) -# define FMT_API __attribute__((visibility("default"))) -# endif -# endif -#endif -#ifndef FMT_API -# define FMT_API -#endif - -// libc++ supports string_view in pre-c++17. -#if FMT_HAS_INCLUDE() && \ - (FMT_CPLUSPLUS >= 201703L || defined(_LIBCPP_VERSION)) -# include -# define FMT_USE_STRING_VIEW -#elif FMT_HAS_INCLUDE("experimental/string_view") && FMT_CPLUSPLUS >= 201402L -# include -# define FMT_USE_EXPERIMENTAL_STRING_VIEW -#endif - -#ifndef FMT_UNICODE -# define FMT_UNICODE !FMT_MSC_VERSION -#endif - -#ifndef FMT_CONSTEVAL -# if ((FMT_GCC_VERSION >= 1000 || FMT_CLANG_VERSION >= 1101) && \ - FMT_CPLUSPLUS >= 202002L && !defined(__apple_build_version__)) || \ - (defined(__cpp_consteval) && \ - (!FMT_MSC_VERSION || _MSC_FULL_VER >= 193030704)) -// consteval is broken in MSVC before VS2022 and Apple clang 13. -# define FMT_CONSTEVAL consteval -# define FMT_HAS_CONSTEVAL -# else -# define FMT_CONSTEVAL -# endif -#endif - -#ifndef FMT_USE_NONTYPE_TEMPLATE_ARGS -# if defined(__cpp_nontype_template_args) && \ - ((FMT_GCC_VERSION >= 903 && FMT_CPLUSPLUS >= 201709L) || \ - __cpp_nontype_template_args >= 201911L) && \ - !defined(__NVCOMPILER) && !defined(__LCC__) -# define FMT_USE_NONTYPE_TEMPLATE_ARGS 1 -# else -# define FMT_USE_NONTYPE_TEMPLATE_ARGS 0 -# endif -#endif - -// Enable minimal optimizations for more compact code in debug mode. -FMT_GCC_PRAGMA("GCC push_options") -#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__) -FMT_GCC_PRAGMA("GCC optimize(\"Og\")") -#endif - -FMT_BEGIN_NAMESPACE -FMT_MODULE_EXPORT_BEGIN - -// Implementations of enable_if_t and other metafunctions for older systems. -template -using enable_if_t = typename std::enable_if::type; -template -using conditional_t = typename std::conditional::type; -template using bool_constant = std::integral_constant; -template -using remove_reference_t = typename std::remove_reference::type; -template -using remove_const_t = typename std::remove_const::type; -template -using remove_cvref_t = typename std::remove_cv>::type; -template struct type_identity { using type = T; }; -template using type_identity_t = typename type_identity::type; -template -using underlying_t = typename std::underlying_type::type; - -template struct disjunction : std::false_type {}; -template struct disjunction

: P {}; -template -struct disjunction - : conditional_t> {}; - -template struct conjunction : std::true_type {}; -template struct conjunction

: P {}; -template -struct conjunction - : conditional_t, P1> {}; - -struct monostate { - constexpr monostate() {} -}; - -// An enable_if helper to be used in template parameters which results in much -// shorter symbols: https://godbolt.org/z/sWw4vP. Extra parentheses are needed -// to workaround a bug in MSVC 2019 (see #1140 and #1186). -#ifdef FMT_DOC -# define FMT_ENABLE_IF(...) -#else -# define FMT_ENABLE_IF(...) fmt::enable_if_t<(__VA_ARGS__), int> = 0 -#endif - -FMT_BEGIN_DETAIL_NAMESPACE - -// Suppresses "unused variable" warnings with the method described in -// https://herbsutter.com/2009/10/18/mailbag-shutting-up-compiler-warnings/. -// (void)var does not work on many Intel compilers. -template FMT_CONSTEXPR void ignore_unused(const T&...) {} - -constexpr FMT_INLINE auto is_constant_evaluated( - bool default_value = false) noexcept -> bool { -#ifdef __cpp_lib_is_constant_evaluated - ignore_unused(default_value); - return std::is_constant_evaluated(); -#else - return default_value; -#endif -} - -// Suppresses "conditional expression is constant" warnings. -template constexpr FMT_INLINE auto const_check(T value) -> T { - return value; -} - -FMT_NORETURN FMT_API void assert_fail(const char* file, int line, - const char* message); - -#ifndef FMT_ASSERT -# ifdef NDEBUG -// FMT_ASSERT is not empty to avoid -Wempty-body. -# define FMT_ASSERT(condition, message) \ - ::fmt::detail::ignore_unused((condition), (message)) -# else -# define FMT_ASSERT(condition, message) \ - ((condition) /* void() fails with -Winvalid-constexpr on clang 4.0.1 */ \ - ? (void)0 \ - : ::fmt::detail::assert_fail(__FILE__, __LINE__, (message))) -# endif -#endif - -#if defined(FMT_USE_STRING_VIEW) -template using std_string_view = std::basic_string_view; -#elif defined(FMT_USE_EXPERIMENTAL_STRING_VIEW) -template -using std_string_view = std::experimental::basic_string_view; -#else -template struct std_string_view {}; -#endif - -#ifdef FMT_USE_INT128 -// Do nothing. -#elif defined(__SIZEOF_INT128__) && !defined(__NVCC__) && \ - !(FMT_CLANG_VERSION && FMT_MSC_VERSION) -# define FMT_USE_INT128 1 -using int128_opt = __int128_t; // An optional native 128-bit integer. -using uint128_opt = __uint128_t; -template inline auto convert_for_visit(T value) -> T { - return value; -} -#else -# define FMT_USE_INT128 0 -#endif -#if !FMT_USE_INT128 -enum class int128_opt {}; -enum class uint128_opt {}; -// Reduce template instantiations. -template auto convert_for_visit(T) -> monostate { return {}; } -#endif - -// Casts a nonnegative integer to unsigned. -template -FMT_CONSTEXPR auto to_unsigned(Int value) -> - typename std::make_unsigned::type { - return static_cast::type>(value); -} - -FMT_MSC_WARNING(suppress : 4566) constexpr unsigned char micro[] = "\u00B5"; - -constexpr auto is_utf8() -> bool { - // Avoid buggy sign extensions in MSVC's constant evaluation mode (#2297). - using uchar = unsigned char; - return FMT_UNICODE || (sizeof(micro) == 3 && uchar(micro[0]) == 0xC2 && - uchar(micro[1]) == 0xB5); -} -FMT_END_DETAIL_NAMESPACE - -/** - An implementation of ``std::basic_string_view`` for pre-C++17. It provides a - subset of the API. ``fmt::basic_string_view`` is used for format strings even - if ``std::string_view`` is available to prevent issues when a library is - compiled with a different ``-std`` option than the client code (which is not - recommended). - */ -template class basic_string_view { - private: - const Char* data_; - size_t size_; - - public: - using value_type = Char; - using iterator = const Char*; - - constexpr basic_string_view() noexcept : data_(nullptr), size_(0) {} - - /** Constructs a string reference object from a C string and a size. */ - constexpr basic_string_view(const Char* s, size_t count) noexcept - : data_(s), size_(count) {} - - /** - \rst - Constructs a string reference object from a C string computing - the size with ``std::char_traits::length``. - \endrst - */ - FMT_CONSTEXPR_CHAR_TRAITS - FMT_INLINE - basic_string_view(const Char* s) - : data_(s), - size_(detail::const_check(std::is_same::value && - !detail::is_constant_evaluated(true)) - ? std::strlen(reinterpret_cast(s)) - : std::char_traits::length(s)) {} - - /** Constructs a string reference from a ``std::basic_string`` object. */ - template - FMT_CONSTEXPR basic_string_view( - const std::basic_string& s) noexcept - : data_(s.data()), size_(s.size()) {} - - template >::value)> - FMT_CONSTEXPR basic_string_view(S s) noexcept - : data_(s.data()), size_(s.size()) {} - - /** Returns a pointer to the string data. */ - constexpr auto data() const noexcept -> const Char* { return data_; } - - /** Returns the string size. */ - constexpr auto size() const noexcept -> size_t { return size_; } - - constexpr auto begin() const noexcept -> iterator { return data_; } - constexpr auto end() const noexcept -> iterator { return data_ + size_; } - - constexpr auto operator[](size_t pos) const noexcept -> const Char& { - return data_[pos]; - } - - FMT_CONSTEXPR void remove_prefix(size_t n) noexcept { - data_ += n; - size_ -= n; - } - - FMT_CONSTEXPR_CHAR_TRAITS bool starts_with( - basic_string_view sv) const noexcept { - return size_ >= sv.size_ && - std::char_traits::compare(data_, sv.data_, sv.size_) == 0; - } - FMT_CONSTEXPR_CHAR_TRAITS bool starts_with(Char c) const noexcept { - return size_ >= 1 && std::char_traits::eq(*data_, c); - } - FMT_CONSTEXPR_CHAR_TRAITS bool starts_with(const Char* s) const { - return starts_with(basic_string_view(s)); - } - - // Lexicographically compare this string reference to other. - FMT_CONSTEXPR_CHAR_TRAITS auto compare(basic_string_view other) const -> int { - size_t str_size = size_ < other.size_ ? size_ : other.size_; - int result = std::char_traits::compare(data_, other.data_, str_size); - if (result == 0) - result = size_ == other.size_ ? 0 : (size_ < other.size_ ? -1 : 1); - return result; - } - - FMT_CONSTEXPR_CHAR_TRAITS friend auto operator==(basic_string_view lhs, - basic_string_view rhs) - -> bool { - return lhs.compare(rhs) == 0; - } - friend auto operator!=(basic_string_view lhs, basic_string_view rhs) -> bool { - return lhs.compare(rhs) != 0; - } - friend auto operator<(basic_string_view lhs, basic_string_view rhs) -> bool { - return lhs.compare(rhs) < 0; - } - friend auto operator<=(basic_string_view lhs, basic_string_view rhs) -> bool { - return lhs.compare(rhs) <= 0; - } - friend auto operator>(basic_string_view lhs, basic_string_view rhs) -> bool { - return lhs.compare(rhs) > 0; - } - friend auto operator>=(basic_string_view lhs, basic_string_view rhs) -> bool { - return lhs.compare(rhs) >= 0; - } -}; - -using string_view = basic_string_view; - -/** Specifies if ``T`` is a character type. Can be specialized by users. */ -template struct is_char : std::false_type {}; -template <> struct is_char : std::true_type {}; - -FMT_BEGIN_DETAIL_NAMESPACE - -// A base class for compile-time strings. -struct compile_string {}; - -template -struct is_compile_string : std::is_base_of {}; - -// Returns a string view of `s`. -template ::value)> -FMT_INLINE auto to_string_view(const Char* s) -> basic_string_view { - return s; -} -template -inline auto to_string_view(const std::basic_string& s) - -> basic_string_view { - return s; -} -template -constexpr auto to_string_view(basic_string_view s) - -> basic_string_view { - return s; -} -template >::value)> -inline auto to_string_view(std_string_view s) -> basic_string_view { - return s; -} -template ::value)> -constexpr auto to_string_view(const S& s) - -> basic_string_view { - return basic_string_view(s); -} -void to_string_view(...); - -// Specifies whether S is a string type convertible to fmt::basic_string_view. -// It should be a constexpr function but MSVC 2017 fails to compile it in -// enable_if and MSVC 2015 fails to compile it as an alias template. -// ADL invocation of to_string_view is DEPRECATED! -template -struct is_string : std::is_class()))> { -}; - -template struct char_t_impl {}; -template struct char_t_impl::value>> { - using result = decltype(to_string_view(std::declval())); - using type = typename result::value_type; -}; - -enum class type { - none_type, - // Integer types should go first, - int_type, - uint_type, - long_long_type, - ulong_long_type, - int128_type, - uint128_type, - bool_type, - char_type, - last_integer_type = char_type, - // followed by floating-point types. - float_type, - double_type, - long_double_type, - last_numeric_type = long_double_type, - cstring_type, - string_type, - pointer_type, - custom_type -}; - -// Maps core type T to the corresponding type enum constant. -template -struct type_constant : std::integral_constant {}; - -#define FMT_TYPE_CONSTANT(Type, constant) \ - template \ - struct type_constant \ - : std::integral_constant {} - -FMT_TYPE_CONSTANT(int, int_type); -FMT_TYPE_CONSTANT(unsigned, uint_type); -FMT_TYPE_CONSTANT(long long, long_long_type); -FMT_TYPE_CONSTANT(unsigned long long, ulong_long_type); -FMT_TYPE_CONSTANT(int128_opt, int128_type); -FMT_TYPE_CONSTANT(uint128_opt, uint128_type); -FMT_TYPE_CONSTANT(bool, bool_type); -FMT_TYPE_CONSTANT(Char, char_type); -FMT_TYPE_CONSTANT(float, float_type); -FMT_TYPE_CONSTANT(double, double_type); -FMT_TYPE_CONSTANT(long double, long_double_type); -FMT_TYPE_CONSTANT(const Char*, cstring_type); -FMT_TYPE_CONSTANT(basic_string_view, string_type); -FMT_TYPE_CONSTANT(const void*, pointer_type); - -constexpr bool is_integral_type(type t) { - return t > type::none_type && t <= type::last_integer_type; -} - -constexpr bool is_arithmetic_type(type t) { - return t > type::none_type && t <= type::last_numeric_type; -} - -FMT_NORETURN FMT_API void throw_format_error(const char* message); - -struct error_handler { - constexpr error_handler() = default; - constexpr error_handler(const error_handler&) = default; - - // This function is intentionally not constexpr to give a compile-time error. - FMT_NORETURN void on_error(const char* message) { - throw_format_error(message); - } -}; -FMT_END_DETAIL_NAMESPACE - -/** String's character type. */ -template using char_t = typename detail::char_t_impl::type; - -/** - \rst - Parsing context consisting of a format string range being parsed and an - argument counter for automatic indexing. - You can use the ``format_parse_context`` type alias for ``char`` instead. - \endrst - */ -template -class basic_format_parse_context : private ErrorHandler { - private: - basic_string_view format_str_; - int next_arg_id_; - - FMT_CONSTEXPR void do_check_arg_id(int id); - - public: - using char_type = Char; - using iterator = typename basic_string_view::iterator; - - explicit constexpr basic_format_parse_context( - basic_string_view format_str, ErrorHandler eh = {}, - int next_arg_id = 0) - : ErrorHandler(eh), format_str_(format_str), next_arg_id_(next_arg_id) {} - - /** - Returns an iterator to the beginning of the format string range being - parsed. - */ - constexpr auto begin() const noexcept -> iterator { - return format_str_.begin(); - } - - /** - Returns an iterator past the end of the format string range being parsed. - */ - constexpr auto end() const noexcept -> iterator { return format_str_.end(); } - - /** Advances the begin iterator to ``it``. */ - FMT_CONSTEXPR void advance_to(iterator it) { - format_str_.remove_prefix(detail::to_unsigned(it - begin())); - } - - /** - Reports an error if using the manual argument indexing; otherwise returns - the next argument index and switches to the automatic indexing. - */ - FMT_CONSTEXPR auto next_arg_id() -> int { - if (next_arg_id_ < 0) { - on_error("cannot switch from manual to automatic argument indexing"); - return 0; - } - int id = next_arg_id_++; - do_check_arg_id(id); - return id; - } - - /** - Reports an error if using the automatic argument indexing; otherwise - switches to the manual indexing. - */ - FMT_CONSTEXPR void check_arg_id(int id) { - if (next_arg_id_ > 0) { - on_error("cannot switch from automatic to manual argument indexing"); - return; - } - next_arg_id_ = -1; - do_check_arg_id(id); - } - FMT_CONSTEXPR void check_arg_id(basic_string_view) {} - FMT_CONSTEXPR void check_dynamic_spec(int arg_id); - - FMT_CONSTEXPR void on_error(const char* message) { - ErrorHandler::on_error(message); - } - - constexpr auto error_handler() const -> ErrorHandler { return *this; } -}; - -using format_parse_context = basic_format_parse_context; - -FMT_BEGIN_DETAIL_NAMESPACE -// A parse context with extra data used only in compile-time checks. -template -class compile_parse_context - : public basic_format_parse_context { - private: - int num_args_; - const type* types_; - using base = basic_format_parse_context; - - public: - explicit FMT_CONSTEXPR compile_parse_context( - basic_string_view format_str, int num_args, const type* types, - ErrorHandler eh = {}, int next_arg_id = 0) - : base(format_str, eh, next_arg_id), num_args_(num_args), types_(types) {} - - constexpr auto num_args() const -> int { return num_args_; } - constexpr auto arg_type(int id) const -> type { return types_[id]; } - - FMT_CONSTEXPR auto next_arg_id() -> int { - int id = base::next_arg_id(); - if (id >= num_args_) this->on_error("argument not found"); - return id; - } - - FMT_CONSTEXPR void check_arg_id(int id) { - base::check_arg_id(id); - if (id >= num_args_) this->on_error("argument not found"); - } - using base::check_arg_id; - - FMT_CONSTEXPR void check_dynamic_spec(int arg_id) { - detail::ignore_unused(arg_id); -#if !defined(__LCC__) - if (arg_id < num_args_ && types_ && !is_integral_type(types_[arg_id])) - this->on_error("width/precision is not integer"); -#endif - } -}; -FMT_END_DETAIL_NAMESPACE - -template -FMT_CONSTEXPR void -basic_format_parse_context::do_check_arg_id(int id) { - // Argument id is only checked at compile-time during parsing because - // formatting has its own validation. - if (detail::is_constant_evaluated() && FMT_GCC_VERSION >= 1200) { - using context = detail::compile_parse_context; - if (id >= static_cast(this)->num_args()) - on_error("argument not found"); - } -} - -template -FMT_CONSTEXPR void -basic_format_parse_context::check_dynamic_spec(int arg_id) { - if (detail::is_constant_evaluated()) { - using context = detail::compile_parse_context; - static_cast(this)->check_dynamic_spec(arg_id); - } -} - -template class basic_format_arg; -template class basic_format_args; -template class dynamic_format_arg_store; - -// A formatter for objects of type T. -template -struct formatter { - // A deleted default constructor indicates a disabled formatter. - formatter() = delete; -}; - -// Specifies if T has an enabled formatter specialization. A type can be -// formattable even if it doesn't have a formatter e.g. via a conversion. -template -using has_formatter = - std::is_constructible>; - -// Checks whether T is a container with contiguous storage. -template struct is_contiguous : std::false_type {}; -template -struct is_contiguous> : std::true_type {}; - -class appender; - -FMT_BEGIN_DETAIL_NAMESPACE - -template -constexpr auto has_const_formatter_impl(T*) - -> decltype(typename Context::template formatter_type().format( - std::declval(), std::declval()), - true) { - return true; -} -template -constexpr auto has_const_formatter_impl(...) -> bool { - return false; -} -template -constexpr auto has_const_formatter() -> bool { - return has_const_formatter_impl(static_cast(nullptr)); -} - -// Extracts a reference to the container from back_insert_iterator. -template -inline auto get_container(std::back_insert_iterator it) - -> Container& { - using base = std::back_insert_iterator; - struct accessor : base { - accessor(base b) : base(b) {} - using base::container; - }; - return *accessor(it).container; -} - -template -FMT_CONSTEXPR auto copy_str(InputIt begin, InputIt end, OutputIt out) - -> OutputIt { - while (begin != end) *out++ = static_cast(*begin++); - return out; -} - -template , U>::value&& is_char::value)> -FMT_CONSTEXPR auto copy_str(T* begin, T* end, U* out) -> U* { - if (is_constant_evaluated()) return copy_str(begin, end, out); - auto size = to_unsigned(end - begin); - memcpy(out, begin, size * sizeof(U)); - return out + size; -} - -/** - \rst - A contiguous memory buffer with an optional growing ability. It is an internal - class and shouldn't be used directly, only via `~fmt::basic_memory_buffer`. - \endrst - */ -template class buffer { - private: - T* ptr_; - size_t size_; - size_t capacity_; - - protected: - // Don't initialize ptr_ since it is not accessed to save a few cycles. - FMT_MSC_WARNING(suppress : 26495) - buffer(size_t sz) noexcept : size_(sz), capacity_(sz) {} - - FMT_CONSTEXPR20 buffer(T* p = nullptr, size_t sz = 0, size_t cap = 0) noexcept - : ptr_(p), size_(sz), capacity_(cap) {} - - FMT_CONSTEXPR20 ~buffer() = default; - buffer(buffer&&) = default; - - /** Sets the buffer data and capacity. */ - FMT_CONSTEXPR void set(T* buf_data, size_t buf_capacity) noexcept { - ptr_ = buf_data; - capacity_ = buf_capacity; - } - - /** Increases the buffer capacity to hold at least *capacity* elements. */ - virtual FMT_CONSTEXPR20 void grow(size_t capacity) = 0; - - public: - using value_type = T; - using const_reference = const T&; - - buffer(const buffer&) = delete; - void operator=(const buffer&) = delete; - - FMT_INLINE auto begin() noexcept -> T* { return ptr_; } - FMT_INLINE auto end() noexcept -> T* { return ptr_ + size_; } - - FMT_INLINE auto begin() const noexcept -> const T* { return ptr_; } - FMT_INLINE auto end() const noexcept -> const T* { return ptr_ + size_; } - - /** Returns the size of this buffer. */ - constexpr auto size() const noexcept -> size_t { return size_; } - - /** Returns the capacity of this buffer. */ - constexpr auto capacity() const noexcept -> size_t { return capacity_; } - - /** Returns a pointer to the buffer data. */ - FMT_CONSTEXPR auto data() noexcept -> T* { return ptr_; } - - /** Returns a pointer to the buffer data. */ - FMT_CONSTEXPR auto data() const noexcept -> const T* { return ptr_; } - - /** Clears this buffer. */ - void clear() { size_ = 0; } - - // Tries resizing the buffer to contain *count* elements. If T is a POD type - // the new elements may not be initialized. - FMT_CONSTEXPR20 void try_resize(size_t count) { - try_reserve(count); - size_ = count <= capacity_ ? count : capacity_; - } - - // Tries increasing the buffer capacity to *new_capacity*. It can increase the - // capacity by a smaller amount than requested but guarantees there is space - // for at least one additional element either by increasing the capacity or by - // flushing the buffer if it is full. - FMT_CONSTEXPR20 void try_reserve(size_t new_capacity) { - if (new_capacity > capacity_) grow(new_capacity); - } - - FMT_CONSTEXPR20 void push_back(const T& value) { - try_reserve(size_ + 1); - ptr_[size_++] = value; - } - - /** Appends data to the end of the buffer. */ - template void append(const U* begin, const U* end); - - template FMT_CONSTEXPR auto operator[](Idx index) -> T& { - return ptr_[index]; - } - template - FMT_CONSTEXPR auto operator[](Idx index) const -> const T& { - return ptr_[index]; - } -}; - -struct buffer_traits { - explicit buffer_traits(size_t) {} - auto count() const -> size_t { return 0; } - auto limit(size_t size) -> size_t { return size; } -}; - -class fixed_buffer_traits { - private: - size_t count_ = 0; - size_t limit_; - - public: - explicit fixed_buffer_traits(size_t limit) : limit_(limit) {} - auto count() const -> size_t { return count_; } - auto limit(size_t size) -> size_t { - size_t n = limit_ > count_ ? limit_ - count_ : 0; - count_ += size; - return size < n ? size : n; - } -}; - -// A buffer that writes to an output iterator when flushed. -template -class iterator_buffer final : public Traits, public buffer { - private: - OutputIt out_; - enum { buffer_size = 256 }; - T data_[buffer_size]; - - protected: - FMT_CONSTEXPR20 void grow(size_t) override { - if (this->size() == buffer_size) flush(); - } - - void flush() { - auto size = this->size(); - this->clear(); - out_ = copy_str(data_, data_ + this->limit(size), out_); - } - - public: - explicit iterator_buffer(OutputIt out, size_t n = buffer_size) - : Traits(n), buffer(data_, 0, buffer_size), out_(out) {} - iterator_buffer(iterator_buffer&& other) - : Traits(other), buffer(data_, 0, buffer_size), out_(other.out_) {} - ~iterator_buffer() { flush(); } - - auto out() -> OutputIt { - flush(); - return out_; - } - auto count() const -> size_t { return Traits::count() + this->size(); } -}; - -template -class iterator_buffer final - : public fixed_buffer_traits, - public buffer { - private: - T* out_; - enum { buffer_size = 256 }; - T data_[buffer_size]; - - protected: - FMT_CONSTEXPR20 void grow(size_t) override { - if (this->size() == this->capacity()) flush(); - } - - void flush() { - size_t n = this->limit(this->size()); - if (this->data() == out_) { - out_ += n; - this->set(data_, buffer_size); - } - this->clear(); - } - - public: - explicit iterator_buffer(T* out, size_t n = buffer_size) - : fixed_buffer_traits(n), buffer(out, 0, n), out_(out) {} - iterator_buffer(iterator_buffer&& other) - : fixed_buffer_traits(other), - buffer(std::move(other)), - out_(other.out_) { - if (this->data() != out_) { - this->set(data_, buffer_size); - this->clear(); - } - } - ~iterator_buffer() { flush(); } - - auto out() -> T* { - flush(); - return out_; - } - auto count() const -> size_t { - return fixed_buffer_traits::count() + this->size(); - } -}; - -template class iterator_buffer final : public buffer { - protected: - FMT_CONSTEXPR20 void grow(size_t) override {} - - public: - explicit iterator_buffer(T* out, size_t = 0) : buffer(out, 0, ~size_t()) {} - - auto out() -> T* { return &*this->end(); } -}; - -// A buffer that writes to a container with the contiguous storage. -template -class iterator_buffer, - enable_if_t::value, - typename Container::value_type>> - final : public buffer { - private: - Container& container_; - - protected: - FMT_CONSTEXPR20 void grow(size_t capacity) override { - container_.resize(capacity); - this->set(&container_[0], capacity); - } - - public: - explicit iterator_buffer(Container& c) - : buffer(c.size()), container_(c) {} - explicit iterator_buffer(std::back_insert_iterator out, size_t = 0) - : iterator_buffer(get_container(out)) {} - - auto out() -> std::back_insert_iterator { - return std::back_inserter(container_); - } -}; - -// A buffer that counts the number of code units written discarding the output. -template class counting_buffer final : public buffer { - private: - enum { buffer_size = 256 }; - T data_[buffer_size]; - size_t count_ = 0; - - protected: - FMT_CONSTEXPR20 void grow(size_t) override { - if (this->size() != buffer_size) return; - count_ += this->size(); - this->clear(); - } - - public: - counting_buffer() : buffer(data_, 0, buffer_size) {} - - auto count() -> size_t { return count_ + this->size(); } -}; - -template -using buffer_appender = conditional_t::value, appender, - std::back_insert_iterator>>; - -// Maps an output iterator to a buffer. -template -auto get_buffer(OutputIt out) -> iterator_buffer { - return iterator_buffer(out); -} -template , Buf>::value)> -auto get_buffer(std::back_insert_iterator out) -> buffer& { - return get_container(out); -} - -template -FMT_INLINE auto get_iterator(Buf& buf, OutputIt) -> decltype(buf.out()) { - return buf.out(); -} -template -auto get_iterator(buffer&, OutputIt out) -> OutputIt { - return out; -} - -template -struct fallback_formatter { - fallback_formatter() = delete; -}; - -// Specifies if T has an enabled fallback_formatter specialization. -template -using has_fallback_formatter = -#ifdef FMT_DEPRECATED_OSTREAM - std::is_constructible>; -#else - std::false_type; -#endif - -struct view {}; - -template struct named_arg : view { - const Char* name; - const T& value; - named_arg(const Char* n, const T& v) : name(n), value(v) {} -}; - -template struct named_arg_info { - const Char* name; - int id; -}; - -template -struct arg_data { - // args_[0].named_args points to named_args_ to avoid bloating format_args. - // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning. - T args_[1 + (NUM_ARGS != 0 ? NUM_ARGS : +1)]; - named_arg_info named_args_[NUM_NAMED_ARGS]; - - template - arg_data(const U&... init) : args_{T(named_args_, NUM_NAMED_ARGS), init...} {} - arg_data(const arg_data& other) = delete; - auto args() const -> const T* { return args_ + 1; } - auto named_args() -> named_arg_info* { return named_args_; } -}; - -template -struct arg_data { - // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning. - T args_[NUM_ARGS != 0 ? NUM_ARGS : +1]; - - template - FMT_CONSTEXPR FMT_INLINE arg_data(const U&... init) : args_{init...} {} - FMT_CONSTEXPR FMT_INLINE auto args() const -> const T* { return args_; } - FMT_CONSTEXPR FMT_INLINE auto named_args() -> std::nullptr_t { - return nullptr; - } -}; - -template -inline void init_named_args(named_arg_info*, int, int) {} - -template struct is_named_arg : std::false_type {}; -template struct is_statically_named_arg : std::false_type {}; - -template -struct is_named_arg> : std::true_type {}; - -template ::value)> -void init_named_args(named_arg_info* named_args, int arg_count, - int named_arg_count, const T&, const Tail&... args) { - init_named_args(named_args, arg_count + 1, named_arg_count, args...); -} - -template ::value)> -void init_named_args(named_arg_info* named_args, int arg_count, - int named_arg_count, const T& arg, const Tail&... args) { - named_args[named_arg_count++] = {arg.name, arg_count}; - init_named_args(named_args, arg_count + 1, named_arg_count, args...); -} - -template -FMT_CONSTEXPR FMT_INLINE void init_named_args(std::nullptr_t, int, int, - const Args&...) {} - -template constexpr auto count() -> size_t { return B ? 1 : 0; } -template constexpr auto count() -> size_t { - return (B1 ? 1 : 0) + count(); -} - -template constexpr auto count_named_args() -> size_t { - return count::value...>(); -} - -template -constexpr auto count_statically_named_args() -> size_t { - return count::value...>(); -} - -struct unformattable {}; -struct unformattable_char : unformattable {}; -struct unformattable_const : unformattable {}; -struct unformattable_pointer : unformattable {}; - -template struct string_value { - const Char* data; - size_t size; -}; - -template struct named_arg_value { - const named_arg_info* data; - size_t size; -}; - -template struct custom_value { - using parse_context = typename Context::parse_context_type; - void* value; - void (*format)(void* arg, parse_context& parse_ctx, Context& ctx); -}; - -// A formatting argument value. -template class value { - public: - using char_type = typename Context::char_type; - - union { - monostate no_value; - int int_value; - unsigned uint_value; - long long long_long_value; - unsigned long long ulong_long_value; - int128_opt int128_value; - uint128_opt uint128_value; - bool bool_value; - char_type char_value; - float float_value; - double double_value; - long double long_double_value; - const void* pointer; - string_value string; - custom_value custom; - named_arg_value named_args; - }; - - constexpr FMT_INLINE value() : no_value() {} - constexpr FMT_INLINE value(int val) : int_value(val) {} - constexpr FMT_INLINE value(unsigned val) : uint_value(val) {} - constexpr FMT_INLINE value(long long val) : long_long_value(val) {} - constexpr FMT_INLINE value(unsigned long long val) : ulong_long_value(val) {} - FMT_INLINE value(int128_opt val) : int128_value(val) {} - FMT_INLINE value(uint128_opt val) : uint128_value(val) {} - constexpr FMT_INLINE value(float val) : float_value(val) {} - constexpr FMT_INLINE value(double val) : double_value(val) {} - FMT_INLINE value(long double val) : long_double_value(val) {} - constexpr FMT_INLINE value(bool val) : bool_value(val) {} - constexpr FMT_INLINE value(char_type val) : char_value(val) {} - FMT_CONSTEXPR FMT_INLINE value(const char_type* val) { - string.data = val; - if (is_constant_evaluated()) string.size = {}; - } - FMT_CONSTEXPR FMT_INLINE value(basic_string_view val) { - string.data = val.data(); - string.size = val.size(); - } - FMT_INLINE value(const void* val) : pointer(val) {} - FMT_INLINE value(const named_arg_info* args, size_t size) - : named_args{args, size} {} - - template FMT_CONSTEXPR FMT_INLINE value(T& val) { - using value_type = remove_cvref_t; - custom.value = const_cast(&val); - // Get the formatter type through the context to allow different contexts - // have different extension points, e.g. `formatter` for `format` and - // `printf_formatter` for `printf`. - custom.format = format_custom_arg< - value_type, - conditional_t::value, - typename Context::template formatter_type, - fallback_formatter>>; - } - value(unformattable); - value(unformattable_char); - value(unformattable_const); - value(unformattable_pointer); - - private: - // Formats an argument of a custom type, such as a user-defined class. - template - static void format_custom_arg(void* arg, - typename Context::parse_context_type& parse_ctx, - Context& ctx) { - auto f = Formatter(); - parse_ctx.advance_to(f.parse(parse_ctx)); - using qualified_type = - conditional_t(), const T, T>; - ctx.advance_to(f.format(*static_cast(arg), ctx)); - } -}; - -template -FMT_CONSTEXPR auto make_arg(T&& value) -> basic_format_arg; - -// To minimize the number of types we need to deal with, long is translated -// either to int or to long long depending on its size. -enum { long_short = sizeof(long) == sizeof(int) }; -using long_type = conditional_t; -using ulong_type = conditional_t; - -#ifdef __cpp_lib_byte -inline auto format_as(std::byte b) -> unsigned char { - return static_cast(b); -} -#endif - -template struct has_format_as { - template ::value&& std::is_integral::value)> - static auto check(U*) -> std::true_type; - static auto check(...) -> std::false_type; - - enum { value = decltype(check(static_cast(nullptr)))::value }; -}; - -// Maps formatting arguments to core types. -// arg_mapper reports errors by returning unformattable instead of using -// static_assert because it's used in the is_formattable trait. -template struct arg_mapper { - using char_type = typename Context::char_type; - - FMT_CONSTEXPR FMT_INLINE auto map(signed char val) -> int { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(unsigned char val) -> unsigned { - return val; - } - FMT_CONSTEXPR FMT_INLINE auto map(short val) -> int { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(unsigned short val) -> unsigned { - return val; - } - FMT_CONSTEXPR FMT_INLINE auto map(int val) -> int { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(unsigned val) -> unsigned { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(long val) -> long_type { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(unsigned long val) -> ulong_type { - return val; - } - FMT_CONSTEXPR FMT_INLINE auto map(long long val) -> long long { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(unsigned long long val) - -> unsigned long long { - return val; - } - FMT_CONSTEXPR FMT_INLINE auto map(int128_opt val) -> int128_opt { - return val; - } - FMT_CONSTEXPR FMT_INLINE auto map(uint128_opt val) -> uint128_opt { - return val; - } - FMT_CONSTEXPR FMT_INLINE auto map(bool val) -> bool { return val; } - - template ::value || - std::is_same::value)> - FMT_CONSTEXPR FMT_INLINE auto map(T val) -> char_type { - return val; - } - template ::value || -#ifdef __cpp_char8_t - std::is_same::value || -#endif - std::is_same::value || - std::is_same::value) && - !std::is_same::value, - int> = 0> - FMT_CONSTEXPR FMT_INLINE auto map(T) -> unformattable_char { - return {}; - } - - FMT_CONSTEXPR FMT_INLINE auto map(float val) -> float { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(double val) -> double { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(long double val) -> long double { - return val; - } - - FMT_CONSTEXPR FMT_INLINE auto map(char_type* val) -> const char_type* { - return val; - } - FMT_CONSTEXPR FMT_INLINE auto map(const char_type* val) -> const char_type* { - return val; - } - template ::value && !std::is_pointer::value && - std::is_same>::value)> - FMT_CONSTEXPR FMT_INLINE auto map(const T& val) - -> basic_string_view { - return to_string_view(val); - } - template ::value && !std::is_pointer::value && - !std::is_same>::value)> - FMT_CONSTEXPR FMT_INLINE auto map(const T&) -> unformattable_char { - return {}; - } - template >::value && - !is_string::value && !has_formatter::value && - !has_fallback_formatter::value)> - FMT_CONSTEXPR FMT_INLINE auto map(const T& val) - -> basic_string_view { - return basic_string_view(val); - } - template >::value && - !std::is_convertible>::value && - !is_string::value && !has_formatter::value && - !has_fallback_formatter::value)> - FMT_CONSTEXPR FMT_INLINE auto map(const T& val) - -> basic_string_view { - return std_string_view(val); - } - - FMT_CONSTEXPR FMT_INLINE auto map(void* val) -> const void* { return val; } - FMT_CONSTEXPR FMT_INLINE auto map(const void* val) -> const void* { - return val; - } - FMT_CONSTEXPR FMT_INLINE auto map(std::nullptr_t val) -> const void* { - return val; - } - - // We use SFINAE instead of a const T* parameter to avoid conflicting with - // the C array overload. - template < - typename T, - FMT_ENABLE_IF( - std::is_pointer::value || std::is_member_pointer::value || - std::is_function::type>::value || - (std::is_convertible::value && - !std::is_convertible::value && - !has_formatter::value))> - FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer { - return {}; - } - - template ::value)> - FMT_CONSTEXPR FMT_INLINE auto map(const T (&values)[N]) -> const T (&)[N] { - return values; - } - - template ::value&& std::is_convertible::value && - !has_format_as::value && !has_formatter::value && - !has_fallback_formatter::value)> - FMT_CONSTEXPR FMT_INLINE auto map(const T& val) - -> decltype(std::declval().map( - static_cast>(val))) { - return map(static_cast>(val)); - } - - template ::value && - !has_formatter::value)> - FMT_CONSTEXPR FMT_INLINE auto map(const T& val) - -> decltype(std::declval().map(format_as(T()))) { - return map(format_as(val)); - } - - template > - struct formattable - : bool_constant() || - !std::is_const>::value || - has_fallback_formatter::value> {}; - -#if (FMT_MSC_VERSION != 0 && FMT_MSC_VERSION < 1910) || \ - FMT_ICC_VERSION != 0 || defined(__NVCC__) - // Workaround a bug in MSVC and Intel (Issue 2746). - template FMT_CONSTEXPR FMT_INLINE auto do_map(T&& val) -> T& { - return val; - } -#else - template ::value)> - FMT_CONSTEXPR FMT_INLINE auto do_map(T&& val) -> T& { - return val; - } - template ::value)> - FMT_CONSTEXPR FMT_INLINE auto do_map(T&&) -> unformattable_const { - return {}; - } -#endif - - template , - FMT_ENABLE_IF(!is_string::value && !is_char::value && - !std::is_array::value && - !std::is_pointer::value && - !has_format_as::value && - (has_formatter::value || - has_fallback_formatter::value))> - FMT_CONSTEXPR FMT_INLINE auto map(T&& val) - -> decltype(this->do_map(std::forward(val))) { - return do_map(std::forward(val)); - } - - template ::value)> - FMT_CONSTEXPR FMT_INLINE auto map(const T& named_arg) - -> decltype(std::declval().map(named_arg.value)) { - return map(named_arg.value); - } - - auto map(...) -> unformattable { return {}; } -}; - -// A type constant after applying arg_mapper. -template -using mapped_type_constant = - type_constant().map(std::declval())), - typename Context::char_type>; - -enum { packed_arg_bits = 4 }; -// Maximum number of arguments with packed types. -enum { max_packed_args = 62 / packed_arg_bits }; -enum : unsigned long long { is_unpacked_bit = 1ULL << 63 }; -enum : unsigned long long { has_named_args_bit = 1ULL << 62 }; - -FMT_END_DETAIL_NAMESPACE - -// An output iterator that appends to a buffer. -// It is used to reduce symbol sizes for the common case. -class appender : public std::back_insert_iterator> { - using base = std::back_insert_iterator>; - - public: - using std::back_insert_iterator>::back_insert_iterator; - appender(base it) noexcept : base(it) {} - FMT_UNCHECKED_ITERATOR(appender); - - auto operator++() noexcept -> appender& { return *this; } - auto operator++(int) noexcept -> appender { return *this; } -}; - -// A formatting argument. It is a trivially copyable/constructible type to -// allow storage in basic_memory_buffer. -template class basic_format_arg { - private: - detail::value value_; - detail::type type_; - - template - friend FMT_CONSTEXPR auto detail::make_arg(T&& value) - -> basic_format_arg; - - template - friend FMT_CONSTEXPR auto visit_format_arg(Visitor&& vis, - const basic_format_arg& arg) - -> decltype(vis(0)); - - friend class basic_format_args; - friend class dynamic_format_arg_store; - - using char_type = typename Context::char_type; - - template - friend struct detail::arg_data; - - basic_format_arg(const detail::named_arg_info* args, size_t size) - : value_(args, size) {} - - public: - class handle { - public: - explicit handle(detail::custom_value custom) : custom_(custom) {} - - void format(typename Context::parse_context_type& parse_ctx, - Context& ctx) const { - custom_.format(custom_.value, parse_ctx, ctx); - } - - private: - detail::custom_value custom_; - }; - - constexpr basic_format_arg() : type_(detail::type::none_type) {} - - constexpr explicit operator bool() const noexcept { - return type_ != detail::type::none_type; - } - - auto type() const -> detail::type { return type_; } - - auto is_integral() const -> bool { return detail::is_integral_type(type_); } - auto is_arithmetic() const -> bool { - return detail::is_arithmetic_type(type_); - } -}; - -/** - \rst - Visits an argument dispatching to the appropriate visit method based on - the argument type. For example, if the argument type is ``double`` then - ``vis(value)`` will be called with the value of type ``double``. - \endrst - */ -#if FMT_ICC_VERSION != 0 -#pragma warning(disable : 1595) -#endif -template -FMT_CONSTEXPR FMT_INLINE auto visit_format_arg( - Visitor&& vis, const basic_format_arg& arg) -> decltype(vis(0)) { - switch (arg.type_) { - case detail::type::none_type: - break; - case detail::type::int_type: - return vis(arg.value_.int_value); - case detail::type::uint_type: - return vis(arg.value_.uint_value); - case detail::type::long_long_type: - return vis(arg.value_.long_long_value); - case detail::type::ulong_long_type: - return vis(arg.value_.ulong_long_value); - case detail::type::int128_type: - return vis(detail::convert_for_visit(arg.value_.int128_value)); - case detail::type::uint128_type: - return vis(detail::convert_for_visit(arg.value_.uint128_value)); - case detail::type::bool_type: - return vis(arg.value_.bool_value); - case detail::type::char_type: - return vis(arg.value_.char_value); - case detail::type::float_type: - return vis(arg.value_.float_value); - case detail::type::double_type: - return vis(arg.value_.double_value); - case detail::type::long_double_type: - return vis(arg.value_.long_double_value); - case detail::type::cstring_type: - return vis(arg.value_.string.data); - case detail::type::string_type: - using sv = basic_string_view; - return vis(sv(arg.value_.string.data, arg.value_.string.size)); - case detail::type::pointer_type: - return vis(arg.value_.pointer); - case detail::type::custom_type: - return vis(typename basic_format_arg::handle(arg.value_.custom)); - } - return vis(monostate()); -} - -FMT_BEGIN_DETAIL_NAMESPACE - -template -auto copy_str(InputIt begin, InputIt end, appender out) -> appender { - get_container(out).append(begin, end); - return out; -} - -template -FMT_CONSTEXPR auto copy_str(R&& rng, OutputIt out) -> OutputIt { - return detail::copy_str(rng.begin(), rng.end(), out); -} - -#if FMT_GCC_VERSION && FMT_GCC_VERSION < 500 -// A workaround for gcc 4.8 to make void_t work in a SFINAE context. -template struct void_t_impl { using type = void; }; -template -using void_t = typename detail::void_t_impl::type; -#else -template using void_t = void; -#endif - -template -struct is_output_iterator : std::false_type {}; - -template -struct is_output_iterator< - It, T, - void_t::iterator_category, - decltype(*std::declval() = std::declval())>> - : std::true_type {}; - -template -struct is_back_insert_iterator : std::false_type {}; -template -struct is_back_insert_iterator> - : std::true_type {}; - -template -struct is_contiguous_back_insert_iterator : std::false_type {}; -template -struct is_contiguous_back_insert_iterator> - : is_contiguous {}; -template <> -struct is_contiguous_back_insert_iterator : std::true_type {}; - -// A type-erased reference to an std::locale to avoid a heavy include. -class locale_ref { - private: - const void* locale_; // A type-erased pointer to std::locale. - - public: - constexpr FMT_INLINE locale_ref() : locale_(nullptr) {} - template explicit locale_ref(const Locale& loc); - - explicit operator bool() const noexcept { return locale_ != nullptr; } - - template auto get() const -> Locale; -}; - -template constexpr auto encode_types() -> unsigned long long { - return 0; -} - -template -constexpr auto encode_types() -> unsigned long long { - return static_cast(mapped_type_constant::value) | - (encode_types() << packed_arg_bits); -} - -template -FMT_CONSTEXPR FMT_INLINE auto make_value(T&& val) -> value { - const auto& arg = arg_mapper().map(FMT_FORWARD(val)); - - constexpr bool formattable_char = - !std::is_same::value; - static_assert(formattable_char, "Mixing character types is disallowed."); - - constexpr bool formattable_const = - !std::is_same::value; - static_assert(formattable_const, "Cannot format a const argument."); - - // Formatting of arbitrary pointers is disallowed. If you want to output - // a pointer cast it to "void *" or "const void *". In particular, this - // forbids formatting of "[const] volatile char *" which is printed as bool - // by iostreams. - constexpr bool formattable_pointer = - !std::is_same::value; - static_assert(formattable_pointer, - "Formatting of non-void pointers is disallowed."); - - constexpr bool formattable = - !std::is_same::value; - static_assert( - formattable, - "Cannot format an argument. To make type T formattable provide a " - "formatter specialization: https://fmt.dev/latest/api.html#udt"); - return {arg}; -} - -template -FMT_CONSTEXPR auto make_arg(T&& value) -> basic_format_arg { - basic_format_arg arg; - arg.type_ = mapped_type_constant::value; - arg.value_ = make_value(value); - return arg; -} - -// The type template parameter is there to avoid an ODR violation when using -// a fallback formatter in one translation unit and an implicit conversion in -// another (not recommended). -template -FMT_CONSTEXPR FMT_INLINE auto make_arg(T&& val) -> value { - return make_value(val); -} - -template -FMT_CONSTEXPR inline auto make_arg(T&& value) -> basic_format_arg { - return make_arg(value); -} -FMT_END_DETAIL_NAMESPACE - -// Formatting context. -template class basic_format_context { - public: - /** The character type for the output. */ - using char_type = Char; - - private: - OutputIt out_; - basic_format_args args_; - detail::locale_ref loc_; - - public: - using iterator = OutputIt; - using format_arg = basic_format_arg; - using parse_context_type = basic_format_parse_context; - template using formatter_type = formatter; - - basic_format_context(basic_format_context&&) = default; - basic_format_context(const basic_format_context&) = delete; - void operator=(const basic_format_context&) = delete; - /** - Constructs a ``basic_format_context`` object. References to the arguments are - stored in the object so make sure they have appropriate lifetimes. - */ - constexpr basic_format_context( - OutputIt out, basic_format_args ctx_args, - detail::locale_ref loc = detail::locale_ref()) - : out_(out), args_(ctx_args), loc_(loc) {} - - constexpr auto arg(int id) const -> format_arg { return args_.get(id); } - FMT_CONSTEXPR auto arg(basic_string_view name) -> format_arg { - return args_.get(name); - } - FMT_CONSTEXPR auto arg_id(basic_string_view name) -> int { - return args_.get_id(name); - } - auto args() const -> const basic_format_args& { - return args_; - } - - FMT_CONSTEXPR auto error_handler() -> detail::error_handler { return {}; } - void on_error(const char* message) { error_handler().on_error(message); } - - // Returns an iterator to the beginning of the output range. - FMT_CONSTEXPR auto out() -> iterator { return out_; } - - // Advances the begin iterator to ``it``. - void advance_to(iterator it) { - if (!detail::is_back_insert_iterator()) out_ = it; - } - - FMT_CONSTEXPR auto locale() -> detail::locale_ref { return loc_; } -}; - -template -using buffer_context = - basic_format_context, Char>; -using format_context = buffer_context; - -// Workaround an alias issue: https://stackoverflow.com/q/62767544/471164. -#define FMT_BUFFER_CONTEXT(Char) \ - basic_format_context, Char> - -template -using is_formattable = bool_constant< - !std::is_base_of>().map( - std::declval()))>::value && - !detail::has_fallback_formatter::value>; - -/** - \rst - An array of references to arguments. It can be implicitly converted into - `~fmt::basic_format_args` for passing into type-erased formatting functions - such as `~fmt::vformat`. - \endrst - */ -template -class format_arg_store -#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 - // Workaround a GCC template argument substitution bug. - : public basic_format_args -#endif -{ - private: - static const size_t num_args = sizeof...(Args); - static const size_t num_named_args = detail::count_named_args(); - static const bool is_packed = num_args <= detail::max_packed_args; - - using value_type = conditional_t, - basic_format_arg>; - - detail::arg_data - data_; - - friend class basic_format_args; - - static constexpr unsigned long long desc = - (is_packed ? detail::encode_types() - : detail::is_unpacked_bit | num_args) | - (num_named_args != 0 - ? static_cast(detail::has_named_args_bit) - : 0); - - public: - template - FMT_CONSTEXPR FMT_INLINE format_arg_store(T&&... args) - : -#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 - basic_format_args(*this), -#endif - data_{detail::make_arg< - is_packed, Context, - detail::mapped_type_constant, Context>::value>( - FMT_FORWARD(args))...} { - detail::init_named_args(data_.named_args(), 0, 0, args...); - } -}; - -/** - \rst - Constructs a `~fmt::format_arg_store` object that contains references to - arguments and can be implicitly converted to `~fmt::format_args`. `Context` - can be omitted in which case it defaults to `~fmt::context`. - See `~fmt::arg` for lifetime considerations. - \endrst - */ -template -constexpr auto make_format_args(Args&&... args) - -> format_arg_store...> { - return {FMT_FORWARD(args)...}; -} - -/** - \rst - Returns a named argument to be used in a formatting function. - It should only be used in a call to a formatting function or - `dynamic_format_arg_store::push_back`. - - **Example**:: - - fmt::print("Elapsed time: {s:.2f} seconds", fmt::arg("s", 1.23)); - \endrst - */ -template -inline auto arg(const Char* name, const T& arg) -> detail::named_arg { - static_assert(!detail::is_named_arg(), "nested named arguments"); - return {name, arg}; -} - -/** - \rst - A view of a collection of formatting arguments. To avoid lifetime issues it - should only be used as a parameter type in type-erased functions such as - ``vformat``:: - - void vlog(string_view format_str, format_args args); // OK - format_args args = make_format_args(42); // Error: dangling reference - \endrst - */ -template class basic_format_args { - public: - using size_type = int; - using format_arg = basic_format_arg; - - private: - // A descriptor that contains information about formatting arguments. - // If the number of arguments is less or equal to max_packed_args then - // argument types are passed in the descriptor. This reduces binary code size - // per formatting function call. - unsigned long long desc_; - union { - // If is_packed() returns true then argument values are stored in values_; - // otherwise they are stored in args_. This is done to improve cache - // locality and reduce compiled code size since storing larger objects - // may require more code (at least on x86-64) even if the same amount of - // data is actually copied to stack. It saves ~10% on the bloat test. - const detail::value* values_; - const format_arg* args_; - }; - - constexpr auto is_packed() const -> bool { - return (desc_ & detail::is_unpacked_bit) == 0; - } - auto has_named_args() const -> bool { - return (desc_ & detail::has_named_args_bit) != 0; - } - - FMT_CONSTEXPR auto type(int index) const -> detail::type { - int shift = index * detail::packed_arg_bits; - unsigned int mask = (1 << detail::packed_arg_bits) - 1; - return static_cast((desc_ >> shift) & mask); - } - - constexpr FMT_INLINE basic_format_args(unsigned long long desc, - const detail::value* values) - : desc_(desc), values_(values) {} - constexpr basic_format_args(unsigned long long desc, const format_arg* args) - : desc_(desc), args_(args) {} - - public: - constexpr basic_format_args() : desc_(0), args_(nullptr) {} - - /** - \rst - Constructs a `basic_format_args` object from `~fmt::format_arg_store`. - \endrst - */ - template - constexpr FMT_INLINE basic_format_args( - const format_arg_store& store) - : basic_format_args(format_arg_store::desc, - store.data_.args()) {} - - /** - \rst - Constructs a `basic_format_args` object from - `~fmt::dynamic_format_arg_store`. - \endrst - */ - constexpr FMT_INLINE basic_format_args( - const dynamic_format_arg_store& store) - : basic_format_args(store.get_types(), store.data()) {} - - /** - \rst - Constructs a `basic_format_args` object from a dynamic set of arguments. - \endrst - */ - constexpr basic_format_args(const format_arg* args, int count) - : basic_format_args(detail::is_unpacked_bit | detail::to_unsigned(count), - args) {} - - /** Returns the argument with the specified id. */ - FMT_CONSTEXPR auto get(int id) const -> format_arg { - format_arg arg; - if (!is_packed()) { - if (id < max_size()) arg = args_[id]; - return arg; - } - if (id >= detail::max_packed_args) return arg; - arg.type_ = type(id); - if (arg.type_ == detail::type::none_type) return arg; - arg.value_ = values_[id]; - return arg; - } - - template - auto get(basic_string_view name) const -> format_arg { - int id = get_id(name); - return id >= 0 ? get(id) : format_arg(); - } - - template - auto get_id(basic_string_view name) const -> int { - if (!has_named_args()) return -1; - const auto& named_args = - (is_packed() ? values_[-1] : args_[-1].value_).named_args; - for (size_t i = 0; i < named_args.size; ++i) { - if (named_args.data[i].name == name) return named_args.data[i].id; - } - return -1; - } - - auto max_size() const -> int { - unsigned long long max_packed = detail::max_packed_args; - return static_cast(is_packed() ? max_packed - : desc_ & ~detail::is_unpacked_bit); - } -}; - -/** An alias to ``basic_format_args``. */ -// A separate type would result in shorter symbols but break ABI compatibility -// between clang and gcc on ARM (#1919). -using format_args = basic_format_args; - -// We cannot use enum classes as bit fields because of a gcc bug, so we put them -// in namespaces instead (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414). -// Additionally, if an underlying type is specified, older gcc incorrectly warns -// that the type is too small. Both bugs are fixed in gcc 9.3. -#if FMT_GCC_VERSION && FMT_GCC_VERSION < 903 -# define FMT_ENUM_UNDERLYING_TYPE(type) -#else -# define FMT_ENUM_UNDERLYING_TYPE(type) : type -#endif -namespace align { -enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, left, right, center, - numeric}; -} -using align_t = align::type; -namespace sign { -enum type FMT_ENUM_UNDERLYING_TYPE(unsigned char){none, minus, plus, space}; -} -using sign_t = sign::type; - -FMT_BEGIN_DETAIL_NAMESPACE - -// Workaround an array initialization issue in gcc 4.8. -template struct fill_t { - private: - enum { max_size = 4 }; - Char data_[max_size] = {Char(' '), Char(0), Char(0), Char(0)}; - unsigned char size_ = 1; - - public: - FMT_CONSTEXPR void operator=(basic_string_view s) { - auto size = s.size(); - if (size > max_size) return throw_format_error("invalid fill"); - for (size_t i = 0; i < size; ++i) data_[i] = s[i]; - size_ = static_cast(size); - } - - constexpr auto size() const -> size_t { return size_; } - constexpr auto data() const -> const Char* { return data_; } - - FMT_CONSTEXPR auto operator[](size_t index) -> Char& { return data_[index]; } - FMT_CONSTEXPR auto operator[](size_t index) const -> const Char& { - return data_[index]; - } -}; -FMT_END_DETAIL_NAMESPACE - -enum class presentation_type : unsigned char { - none, - // Integer types should go first, - dec, // 'd' - oct, // 'o' - hex_lower, // 'x' - hex_upper, // 'X' - bin_lower, // 'b' - bin_upper, // 'B' - hexfloat_lower, // 'a' - hexfloat_upper, // 'A' - exp_lower, // 'e' - exp_upper, // 'E' - fixed_lower, // 'f' - fixed_upper, // 'F' - general_lower, // 'g' - general_upper, // 'G' - chr, // 'c' - string, // 's' - pointer, // 'p' - debug // '?' -}; - -// Format specifiers for built-in and string types. -template struct basic_format_specs { - int width; - int precision; - presentation_type type; - align_t align : 4; - sign_t sign : 3; - bool alt : 1; // Alternate form ('#'). - bool localized : 1; - detail::fill_t fill; - - constexpr basic_format_specs() - : width(0), - precision(-1), - type(presentation_type::none), - align(align::none), - sign(sign::none), - alt(false), - localized(false) {} -}; - -using format_specs = basic_format_specs; - -FMT_BEGIN_DETAIL_NAMESPACE - -enum class arg_id_kind { none, index, name }; - -// An argument reference. -template struct arg_ref { - FMT_CONSTEXPR arg_ref() : kind(arg_id_kind::none), val() {} - - FMT_CONSTEXPR explicit arg_ref(int index) - : kind(arg_id_kind::index), val(index) {} - FMT_CONSTEXPR explicit arg_ref(basic_string_view name) - : kind(arg_id_kind::name), val(name) {} - - FMT_CONSTEXPR auto operator=(int idx) -> arg_ref& { - kind = arg_id_kind::index; - val.index = idx; - return *this; - } - - arg_id_kind kind; - union value { - FMT_CONSTEXPR value(int id = 0) : index{id} {} - FMT_CONSTEXPR value(basic_string_view n) : name(n) {} - - int index; - basic_string_view name; - } val; -}; - -// Format specifiers with width and precision resolved at formatting rather -// than parsing time to allow re-using the same parsed specifiers with -// different sets of arguments (precompilation of format strings). -template -struct dynamic_format_specs : basic_format_specs { - arg_ref width_ref; - arg_ref precision_ref; -}; - -struct auto_id {}; - -// A format specifier handler that sets fields in basic_format_specs. -template class specs_setter { - protected: - basic_format_specs& specs_; - - public: - explicit FMT_CONSTEXPR specs_setter(basic_format_specs& specs) - : specs_(specs) {} - - FMT_CONSTEXPR specs_setter(const specs_setter& other) - : specs_(other.specs_) {} - - FMT_CONSTEXPR void on_align(align_t align) { specs_.align = align; } - FMT_CONSTEXPR void on_fill(basic_string_view fill) { - specs_.fill = fill; - } - FMT_CONSTEXPR void on_sign(sign_t s) { specs_.sign = s; } - FMT_CONSTEXPR void on_hash() { specs_.alt = true; } - FMT_CONSTEXPR void on_localized() { specs_.localized = true; } - - FMT_CONSTEXPR void on_zero() { - if (specs_.align == align::none) specs_.align = align::numeric; - specs_.fill[0] = Char('0'); - } - - FMT_CONSTEXPR void on_width(int width) { specs_.width = width; } - FMT_CONSTEXPR void on_precision(int precision) { - specs_.precision = precision; - } - FMT_CONSTEXPR void end_precision() {} - - FMT_CONSTEXPR void on_type(presentation_type type) { specs_.type = type; } -}; - -// Format spec handler that saves references to arguments representing dynamic -// width and precision to be resolved at formatting time. -template -class dynamic_specs_handler - : public specs_setter { - public: - using char_type = typename ParseContext::char_type; - - FMT_CONSTEXPR dynamic_specs_handler(dynamic_format_specs& specs, - ParseContext& ctx) - : specs_setter(specs), specs_(specs), context_(ctx) {} - - FMT_CONSTEXPR dynamic_specs_handler(const dynamic_specs_handler& other) - : specs_setter(other), - specs_(other.specs_), - context_(other.context_) {} - - template FMT_CONSTEXPR void on_dynamic_width(Id arg_id) { - specs_.width_ref = make_arg_ref(arg_id); - } - - template FMT_CONSTEXPR void on_dynamic_precision(Id arg_id) { - specs_.precision_ref = make_arg_ref(arg_id); - } - - FMT_CONSTEXPR void on_error(const char* message) { - context_.on_error(message); - } - - private: - dynamic_format_specs& specs_; - ParseContext& context_; - - using arg_ref_type = arg_ref; - - FMT_CONSTEXPR auto make_arg_ref(int arg_id) -> arg_ref_type { - context_.check_arg_id(arg_id); - context_.check_dynamic_spec(arg_id); - return arg_ref_type(arg_id); - } - - FMT_CONSTEXPR auto make_arg_ref(auto_id) -> arg_ref_type { - int arg_id = context_.next_arg_id(); - context_.check_dynamic_spec(arg_id); - return arg_ref_type(arg_id); - } - - FMT_CONSTEXPR auto make_arg_ref(basic_string_view arg_id) - -> arg_ref_type { - context_.check_arg_id(arg_id); - basic_string_view format_str( - context_.begin(), to_unsigned(context_.end() - context_.begin())); - return arg_ref_type(arg_id); - } -}; - -template constexpr bool is_ascii_letter(Char c) { - return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); -} - -// Converts a character to ASCII. Returns a number > 127 on conversion failure. -template ::value)> -constexpr auto to_ascii(Char c) -> Char { - return c; -} -template ::value)> -constexpr auto to_ascii(Char c) -> underlying_t { - return c; -} - -FMT_CONSTEXPR inline auto code_point_length_impl(char c) -> int { - return "\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\0\0\0\0\0\0\0\2\2\2\2\3\3\4" - [static_cast(c) >> 3]; -} - -template -FMT_CONSTEXPR auto code_point_length(const Char* begin) -> int { - if (const_check(sizeof(Char) != 1)) return 1; - int len = code_point_length_impl(static_cast(*begin)); - - // Compute the pointer to the next character early so that the next - // iteration can start working on the next character. Neither Clang - // nor GCC figure out this reordering on their own. - return len + !len; -} - -// Return the result via the out param to workaround gcc bug 77539. -template -FMT_CONSTEXPR auto find(Ptr first, Ptr last, T value, Ptr& out) -> bool { - for (out = first; out != last; ++out) { - if (*out == value) return true; - } - return false; -} - -template <> -inline auto find(const char* first, const char* last, char value, - const char*& out) -> bool { - out = static_cast( - std::memchr(first, value, to_unsigned(last - first))); - return out != nullptr; -} - -// Parses the range [begin, end) as an unsigned integer. This function assumes -// that the range is non-empty and the first character is a digit. -template -FMT_CONSTEXPR auto parse_nonnegative_int(const Char*& begin, const Char* end, - int error_value) noexcept -> int { - FMT_ASSERT(begin != end && '0' <= *begin && *begin <= '9', ""); - unsigned value = 0, prev = 0; - auto p = begin; - do { - prev = value; - value = value * 10 + unsigned(*p - '0'); - ++p; - } while (p != end && '0' <= *p && *p <= '9'); - auto num_digits = p - begin; - begin = p; - if (num_digits <= std::numeric_limits::digits10) - return static_cast(value); - // Check for overflow. - const unsigned max = to_unsigned((std::numeric_limits::max)()); - return num_digits == std::numeric_limits::digits10 + 1 && - prev * 10ull + unsigned(p[-1] - '0') <= max - ? static_cast(value) - : error_value; -} - -// Parses fill and alignment. -template -FMT_CONSTEXPR auto parse_align(const Char* begin, const Char* end, - Handler&& handler) -> const Char* { - FMT_ASSERT(begin != end, ""); - auto align = align::none; - auto p = begin + code_point_length(begin); - if (end - p <= 0) p = begin; - for (;;) { - switch (to_ascii(*p)) { - case '<': - align = align::left; - break; - case '>': - align = align::right; - break; - case '^': - align = align::center; - break; - default: - break; - } - if (align != align::none) { - if (p != begin) { - auto c = *begin; - if (c == '{') - return handler.on_error("invalid fill character '{'"), begin; - if (c == '}') return begin; - handler.on_fill(basic_string_view(begin, to_unsigned(p - begin))); - begin = p + 1; - } else - ++begin; - handler.on_align(align); - break; - } else if (p == begin) { - break; - } - p = begin; - } - return begin; -} - -template FMT_CONSTEXPR bool is_name_start(Char c) { - return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '_' == c; -} - -template -FMT_CONSTEXPR auto do_parse_arg_id(const Char* begin, const Char* end, - IDHandler&& handler) -> const Char* { - FMT_ASSERT(begin != end, ""); - Char c = *begin; - if (c >= '0' && c <= '9') { - int index = 0; - if (c != '0') - index = - parse_nonnegative_int(begin, end, (std::numeric_limits::max)()); - else - ++begin; - if (begin == end || (*begin != '}' && *begin != ':')) - handler.on_error("invalid format string"); - else - handler(index); - return begin; - } - if (!is_name_start(c)) { - handler.on_error("invalid format string"); - return begin; - } - auto it = begin; - do { - ++it; - } while (it != end && (is_name_start(c = *it) || ('0' <= c && c <= '9'))); - handler(basic_string_view(begin, to_unsigned(it - begin))); - return it; -} - -template -FMT_CONSTEXPR FMT_INLINE auto parse_arg_id(const Char* begin, const Char* end, - IDHandler&& handler) -> const Char* { - Char c = *begin; - if (c != '}' && c != ':') return do_parse_arg_id(begin, end, handler); - handler(); - return begin; -} - -template -FMT_CONSTEXPR auto parse_width(const Char* begin, const Char* end, - Handler&& handler) -> const Char* { - using detail::auto_id; - struct width_adapter { - Handler& handler; - - FMT_CONSTEXPR void operator()() { handler.on_dynamic_width(auto_id()); } - FMT_CONSTEXPR void operator()(int id) { handler.on_dynamic_width(id); } - FMT_CONSTEXPR void operator()(basic_string_view id) { - handler.on_dynamic_width(id); - } - FMT_CONSTEXPR void on_error(const char* message) { - if (message) handler.on_error(message); - } - }; - - FMT_ASSERT(begin != end, ""); - if ('0' <= *begin && *begin <= '9') { - int width = parse_nonnegative_int(begin, end, -1); - if (width != -1) - handler.on_width(width); - else - handler.on_error("number is too big"); - } else if (*begin == '{') { - ++begin; - if (begin != end) begin = parse_arg_id(begin, end, width_adapter{handler}); - if (begin == end || *begin != '}') - return handler.on_error("invalid format string"), begin; - ++begin; - } - return begin; -} - -template -FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end, - Handler&& handler) -> const Char* { - using detail::auto_id; - struct precision_adapter { - Handler& handler; - - FMT_CONSTEXPR void operator()() { handler.on_dynamic_precision(auto_id()); } - FMT_CONSTEXPR void operator()(int id) { handler.on_dynamic_precision(id); } - FMT_CONSTEXPR void operator()(basic_string_view id) { - handler.on_dynamic_precision(id); - } - FMT_CONSTEXPR void on_error(const char* message) { - if (message) handler.on_error(message); - } - }; - - ++begin; - auto c = begin != end ? *begin : Char(); - if ('0' <= c && c <= '9') { - auto precision = parse_nonnegative_int(begin, end, -1); - if (precision != -1) - handler.on_precision(precision); - else - handler.on_error("number is too big"); - } else if (c == '{') { - ++begin; - if (begin != end) - begin = parse_arg_id(begin, end, precision_adapter{handler}); - if (begin == end || *begin++ != '}') - return handler.on_error("invalid format string"), begin; - } else { - return handler.on_error("missing precision specifier"), begin; - } - handler.end_precision(); - return begin; -} - -template -FMT_CONSTEXPR auto parse_presentation_type(Char type) -> presentation_type { - switch (to_ascii(type)) { - case 'd': - return presentation_type::dec; - case 'o': - return presentation_type::oct; - case 'x': - return presentation_type::hex_lower; - case 'X': - return presentation_type::hex_upper; - case 'b': - return presentation_type::bin_lower; - case 'B': - return presentation_type::bin_upper; - case 'a': - return presentation_type::hexfloat_lower; - case 'A': - return presentation_type::hexfloat_upper; - case 'e': - return presentation_type::exp_lower; - case 'E': - return presentation_type::exp_upper; - case 'f': - return presentation_type::fixed_lower; - case 'F': - return presentation_type::fixed_upper; - case 'g': - return presentation_type::general_lower; - case 'G': - return presentation_type::general_upper; - case 'c': - return presentation_type::chr; - case 's': - return presentation_type::string; - case 'p': - return presentation_type::pointer; - case '?': - return presentation_type::debug; - default: - return presentation_type::none; - } -} - -// Parses standard format specifiers and sends notifications about parsed -// components to handler. -template -FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(const Char* begin, - const Char* end, - SpecHandler&& handler) - -> const Char* { - if (1 < end - begin && begin[1] == '}' && is_ascii_letter(*begin) && - *begin != 'L') { - presentation_type type = parse_presentation_type(*begin++); - if (type == presentation_type::none) - handler.on_error("invalid type specifier"); - handler.on_type(type); - return begin; - } - - if (begin == end) return begin; - - begin = parse_align(begin, end, handler); - if (begin == end) return begin; - - // Parse sign. - switch (to_ascii(*begin)) { - case '+': - handler.on_sign(sign::plus); - ++begin; - break; - case '-': - handler.on_sign(sign::minus); - ++begin; - break; - case ' ': - handler.on_sign(sign::space); - ++begin; - break; - default: - break; - } - if (begin == end) return begin; - - if (*begin == '#') { - handler.on_hash(); - if (++begin == end) return begin; - } - - // Parse zero flag. - if (*begin == '0') { - handler.on_zero(); - if (++begin == end) return begin; - } - - begin = parse_width(begin, end, handler); - if (begin == end) return begin; - - // Parse precision. - if (*begin == '.') { - begin = parse_precision(begin, end, handler); - if (begin == end) return begin; - } - - if (*begin == 'L') { - handler.on_localized(); - ++begin; - } - - // Parse type. - if (begin != end && *begin != '}') { - presentation_type type = parse_presentation_type(*begin++); - if (type == presentation_type::none) - handler.on_error("invalid type specifier"); - handler.on_type(type); - } - return begin; -} - -template -FMT_CONSTEXPR auto parse_replacement_field(const Char* begin, const Char* end, - Handler&& handler) -> const Char* { - struct id_adapter { - Handler& handler; - int arg_id; - - FMT_CONSTEXPR void operator()() { arg_id = handler.on_arg_id(); } - FMT_CONSTEXPR void operator()(int id) { arg_id = handler.on_arg_id(id); } - FMT_CONSTEXPR void operator()(basic_string_view id) { - arg_id = handler.on_arg_id(id); - } - FMT_CONSTEXPR void on_error(const char* message) { - if (message) handler.on_error(message); - } - }; - - ++begin; - if (begin == end) return handler.on_error("invalid format string"), end; - if (*begin == '}') { - handler.on_replacement_field(handler.on_arg_id(), begin); - } else if (*begin == '{') { - handler.on_text(begin, begin + 1); - } else { - auto adapter = id_adapter{handler, 0}; - begin = parse_arg_id(begin, end, adapter); - Char c = begin != end ? *begin : Char(); - if (c == '}') { - handler.on_replacement_field(adapter.arg_id, begin); - } else if (c == ':') { - begin = handler.on_format_specs(adapter.arg_id, begin + 1, end); - if (begin == end || *begin != '}') - return handler.on_error("unknown format specifier"), end; - } else { - return handler.on_error("missing '}' in format string"), end; - } - } - return begin + 1; -} - -template -FMT_CONSTEXPR FMT_INLINE void parse_format_string( - basic_string_view format_str, Handler&& handler) { - // Workaround a name-lookup bug in MSVC's modules implementation. - using detail::find; - - auto begin = format_str.data(); - auto end = begin + format_str.size(); - if (end - begin < 32) { - // Use a simple loop instead of memchr for small strings. - const Char* p = begin; - while (p != end) { - auto c = *p++; - if (c == '{') { - handler.on_text(begin, p - 1); - begin = p = parse_replacement_field(p - 1, end, handler); - } else if (c == '}') { - if (p == end || *p != '}') - return handler.on_error("unmatched '}' in format string"); - handler.on_text(begin, p); - begin = ++p; - } - } - handler.on_text(begin, end); - return; - } - struct writer { - FMT_CONSTEXPR void operator()(const Char* from, const Char* to) { - if (from == to) return; - for (;;) { - const Char* p = nullptr; - if (!find(from, to, Char('}'), p)) - return handler_.on_text(from, to); - ++p; - if (p == to || *p != '}') - return handler_.on_error("unmatched '}' in format string"); - handler_.on_text(from, p); - from = p + 1; - } - } - Handler& handler_; - } write = {handler}; - while (begin != end) { - // Doing two passes with memchr (one for '{' and another for '}') is up to - // 2.5x faster than the naive one-pass implementation on big format strings. - const Char* p = begin; - if (*begin != '{' && !find(begin + 1, end, Char('{'), p)) - return write(begin, end); - write(begin, p); - begin = parse_replacement_field(p, end, handler); - } -} - -template ::value> struct strip_named_arg { - using type = T; -}; -template struct strip_named_arg { - using type = remove_cvref_t; -}; - -template -FMT_CONSTEXPR auto parse_format_specs(ParseContext& ctx) - -> decltype(ctx.begin()) { - using char_type = typename ParseContext::char_type; - using context = buffer_context; - using stripped_type = typename strip_named_arg::type; - using mapped_type = conditional_t< - mapped_type_constant::value != type::custom_type, - decltype(arg_mapper().map(std::declval())), - stripped_type>; - auto f = conditional_t::value, - formatter, - fallback_formatter>(); - return f.parse(ctx); -} - -template -FMT_CONSTEXPR void check_int_type_spec(presentation_type type, - ErrorHandler&& eh) { - if (type > presentation_type::bin_upper && type != presentation_type::chr) - eh.on_error("invalid type specifier"); -} - -// Checks char specs and returns true if the type spec is char (and not int). -template -FMT_CONSTEXPR auto check_char_specs(const basic_format_specs& specs, - ErrorHandler&& eh = {}) -> bool { - if (specs.type != presentation_type::none && - specs.type != presentation_type::chr && - specs.type != presentation_type::debug) { - check_int_type_spec(specs.type, eh); - return false; - } - if (specs.align == align::numeric || specs.sign != sign::none || specs.alt) - eh.on_error("invalid format specifier for char"); - return true; -} - -// A floating-point presentation format. -enum class float_format : unsigned char { - general, // General: exponent notation or fixed point based on magnitude. - exp, // Exponent notation with the default precision of 6, e.g. 1.2e-3. - fixed, // Fixed point with the default precision of 6, e.g. 0.0012. - hex -}; - -struct float_specs { - int precision; - float_format format : 8; - sign_t sign : 8; - bool upper : 1; - bool locale : 1; - bool binary32 : 1; - bool showpoint : 1; -}; - -template -FMT_CONSTEXPR auto parse_float_type_spec(const basic_format_specs& specs, - ErrorHandler&& eh = {}) - -> float_specs { - auto result = float_specs(); - result.showpoint = specs.alt; - result.locale = specs.localized; - switch (specs.type) { - case presentation_type::none: - result.format = float_format::general; - break; - case presentation_type::general_upper: - result.upper = true; - FMT_FALLTHROUGH; - case presentation_type::general_lower: - result.format = float_format::general; - break; - case presentation_type::exp_upper: - result.upper = true; - FMT_FALLTHROUGH; - case presentation_type::exp_lower: - result.format = float_format::exp; - result.showpoint |= specs.precision != 0; - break; - case presentation_type::fixed_upper: - result.upper = true; - FMT_FALLTHROUGH; - case presentation_type::fixed_lower: - result.format = float_format::fixed; - result.showpoint |= specs.precision != 0; - break; - case presentation_type::hexfloat_upper: - result.upper = true; - FMT_FALLTHROUGH; - case presentation_type::hexfloat_lower: - result.format = float_format::hex; - break; - default: - eh.on_error("invalid type specifier"); - break; - } - return result; -} - -template -FMT_CONSTEXPR auto check_cstring_type_spec(presentation_type type, - ErrorHandler&& eh = {}) -> bool { - if (type == presentation_type::none || type == presentation_type::string || - type == presentation_type::debug) - return true; - if (type != presentation_type::pointer) eh.on_error("invalid type specifier"); - return false; -} - -template -FMT_CONSTEXPR void check_string_type_spec(presentation_type type, - ErrorHandler&& eh = {}) { - if (type != presentation_type::none && type != presentation_type::string && - type != presentation_type::debug) - eh.on_error("invalid type specifier"); -} - -template -FMT_CONSTEXPR void check_pointer_type_spec(presentation_type type, - ErrorHandler&& eh) { - if (type != presentation_type::none && type != presentation_type::pointer) - eh.on_error("invalid type specifier"); -} - -// A parse_format_specs handler that checks if specifiers are consistent with -// the argument type. -template class specs_checker : public Handler { - private: - detail::type arg_type_; - - FMT_CONSTEXPR void require_numeric_argument() { - if (!is_arithmetic_type(arg_type_)) - this->on_error("format specifier requires numeric argument"); - } - - public: - FMT_CONSTEXPR specs_checker(const Handler& handler, detail::type arg_type) - : Handler(handler), arg_type_(arg_type) {} - - FMT_CONSTEXPR void on_align(align_t align) { - if (align == align::numeric) require_numeric_argument(); - Handler::on_align(align); - } - - FMT_CONSTEXPR void on_sign(sign_t s) { - require_numeric_argument(); - if (is_integral_type(arg_type_) && arg_type_ != type::int_type && - arg_type_ != type::long_long_type && arg_type_ != type::int128_type && - arg_type_ != type::char_type) { - this->on_error("format specifier requires signed argument"); - } - Handler::on_sign(s); - } - - FMT_CONSTEXPR void on_hash() { - require_numeric_argument(); - Handler::on_hash(); - } - - FMT_CONSTEXPR void on_localized() { - require_numeric_argument(); - Handler::on_localized(); - } - - FMT_CONSTEXPR void on_zero() { - require_numeric_argument(); - Handler::on_zero(); - } - - FMT_CONSTEXPR void end_precision() { - if (is_integral_type(arg_type_) || arg_type_ == type::pointer_type) - this->on_error("precision not allowed for this argument type"); - } -}; - -constexpr int invalid_arg_index = -1; - -#if FMT_USE_NONTYPE_TEMPLATE_ARGS -template -constexpr auto get_arg_index_by_name(basic_string_view name) -> int { - if constexpr (detail::is_statically_named_arg()) { - if (name == T::name) return N; - } - if constexpr (sizeof...(Args) > 0) - return get_arg_index_by_name(name); - (void)name; // Workaround an MSVC bug about "unused" parameter. - return invalid_arg_index; -} -#endif - -template -FMT_CONSTEXPR auto get_arg_index_by_name(basic_string_view name) -> int { -#if FMT_USE_NONTYPE_TEMPLATE_ARGS - if constexpr (sizeof...(Args) > 0) - return get_arg_index_by_name<0, Args...>(name); -#endif - (void)name; - return invalid_arg_index; -} - -template -class format_string_checker { - private: - // In the future basic_format_parse_context will replace compile_parse_context - // here and will use is_constant_evaluated and downcasting to access the data - // needed for compile-time checks: https://godbolt.org/z/GvWzcTjh1. - using parse_context_type = compile_parse_context; - static constexpr int num_args = sizeof...(Args); - - // Format specifier parsing function. - using parse_func = const Char* (*)(parse_context_type&); - - parse_context_type context_; - parse_func parse_funcs_[num_args > 0 ? static_cast(num_args) : 1]; - type types_[num_args > 0 ? static_cast(num_args) : 1]; - - public: - explicit FMT_CONSTEXPR format_string_checker( - basic_string_view format_str, ErrorHandler eh) - : context_(format_str, num_args, types_, eh), - parse_funcs_{&parse_format_specs...}, - types_{ - mapped_type_constant>::value...} { - } - - FMT_CONSTEXPR void on_text(const Char*, const Char*) {} - - FMT_CONSTEXPR auto on_arg_id() -> int { return context_.next_arg_id(); } - FMT_CONSTEXPR auto on_arg_id(int id) -> int { - return context_.check_arg_id(id), id; - } - FMT_CONSTEXPR auto on_arg_id(basic_string_view id) -> int { -#if FMT_USE_NONTYPE_TEMPLATE_ARGS - auto index = get_arg_index_by_name(id); - if (index == invalid_arg_index) on_error("named argument is not found"); - return context_.check_arg_id(index), index; -#else - (void)id; - on_error("compile-time checks for named arguments require C++20 support"); - return 0; -#endif - } - - FMT_CONSTEXPR void on_replacement_field(int, const Char*) {} - - FMT_CONSTEXPR auto on_format_specs(int id, const Char* begin, const Char*) - -> const Char* { - context_.advance_to(context_.begin() + (begin - &*context_.begin())); - // id >= 0 check is a workaround for gcc 10 bug (#2065). - return id >= 0 && id < num_args ? parse_funcs_[id](context_) : begin; - } - - FMT_CONSTEXPR void on_error(const char* message) { - context_.on_error(message); - } -}; - -// Reports a compile-time error if S is not a valid format string. -template ::value)> -FMT_INLINE void check_format_string(const S&) { -#ifdef FMT_ENFORCE_COMPILE_STRING - static_assert(is_compile_string::value, - "FMT_ENFORCE_COMPILE_STRING requires all format strings to use " - "FMT_STRING."); -#endif -} -template ::value)> -void check_format_string(S format_str) { - FMT_CONSTEXPR auto s = basic_string_view(format_str); - using checker = format_string_checker...>; - FMT_CONSTEXPR bool invalid_format = - (parse_format_string(s, checker(s, {})), true); - ignore_unused(invalid_format); -} - -// Don't use type_identity for args to simplify symbols. -template -void vformat_to(buffer& buf, basic_string_view fmt, - basic_format_args args, - locale_ref loc = {}); - -FMT_API void vprint_mojibake(std::FILE*, string_view, format_args); -#ifndef _WIN32 -inline void vprint_mojibake(std::FILE*, string_view, format_args) {} -#endif -FMT_END_DETAIL_NAMESPACE - -// A formatter specialization for the core types corresponding to detail::type -// constants. -template -struct formatter::value != - detail::type::custom_type>> { - private: - detail::dynamic_format_specs specs_; - - public: - // Parses format specifiers stopping either at the end of the range or at the - // terminating '}'. - template - FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { - auto begin = ctx.begin(), end = ctx.end(); - if (begin == end) return begin; - using handler_type = detail::dynamic_specs_handler; - auto type = detail::type_constant::value; - auto checker = - detail::specs_checker(handler_type(specs_, ctx), type); - auto it = detail::parse_format_specs(begin, end, checker); - auto eh = ctx.error_handler(); - switch (type) { - case detail::type::none_type: - FMT_ASSERT(false, "invalid argument type"); - break; - case detail::type::bool_type: - if (specs_.type == presentation_type::none || - specs_.type == presentation_type::string) { - break; - } - FMT_FALLTHROUGH; - case detail::type::int_type: - case detail::type::uint_type: - case detail::type::long_long_type: - case detail::type::ulong_long_type: - case detail::type::int128_type: - case detail::type::uint128_type: - detail::check_int_type_spec(specs_.type, eh); - break; - case detail::type::char_type: - detail::check_char_specs(specs_, eh); - break; - case detail::type::float_type: - if (detail::const_check(FMT_USE_FLOAT)) - detail::parse_float_type_spec(specs_, eh); - else - FMT_ASSERT(false, "float support disabled"); - break; - case detail::type::double_type: - if (detail::const_check(FMT_USE_DOUBLE)) - detail::parse_float_type_spec(specs_, eh); - else - FMT_ASSERT(false, "double support disabled"); - break; - case detail::type::long_double_type: - if (detail::const_check(FMT_USE_LONG_DOUBLE)) - detail::parse_float_type_spec(specs_, eh); - else - FMT_ASSERT(false, "long double support disabled"); - break; - case detail::type::cstring_type: - detail::check_cstring_type_spec(specs_.type, eh); - break; - case detail::type::string_type: - detail::check_string_type_spec(specs_.type, eh); - break; - case detail::type::pointer_type: - detail::check_pointer_type_spec(specs_.type, eh); - break; - case detail::type::custom_type: - // Custom format specifiers are checked in parse functions of - // formatter specializations. - break; - } - return it; - } - - template ::value, - enable_if_t<(U == detail::type::string_type || - U == detail::type::cstring_type || - U == detail::type::char_type), - int> = 0> - FMT_CONSTEXPR void set_debug_format() { - specs_.type = presentation_type::debug; - } - - template - FMT_CONSTEXPR auto format(const T& val, FormatContext& ctx) const - -> decltype(ctx.out()); -}; - -#define FMT_FORMAT_AS(Type, Base) \ - template \ - struct formatter : formatter { \ - template \ - auto format(Type const& val, FormatContext& ctx) const \ - -> decltype(ctx.out()) { \ - return formatter::format(static_cast(val), ctx); \ - } \ - } - -FMT_FORMAT_AS(signed char, int); -FMT_FORMAT_AS(unsigned char, unsigned); -FMT_FORMAT_AS(short, int); -FMT_FORMAT_AS(unsigned short, unsigned); -FMT_FORMAT_AS(long, long long); -FMT_FORMAT_AS(unsigned long, unsigned long long); -FMT_FORMAT_AS(Char*, const Char*); -FMT_FORMAT_AS(std::basic_string, basic_string_view); -FMT_FORMAT_AS(std::nullptr_t, const void*); -FMT_FORMAT_AS(detail::std_string_view, basic_string_view); - -template struct basic_runtime { basic_string_view str; }; - -/** A compile-time format string. */ -template class basic_format_string { - private: - basic_string_view str_; - - public: - template >::value)> - FMT_CONSTEVAL FMT_INLINE basic_format_string(const S& s) : str_(s) { - static_assert( - detail::count< - (std::is_base_of>::value && - std::is_reference::value)...>() == 0, - "passing views as lvalues is disallowed"); -#ifdef FMT_HAS_CONSTEVAL - if constexpr (detail::count_named_args() == - detail::count_statically_named_args()) { - using checker = detail::format_string_checker...>; - detail::parse_format_string(str_, checker(s, {})); - } -#else - detail::check_format_string(s); -#endif - } - basic_format_string(basic_runtime r) : str_(r.str) {} - - FMT_INLINE operator basic_string_view() const { return str_; } - FMT_INLINE basic_string_view get() const { return str_; } -}; - -#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 -// Workaround broken conversion on older gcc. -template using format_string = string_view; -inline auto runtime(string_view s) -> string_view { return s; } -#else -template -using format_string = basic_format_string...>; -/** - \rst - Creates a runtime format string. - - **Example**:: - - // Check format string at runtime instead of compile-time. - fmt::print(fmt::runtime("{:d}"), "I am not a number"); - \endrst - */ -inline auto runtime(string_view s) -> basic_runtime { return {{s}}; } -#endif - -FMT_API auto vformat(string_view fmt, format_args args) -> std::string; - -/** - \rst - Formats ``args`` according to specifications in ``fmt`` and returns the result - as a string. - - **Example**:: - - #include - std::string message = fmt::format("The answer is {}.", 42); - \endrst -*/ -template -FMT_NODISCARD FMT_INLINE auto format(format_string fmt, T&&... args) - -> std::string { - return vformat(fmt, fmt::make_format_args(args...)); -} - -/** Formats a string and writes the output to ``out``. */ -template ::value)> -auto vformat_to(OutputIt out, string_view fmt, format_args args) -> OutputIt { - auto&& buf = detail::get_buffer(out); - detail::vformat_to(buf, fmt, args, {}); - return detail::get_iterator(buf, out); -} - -/** - \rst - Formats ``args`` according to specifications in ``fmt``, writes the result to - the output iterator ``out`` and returns the iterator past the end of the output - range. `format_to` does not append a terminating null character. - - **Example**:: - - auto out = std::vector(); - fmt::format_to(std::back_inserter(out), "{}", 42); - \endrst - */ -template ::value)> -FMT_INLINE auto format_to(OutputIt out, format_string fmt, T&&... args) - -> OutputIt { - return vformat_to(out, fmt, fmt::make_format_args(args...)); -} - -template struct format_to_n_result { - /** Iterator past the end of the output range. */ - OutputIt out; - /** Total (not truncated) output size. */ - size_t size; -}; - -template ::value)> -auto vformat_to_n(OutputIt out, size_t n, string_view fmt, format_args args) - -> format_to_n_result { - using traits = detail::fixed_buffer_traits; - auto buf = detail::iterator_buffer(out, n); - detail::vformat_to(buf, fmt, args, {}); - return {buf.out(), buf.count()}; -} - -/** - \rst - Formats ``args`` according to specifications in ``fmt``, writes up to ``n`` - characters of the result to the output iterator ``out`` and returns the total - (not truncated) output size and the iterator past the end of the output range. - `format_to_n` does not append a terminating null character. - \endrst - */ -template ::value)> -FMT_INLINE auto format_to_n(OutputIt out, size_t n, format_string fmt, - T&&... args) -> format_to_n_result { - return vformat_to_n(out, n, fmt, fmt::make_format_args(args...)); -} - -/** Returns the number of chars in the output of ``format(fmt, args...)``. */ -template -FMT_NODISCARD FMT_INLINE auto formatted_size(format_string fmt, - T&&... args) -> size_t { - auto buf = detail::counting_buffer<>(); - detail::vformat_to(buf, string_view(fmt), - format_args(fmt::make_format_args(args...)), {}); - return buf.count(); -} - -FMT_API void vprint(string_view fmt, format_args args); -FMT_API void vprint(std::FILE* f, string_view fmt, format_args args); - -/** - \rst - Formats ``args`` according to specifications in ``fmt`` and writes the output - to ``stdout``. - - **Example**:: - - fmt::print("Elapsed time: {0:.2f} seconds", 1.23); - \endrst - */ -template -FMT_INLINE void print(format_string fmt, T&&... args) { - const auto& vargs = fmt::make_format_args(args...); - return detail::is_utf8() ? vprint(fmt, vargs) - : detail::vprint_mojibake(stdout, fmt, vargs); -} - -/** - \rst - Formats ``args`` according to specifications in ``fmt`` and writes the - output to the file ``f``. - - **Example**:: - - fmt::print(stderr, "Don't {}!", "panic"); - \endrst - */ -template -FMT_INLINE void print(std::FILE* f, format_string fmt, T&&... args) { - const auto& vargs = fmt::make_format_args(args...); - return detail::is_utf8() ? vprint(f, fmt, vargs) - : detail::vprint_mojibake(f, fmt, vargs); -} - -FMT_MODULE_EXPORT_END -FMT_GCC_PRAGMA("GCC pop_options") -FMT_END_NAMESPACE - -#ifdef FMT_HEADER_ONLY -# include "format.h" -#endif -#endif // FMT_CORE_H_ diff --git a/packages/seacas/libraries/aprepro_lib/fmt/format-inl.h b/packages/seacas/libraries/aprepro_lib/fmt/format-inl.h deleted file mode 100644 index 9ac55e47f22f..000000000000 --- a/packages/seacas/libraries/aprepro_lib/fmt/format-inl.h +++ /dev/null @@ -1,1759 +0,0 @@ -// Formatting library for C++ - implementation -// -// Copyright (c) 2012 - 2016, Victor Zverovich -// All rights reserved. -// -// For the license information refer to format.h. - -#ifndef FMT_FORMAT_INL_H_ -#define FMT_FORMAT_INL_H_ - -#include -#include -#include // errno -#include -#include -#include -#include // std::memmove -#include -#include - -#ifndef FMT_STATIC_THOUSANDS_SEPARATOR -# include -#endif - -#ifdef _WIN32 -# include // _isatty -#endif - -#include "format.h" - -FMT_BEGIN_NAMESPACE -namespace detail { - -FMT_FUNC void assert_fail(const char* file, int line, const char* message) { - // Use unchecked std::fprintf to avoid triggering another assertion when - // writing to stderr fails - std::fprintf(stderr, "%s:%d: assertion failed: %s", file, line, message); - // Chosen instead of std::abort to satisfy Clang in CUDA mode during device - // code pass. - std::terminate(); -} - -FMT_FUNC void throw_format_error(const char* message) { - FMT_THROW(format_error(message)); -} - -FMT_FUNC void format_error_code(detail::buffer& out, int error_code, - string_view message) noexcept { - // Report error code making sure that the output fits into - // inline_buffer_size to avoid dynamic memory allocation and potential - // bad_alloc. - out.try_resize(0); - static const char SEP[] = ": "; - static const char ERROR_STR[] = "error "; - // Subtract 2 to account for terminating null characters in SEP and ERROR_STR. - size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2; - auto abs_value = static_cast>(error_code); - if (detail::is_negative(error_code)) { - abs_value = 0 - abs_value; - ++error_code_size; - } - error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); - auto it = buffer_appender(out); - if (message.size() <= inline_buffer_size - error_code_size) - format_to(it, FMT_STRING("{}{}"), message, SEP); - format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); - FMT_ASSERT(out.size() <= inline_buffer_size, ""); -} - -FMT_FUNC void report_error(format_func func, int error_code, - const char* message) noexcept { - memory_buffer full_message; - func(full_message, error_code, message); - // Don't use fwrite_fully because the latter may throw. - if (std::fwrite(full_message.data(), full_message.size(), 1, stderr) > 0) - std::fputc('\n', stderr); -} - -// A wrapper around fwrite that throws on error. -inline void fwrite_fully(const void* ptr, size_t size, size_t count, - FILE* stream) { - size_t written = std::fwrite(ptr, size, count, stream); -#if !__NVCC__ - if (written < count) - FMT_THROW(system_error(errno, FMT_STRING("cannot write to file"))); -#endif -} - -#ifndef FMT_STATIC_THOUSANDS_SEPARATOR -template -locale_ref::locale_ref(const Locale& loc) : locale_(&loc) { - static_assert(std::is_same::value, ""); -} - -template Locale locale_ref::get() const { - static_assert(std::is_same::value, ""); - return locale_ ? *static_cast(locale_) : std::locale(); -} - -template -FMT_FUNC auto thousands_sep_impl(locale_ref loc) -> thousands_sep_result { - auto& facet = std::use_facet>(loc.get()); - auto grouping = facet.grouping(); - auto thousands_sep = grouping.empty() ? Char() : facet.thousands_sep(); - return {std::move(grouping), thousands_sep}; -} -template FMT_FUNC Char decimal_point_impl(locale_ref loc) { - return std::use_facet>(loc.get()) - .decimal_point(); -} -#else -template -FMT_FUNC auto thousands_sep_impl(locale_ref) -> thousands_sep_result { - return {"\03", FMT_STATIC_THOUSANDS_SEPARATOR}; -} -template FMT_FUNC Char decimal_point_impl(locale_ref) { - return '.'; -} -#endif - -FMT_FUNC auto write_loc(appender out, loc_value value, - const format_specs& specs, locale_ref loc) -> bool { -#ifndef FMT_STATIC_THOUSANDS_SEPARATOR - auto locale = loc.get(); - // We cannot use the num_put facet because it may produce output in - // a wrong encoding. - using facet = format_facet; - if (std::has_facet(locale)) - return std::use_facet(locale).put(out, value, specs); - return facet(locale).put(out, value, specs); -#endif - return false; -} -} // namespace detail - -template typename Locale::id format_facet::id; - -#ifndef FMT_STATIC_THOUSANDS_SEPARATOR -template format_facet::format_facet(Locale& loc) { - auto& numpunct = std::use_facet>(loc); - grouping_ = numpunct.grouping(); - if (!grouping_.empty()) separator_ = std::string(1, numpunct.thousands_sep()); -} - -template <> -FMT_API FMT_FUNC auto format_facet::do_put( - appender out, loc_value val, const format_specs& specs) const -> bool { - return val.visit( - detail::loc_writer<>{out, specs, separator_, grouping_, decimal_point_}); -} -#endif - -#if !FMT_MSC_VERSION -FMT_API FMT_FUNC format_error::~format_error() noexcept = default; -#endif - -#if !__NVCC__ -FMT_FUNC std::system_error vsystem_error(int error_code, string_view format_str, - format_args args) { - auto ec = std::error_code(error_code, std::generic_category()); - return std::system_error(ec, vformat(format_str, args)); -} -#endif - -namespace detail { - -template inline bool operator==(basic_fp x, basic_fp y) { - return x.f == y.f && x.e == y.e; -} - -// Compilers should be able to optimize this into the ror instruction. -FMT_CONSTEXPR inline uint32_t rotr(uint32_t n, uint32_t r) noexcept { - r &= 31; - return (n >> r) | (n << (32 - r)); -} -FMT_CONSTEXPR inline uint64_t rotr(uint64_t n, uint32_t r) noexcept { - r &= 63; - return (n >> r) | (n << (64 - r)); -} - -// Computes 128-bit result of multiplication of two 64-bit unsigned integers. -inline uint128_fallback umul128(uint64_t x, uint64_t y) noexcept { -#if FMT_USE_INT128 - auto p = static_cast(x) * static_cast(y); - return {static_cast(p >> 64), static_cast(p)}; -#elif defined(_MSC_VER) && defined(_M_X64) - auto result = uint128_fallback(); - result.lo_ = _umul128(x, y, &result.hi_); - return result; -#else - const uint64_t mask = static_cast(max_value()); - - uint64_t a = x >> 32; - uint64_t b = x & mask; - uint64_t c = y >> 32; - uint64_t d = y & mask; - - uint64_t ac = a * c; - uint64_t bc = b * c; - uint64_t ad = a * d; - uint64_t bd = b * d; - - uint64_t intermediate = (bd >> 32) + (ad & mask) + (bc & mask); - - return {ac + (intermediate >> 32) + (ad >> 32) + (bc >> 32), - (intermediate << 32) + (bd & mask)}; -#endif -} - -// Implementation of Dragonbox algorithm: https://github.com/jk-jeon/dragonbox. -namespace dragonbox { -// Computes upper 64 bits of multiplication of two 64-bit unsigned integers. -inline uint64_t umul128_upper64(uint64_t x, uint64_t y) noexcept { -#if FMT_USE_INT128 - auto p = static_cast(x) * static_cast(y); - return static_cast(p >> 64); -#elif defined(_MSC_VER) && defined(_M_X64) - return __umulh(x, y); -#else - return umul128(x, y).high(); -#endif -} - -// Computes upper 128 bits of multiplication of a 64-bit unsigned integer and a -// 128-bit unsigned integer. -inline uint128_fallback umul192_upper128(uint64_t x, - uint128_fallback y) noexcept { - uint128_fallback r = umul128(x, y.high()); - r += umul128_upper64(x, y.low()); - return r; -} - -// Computes upper 64 bits of multiplication of a 32-bit unsigned integer and a -// 64-bit unsigned integer. -inline uint64_t umul96_upper64(uint32_t x, uint64_t y) noexcept { - return umul128_upper64(static_cast(x) << 32, y); -} - -// Computes lower 128 bits of multiplication of a 64-bit unsigned integer and a -// 128-bit unsigned integer. -inline uint128_fallback umul192_lower128(uint64_t x, - uint128_fallback y) noexcept { - uint64_t high = x * y.high(); - uint128_fallback high_low = umul128(x, y.low()); - return {high + high_low.high(), high_low.low()}; -} - -// Computes lower 64 bits of multiplication of a 32-bit unsigned integer and a -// 64-bit unsigned integer. -inline uint64_t umul96_lower64(uint32_t x, uint64_t y) noexcept { - return x * y; -} - -// Computes floor(log10(pow(2, e))) for e in [-2620, 2620] using the method from -// https://fmt.dev/papers/Dragonbox.pdf#page=28, section 6.1. -inline int floor_log10_pow2(int e) noexcept { - FMT_ASSERT(e <= 2620 && e >= -2620, "too large exponent"); - static_assert((-1 >> 1) == -1, "right shift is not arithmetic"); - return (e * 315653) >> 20; -} - -// Various fast log computations. -inline int floor_log2_pow10(int e) noexcept { - FMT_ASSERT(e <= 1233 && e >= -1233, "too large exponent"); - return (e * 1741647) >> 19; -} -inline int floor_log10_pow2_minus_log10_4_over_3(int e) noexcept { - FMT_ASSERT(e <= 2936 && e >= -2985, "too large exponent"); - return (e * 631305 - 261663) >> 21; -} - -static constexpr struct { - uint32_t divisor; - int shift_amount; -} div_small_pow10_infos[] = {{10, 16}, {100, 16}}; - -// Replaces n by floor(n / pow(10, N)) returning true if and only if n is -// divisible by pow(10, N). -// Precondition: n <= pow(10, N + 1). -template -bool check_divisibility_and_divide_by_pow10(uint32_t& n) noexcept { - // The numbers below are chosen such that: - // 1. floor(n/d) = floor(nm / 2^k) where d=10 or d=100, - // 2. nm mod 2^k < m if and only if n is divisible by d, - // where m is magic_number, k is shift_amount - // and d is divisor. - // - // Item 1 is a common technique of replacing division by a constant with - // multiplication, see e.g. "Division by Invariant Integers Using - // Multiplication" by Granlund and Montgomery (1994). magic_number (m) is set - // to ceil(2^k/d) for large enough k. - // The idea for item 2 originates from Schubfach. - constexpr auto info = div_small_pow10_infos[N - 1]; - FMT_ASSERT(n <= info.divisor * 10, "n is too large"); - constexpr uint32_t magic_number = - (1u << info.shift_amount) / info.divisor + 1; - n *= magic_number; - const uint32_t comparison_mask = (1u << info.shift_amount) - 1; - bool result = (n & comparison_mask) < magic_number; - n >>= info.shift_amount; - return result; -} - -// Computes floor(n / pow(10, N)) for small n and N. -// Precondition: n <= pow(10, N + 1). -template uint32_t small_division_by_pow10(uint32_t n) noexcept { - constexpr auto info = div_small_pow10_infos[N - 1]; - FMT_ASSERT(n <= info.divisor * 10, "n is too large"); - constexpr uint32_t magic_number = - (1u << info.shift_amount) / info.divisor + 1; - return (n * magic_number) >> info.shift_amount; -} - -// Computes floor(n / 10^(kappa + 1)) (float) -inline uint32_t divide_by_10_to_kappa_plus_1(uint32_t n) noexcept { - // 1374389535 = ceil(2^37/100) - return static_cast((static_cast(n) * 1374389535) >> 37); -} -// Computes floor(n / 10^(kappa + 1)) (double) -inline uint64_t divide_by_10_to_kappa_plus_1(uint64_t n) noexcept { - // 2361183241434822607 = ceil(2^(64+7)/1000) - return umul128_upper64(n, 2361183241434822607ull) >> 7; -} - -// Various subroutines using pow10 cache -template struct cache_accessor; - -template <> struct cache_accessor { - using carrier_uint = float_info::carrier_uint; - using cache_entry_type = uint64_t; - - static uint64_t get_cached_power(int k) noexcept { - FMT_ASSERT(k >= float_info::min_k && k <= float_info::max_k, - "k is out of range"); - static constexpr const uint64_t pow10_significands[] = { - 0x81ceb32c4b43fcf5, 0xa2425ff75e14fc32, 0xcad2f7f5359a3b3f, - 0xfd87b5f28300ca0e, 0x9e74d1b791e07e49, 0xc612062576589ddb, - 0xf79687aed3eec552, 0x9abe14cd44753b53, 0xc16d9a0095928a28, - 0xf1c90080baf72cb2, 0x971da05074da7bef, 0xbce5086492111aeb, - 0xec1e4a7db69561a6, 0x9392ee8e921d5d08, 0xb877aa3236a4b44a, - 0xe69594bec44de15c, 0x901d7cf73ab0acda, 0xb424dc35095cd810, - 0xe12e13424bb40e14, 0x8cbccc096f5088cc, 0xafebff0bcb24aaff, - 0xdbe6fecebdedd5bf, 0x89705f4136b4a598, 0xabcc77118461cefd, - 0xd6bf94d5e57a42bd, 0x8637bd05af6c69b6, 0xa7c5ac471b478424, - 0xd1b71758e219652c, 0x83126e978d4fdf3c, 0xa3d70a3d70a3d70b, - 0xcccccccccccccccd, 0x8000000000000000, 0xa000000000000000, - 0xc800000000000000, 0xfa00000000000000, 0x9c40000000000000, - 0xc350000000000000, 0xf424000000000000, 0x9896800000000000, - 0xbebc200000000000, 0xee6b280000000000, 0x9502f90000000000, - 0xba43b74000000000, 0xe8d4a51000000000, 0x9184e72a00000000, - 0xb5e620f480000000, 0xe35fa931a0000000, 0x8e1bc9bf04000000, - 0xb1a2bc2ec5000000, 0xde0b6b3a76400000, 0x8ac7230489e80000, - 0xad78ebc5ac620000, 0xd8d726b7177a8000, 0x878678326eac9000, - 0xa968163f0a57b400, 0xd3c21bcecceda100, 0x84595161401484a0, - 0xa56fa5b99019a5c8, 0xcecb8f27f4200f3a, 0x813f3978f8940985, - 0xa18f07d736b90be6, 0xc9f2c9cd04674edf, 0xfc6f7c4045812297, - 0x9dc5ada82b70b59e, 0xc5371912364ce306, 0xf684df56c3e01bc7, - 0x9a130b963a6c115d, 0xc097ce7bc90715b4, 0xf0bdc21abb48db21, - 0x96769950b50d88f5, 0xbc143fa4e250eb32, 0xeb194f8e1ae525fe, - 0x92efd1b8d0cf37bf, 0xb7abc627050305ae, 0xe596b7b0c643c71a, - 0x8f7e32ce7bea5c70, 0xb35dbf821ae4f38c, 0xe0352f62a19e306f}; - return pow10_significands[k - float_info::min_k]; - } - - struct compute_mul_result { - carrier_uint result; - bool is_integer; - }; - struct compute_mul_parity_result { - bool parity; - bool is_integer; - }; - - static compute_mul_result compute_mul( - carrier_uint u, const cache_entry_type& cache) noexcept { - auto r = umul96_upper64(u, cache); - return {static_cast(r >> 32), - static_cast(r) == 0}; - } - - static uint32_t compute_delta(const cache_entry_type& cache, - int beta) noexcept { - return static_cast(cache >> (64 - 1 - beta)); - } - - static compute_mul_parity_result compute_mul_parity( - carrier_uint two_f, const cache_entry_type& cache, int beta) noexcept { - FMT_ASSERT(beta >= 1, ""); - FMT_ASSERT(beta < 64, ""); - - auto r = umul96_lower64(two_f, cache); - return {((r >> (64 - beta)) & 1) != 0, - static_cast(r >> (32 - beta)) == 0}; - } - - static carrier_uint compute_left_endpoint_for_shorter_interval_case( - const cache_entry_type& cache, int beta) noexcept { - return static_cast( - (cache - (cache >> (num_significand_bits() + 2))) >> - (64 - num_significand_bits() - 1 - beta)); - } - - static carrier_uint compute_right_endpoint_for_shorter_interval_case( - const cache_entry_type& cache, int beta) noexcept { - return static_cast( - (cache + (cache >> (num_significand_bits() + 1))) >> - (64 - num_significand_bits() - 1 - beta)); - } - - static carrier_uint compute_round_up_for_shorter_interval_case( - const cache_entry_type& cache, int beta) noexcept { - return (static_cast( - cache >> (64 - num_significand_bits() - 2 - beta)) + - 1) / - 2; - } -}; - -template <> struct cache_accessor { - using carrier_uint = float_info::carrier_uint; - using cache_entry_type = uint128_fallback; - - static uint128_fallback get_cached_power(int k) noexcept { - FMT_ASSERT(k >= float_info::min_k && k <= float_info::max_k, - "k is out of range"); - - static constexpr const uint128_fallback pow10_significands[] = { -#if FMT_USE_FULL_CACHE_DRAGONBOX - {0xff77b1fcbebcdc4f, 0x25e8e89c13bb0f7b}, - {0x9faacf3df73609b1, 0x77b191618c54e9ad}, - {0xc795830d75038c1d, 0xd59df5b9ef6a2418}, - {0xf97ae3d0d2446f25, 0x4b0573286b44ad1e}, - {0x9becce62836ac577, 0x4ee367f9430aec33}, - {0xc2e801fb244576d5, 0x229c41f793cda740}, - {0xf3a20279ed56d48a, 0x6b43527578c11110}, - {0x9845418c345644d6, 0x830a13896b78aaaa}, - {0xbe5691ef416bd60c, 0x23cc986bc656d554}, - {0xedec366b11c6cb8f, 0x2cbfbe86b7ec8aa9}, - {0x94b3a202eb1c3f39, 0x7bf7d71432f3d6aa}, - {0xb9e08a83a5e34f07, 0xdaf5ccd93fb0cc54}, - {0xe858ad248f5c22c9, 0xd1b3400f8f9cff69}, - {0x91376c36d99995be, 0x23100809b9c21fa2}, - {0xb58547448ffffb2d, 0xabd40a0c2832a78b}, - {0xe2e69915b3fff9f9, 0x16c90c8f323f516d}, - {0x8dd01fad907ffc3b, 0xae3da7d97f6792e4}, - {0xb1442798f49ffb4a, 0x99cd11cfdf41779d}, - {0xdd95317f31c7fa1d, 0x40405643d711d584}, - {0x8a7d3eef7f1cfc52, 0x482835ea666b2573}, - {0xad1c8eab5ee43b66, 0xda3243650005eed0}, - {0xd863b256369d4a40, 0x90bed43e40076a83}, - {0x873e4f75e2224e68, 0x5a7744a6e804a292}, - {0xa90de3535aaae202, 0x711515d0a205cb37}, - {0xd3515c2831559a83, 0x0d5a5b44ca873e04}, - {0x8412d9991ed58091, 0xe858790afe9486c3}, - {0xa5178fff668ae0b6, 0x626e974dbe39a873}, - {0xce5d73ff402d98e3, 0xfb0a3d212dc81290}, - {0x80fa687f881c7f8e, 0x7ce66634bc9d0b9a}, - {0xa139029f6a239f72, 0x1c1fffc1ebc44e81}, - {0xc987434744ac874e, 0xa327ffb266b56221}, - {0xfbe9141915d7a922, 0x4bf1ff9f0062baa9}, - {0x9d71ac8fada6c9b5, 0x6f773fc3603db4aa}, - {0xc4ce17b399107c22, 0xcb550fb4384d21d4}, - {0xf6019da07f549b2b, 0x7e2a53a146606a49}, - {0x99c102844f94e0fb, 0x2eda7444cbfc426e}, - {0xc0314325637a1939, 0xfa911155fefb5309}, - {0xf03d93eebc589f88, 0x793555ab7eba27cb}, - {0x96267c7535b763b5, 0x4bc1558b2f3458df}, - {0xbbb01b9283253ca2, 0x9eb1aaedfb016f17}, - {0xea9c227723ee8bcb, 0x465e15a979c1cadd}, - {0x92a1958a7675175f, 0x0bfacd89ec191eca}, - {0xb749faed14125d36, 0xcef980ec671f667c}, - {0xe51c79a85916f484, 0x82b7e12780e7401b}, - {0x8f31cc0937ae58d2, 0xd1b2ecb8b0908811}, - {0xb2fe3f0b8599ef07, 0x861fa7e6dcb4aa16}, - {0xdfbdcece67006ac9, 0x67a791e093e1d49b}, - {0x8bd6a141006042bd, 0xe0c8bb2c5c6d24e1}, - {0xaecc49914078536d, 0x58fae9f773886e19}, - {0xda7f5bf590966848, 0xaf39a475506a899f}, - {0x888f99797a5e012d, 0x6d8406c952429604}, - {0xaab37fd7d8f58178, 0xc8e5087ba6d33b84}, - {0xd5605fcdcf32e1d6, 0xfb1e4a9a90880a65}, - {0x855c3be0a17fcd26, 0x5cf2eea09a550680}, - {0xa6b34ad8c9dfc06f, 0xf42faa48c0ea481f}, - {0xd0601d8efc57b08b, 0xf13b94daf124da27}, - {0x823c12795db6ce57, 0x76c53d08d6b70859}, - {0xa2cb1717b52481ed, 0x54768c4b0c64ca6f}, - {0xcb7ddcdda26da268, 0xa9942f5dcf7dfd0a}, - {0xfe5d54150b090b02, 0xd3f93b35435d7c4d}, - {0x9efa548d26e5a6e1, 0xc47bc5014a1a6db0}, - {0xc6b8e9b0709f109a, 0x359ab6419ca1091c}, - {0xf867241c8cc6d4c0, 0xc30163d203c94b63}, - {0x9b407691d7fc44f8, 0x79e0de63425dcf1e}, - {0xc21094364dfb5636, 0x985915fc12f542e5}, - {0xf294b943e17a2bc4, 0x3e6f5b7b17b2939e}, - {0x979cf3ca6cec5b5a, 0xa705992ceecf9c43}, - {0xbd8430bd08277231, 0x50c6ff782a838354}, - {0xece53cec4a314ebd, 0xa4f8bf5635246429}, - {0x940f4613ae5ed136, 0x871b7795e136be9a}, - {0xb913179899f68584, 0x28e2557b59846e40}, - {0xe757dd7ec07426e5, 0x331aeada2fe589d0}, - {0x9096ea6f3848984f, 0x3ff0d2c85def7622}, - {0xb4bca50b065abe63, 0x0fed077a756b53aa}, - {0xe1ebce4dc7f16dfb, 0xd3e8495912c62895}, - {0x8d3360f09cf6e4bd, 0x64712dd7abbbd95d}, - {0xb080392cc4349dec, 0xbd8d794d96aacfb4}, - {0xdca04777f541c567, 0xecf0d7a0fc5583a1}, - {0x89e42caaf9491b60, 0xf41686c49db57245}, - {0xac5d37d5b79b6239, 0x311c2875c522ced6}, - {0xd77485cb25823ac7, 0x7d633293366b828c}, - {0x86a8d39ef77164bc, 0xae5dff9c02033198}, - {0xa8530886b54dbdeb, 0xd9f57f830283fdfd}, - {0xd267caa862a12d66, 0xd072df63c324fd7c}, - {0x8380dea93da4bc60, 0x4247cb9e59f71e6e}, - {0xa46116538d0deb78, 0x52d9be85f074e609}, - {0xcd795be870516656, 0x67902e276c921f8c}, - {0x806bd9714632dff6, 0x00ba1cd8a3db53b7}, - {0xa086cfcd97bf97f3, 0x80e8a40eccd228a5}, - {0xc8a883c0fdaf7df0, 0x6122cd128006b2ce}, - {0xfad2a4b13d1b5d6c, 0x796b805720085f82}, - {0x9cc3a6eec6311a63, 0xcbe3303674053bb1}, - {0xc3f490aa77bd60fc, 0xbedbfc4411068a9d}, - {0xf4f1b4d515acb93b, 0xee92fb5515482d45}, - {0x991711052d8bf3c5, 0x751bdd152d4d1c4b}, - {0xbf5cd54678eef0b6, 0xd262d45a78a0635e}, - {0xef340a98172aace4, 0x86fb897116c87c35}, - {0x9580869f0e7aac0e, 0xd45d35e6ae3d4da1}, - {0xbae0a846d2195712, 0x8974836059cca10a}, - {0xe998d258869facd7, 0x2bd1a438703fc94c}, - {0x91ff83775423cc06, 0x7b6306a34627ddd0}, - {0xb67f6455292cbf08, 0x1a3bc84c17b1d543}, - {0xe41f3d6a7377eeca, 0x20caba5f1d9e4a94}, - {0x8e938662882af53e, 0x547eb47b7282ee9d}, - {0xb23867fb2a35b28d, 0xe99e619a4f23aa44}, - {0xdec681f9f4c31f31, 0x6405fa00e2ec94d5}, - {0x8b3c113c38f9f37e, 0xde83bc408dd3dd05}, - {0xae0b158b4738705e, 0x9624ab50b148d446}, - {0xd98ddaee19068c76, 0x3badd624dd9b0958}, - {0x87f8a8d4cfa417c9, 0xe54ca5d70a80e5d7}, - {0xa9f6d30a038d1dbc, 0x5e9fcf4ccd211f4d}, - {0xd47487cc8470652b, 0x7647c32000696720}, - {0x84c8d4dfd2c63f3b, 0x29ecd9f40041e074}, - {0xa5fb0a17c777cf09, 0xf468107100525891}, - {0xcf79cc9db955c2cc, 0x7182148d4066eeb5}, - {0x81ac1fe293d599bf, 0xc6f14cd848405531}, - {0xa21727db38cb002f, 0xb8ada00e5a506a7d}, - {0xca9cf1d206fdc03b, 0xa6d90811f0e4851d}, - {0xfd442e4688bd304a, 0x908f4a166d1da664}, - {0x9e4a9cec15763e2e, 0x9a598e4e043287ff}, - {0xc5dd44271ad3cdba, 0x40eff1e1853f29fe}, - {0xf7549530e188c128, 0xd12bee59e68ef47d}, - {0x9a94dd3e8cf578b9, 0x82bb74f8301958cf}, - {0xc13a148e3032d6e7, 0xe36a52363c1faf02}, - {0xf18899b1bc3f8ca1, 0xdc44e6c3cb279ac2}, - {0x96f5600f15a7b7e5, 0x29ab103a5ef8c0ba}, - {0xbcb2b812db11a5de, 0x7415d448f6b6f0e8}, - {0xebdf661791d60f56, 0x111b495b3464ad22}, - {0x936b9fcebb25c995, 0xcab10dd900beec35}, - {0xb84687c269ef3bfb, 0x3d5d514f40eea743}, - {0xe65829b3046b0afa, 0x0cb4a5a3112a5113}, - {0x8ff71a0fe2c2e6dc, 0x47f0e785eaba72ac}, - {0xb3f4e093db73a093, 0x59ed216765690f57}, - {0xe0f218b8d25088b8, 0x306869c13ec3532d}, - {0x8c974f7383725573, 0x1e414218c73a13fc}, - {0xafbd2350644eeacf, 0xe5d1929ef90898fb}, - {0xdbac6c247d62a583, 0xdf45f746b74abf3a}, - {0x894bc396ce5da772, 0x6b8bba8c328eb784}, - {0xab9eb47c81f5114f, 0x066ea92f3f326565}, - {0xd686619ba27255a2, 0xc80a537b0efefebe}, - {0x8613fd0145877585, 0xbd06742ce95f5f37}, - {0xa798fc4196e952e7, 0x2c48113823b73705}, - {0xd17f3b51fca3a7a0, 0xf75a15862ca504c6}, - {0x82ef85133de648c4, 0x9a984d73dbe722fc}, - {0xa3ab66580d5fdaf5, 0xc13e60d0d2e0ebbb}, - {0xcc963fee10b7d1b3, 0x318df905079926a9}, - {0xffbbcfe994e5c61f, 0xfdf17746497f7053}, - {0x9fd561f1fd0f9bd3, 0xfeb6ea8bedefa634}, - {0xc7caba6e7c5382c8, 0xfe64a52ee96b8fc1}, - {0xf9bd690a1b68637b, 0x3dfdce7aa3c673b1}, - {0x9c1661a651213e2d, 0x06bea10ca65c084f}, - {0xc31bfa0fe5698db8, 0x486e494fcff30a63}, - {0xf3e2f893dec3f126, 0x5a89dba3c3efccfb}, - {0x986ddb5c6b3a76b7, 0xf89629465a75e01d}, - {0xbe89523386091465, 0xf6bbb397f1135824}, - {0xee2ba6c0678b597f, 0x746aa07ded582e2d}, - {0x94db483840b717ef, 0xa8c2a44eb4571cdd}, - {0xba121a4650e4ddeb, 0x92f34d62616ce414}, - {0xe896a0d7e51e1566, 0x77b020baf9c81d18}, - {0x915e2486ef32cd60, 0x0ace1474dc1d122f}, - {0xb5b5ada8aaff80b8, 0x0d819992132456bb}, - {0xe3231912d5bf60e6, 0x10e1fff697ed6c6a}, - {0x8df5efabc5979c8f, 0xca8d3ffa1ef463c2}, - {0xb1736b96b6fd83b3, 0xbd308ff8a6b17cb3}, - {0xddd0467c64bce4a0, 0xac7cb3f6d05ddbdf}, - {0x8aa22c0dbef60ee4, 0x6bcdf07a423aa96c}, - {0xad4ab7112eb3929d, 0x86c16c98d2c953c7}, - {0xd89d64d57a607744, 0xe871c7bf077ba8b8}, - {0x87625f056c7c4a8b, 0x11471cd764ad4973}, - {0xa93af6c6c79b5d2d, 0xd598e40d3dd89bd0}, - {0xd389b47879823479, 0x4aff1d108d4ec2c4}, - {0x843610cb4bf160cb, 0xcedf722a585139bb}, - {0xa54394fe1eedb8fe, 0xc2974eb4ee658829}, - {0xce947a3da6a9273e, 0x733d226229feea33}, - {0x811ccc668829b887, 0x0806357d5a3f5260}, - {0xa163ff802a3426a8, 0xca07c2dcb0cf26f8}, - {0xc9bcff6034c13052, 0xfc89b393dd02f0b6}, - {0xfc2c3f3841f17c67, 0xbbac2078d443ace3}, - {0x9d9ba7832936edc0, 0xd54b944b84aa4c0e}, - {0xc5029163f384a931, 0x0a9e795e65d4df12}, - {0xf64335bcf065d37d, 0x4d4617b5ff4a16d6}, - {0x99ea0196163fa42e, 0x504bced1bf8e4e46}, - {0xc06481fb9bcf8d39, 0xe45ec2862f71e1d7}, - {0xf07da27a82c37088, 0x5d767327bb4e5a4d}, - {0x964e858c91ba2655, 0x3a6a07f8d510f870}, - {0xbbe226efb628afea, 0x890489f70a55368c}, - {0xeadab0aba3b2dbe5, 0x2b45ac74ccea842f}, - {0x92c8ae6b464fc96f, 0x3b0b8bc90012929e}, - {0xb77ada0617e3bbcb, 0x09ce6ebb40173745}, - {0xe55990879ddcaabd, 0xcc420a6a101d0516}, - {0x8f57fa54c2a9eab6, 0x9fa946824a12232e}, - {0xb32df8e9f3546564, 0x47939822dc96abfa}, - {0xdff9772470297ebd, 0x59787e2b93bc56f8}, - {0x8bfbea76c619ef36, 0x57eb4edb3c55b65b}, - {0xaefae51477a06b03, 0xede622920b6b23f2}, - {0xdab99e59958885c4, 0xe95fab368e45ecee}, - {0x88b402f7fd75539b, 0x11dbcb0218ebb415}, - {0xaae103b5fcd2a881, 0xd652bdc29f26a11a}, - {0xd59944a37c0752a2, 0x4be76d3346f04960}, - {0x857fcae62d8493a5, 0x6f70a4400c562ddc}, - {0xa6dfbd9fb8e5b88e, 0xcb4ccd500f6bb953}, - {0xd097ad07a71f26b2, 0x7e2000a41346a7a8}, - {0x825ecc24c873782f, 0x8ed400668c0c28c9}, - {0xa2f67f2dfa90563b, 0x728900802f0f32fb}, - {0xcbb41ef979346bca, 0x4f2b40a03ad2ffba}, - {0xfea126b7d78186bc, 0xe2f610c84987bfa9}, - {0x9f24b832e6b0f436, 0x0dd9ca7d2df4d7ca}, - {0xc6ede63fa05d3143, 0x91503d1c79720dbc}, - {0xf8a95fcf88747d94, 0x75a44c6397ce912b}, - {0x9b69dbe1b548ce7c, 0xc986afbe3ee11abb}, - {0xc24452da229b021b, 0xfbe85badce996169}, - {0xf2d56790ab41c2a2, 0xfae27299423fb9c4}, - {0x97c560ba6b0919a5, 0xdccd879fc967d41b}, - {0xbdb6b8e905cb600f, 0x5400e987bbc1c921}, - {0xed246723473e3813, 0x290123e9aab23b69}, - {0x9436c0760c86e30b, 0xf9a0b6720aaf6522}, - {0xb94470938fa89bce, 0xf808e40e8d5b3e6a}, - {0xe7958cb87392c2c2, 0xb60b1d1230b20e05}, - {0x90bd77f3483bb9b9, 0xb1c6f22b5e6f48c3}, - {0xb4ecd5f01a4aa828, 0x1e38aeb6360b1af4}, - {0xe2280b6c20dd5232, 0x25c6da63c38de1b1}, - {0x8d590723948a535f, 0x579c487e5a38ad0f}, - {0xb0af48ec79ace837, 0x2d835a9df0c6d852}, - {0xdcdb1b2798182244, 0xf8e431456cf88e66}, - {0x8a08f0f8bf0f156b, 0x1b8e9ecb641b5900}, - {0xac8b2d36eed2dac5, 0xe272467e3d222f40}, - {0xd7adf884aa879177, 0x5b0ed81dcc6abb10}, - {0x86ccbb52ea94baea, 0x98e947129fc2b4ea}, - {0xa87fea27a539e9a5, 0x3f2398d747b36225}, - {0xd29fe4b18e88640e, 0x8eec7f0d19a03aae}, - {0x83a3eeeef9153e89, 0x1953cf68300424ad}, - {0xa48ceaaab75a8e2b, 0x5fa8c3423c052dd8}, - {0xcdb02555653131b6, 0x3792f412cb06794e}, - {0x808e17555f3ebf11, 0xe2bbd88bbee40bd1}, - {0xa0b19d2ab70e6ed6, 0x5b6aceaeae9d0ec5}, - {0xc8de047564d20a8b, 0xf245825a5a445276}, - {0xfb158592be068d2e, 0xeed6e2f0f0d56713}, - {0x9ced737bb6c4183d, 0x55464dd69685606c}, - {0xc428d05aa4751e4c, 0xaa97e14c3c26b887}, - {0xf53304714d9265df, 0xd53dd99f4b3066a9}, - {0x993fe2c6d07b7fab, 0xe546a8038efe402a}, - {0xbf8fdb78849a5f96, 0xde98520472bdd034}, - {0xef73d256a5c0f77c, 0x963e66858f6d4441}, - {0x95a8637627989aad, 0xdde7001379a44aa9}, - {0xbb127c53b17ec159, 0x5560c018580d5d53}, - {0xe9d71b689dde71af, 0xaab8f01e6e10b4a7}, - {0x9226712162ab070d, 0xcab3961304ca70e9}, - {0xb6b00d69bb55c8d1, 0x3d607b97c5fd0d23}, - {0xe45c10c42a2b3b05, 0x8cb89a7db77c506b}, - {0x8eb98a7a9a5b04e3, 0x77f3608e92adb243}, - {0xb267ed1940f1c61c, 0x55f038b237591ed4}, - {0xdf01e85f912e37a3, 0x6b6c46dec52f6689}, - {0x8b61313bbabce2c6, 0x2323ac4b3b3da016}, - {0xae397d8aa96c1b77, 0xabec975e0a0d081b}, - {0xd9c7dced53c72255, 0x96e7bd358c904a22}, - {0x881cea14545c7575, 0x7e50d64177da2e55}, - {0xaa242499697392d2, 0xdde50bd1d5d0b9ea}, - {0xd4ad2dbfc3d07787, 0x955e4ec64b44e865}, - {0x84ec3c97da624ab4, 0xbd5af13bef0b113f}, - {0xa6274bbdd0fadd61, 0xecb1ad8aeacdd58f}, - {0xcfb11ead453994ba, 0x67de18eda5814af3}, - {0x81ceb32c4b43fcf4, 0x80eacf948770ced8}, - {0xa2425ff75e14fc31, 0xa1258379a94d028e}, - {0xcad2f7f5359a3b3e, 0x096ee45813a04331}, - {0xfd87b5f28300ca0d, 0x8bca9d6e188853fd}, - {0x9e74d1b791e07e48, 0x775ea264cf55347e}, - {0xc612062576589dda, 0x95364afe032a819e}, - {0xf79687aed3eec551, 0x3a83ddbd83f52205}, - {0x9abe14cd44753b52, 0xc4926a9672793543}, - {0xc16d9a0095928a27, 0x75b7053c0f178294}, - {0xf1c90080baf72cb1, 0x5324c68b12dd6339}, - {0x971da05074da7bee, 0xd3f6fc16ebca5e04}, - {0xbce5086492111aea, 0x88f4bb1ca6bcf585}, - {0xec1e4a7db69561a5, 0x2b31e9e3d06c32e6}, - {0x9392ee8e921d5d07, 0x3aff322e62439fd0}, - {0xb877aa3236a4b449, 0x09befeb9fad487c3}, - {0xe69594bec44de15b, 0x4c2ebe687989a9b4}, - {0x901d7cf73ab0acd9, 0x0f9d37014bf60a11}, - {0xb424dc35095cd80f, 0x538484c19ef38c95}, - {0xe12e13424bb40e13, 0x2865a5f206b06fba}, - {0x8cbccc096f5088cb, 0xf93f87b7442e45d4}, - {0xafebff0bcb24aafe, 0xf78f69a51539d749}, - {0xdbe6fecebdedd5be, 0xb573440e5a884d1c}, - {0x89705f4136b4a597, 0x31680a88f8953031}, - {0xabcc77118461cefc, 0xfdc20d2b36ba7c3e}, - {0xd6bf94d5e57a42bc, 0x3d32907604691b4d}, - {0x8637bd05af6c69b5, 0xa63f9a49c2c1b110}, - {0xa7c5ac471b478423, 0x0fcf80dc33721d54}, - {0xd1b71758e219652b, 0xd3c36113404ea4a9}, - {0x83126e978d4fdf3b, 0x645a1cac083126ea}, - {0xa3d70a3d70a3d70a, 0x3d70a3d70a3d70a4}, - {0xcccccccccccccccc, 0xcccccccccccccccd}, - {0x8000000000000000, 0x0000000000000000}, - {0xa000000000000000, 0x0000000000000000}, - {0xc800000000000000, 0x0000000000000000}, - {0xfa00000000000000, 0x0000000000000000}, - {0x9c40000000000000, 0x0000000000000000}, - {0xc350000000000000, 0x0000000000000000}, - {0xf424000000000000, 0x0000000000000000}, - {0x9896800000000000, 0x0000000000000000}, - {0xbebc200000000000, 0x0000000000000000}, - {0xee6b280000000000, 0x0000000000000000}, - {0x9502f90000000000, 0x0000000000000000}, - {0xba43b74000000000, 0x0000000000000000}, - {0xe8d4a51000000000, 0x0000000000000000}, - {0x9184e72a00000000, 0x0000000000000000}, - {0xb5e620f480000000, 0x0000000000000000}, - {0xe35fa931a0000000, 0x0000000000000000}, - {0x8e1bc9bf04000000, 0x0000000000000000}, - {0xb1a2bc2ec5000000, 0x0000000000000000}, - {0xde0b6b3a76400000, 0x0000000000000000}, - {0x8ac7230489e80000, 0x0000000000000000}, - {0xad78ebc5ac620000, 0x0000000000000000}, - {0xd8d726b7177a8000, 0x0000000000000000}, - {0x878678326eac9000, 0x0000000000000000}, - {0xa968163f0a57b400, 0x0000000000000000}, - {0xd3c21bcecceda100, 0x0000000000000000}, - {0x84595161401484a0, 0x0000000000000000}, - {0xa56fa5b99019a5c8, 0x0000000000000000}, - {0xcecb8f27f4200f3a, 0x0000000000000000}, - {0x813f3978f8940984, 0x4000000000000000}, - {0xa18f07d736b90be5, 0x5000000000000000}, - {0xc9f2c9cd04674ede, 0xa400000000000000}, - {0xfc6f7c4045812296, 0x4d00000000000000}, - {0x9dc5ada82b70b59d, 0xf020000000000000}, - {0xc5371912364ce305, 0x6c28000000000000}, - {0xf684df56c3e01bc6, 0xc732000000000000}, - {0x9a130b963a6c115c, 0x3c7f400000000000}, - {0xc097ce7bc90715b3, 0x4b9f100000000000}, - {0xf0bdc21abb48db20, 0x1e86d40000000000}, - {0x96769950b50d88f4, 0x1314448000000000}, - {0xbc143fa4e250eb31, 0x17d955a000000000}, - {0xeb194f8e1ae525fd, 0x5dcfab0800000000}, - {0x92efd1b8d0cf37be, 0x5aa1cae500000000}, - {0xb7abc627050305ad, 0xf14a3d9e40000000}, - {0xe596b7b0c643c719, 0x6d9ccd05d0000000}, - {0x8f7e32ce7bea5c6f, 0xe4820023a2000000}, - {0xb35dbf821ae4f38b, 0xdda2802c8a800000}, - {0xe0352f62a19e306e, 0xd50b2037ad200000}, - {0x8c213d9da502de45, 0x4526f422cc340000}, - {0xaf298d050e4395d6, 0x9670b12b7f410000}, - {0xdaf3f04651d47b4c, 0x3c0cdd765f114000}, - {0x88d8762bf324cd0f, 0xa5880a69fb6ac800}, - {0xab0e93b6efee0053, 0x8eea0d047a457a00}, - {0xd5d238a4abe98068, 0x72a4904598d6d880}, - {0x85a36366eb71f041, 0x47a6da2b7f864750}, - {0xa70c3c40a64e6c51, 0x999090b65f67d924}, - {0xd0cf4b50cfe20765, 0xfff4b4e3f741cf6d}, - {0x82818f1281ed449f, 0xbff8f10e7a8921a5}, - {0xa321f2d7226895c7, 0xaff72d52192b6a0e}, - {0xcbea6f8ceb02bb39, 0x9bf4f8a69f764491}, - {0xfee50b7025c36a08, 0x02f236d04753d5b5}, - {0x9f4f2726179a2245, 0x01d762422c946591}, - {0xc722f0ef9d80aad6, 0x424d3ad2b7b97ef6}, - {0xf8ebad2b84e0d58b, 0xd2e0898765a7deb3}, - {0x9b934c3b330c8577, 0x63cc55f49f88eb30}, - {0xc2781f49ffcfa6d5, 0x3cbf6b71c76b25fc}, - {0xf316271c7fc3908a, 0x8bef464e3945ef7b}, - {0x97edd871cfda3a56, 0x97758bf0e3cbb5ad}, - {0xbde94e8e43d0c8ec, 0x3d52eeed1cbea318}, - {0xed63a231d4c4fb27, 0x4ca7aaa863ee4bde}, - {0x945e455f24fb1cf8, 0x8fe8caa93e74ef6b}, - {0xb975d6b6ee39e436, 0xb3e2fd538e122b45}, - {0xe7d34c64a9c85d44, 0x60dbbca87196b617}, - {0x90e40fbeea1d3a4a, 0xbc8955e946fe31ce}, - {0xb51d13aea4a488dd, 0x6babab6398bdbe42}, - {0xe264589a4dcdab14, 0xc696963c7eed2dd2}, - {0x8d7eb76070a08aec, 0xfc1e1de5cf543ca3}, - {0xb0de65388cc8ada8, 0x3b25a55f43294bcc}, - {0xdd15fe86affad912, 0x49ef0eb713f39ebf}, - {0x8a2dbf142dfcc7ab, 0x6e3569326c784338}, - {0xacb92ed9397bf996, 0x49c2c37f07965405}, - {0xd7e77a8f87daf7fb, 0xdc33745ec97be907}, - {0x86f0ac99b4e8dafd, 0x69a028bb3ded71a4}, - {0xa8acd7c0222311bc, 0xc40832ea0d68ce0d}, - {0xd2d80db02aabd62b, 0xf50a3fa490c30191}, - {0x83c7088e1aab65db, 0x792667c6da79e0fb}, - {0xa4b8cab1a1563f52, 0x577001b891185939}, - {0xcde6fd5e09abcf26, 0xed4c0226b55e6f87}, - {0x80b05e5ac60b6178, 0x544f8158315b05b5}, - {0xa0dc75f1778e39d6, 0x696361ae3db1c722}, - {0xc913936dd571c84c, 0x03bc3a19cd1e38ea}, - {0xfb5878494ace3a5f, 0x04ab48a04065c724}, - {0x9d174b2dcec0e47b, 0x62eb0d64283f9c77}, - {0xc45d1df942711d9a, 0x3ba5d0bd324f8395}, - {0xf5746577930d6500, 0xca8f44ec7ee3647a}, - {0x9968bf6abbe85f20, 0x7e998b13cf4e1ecc}, - {0xbfc2ef456ae276e8, 0x9e3fedd8c321a67f}, - {0xefb3ab16c59b14a2, 0xc5cfe94ef3ea101f}, - {0x95d04aee3b80ece5, 0xbba1f1d158724a13}, - {0xbb445da9ca61281f, 0x2a8a6e45ae8edc98}, - {0xea1575143cf97226, 0xf52d09d71a3293be}, - {0x924d692ca61be758, 0x593c2626705f9c57}, - {0xb6e0c377cfa2e12e, 0x6f8b2fb00c77836d}, - {0xe498f455c38b997a, 0x0b6dfb9c0f956448}, - {0x8edf98b59a373fec, 0x4724bd4189bd5ead}, - {0xb2977ee300c50fe7, 0x58edec91ec2cb658}, - {0xdf3d5e9bc0f653e1, 0x2f2967b66737e3ee}, - {0x8b865b215899f46c, 0xbd79e0d20082ee75}, - {0xae67f1e9aec07187, 0xecd8590680a3aa12}, - {0xda01ee641a708de9, 0xe80e6f4820cc9496}, - {0x884134fe908658b2, 0x3109058d147fdcde}, - {0xaa51823e34a7eede, 0xbd4b46f0599fd416}, - {0xd4e5e2cdc1d1ea96, 0x6c9e18ac7007c91b}, - {0x850fadc09923329e, 0x03e2cf6bc604ddb1}, - {0xa6539930bf6bff45, 0x84db8346b786151d}, - {0xcfe87f7cef46ff16, 0xe612641865679a64}, - {0x81f14fae158c5f6e, 0x4fcb7e8f3f60c07f}, - {0xa26da3999aef7749, 0xe3be5e330f38f09e}, - {0xcb090c8001ab551c, 0x5cadf5bfd3072cc6}, - {0xfdcb4fa002162a63, 0x73d9732fc7c8f7f7}, - {0x9e9f11c4014dda7e, 0x2867e7fddcdd9afb}, - {0xc646d63501a1511d, 0xb281e1fd541501b9}, - {0xf7d88bc24209a565, 0x1f225a7ca91a4227}, - {0x9ae757596946075f, 0x3375788de9b06959}, - {0xc1a12d2fc3978937, 0x0052d6b1641c83af}, - {0xf209787bb47d6b84, 0xc0678c5dbd23a49b}, - {0x9745eb4d50ce6332, 0xf840b7ba963646e1}, - {0xbd176620a501fbff, 0xb650e5a93bc3d899}, - {0xec5d3fa8ce427aff, 0xa3e51f138ab4cebf}, - {0x93ba47c980e98cdf, 0xc66f336c36b10138}, - {0xb8a8d9bbe123f017, 0xb80b0047445d4185}, - {0xe6d3102ad96cec1d, 0xa60dc059157491e6}, - {0x9043ea1ac7e41392, 0x87c89837ad68db30}, - {0xb454e4a179dd1877, 0x29babe4598c311fc}, - {0xe16a1dc9d8545e94, 0xf4296dd6fef3d67b}, - {0x8ce2529e2734bb1d, 0x1899e4a65f58660d}, - {0xb01ae745b101e9e4, 0x5ec05dcff72e7f90}, - {0xdc21a1171d42645d, 0x76707543f4fa1f74}, - {0x899504ae72497eba, 0x6a06494a791c53a9}, - {0xabfa45da0edbde69, 0x0487db9d17636893}, - {0xd6f8d7509292d603, 0x45a9d2845d3c42b7}, - {0x865b86925b9bc5c2, 0x0b8a2392ba45a9b3}, - {0xa7f26836f282b732, 0x8e6cac7768d7141f}, - {0xd1ef0244af2364ff, 0x3207d795430cd927}, - {0x8335616aed761f1f, 0x7f44e6bd49e807b9}, - {0xa402b9c5a8d3a6e7, 0x5f16206c9c6209a7}, - {0xcd036837130890a1, 0x36dba887c37a8c10}, - {0x802221226be55a64, 0xc2494954da2c978a}, - {0xa02aa96b06deb0fd, 0xf2db9baa10b7bd6d}, - {0xc83553c5c8965d3d, 0x6f92829494e5acc8}, - {0xfa42a8b73abbf48c, 0xcb772339ba1f17fa}, - {0x9c69a97284b578d7, 0xff2a760414536efc}, - {0xc38413cf25e2d70d, 0xfef5138519684abb}, - {0xf46518c2ef5b8cd1, 0x7eb258665fc25d6a}, - {0x98bf2f79d5993802, 0xef2f773ffbd97a62}, - {0xbeeefb584aff8603, 0xaafb550ffacfd8fb}, - {0xeeaaba2e5dbf6784, 0x95ba2a53f983cf39}, - {0x952ab45cfa97a0b2, 0xdd945a747bf26184}, - {0xba756174393d88df, 0x94f971119aeef9e5}, - {0xe912b9d1478ceb17, 0x7a37cd5601aab85e}, - {0x91abb422ccb812ee, 0xac62e055c10ab33b}, - {0xb616a12b7fe617aa, 0x577b986b314d600a}, - {0xe39c49765fdf9d94, 0xed5a7e85fda0b80c}, - {0x8e41ade9fbebc27d, 0x14588f13be847308}, - {0xb1d219647ae6b31c, 0x596eb2d8ae258fc9}, - {0xde469fbd99a05fe3, 0x6fca5f8ed9aef3bc}, - {0x8aec23d680043bee, 0x25de7bb9480d5855}, - {0xada72ccc20054ae9, 0xaf561aa79a10ae6b}, - {0xd910f7ff28069da4, 0x1b2ba1518094da05}, - {0x87aa9aff79042286, 0x90fb44d2f05d0843}, - {0xa99541bf57452b28, 0x353a1607ac744a54}, - {0xd3fa922f2d1675f2, 0x42889b8997915ce9}, - {0x847c9b5d7c2e09b7, 0x69956135febada12}, - {0xa59bc234db398c25, 0x43fab9837e699096}, - {0xcf02b2c21207ef2e, 0x94f967e45e03f4bc}, - {0x8161afb94b44f57d, 0x1d1be0eebac278f6}, - {0xa1ba1ba79e1632dc, 0x6462d92a69731733}, - {0xca28a291859bbf93, 0x7d7b8f7503cfdcff}, - {0xfcb2cb35e702af78, 0x5cda735244c3d43f}, - {0x9defbf01b061adab, 0x3a0888136afa64a8}, - {0xc56baec21c7a1916, 0x088aaa1845b8fdd1}, - {0xf6c69a72a3989f5b, 0x8aad549e57273d46}, - {0x9a3c2087a63f6399, 0x36ac54e2f678864c}, - {0xc0cb28a98fcf3c7f, 0x84576a1bb416a7de}, - {0xf0fdf2d3f3c30b9f, 0x656d44a2a11c51d6}, - {0x969eb7c47859e743, 0x9f644ae5a4b1b326}, - {0xbc4665b596706114, 0x873d5d9f0dde1fef}, - {0xeb57ff22fc0c7959, 0xa90cb506d155a7eb}, - {0x9316ff75dd87cbd8, 0x09a7f12442d588f3}, - {0xb7dcbf5354e9bece, 0x0c11ed6d538aeb30}, - {0xe5d3ef282a242e81, 0x8f1668c8a86da5fb}, - {0x8fa475791a569d10, 0xf96e017d694487bd}, - {0xb38d92d760ec4455, 0x37c981dcc395a9ad}, - {0xe070f78d3927556a, 0x85bbe253f47b1418}, - {0x8c469ab843b89562, 0x93956d7478ccec8f}, - {0xaf58416654a6babb, 0x387ac8d1970027b3}, - {0xdb2e51bfe9d0696a, 0x06997b05fcc0319f}, - {0x88fcf317f22241e2, 0x441fece3bdf81f04}, - {0xab3c2fddeeaad25a, 0xd527e81cad7626c4}, - {0xd60b3bd56a5586f1, 0x8a71e223d8d3b075}, - {0x85c7056562757456, 0xf6872d5667844e4a}, - {0xa738c6bebb12d16c, 0xb428f8ac016561dc}, - {0xd106f86e69d785c7, 0xe13336d701beba53}, - {0x82a45b450226b39c, 0xecc0024661173474}, - {0xa34d721642b06084, 0x27f002d7f95d0191}, - {0xcc20ce9bd35c78a5, 0x31ec038df7b441f5}, - {0xff290242c83396ce, 0x7e67047175a15272}, - {0x9f79a169bd203e41, 0x0f0062c6e984d387}, - {0xc75809c42c684dd1, 0x52c07b78a3e60869}, - {0xf92e0c3537826145, 0xa7709a56ccdf8a83}, - {0x9bbcc7a142b17ccb, 0x88a66076400bb692}, - {0xc2abf989935ddbfe, 0x6acff893d00ea436}, - {0xf356f7ebf83552fe, 0x0583f6b8c4124d44}, - {0x98165af37b2153de, 0xc3727a337a8b704b}, - {0xbe1bf1b059e9a8d6, 0x744f18c0592e4c5d}, - {0xeda2ee1c7064130c, 0x1162def06f79df74}, - {0x9485d4d1c63e8be7, 0x8addcb5645ac2ba9}, - {0xb9a74a0637ce2ee1, 0x6d953e2bd7173693}, - {0xe8111c87c5c1ba99, 0xc8fa8db6ccdd0438}, - {0x910ab1d4db9914a0, 0x1d9c9892400a22a3}, - {0xb54d5e4a127f59c8, 0x2503beb6d00cab4c}, - {0xe2a0b5dc971f303a, 0x2e44ae64840fd61e}, - {0x8da471a9de737e24, 0x5ceaecfed289e5d3}, - {0xb10d8e1456105dad, 0x7425a83e872c5f48}, - {0xdd50f1996b947518, 0xd12f124e28f7771a}, - {0x8a5296ffe33cc92f, 0x82bd6b70d99aaa70}, - {0xace73cbfdc0bfb7b, 0x636cc64d1001550c}, - {0xd8210befd30efa5a, 0x3c47f7e05401aa4f}, - {0x8714a775e3e95c78, 0x65acfaec34810a72}, - {0xa8d9d1535ce3b396, 0x7f1839a741a14d0e}, - {0xd31045a8341ca07c, 0x1ede48111209a051}, - {0x83ea2b892091e44d, 0x934aed0aab460433}, - {0xa4e4b66b68b65d60, 0xf81da84d56178540}, - {0xce1de40642e3f4b9, 0x36251260ab9d668f}, - {0x80d2ae83e9ce78f3, 0xc1d72b7c6b42601a}, - {0xa1075a24e4421730, 0xb24cf65b8612f820}, - {0xc94930ae1d529cfc, 0xdee033f26797b628}, - {0xfb9b7cd9a4a7443c, 0x169840ef017da3b2}, - {0x9d412e0806e88aa5, 0x8e1f289560ee864f}, - {0xc491798a08a2ad4e, 0xf1a6f2bab92a27e3}, - {0xf5b5d7ec8acb58a2, 0xae10af696774b1dc}, - {0x9991a6f3d6bf1765, 0xacca6da1e0a8ef2a}, - {0xbff610b0cc6edd3f, 0x17fd090a58d32af4}, - {0xeff394dcff8a948e, 0xddfc4b4cef07f5b1}, - {0x95f83d0a1fb69cd9, 0x4abdaf101564f98f}, - {0xbb764c4ca7a4440f, 0x9d6d1ad41abe37f2}, - {0xea53df5fd18d5513, 0x84c86189216dc5ee}, - {0x92746b9be2f8552c, 0x32fd3cf5b4e49bb5}, - {0xb7118682dbb66a77, 0x3fbc8c33221dc2a2}, - {0xe4d5e82392a40515, 0x0fabaf3feaa5334b}, - {0x8f05b1163ba6832d, 0x29cb4d87f2a7400f}, - {0xb2c71d5bca9023f8, 0x743e20e9ef511013}, - {0xdf78e4b2bd342cf6, 0x914da9246b255417}, - {0x8bab8eefb6409c1a, 0x1ad089b6c2f7548f}, - {0xae9672aba3d0c320, 0xa184ac2473b529b2}, - {0xda3c0f568cc4f3e8, 0xc9e5d72d90a2741f}, - {0x8865899617fb1871, 0x7e2fa67c7a658893}, - {0xaa7eebfb9df9de8d, 0xddbb901b98feeab8}, - {0xd51ea6fa85785631, 0x552a74227f3ea566}, - {0x8533285c936b35de, 0xd53a88958f872760}, - {0xa67ff273b8460356, 0x8a892abaf368f138}, - {0xd01fef10a657842c, 0x2d2b7569b0432d86}, - {0x8213f56a67f6b29b, 0x9c3b29620e29fc74}, - {0xa298f2c501f45f42, 0x8349f3ba91b47b90}, - {0xcb3f2f7642717713, 0x241c70a936219a74}, - {0xfe0efb53d30dd4d7, 0xed238cd383aa0111}, - {0x9ec95d1463e8a506, 0xf4363804324a40ab}, - {0xc67bb4597ce2ce48, 0xb143c6053edcd0d6}, - {0xf81aa16fdc1b81da, 0xdd94b7868e94050b}, - {0x9b10a4e5e9913128, 0xca7cf2b4191c8327}, - {0xc1d4ce1f63f57d72, 0xfd1c2f611f63a3f1}, - {0xf24a01a73cf2dccf, 0xbc633b39673c8ced}, - {0x976e41088617ca01, 0xd5be0503e085d814}, - {0xbd49d14aa79dbc82, 0x4b2d8644d8a74e19}, - {0xec9c459d51852ba2, 0xddf8e7d60ed1219f}, - {0x93e1ab8252f33b45, 0xcabb90e5c942b504}, - {0xb8da1662e7b00a17, 0x3d6a751f3b936244}, - {0xe7109bfba19c0c9d, 0x0cc512670a783ad5}, - {0x906a617d450187e2, 0x27fb2b80668b24c6}, - {0xb484f9dc9641e9da, 0xb1f9f660802dedf7}, - {0xe1a63853bbd26451, 0x5e7873f8a0396974}, - {0x8d07e33455637eb2, 0xdb0b487b6423e1e9}, - {0xb049dc016abc5e5f, 0x91ce1a9a3d2cda63}, - {0xdc5c5301c56b75f7, 0x7641a140cc7810fc}, - {0x89b9b3e11b6329ba, 0xa9e904c87fcb0a9e}, - {0xac2820d9623bf429, 0x546345fa9fbdcd45}, - {0xd732290fbacaf133, 0xa97c177947ad4096}, - {0x867f59a9d4bed6c0, 0x49ed8eabcccc485e}, - {0xa81f301449ee8c70, 0x5c68f256bfff5a75}, - {0xd226fc195c6a2f8c, 0x73832eec6fff3112}, - {0x83585d8fd9c25db7, 0xc831fd53c5ff7eac}, - {0xa42e74f3d032f525, 0xba3e7ca8b77f5e56}, - {0xcd3a1230c43fb26f, 0x28ce1bd2e55f35ec}, - {0x80444b5e7aa7cf85, 0x7980d163cf5b81b4}, - {0xa0555e361951c366, 0xd7e105bcc3326220}, - {0xc86ab5c39fa63440, 0x8dd9472bf3fefaa8}, - {0xfa856334878fc150, 0xb14f98f6f0feb952}, - {0x9c935e00d4b9d8d2, 0x6ed1bf9a569f33d4}, - {0xc3b8358109e84f07, 0x0a862f80ec4700c9}, - {0xf4a642e14c6262c8, 0xcd27bb612758c0fb}, - {0x98e7e9cccfbd7dbd, 0x8038d51cb897789d}, - {0xbf21e44003acdd2c, 0xe0470a63e6bd56c4}, - {0xeeea5d5004981478, 0x1858ccfce06cac75}, - {0x95527a5202df0ccb, 0x0f37801e0c43ebc9}, - {0xbaa718e68396cffd, 0xd30560258f54e6bb}, - {0xe950df20247c83fd, 0x47c6b82ef32a206a}, - {0x91d28b7416cdd27e, 0x4cdc331d57fa5442}, - {0xb6472e511c81471d, 0xe0133fe4adf8e953}, - {0xe3d8f9e563a198e5, 0x58180fddd97723a7}, - {0x8e679c2f5e44ff8f, 0x570f09eaa7ea7649}, - {0xb201833b35d63f73, 0x2cd2cc6551e513db}, - {0xde81e40a034bcf4f, 0xf8077f7ea65e58d2}, - {0x8b112e86420f6191, 0xfb04afaf27faf783}, - {0xadd57a27d29339f6, 0x79c5db9af1f9b564}, - {0xd94ad8b1c7380874, 0x18375281ae7822bd}, - {0x87cec76f1c830548, 0x8f2293910d0b15b6}, - {0xa9c2794ae3a3c69a, 0xb2eb3875504ddb23}, - {0xd433179d9c8cb841, 0x5fa60692a46151ec}, - {0x849feec281d7f328, 0xdbc7c41ba6bcd334}, - {0xa5c7ea73224deff3, 0x12b9b522906c0801}, - {0xcf39e50feae16bef, 0xd768226b34870a01}, - {0x81842f29f2cce375, 0xe6a1158300d46641}, - {0xa1e53af46f801c53, 0x60495ae3c1097fd1}, - {0xca5e89b18b602368, 0x385bb19cb14bdfc5}, - {0xfcf62c1dee382c42, 0x46729e03dd9ed7b6}, - {0x9e19db92b4e31ba9, 0x6c07a2c26a8346d2}, - {0xc5a05277621be293, 0xc7098b7305241886}, - { 0xf70867153aa2db38, - 0xb8cbee4fc66d1ea8 } -#else - {0xff77b1fcbebcdc4f, 0x25e8e89c13bb0f7b}, - {0xce5d73ff402d98e3, 0xfb0a3d212dc81290}, - {0xa6b34ad8c9dfc06f, 0xf42faa48c0ea481f}, - {0x86a8d39ef77164bc, 0xae5dff9c02033198}, - {0xd98ddaee19068c76, 0x3badd624dd9b0958}, - {0xafbd2350644eeacf, 0xe5d1929ef90898fb}, - {0x8df5efabc5979c8f, 0xca8d3ffa1ef463c2}, - {0xe55990879ddcaabd, 0xcc420a6a101d0516}, - {0xb94470938fa89bce, 0xf808e40e8d5b3e6a}, - {0x95a8637627989aad, 0xdde7001379a44aa9}, - {0xf1c90080baf72cb1, 0x5324c68b12dd6339}, - {0xc350000000000000, 0x0000000000000000}, - {0x9dc5ada82b70b59d, 0xf020000000000000}, - {0xfee50b7025c36a08, 0x02f236d04753d5b5}, - {0xcde6fd5e09abcf26, 0xed4c0226b55e6f87}, - {0xa6539930bf6bff45, 0x84db8346b786151d}, - {0x865b86925b9bc5c2, 0x0b8a2392ba45a9b3}, - {0xd910f7ff28069da4, 0x1b2ba1518094da05}, - {0xaf58416654a6babb, 0x387ac8d1970027b3}, - {0x8da471a9de737e24, 0x5ceaecfed289e5d3}, - {0xe4d5e82392a40515, 0x0fabaf3feaa5334b}, - {0xb8da1662e7b00a17, 0x3d6a751f3b936244}, - { 0x95527a5202df0ccb, - 0x0f37801e0c43ebc9 } -#endif - }; - -#if FMT_USE_FULL_CACHE_DRAGONBOX - return pow10_significands[k - float_info::min_k]; -#else - static constexpr const uint64_t powers_of_5_64[] = { - 0x0000000000000001, 0x0000000000000005, 0x0000000000000019, - 0x000000000000007d, 0x0000000000000271, 0x0000000000000c35, - 0x0000000000003d09, 0x000000000001312d, 0x000000000005f5e1, - 0x00000000001dcd65, 0x00000000009502f9, 0x0000000002e90edd, - 0x000000000e8d4a51, 0x0000000048c27395, 0x000000016bcc41e9, - 0x000000071afd498d, 0x0000002386f26fc1, 0x000000b1a2bc2ec5, - 0x000003782dace9d9, 0x00001158e460913d, 0x000056bc75e2d631, - 0x0001b1ae4d6e2ef5, 0x000878678326eac9, 0x002a5a058fc295ed, - 0x00d3c21bcecceda1, 0x0422ca8b0a00a425, 0x14adf4b7320334b9}; - - static const int compression_ratio = 27; - - // Compute base index. - int cache_index = (k - float_info::min_k) / compression_ratio; - int kb = cache_index * compression_ratio + float_info::min_k; - int offset = k - kb; - - // Get base cache. - uint128_fallback base_cache = pow10_significands[cache_index]; - if (offset == 0) return base_cache; - - // Compute the required amount of bit-shift. - int alpha = floor_log2_pow10(kb + offset) - floor_log2_pow10(kb) - offset; - FMT_ASSERT(alpha > 0 && alpha < 64, "shifting error detected"); - - // Try to recover the real cache. - uint64_t pow5 = powers_of_5_64[offset]; - uint128_fallback recovered_cache = umul128(base_cache.high(), pow5); - uint128_fallback middle_low = umul128(base_cache.low(), pow5); - - recovered_cache += middle_low.high(); - - uint64_t high_to_middle = recovered_cache.high() << (64 - alpha); - uint64_t middle_to_low = recovered_cache.low() << (64 - alpha); - - recovered_cache = - uint128_fallback{(recovered_cache.low() >> alpha) | high_to_middle, - ((middle_low.low() >> alpha) | middle_to_low)}; - FMT_ASSERT(recovered_cache.low() + 1 != 0, ""); - return {recovered_cache.high(), recovered_cache.low() + 1}; -#endif - } - - struct compute_mul_result { - carrier_uint result; - bool is_integer; - }; - struct compute_mul_parity_result { - bool parity; - bool is_integer; - }; - - static compute_mul_result compute_mul( - carrier_uint u, const cache_entry_type& cache) noexcept { - auto r = umul192_upper128(u, cache); - return {r.high(), r.low() == 0}; - } - - static uint32_t compute_delta(cache_entry_type const& cache, - int beta) noexcept { - return static_cast(cache.high() >> (64 - 1 - beta)); - } - - static compute_mul_parity_result compute_mul_parity( - carrier_uint two_f, const cache_entry_type& cache, int beta) noexcept { - FMT_ASSERT(beta >= 1, ""); - FMT_ASSERT(beta < 64, ""); - - auto r = umul192_lower128(two_f, cache); - return {((r.high() >> (64 - beta)) & 1) != 0, - ((r.high() << beta) | (r.low() >> (64 - beta))) == 0}; - } - - static carrier_uint compute_left_endpoint_for_shorter_interval_case( - const cache_entry_type& cache, int beta) noexcept { - return (cache.high() - - (cache.high() >> (num_significand_bits() + 2))) >> - (64 - num_significand_bits() - 1 - beta); - } - - static carrier_uint compute_right_endpoint_for_shorter_interval_case( - const cache_entry_type& cache, int beta) noexcept { - return (cache.high() + - (cache.high() >> (num_significand_bits() + 1))) >> - (64 - num_significand_bits() - 1 - beta); - } - - static carrier_uint compute_round_up_for_shorter_interval_case( - const cache_entry_type& cache, int beta) noexcept { - return ((cache.high() >> (64 - num_significand_bits() - 2 - beta)) + - 1) / - 2; - } -}; - -// Various integer checks -template -bool is_left_endpoint_integer_shorter_interval(int exponent) noexcept { - const int case_shorter_interval_left_endpoint_lower_threshold = 2; - const int case_shorter_interval_left_endpoint_upper_threshold = 3; - return exponent >= case_shorter_interval_left_endpoint_lower_threshold && - exponent <= case_shorter_interval_left_endpoint_upper_threshold; -} - -// Remove trailing zeros from n and return the number of zeros removed (float) -FMT_INLINE int remove_trailing_zeros(uint32_t& n) noexcept { - FMT_ASSERT(n != 0, ""); - const uint32_t mod_inv_5 = 0xcccccccd; - const uint32_t mod_inv_25 = mod_inv_5 * mod_inv_5; - - int s = 0; - while (true) { - auto q = rotr(n * mod_inv_25, 2); - if (q > max_value() / 100) break; - n = q; - s += 2; - } - auto q = rotr(n * mod_inv_5, 1); - if (q <= max_value() / 10) { - n = q; - s |= 1; - } - - return s; -} - -// Removes trailing zeros and returns the number of zeros removed (double) -FMT_INLINE int remove_trailing_zeros(uint64_t& n) noexcept { - FMT_ASSERT(n != 0, ""); - - // This magic number is ceil(2^90 / 10^8). - constexpr uint64_t magic_number = 12379400392853802749ull; - auto nm = umul128(n, magic_number); - - // Is n is divisible by 10^8? - if ((nm.high() & ((1ull << (90 - 64)) - 1)) == 0 && nm.low() < magic_number) { - // If yes, work with the quotient. - auto n32 = static_cast(nm.high() >> (90 - 64)); - - const uint32_t mod_inv_5 = 0xcccccccd; - const uint32_t mod_inv_25 = mod_inv_5 * mod_inv_5; - - int s = 8; - while (true) { - auto q = rotr(n32 * mod_inv_25, 2); - if (q > max_value() / 100) break; - n32 = q; - s += 2; - } - auto q = rotr(n32 * mod_inv_5, 1); - if (q <= max_value() / 10) { - n32 = q; - s |= 1; - } - - n = n32; - return s; - } - - // If n is not divisible by 10^8, work with n itself. - const uint64_t mod_inv_5 = 0xcccccccccccccccd; - const uint64_t mod_inv_25 = mod_inv_5 * mod_inv_5; - - int s = 0; - while (true) { - auto q = rotr(n * mod_inv_25, 2); - if (q > max_value() / 100) break; - n = q; - s += 2; - } - auto q = rotr(n * mod_inv_5, 1); - if (q <= max_value() / 10) { - n = q; - s |= 1; - } - - return s; -} - -// The main algorithm for shorter interval case -template -FMT_INLINE decimal_fp shorter_interval_case(int exponent) noexcept { - decimal_fp ret_value; - // Compute k and beta - const int minus_k = floor_log10_pow2_minus_log10_4_over_3(exponent); - const int beta = exponent + floor_log2_pow10(-minus_k); - - // Compute xi and zi - using cache_entry_type = typename cache_accessor::cache_entry_type; - const cache_entry_type cache = cache_accessor::get_cached_power(-minus_k); - - auto xi = cache_accessor::compute_left_endpoint_for_shorter_interval_case( - cache, beta); - auto zi = cache_accessor::compute_right_endpoint_for_shorter_interval_case( - cache, beta); - - // If the left endpoint is not an integer, increase it - if (!is_left_endpoint_integer_shorter_interval(exponent)) ++xi; - - // Try bigger divisor - ret_value.significand = zi / 10; - - // If succeed, remove trailing zeros if necessary and return - if (ret_value.significand * 10 >= xi) { - ret_value.exponent = minus_k + 1; - ret_value.exponent += remove_trailing_zeros(ret_value.significand); - return ret_value; - } - - // Otherwise, compute the round-up of y - ret_value.significand = - cache_accessor::compute_round_up_for_shorter_interval_case(cache, - beta); - ret_value.exponent = minus_k; - - // When tie occurs, choose one of them according to the rule - if (exponent >= float_info::shorter_interval_tie_lower_threshold && - exponent <= float_info::shorter_interval_tie_upper_threshold) { - ret_value.significand = ret_value.significand % 2 == 0 - ? ret_value.significand - : ret_value.significand - 1; - } else if (ret_value.significand < xi) { - ++ret_value.significand; - } - return ret_value; -} - -template decimal_fp to_decimal(T x) noexcept { - // Step 1: integer promotion & Schubfach multiplier calculation. - - using carrier_uint = typename float_info::carrier_uint; - using cache_entry_type = typename cache_accessor::cache_entry_type; - auto br = bit_cast(x); - - // Extract significand bits and exponent bits. - const carrier_uint significand_mask = - (static_cast(1) << num_significand_bits()) - 1; - carrier_uint significand = (br & significand_mask); - int exponent = - static_cast((br & exponent_mask()) >> num_significand_bits()); - - if (exponent != 0) { // Check if normal. - exponent -= exponent_bias() + num_significand_bits(); - - // Shorter interval case; proceed like Schubfach. - // In fact, when exponent == 1 and significand == 0, the interval is - // regular. However, it can be shown that the end-results are anyway same. - if (significand == 0) return shorter_interval_case(exponent); - - significand |= (static_cast(1) << num_significand_bits()); - } else { - // Subnormal case; the interval is always regular. - if (significand == 0) return {0, 0}; - exponent = - std::numeric_limits::min_exponent - num_significand_bits() - 1; - } - - const bool include_left_endpoint = (significand % 2 == 0); - const bool include_right_endpoint = include_left_endpoint; - - // Compute k and beta. - const int minus_k = floor_log10_pow2(exponent) - float_info::kappa; - const cache_entry_type cache = cache_accessor::get_cached_power(-minus_k); - const int beta = exponent + floor_log2_pow10(-minus_k); - - // Compute zi and deltai. - // 10^kappa <= deltai < 10^(kappa + 1) - const uint32_t deltai = cache_accessor::compute_delta(cache, beta); - const carrier_uint two_fc = significand << 1; - - // For the case of binary32, the result of integer check is not correct for - // 29711844 * 2^-82 - // = 6.1442653300000000008655037797566933477355632930994033813476... * 10^-18 - // and 29711844 * 2^-81 - // = 1.2288530660000000001731007559513386695471126586198806762695... * 10^-17, - // and they are the unique counterexamples. However, since 29711844 is even, - // this does not cause any problem for the endpoints calculations; it can only - // cause a problem when we need to perform integer check for the center. - // Fortunately, with these inputs, that branch is never executed, so we are - // fine. - const typename cache_accessor::compute_mul_result z_mul = - cache_accessor::compute_mul((two_fc | 1) << beta, cache); - - // Step 2: Try larger divisor; remove trailing zeros if necessary. - - // Using an upper bound on zi, we might be able to optimize the division - // better than the compiler; we are computing zi / big_divisor here. - decimal_fp ret_value; - ret_value.significand = divide_by_10_to_kappa_plus_1(z_mul.result); - uint32_t r = static_cast(z_mul.result - float_info::big_divisor * - ret_value.significand); - - if (r < deltai) { - // Exclude the right endpoint if necessary. - if (r == 0 && (z_mul.is_integer & !include_right_endpoint)) { - --ret_value.significand; - r = float_info::big_divisor; - goto small_divisor_case_label; - } - } else if (r > deltai) { - goto small_divisor_case_label; - } else { - // r == deltai; compare fractional parts. - const typename cache_accessor::compute_mul_parity_result x_mul = - cache_accessor::compute_mul_parity(two_fc - 1, cache, beta); - - if (!(x_mul.parity | (x_mul.is_integer & include_left_endpoint))) - goto small_divisor_case_label; - } - ret_value.exponent = minus_k + float_info::kappa + 1; - - // We may need to remove trailing zeros. - ret_value.exponent += remove_trailing_zeros(ret_value.significand); - return ret_value; - - // Step 3: Find the significand with the smaller divisor. - -small_divisor_case_label: - ret_value.significand *= 10; - ret_value.exponent = minus_k + float_info::kappa; - - uint32_t dist = r - (deltai / 2) + (float_info::small_divisor / 2); - const bool approx_y_parity = - ((dist ^ (float_info::small_divisor / 2)) & 1) != 0; - - // Is dist divisible by 10^kappa? - const bool divisible_by_small_divisor = - check_divisibility_and_divide_by_pow10::kappa>(dist); - - // Add dist / 10^kappa to the significand. - ret_value.significand += dist; - - if (!divisible_by_small_divisor) return ret_value; - - // Check z^(f) >= epsilon^(f). - // We have either yi == zi - epsiloni or yi == (zi - epsiloni) - 1, - // where yi == zi - epsiloni if and only if z^(f) >= epsilon^(f). - // Since there are only 2 possibilities, we only need to care about the - // parity. Also, zi and r should have the same parity since the divisor - // is an even number. - const auto y_mul = cache_accessor::compute_mul_parity(two_fc, cache, beta); - - // If z^(f) >= epsilon^(f), we might have a tie when z^(f) == epsilon^(f), - // or equivalently, when y is an integer. - if (y_mul.parity != approx_y_parity) - --ret_value.significand; - else if (y_mul.is_integer & (ret_value.significand % 2 != 0)) - --ret_value.significand; - return ret_value; -} -} // namespace dragonbox - -#ifdef _MSC_VER -FMT_FUNC auto fmt_snprintf(char* buf, size_t size, const char* fmt, ...) - -> int { - auto args = va_list(); - va_start(args, fmt); - int result = vsnprintf_s(buf, size, _TRUNCATE, fmt, args); - va_end(args); - return result; -} -#endif -} // namespace detail - -template <> struct formatter { - FMT_CONSTEXPR auto parse(format_parse_context& ctx) - -> format_parse_context::iterator { - return ctx.begin(); - } - - auto format(const detail::bigint& n, format_context& ctx) const - -> format_context::iterator { - auto out = ctx.out(); - bool first = true; - for (auto i = n.bigits_.size(); i > 0; --i) { - auto value = n.bigits_[i - 1u]; - if (first) { - out = format_to(out, FMT_STRING("{:x}"), value); - first = false; - continue; - } - out = format_to(out, FMT_STRING("{:08x}"), value); - } - if (n.exp_ > 0) - out = format_to(out, FMT_STRING("p{}"), - n.exp_ * detail::bigint::bigit_bits); - return out; - } -}; - -FMT_FUNC detail::utf8_to_utf16::utf8_to_utf16(string_view s) { - for_each_codepoint(s, [this](uint32_t cp, string_view) { - if (cp == invalid_code_point) FMT_THROW(std::runtime_error("invalid utf8")); - if (cp <= 0xFFFF) { - buffer_.push_back(static_cast(cp)); - } else { - cp -= 0x10000; - buffer_.push_back(static_cast(0xD800 + (cp >> 10))); - buffer_.push_back(static_cast(0xDC00 + (cp & 0x3FF))); - } - return true; - }); - buffer_.push_back(0); -} - -FMT_FUNC void format_system_error(detail::buffer& out, int error_code, - const char* message) noexcept { -#if !__NVCC__ - FMT_TRY { - auto ec = std::error_code(error_code, std::generic_category()); - write(std::back_inserter(out), std::system_error(ec, message).what()); - return; - } - FMT_CATCH(...) {} -#endif - format_error_code(out, error_code, message); -} - -FMT_FUNC void report_system_error(int error_code, - const char* message) noexcept { - report_error(format_system_error, error_code, message); -} - -FMT_FUNC std::string vformat(string_view fmt, format_args args) { - // Don't optimize the "{}" case to keep the binary size small and because it - // can be better optimized in fmt::format anyway. - auto buffer = memory_buffer(); - detail::vformat_to(buffer, fmt, args); - return to_string(buffer); -} - -namespace detail { -#ifdef _WIN32 -using dword = conditional_t; -extern "C" __declspec(dllimport) int __stdcall WriteConsoleW( // - void*, const void*, dword, dword*, void*); - -FMT_FUNC bool write_console(std::FILE* f, string_view text) { - auto fd = _fileno(f); - if (_isatty(fd)) { - detail::utf8_to_utf16 u16(string_view(text.data(), text.size())); - auto written = detail::dword(); - if (detail::WriteConsoleW(reinterpret_cast(_get_osfhandle(fd)), - u16.c_str(), static_cast(u16.size()), - &written, nullptr)) { - return true; - } - } - // We return false if the file descriptor was not TTY, or it was but - // SetConsoleW failed which can happen if the output has been redirected to - // NUL. In both cases when we return false, we should attempt to do regular - // write via fwrite or std::ostream::write. - return false; -} -#endif - -FMT_FUNC void print(std::FILE* f, string_view text) { -#ifdef _WIN32 - if (write_console(f, text)) return; -#endif - detail::fwrite_fully(text.data(), 1, text.size(), f); -} -} // namespace detail - -FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) { - memory_buffer buffer; - detail::vformat_to(buffer, format_str, args); - detail::print(f, {buffer.data(), buffer.size()}); -} - -#ifdef _WIN32 -// Print assuming legacy (non-Unicode) encoding. -FMT_FUNC void detail::vprint_mojibake(std::FILE* f, string_view format_str, - format_args args) { - memory_buffer buffer; - detail::vformat_to(buffer, format_str, - basic_format_args>(args)); - fwrite_fully(buffer.data(), 1, buffer.size(), f); -} -#endif - -FMT_FUNC void vprint(string_view format_str, format_args args) { - vprint(stdout, format_str, args); -} - -namespace detail { - -struct singleton { - unsigned char upper; - unsigned char lower_count; -}; - -inline auto is_printable(uint16_t x, const singleton* singletons, - size_t singletons_size, - const unsigned char* singleton_lowers, - const unsigned char* normal, size_t normal_size) - -> bool { - auto upper = x >> 8; - auto lower_start = 0; - for (size_t i = 0; i < singletons_size; ++i) { - auto s = singletons[i]; - auto lower_end = lower_start + s.lower_count; - if (upper < s.upper) break; - if (upper == s.upper) { - for (auto j = lower_start; j < lower_end; ++j) { - if (singleton_lowers[j] == (x & 0xff)) return false; - } - } - lower_start = lower_end; - } - - auto xsigned = static_cast(x); - auto current = true; - for (size_t i = 0; i < normal_size; ++i) { - auto v = static_cast(normal[i]); - auto len = (v & 0x80) != 0 ? (v & 0x7f) << 8 | normal[++i] : v; - xsigned -= len; - if (xsigned < 0) break; - current = !current; - } - return current; -} - -// This code is generated by support/printable.py. -FMT_FUNC auto is_printable(uint32_t cp) -> bool { - static constexpr singleton singletons0[] = { - {0x00, 1}, {0x03, 5}, {0x05, 6}, {0x06, 3}, {0x07, 6}, {0x08, 8}, - {0x09, 17}, {0x0a, 28}, {0x0b, 25}, {0x0c, 20}, {0x0d, 16}, {0x0e, 13}, - {0x0f, 4}, {0x10, 3}, {0x12, 18}, {0x13, 9}, {0x16, 1}, {0x17, 5}, - {0x18, 2}, {0x19, 3}, {0x1a, 7}, {0x1c, 2}, {0x1d, 1}, {0x1f, 22}, - {0x20, 3}, {0x2b, 3}, {0x2c, 2}, {0x2d, 11}, {0x2e, 1}, {0x30, 3}, - {0x31, 2}, {0x32, 1}, {0xa7, 2}, {0xa9, 2}, {0xaa, 4}, {0xab, 8}, - {0xfa, 2}, {0xfb, 5}, {0xfd, 4}, {0xfe, 3}, {0xff, 9}, - }; - static constexpr unsigned char singletons0_lower[] = { - 0xad, 0x78, 0x79, 0x8b, 0x8d, 0xa2, 0x30, 0x57, 0x58, 0x8b, 0x8c, 0x90, - 0x1c, 0x1d, 0xdd, 0x0e, 0x0f, 0x4b, 0x4c, 0xfb, 0xfc, 0x2e, 0x2f, 0x3f, - 0x5c, 0x5d, 0x5f, 0xb5, 0xe2, 0x84, 0x8d, 0x8e, 0x91, 0x92, 0xa9, 0xb1, - 0xba, 0xbb, 0xc5, 0xc6, 0xc9, 0xca, 0xde, 0xe4, 0xe5, 0xff, 0x00, 0x04, - 0x11, 0x12, 0x29, 0x31, 0x34, 0x37, 0x3a, 0x3b, 0x3d, 0x49, 0x4a, 0x5d, - 0x84, 0x8e, 0x92, 0xa9, 0xb1, 0xb4, 0xba, 0xbb, 0xc6, 0xca, 0xce, 0xcf, - 0xe4, 0xe5, 0x00, 0x04, 0x0d, 0x0e, 0x11, 0x12, 0x29, 0x31, 0x34, 0x3a, - 0x3b, 0x45, 0x46, 0x49, 0x4a, 0x5e, 0x64, 0x65, 0x84, 0x91, 0x9b, 0x9d, - 0xc9, 0xce, 0xcf, 0x0d, 0x11, 0x29, 0x45, 0x49, 0x57, 0x64, 0x65, 0x8d, - 0x91, 0xa9, 0xb4, 0xba, 0xbb, 0xc5, 0xc9, 0xdf, 0xe4, 0xe5, 0xf0, 0x0d, - 0x11, 0x45, 0x49, 0x64, 0x65, 0x80, 0x84, 0xb2, 0xbc, 0xbe, 0xbf, 0xd5, - 0xd7, 0xf0, 0xf1, 0x83, 0x85, 0x8b, 0xa4, 0xa6, 0xbe, 0xbf, 0xc5, 0xc7, - 0xce, 0xcf, 0xda, 0xdb, 0x48, 0x98, 0xbd, 0xcd, 0xc6, 0xce, 0xcf, 0x49, - 0x4e, 0x4f, 0x57, 0x59, 0x5e, 0x5f, 0x89, 0x8e, 0x8f, 0xb1, 0xb6, 0xb7, - 0xbf, 0xc1, 0xc6, 0xc7, 0xd7, 0x11, 0x16, 0x17, 0x5b, 0x5c, 0xf6, 0xf7, - 0xfe, 0xff, 0x80, 0x0d, 0x6d, 0x71, 0xde, 0xdf, 0x0e, 0x0f, 0x1f, 0x6e, - 0x6f, 0x1c, 0x1d, 0x5f, 0x7d, 0x7e, 0xae, 0xaf, 0xbb, 0xbc, 0xfa, 0x16, - 0x17, 0x1e, 0x1f, 0x46, 0x47, 0x4e, 0x4f, 0x58, 0x5a, 0x5c, 0x5e, 0x7e, - 0x7f, 0xb5, 0xc5, 0xd4, 0xd5, 0xdc, 0xf0, 0xf1, 0xf5, 0x72, 0x73, 0x8f, - 0x74, 0x75, 0x96, 0x2f, 0x5f, 0x26, 0x2e, 0x2f, 0xa7, 0xaf, 0xb7, 0xbf, - 0xc7, 0xcf, 0xd7, 0xdf, 0x9a, 0x40, 0x97, 0x98, 0x30, 0x8f, 0x1f, 0xc0, - 0xc1, 0xce, 0xff, 0x4e, 0x4f, 0x5a, 0x5b, 0x07, 0x08, 0x0f, 0x10, 0x27, - 0x2f, 0xee, 0xef, 0x6e, 0x6f, 0x37, 0x3d, 0x3f, 0x42, 0x45, 0x90, 0x91, - 0xfe, 0xff, 0x53, 0x67, 0x75, 0xc8, 0xc9, 0xd0, 0xd1, 0xd8, 0xd9, 0xe7, - 0xfe, 0xff, - }; - static constexpr singleton singletons1[] = { - {0x00, 6}, {0x01, 1}, {0x03, 1}, {0x04, 2}, {0x08, 8}, {0x09, 2}, - {0x0a, 5}, {0x0b, 2}, {0x0e, 4}, {0x10, 1}, {0x11, 2}, {0x12, 5}, - {0x13, 17}, {0x14, 1}, {0x15, 2}, {0x17, 2}, {0x19, 13}, {0x1c, 5}, - {0x1d, 8}, {0x24, 1}, {0x6a, 3}, {0x6b, 2}, {0xbc, 2}, {0xd1, 2}, - {0xd4, 12}, {0xd5, 9}, {0xd6, 2}, {0xd7, 2}, {0xda, 1}, {0xe0, 5}, - {0xe1, 2}, {0xe8, 2}, {0xee, 32}, {0xf0, 4}, {0xf8, 2}, {0xf9, 2}, - {0xfa, 2}, {0xfb, 1}, - }; - static constexpr unsigned char singletons1_lower[] = { - 0x0c, 0x27, 0x3b, 0x3e, 0x4e, 0x4f, 0x8f, 0x9e, 0x9e, 0x9f, 0x06, 0x07, - 0x09, 0x36, 0x3d, 0x3e, 0x56, 0xf3, 0xd0, 0xd1, 0x04, 0x14, 0x18, 0x36, - 0x37, 0x56, 0x57, 0x7f, 0xaa, 0xae, 0xaf, 0xbd, 0x35, 0xe0, 0x12, 0x87, - 0x89, 0x8e, 0x9e, 0x04, 0x0d, 0x0e, 0x11, 0x12, 0x29, 0x31, 0x34, 0x3a, - 0x45, 0x46, 0x49, 0x4a, 0x4e, 0x4f, 0x64, 0x65, 0x5c, 0xb6, 0xb7, 0x1b, - 0x1c, 0x07, 0x08, 0x0a, 0x0b, 0x14, 0x17, 0x36, 0x39, 0x3a, 0xa8, 0xa9, - 0xd8, 0xd9, 0x09, 0x37, 0x90, 0x91, 0xa8, 0x07, 0x0a, 0x3b, 0x3e, 0x66, - 0x69, 0x8f, 0x92, 0x6f, 0x5f, 0xee, 0xef, 0x5a, 0x62, 0x9a, 0x9b, 0x27, - 0x28, 0x55, 0x9d, 0xa0, 0xa1, 0xa3, 0xa4, 0xa7, 0xa8, 0xad, 0xba, 0xbc, - 0xc4, 0x06, 0x0b, 0x0c, 0x15, 0x1d, 0x3a, 0x3f, 0x45, 0x51, 0xa6, 0xa7, - 0xcc, 0xcd, 0xa0, 0x07, 0x19, 0x1a, 0x22, 0x25, 0x3e, 0x3f, 0xc5, 0xc6, - 0x04, 0x20, 0x23, 0x25, 0x26, 0x28, 0x33, 0x38, 0x3a, 0x48, 0x4a, 0x4c, - 0x50, 0x53, 0x55, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x63, 0x65, 0x66, - 0x6b, 0x73, 0x78, 0x7d, 0x7f, 0x8a, 0xa4, 0xaa, 0xaf, 0xb0, 0xc0, 0xd0, - 0xae, 0xaf, 0x79, 0xcc, 0x6e, 0x6f, 0x93, - }; - static constexpr unsigned char normal0[] = { - 0x00, 0x20, 0x5f, 0x22, 0x82, 0xdf, 0x04, 0x82, 0x44, 0x08, 0x1b, 0x04, - 0x06, 0x11, 0x81, 0xac, 0x0e, 0x80, 0xab, 0x35, 0x28, 0x0b, 0x80, 0xe0, - 0x03, 0x19, 0x08, 0x01, 0x04, 0x2f, 0x04, 0x34, 0x04, 0x07, 0x03, 0x01, - 0x07, 0x06, 0x07, 0x11, 0x0a, 0x50, 0x0f, 0x12, 0x07, 0x55, 0x07, 0x03, - 0x04, 0x1c, 0x0a, 0x09, 0x03, 0x08, 0x03, 0x07, 0x03, 0x02, 0x03, 0x03, - 0x03, 0x0c, 0x04, 0x05, 0x03, 0x0b, 0x06, 0x01, 0x0e, 0x15, 0x05, 0x3a, - 0x03, 0x11, 0x07, 0x06, 0x05, 0x10, 0x07, 0x57, 0x07, 0x02, 0x07, 0x15, - 0x0d, 0x50, 0x04, 0x43, 0x03, 0x2d, 0x03, 0x01, 0x04, 0x11, 0x06, 0x0f, - 0x0c, 0x3a, 0x04, 0x1d, 0x25, 0x5f, 0x20, 0x6d, 0x04, 0x6a, 0x25, 0x80, - 0xc8, 0x05, 0x82, 0xb0, 0x03, 0x1a, 0x06, 0x82, 0xfd, 0x03, 0x59, 0x07, - 0x15, 0x0b, 0x17, 0x09, 0x14, 0x0c, 0x14, 0x0c, 0x6a, 0x06, 0x0a, 0x06, - 0x1a, 0x06, 0x59, 0x07, 0x2b, 0x05, 0x46, 0x0a, 0x2c, 0x04, 0x0c, 0x04, - 0x01, 0x03, 0x31, 0x0b, 0x2c, 0x04, 0x1a, 0x06, 0x0b, 0x03, 0x80, 0xac, - 0x06, 0x0a, 0x06, 0x21, 0x3f, 0x4c, 0x04, 0x2d, 0x03, 0x74, 0x08, 0x3c, - 0x03, 0x0f, 0x03, 0x3c, 0x07, 0x38, 0x08, 0x2b, 0x05, 0x82, 0xff, 0x11, - 0x18, 0x08, 0x2f, 0x11, 0x2d, 0x03, 0x20, 0x10, 0x21, 0x0f, 0x80, 0x8c, - 0x04, 0x82, 0x97, 0x19, 0x0b, 0x15, 0x88, 0x94, 0x05, 0x2f, 0x05, 0x3b, - 0x07, 0x02, 0x0e, 0x18, 0x09, 0x80, 0xb3, 0x2d, 0x74, 0x0c, 0x80, 0xd6, - 0x1a, 0x0c, 0x05, 0x80, 0xff, 0x05, 0x80, 0xdf, 0x0c, 0xee, 0x0d, 0x03, - 0x84, 0x8d, 0x03, 0x37, 0x09, 0x81, 0x5c, 0x14, 0x80, 0xb8, 0x08, 0x80, - 0xcb, 0x2a, 0x38, 0x03, 0x0a, 0x06, 0x38, 0x08, 0x46, 0x08, 0x0c, 0x06, - 0x74, 0x0b, 0x1e, 0x03, 0x5a, 0x04, 0x59, 0x09, 0x80, 0x83, 0x18, 0x1c, - 0x0a, 0x16, 0x09, 0x4c, 0x04, 0x80, 0x8a, 0x06, 0xab, 0xa4, 0x0c, 0x17, - 0x04, 0x31, 0xa1, 0x04, 0x81, 0xda, 0x26, 0x07, 0x0c, 0x05, 0x05, 0x80, - 0xa5, 0x11, 0x81, 0x6d, 0x10, 0x78, 0x28, 0x2a, 0x06, 0x4c, 0x04, 0x80, - 0x8d, 0x04, 0x80, 0xbe, 0x03, 0x1b, 0x03, 0x0f, 0x0d, - }; - static constexpr unsigned char normal1[] = { - 0x5e, 0x22, 0x7b, 0x05, 0x03, 0x04, 0x2d, 0x03, 0x66, 0x03, 0x01, 0x2f, - 0x2e, 0x80, 0x82, 0x1d, 0x03, 0x31, 0x0f, 0x1c, 0x04, 0x24, 0x09, 0x1e, - 0x05, 0x2b, 0x05, 0x44, 0x04, 0x0e, 0x2a, 0x80, 0xaa, 0x06, 0x24, 0x04, - 0x24, 0x04, 0x28, 0x08, 0x34, 0x0b, 0x01, 0x80, 0x90, 0x81, 0x37, 0x09, - 0x16, 0x0a, 0x08, 0x80, 0x98, 0x39, 0x03, 0x63, 0x08, 0x09, 0x30, 0x16, - 0x05, 0x21, 0x03, 0x1b, 0x05, 0x01, 0x40, 0x38, 0x04, 0x4b, 0x05, 0x2f, - 0x04, 0x0a, 0x07, 0x09, 0x07, 0x40, 0x20, 0x27, 0x04, 0x0c, 0x09, 0x36, - 0x03, 0x3a, 0x05, 0x1a, 0x07, 0x04, 0x0c, 0x07, 0x50, 0x49, 0x37, 0x33, - 0x0d, 0x33, 0x07, 0x2e, 0x08, 0x0a, 0x81, 0x26, 0x52, 0x4e, 0x28, 0x08, - 0x2a, 0x56, 0x1c, 0x14, 0x17, 0x09, 0x4e, 0x04, 0x1e, 0x0f, 0x43, 0x0e, - 0x19, 0x07, 0x0a, 0x06, 0x48, 0x08, 0x27, 0x09, 0x75, 0x0b, 0x3f, 0x41, - 0x2a, 0x06, 0x3b, 0x05, 0x0a, 0x06, 0x51, 0x06, 0x01, 0x05, 0x10, 0x03, - 0x05, 0x80, 0x8b, 0x62, 0x1e, 0x48, 0x08, 0x0a, 0x80, 0xa6, 0x5e, 0x22, - 0x45, 0x0b, 0x0a, 0x06, 0x0d, 0x13, 0x39, 0x07, 0x0a, 0x36, 0x2c, 0x04, - 0x10, 0x80, 0xc0, 0x3c, 0x64, 0x53, 0x0c, 0x48, 0x09, 0x0a, 0x46, 0x45, - 0x1b, 0x48, 0x08, 0x53, 0x1d, 0x39, 0x81, 0x07, 0x46, 0x0a, 0x1d, 0x03, - 0x47, 0x49, 0x37, 0x03, 0x0e, 0x08, 0x0a, 0x06, 0x39, 0x07, 0x0a, 0x81, - 0x36, 0x19, 0x80, 0xb7, 0x01, 0x0f, 0x32, 0x0d, 0x83, 0x9b, 0x66, 0x75, - 0x0b, 0x80, 0xc4, 0x8a, 0xbc, 0x84, 0x2f, 0x8f, 0xd1, 0x82, 0x47, 0xa1, - 0xb9, 0x82, 0x39, 0x07, 0x2a, 0x04, 0x02, 0x60, 0x26, 0x0a, 0x46, 0x0a, - 0x28, 0x05, 0x13, 0x82, 0xb0, 0x5b, 0x65, 0x4b, 0x04, 0x39, 0x07, 0x11, - 0x40, 0x05, 0x0b, 0x02, 0x0e, 0x97, 0xf8, 0x08, 0x84, 0xd6, 0x2a, 0x09, - 0xa2, 0xf7, 0x81, 0x1f, 0x31, 0x03, 0x11, 0x04, 0x08, 0x81, 0x8c, 0x89, - 0x04, 0x6b, 0x05, 0x0d, 0x03, 0x09, 0x07, 0x10, 0x93, 0x60, 0x80, 0xf6, - 0x0a, 0x73, 0x08, 0x6e, 0x17, 0x46, 0x80, 0x9a, 0x14, 0x0c, 0x57, 0x09, - 0x19, 0x80, 0x87, 0x81, 0x47, 0x03, 0x85, 0x42, 0x0f, 0x15, 0x85, 0x50, - 0x2b, 0x80, 0xd5, 0x2d, 0x03, 0x1a, 0x04, 0x02, 0x81, 0x70, 0x3a, 0x05, - 0x01, 0x85, 0x00, 0x80, 0xd7, 0x29, 0x4c, 0x04, 0x0a, 0x04, 0x02, 0x83, - 0x11, 0x44, 0x4c, 0x3d, 0x80, 0xc2, 0x3c, 0x06, 0x01, 0x04, 0x55, 0x05, - 0x1b, 0x34, 0x02, 0x81, 0x0e, 0x2c, 0x04, 0x64, 0x0c, 0x56, 0x0a, 0x80, - 0xae, 0x38, 0x1d, 0x0d, 0x2c, 0x04, 0x09, 0x07, 0x02, 0x0e, 0x06, 0x80, - 0x9a, 0x83, 0xd8, 0x08, 0x0d, 0x03, 0x0d, 0x03, 0x74, 0x0c, 0x59, 0x07, - 0x0c, 0x14, 0x0c, 0x04, 0x38, 0x08, 0x0a, 0x06, 0x28, 0x08, 0x22, 0x4e, - 0x81, 0x54, 0x0c, 0x15, 0x03, 0x03, 0x05, 0x07, 0x09, 0x19, 0x07, 0x07, - 0x09, 0x03, 0x0d, 0x07, 0x29, 0x80, 0xcb, 0x25, 0x0a, 0x84, 0x06, - }; - auto lower = static_cast(cp); - if (cp < 0x10000) { - return is_printable(lower, singletons0, - sizeof(singletons0) / sizeof(*singletons0), - singletons0_lower, normal0, sizeof(normal0)); - } - if (cp < 0x20000) { - return is_printable(lower, singletons1, - sizeof(singletons1) / sizeof(*singletons1), - singletons1_lower, normal1, sizeof(normal1)); - } - if (0x2a6de <= cp && cp < 0x2a700) return false; - if (0x2b735 <= cp && cp < 0x2b740) return false; - if (0x2b81e <= cp && cp < 0x2b820) return false; - if (0x2cea2 <= cp && cp < 0x2ceb0) return false; - if (0x2ebe1 <= cp && cp < 0x2f800) return false; - if (0x2fa1e <= cp && cp < 0x30000) return false; - if (0x3134b <= cp && cp < 0xe0100) return false; - if (0xe01f0 <= cp && cp < 0x110000) return false; - return cp < 0x110000; -} - -} // namespace detail - -FMT_END_NAMESPACE - -#endif // FMT_FORMAT_INL_H_ diff --git a/packages/seacas/libraries/aprepro_lib/fmt/format.h b/packages/seacas/libraries/aprepro_lib/fmt/format.h deleted file mode 100644 index 8dda88727d5c..000000000000 --- a/packages/seacas/libraries/aprepro_lib/fmt/format.h +++ /dev/null @@ -1,4312 +0,0 @@ -/* - Formatting library for C++ - - Copyright (c) 2012 - present, Victor Zverovich - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - --- Optional exception to the license --- - - As an exception, if, as a result of your compiling your source code, portions - of this Software are embedded into a machine-executable object form of such - source code, you may redistribute such embedded portions in such object form - without including the above copyright and permission notices. - */ - -#ifndef FMT_FORMAT_H_ -#define FMT_FORMAT_H_ - -#include // std::signbit -#include // uint32_t -#include // std::memcpy -#include // std::initializer_list -#include // std::numeric_limits -#include // std::uninitialized_copy -#include // std::runtime_error -#include // std::system_error - -#ifdef __cpp_lib_bit_cast -# include // std::bitcast -#endif - -#include "core.h" - -#if FMT_GCC_VERSION -# define FMT_GCC_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) -#else -# define FMT_GCC_VISIBILITY_HIDDEN -#endif - -#ifdef __NVCC__ -# define FMT_CUDA_VERSION (__CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__) -#else -# define FMT_CUDA_VERSION 0 -#endif - -#ifdef __has_builtin -# define FMT_HAS_BUILTIN(x) __has_builtin(x) -#else -# define FMT_HAS_BUILTIN(x) 0 -#endif - -#if FMT_GCC_VERSION || FMT_CLANG_VERSION -# define FMT_NOINLINE __attribute__((noinline)) -#else -# define FMT_NOINLINE -#endif - -#if FMT_MSC_VERSION -# define FMT_MSC_DEFAULT = default -#else -# define FMT_MSC_DEFAULT -#endif - -#ifndef FMT_THROW -# if FMT_EXCEPTIONS -# if FMT_MSC_VERSION || defined(__NVCC__) -FMT_BEGIN_NAMESPACE -namespace detail { -template inline void do_throw(const Exception& x) { - // Silence unreachable code warnings in MSVC and NVCC because these - // are nearly impossible to fix in a generic code. - volatile bool b = true; - if (b) throw x; -} -} // namespace detail -FMT_END_NAMESPACE -# define FMT_THROW(x) detail::do_throw(x) -# else -# define FMT_THROW(x) throw x -# endif -# else -# define FMT_THROW(x) \ - do { \ - FMT_ASSERT(false, (x).what()); \ - } while (false) -# endif -#endif - -#if FMT_EXCEPTIONS -# define FMT_TRY try -# define FMT_CATCH(x) catch (x) -#else -# define FMT_TRY if (true) -# define FMT_CATCH(x) if (false) -#endif - -#ifndef FMT_MAYBE_UNUSED -# if FMT_HAS_CPP17_ATTRIBUTE(maybe_unused) -# define FMT_MAYBE_UNUSED [[maybe_unused]] -# else -# define FMT_MAYBE_UNUSED -# endif -#endif - -#ifndef FMT_USE_USER_DEFINED_LITERALS -// EDG based compilers (Intel, NVIDIA, Elbrus, etc), GCC and MSVC support UDLs. -# if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 407 || \ - FMT_MSC_VERSION >= 1900) && \ - (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= /* UDL feature */ 480) -# define FMT_USE_USER_DEFINED_LITERALS 1 -# else -# define FMT_USE_USER_DEFINED_LITERALS 0 -# endif -#endif - -// Defining FMT_REDUCE_INT_INSTANTIATIONS to 1, will reduce the number of -// integer formatter template instantiations to just one by only using the -// largest integer type. This results in a reduction in binary size but will -// cause a decrease in integer formatting performance. -#if !defined(FMT_REDUCE_INT_INSTANTIATIONS) -# define FMT_REDUCE_INT_INSTANTIATIONS 0 -#endif - -// __builtin_clz is broken in clang with Microsoft CodeGen: -// https://github.com/fmtlib/fmt/issues/519. -#if !FMT_MSC_VERSION -# if FMT_HAS_BUILTIN(__builtin_clz) || FMT_GCC_VERSION || FMT_ICC_VERSION -# define FMT_BUILTIN_CLZ(n) __builtin_clz(n) -# endif -# if FMT_HAS_BUILTIN(__builtin_clzll) || FMT_GCC_VERSION || FMT_ICC_VERSION -# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n) -# endif -#endif - -// __builtin_ctz is broken in Intel Compiler Classic on Windows: -// https://github.com/fmtlib/fmt/issues/2510. -#ifndef __ICL -# if FMT_HAS_BUILTIN(__builtin_ctz) || FMT_GCC_VERSION || FMT_ICC_VERSION || \ - defined(__NVCOMPILER) -# define FMT_BUILTIN_CTZ(n) __builtin_ctz(n) -# endif -# if FMT_HAS_BUILTIN(__builtin_ctzll) || FMT_GCC_VERSION || \ - FMT_ICC_VERSION || defined(__NVCOMPILER) -# define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n) -# endif -#endif - -#if FMT_MSC_VERSION -# include // _BitScanReverse[64], _BitScanForward[64], _umul128 -#endif - -// Some compilers masquerade as both MSVC and GCC-likes or otherwise support -// __builtin_clz and __builtin_clzll, so only define FMT_BUILTIN_CLZ using the -// MSVC intrinsics if the clz and clzll builtins are not available. -#if FMT_MSC_VERSION && !defined(FMT_BUILTIN_CLZLL) && \ - !defined(FMT_BUILTIN_CTZLL) -FMT_BEGIN_NAMESPACE -namespace detail { -// Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning. -# if !defined(__clang__) -# pragma intrinsic(_BitScanForward) -# pragma intrinsic(_BitScanReverse) -# if defined(_WIN64) -# pragma intrinsic(_BitScanForward64) -# pragma intrinsic(_BitScanReverse64) -# endif -# endif - -inline auto clz(uint32_t x) -> int { - unsigned long r = 0; - _BitScanReverse(&r, x); - FMT_ASSERT(x != 0, ""); - // Static analysis complains about using uninitialized data - // "r", but the only way that can happen is if "x" is 0, - // which the callers guarantee to not happen. - FMT_MSC_WARNING(suppress : 6102) - return 31 ^ static_cast(r); -} -# define FMT_BUILTIN_CLZ(n) detail::clz(n) - -inline auto clzll(uint64_t x) -> int { - unsigned long r = 0; -# ifdef _WIN64 - _BitScanReverse64(&r, x); -# else - // Scan the high 32 bits. - if (_BitScanReverse(&r, static_cast(x >> 32))) return 63 ^ (r + 32); - // Scan the low 32 bits. - _BitScanReverse(&r, static_cast(x)); -# endif - FMT_ASSERT(x != 0, ""); - FMT_MSC_WARNING(suppress : 6102) // Suppress a bogus static analysis warning. - return 63 ^ static_cast(r); -} -# define FMT_BUILTIN_CLZLL(n) detail::clzll(n) - -inline auto ctz(uint32_t x) -> int { - unsigned long r = 0; - _BitScanForward(&r, x); - FMT_ASSERT(x != 0, ""); - FMT_MSC_WARNING(suppress : 6102) // Suppress a bogus static analysis warning. - return static_cast(r); -} -# define FMT_BUILTIN_CTZ(n) detail::ctz(n) - -inline auto ctzll(uint64_t x) -> int { - unsigned long r = 0; - FMT_ASSERT(x != 0, ""); - FMT_MSC_WARNING(suppress : 6102) // Suppress a bogus static analysis warning. -# ifdef _WIN64 - _BitScanForward64(&r, x); -# else - // Scan the low 32 bits. - if (_BitScanForward(&r, static_cast(x))) return static_cast(r); - // Scan the high 32 bits. - _BitScanForward(&r, static_cast(x >> 32)); - r += 32; -# endif - return static_cast(r); -} -# define FMT_BUILTIN_CTZLL(n) detail::ctzll(n) -} // namespace detail -FMT_END_NAMESPACE -#endif - -FMT_BEGIN_NAMESPACE -namespace detail { - -FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) { - ignore_unused(condition); -#ifdef FMT_FUZZ - if (condition) throw std::runtime_error("fuzzing limit reached"); -#endif -} - -template struct string_literal { - static constexpr CharT value[sizeof...(C)] = {C...}; - constexpr operator basic_string_view() const { - return {value, sizeof...(C)}; - } -}; - -#if FMT_CPLUSPLUS < 201703L -template -constexpr CharT string_literal::value[sizeof...(C)]; -#endif - -template class formatbuf : public Streambuf { - private: - using char_type = typename Streambuf::char_type; - using streamsize = decltype(std::declval().sputn(nullptr, 0)); - using int_type = typename Streambuf::int_type; - using traits_type = typename Streambuf::traits_type; - - buffer& buffer_; - - public: - explicit formatbuf(buffer& buf) : buffer_(buf) {} - - protected: - // The put area is always empty. This makes the implementation simpler and has - // the advantage that the streambuf and the buffer are always in sync and - // sputc never writes into uninitialized memory. A disadvantage is that each - // call to sputc always results in a (virtual) call to overflow. There is no - // disadvantage here for sputn since this always results in a call to xsputn. - - auto overflow(int_type ch) -> int_type override { - if (!traits_type::eq_int_type(ch, traits_type::eof())) - buffer_.push_back(static_cast(ch)); - return ch; - } - - auto xsputn(const char_type* s, streamsize count) -> streamsize override { - buffer_.append(s, s + count); - return count; - } -}; - -// Implementation of std::bit_cast for pre-C++20. -template -FMT_CONSTEXPR20 auto bit_cast(const From& from) -> To { -#ifdef __cpp_lib_bit_cast - if (is_constant_evaluated()) return std::bit_cast(from); -#endif - auto to = To(); - // The cast suppresses a bogus -Wclass-memaccess on GCC. - std::memcpy(static_cast(&to), &from, sizeof(to)); - return to; -} - -inline auto is_big_endian() -> bool { -#ifdef _WIN32 - return false; -#elif defined(__BIG_ENDIAN__) - return true; -#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) - return __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__; -#else - struct bytes { - char data[sizeof(int)]; - }; - return bit_cast(1).data[0] == 0; -#endif -} - -class uint128_fallback { - private: - uint64_t lo_, hi_; - - friend uint128_fallback umul128(uint64_t x, uint64_t y) noexcept; - - public: - constexpr uint128_fallback(uint64_t hi, uint64_t lo) : lo_(lo), hi_(hi) {} - constexpr uint128_fallback(uint64_t value = 0) : lo_(value), hi_(0) {} - - constexpr uint64_t high() const noexcept { return hi_; } - constexpr uint64_t low() const noexcept { return lo_; } - - template ::value)> - constexpr explicit operator T() const { - return static_cast(lo_); - } - - friend constexpr auto operator==(const uint128_fallback& lhs, - const uint128_fallback& rhs) -> bool { - return lhs.hi_ == rhs.hi_ && lhs.lo_ == rhs.lo_; - } - friend constexpr auto operator!=(const uint128_fallback& lhs, - const uint128_fallback& rhs) -> bool { - return !(lhs == rhs); - } - friend constexpr auto operator>(const uint128_fallback& lhs, - const uint128_fallback& rhs) -> bool { - return lhs.hi_ != rhs.hi_ ? lhs.hi_ > rhs.hi_ : lhs.lo_ > rhs.lo_; - } - friend constexpr auto operator|(const uint128_fallback& lhs, - const uint128_fallback& rhs) - -> uint128_fallback { - return {lhs.hi_ | rhs.hi_, lhs.lo_ | rhs.lo_}; - } - friend constexpr auto operator&(const uint128_fallback& lhs, - const uint128_fallback& rhs) - -> uint128_fallback { - return {lhs.hi_ & rhs.hi_, lhs.lo_ & rhs.lo_}; - } - friend auto operator+(const uint128_fallback& lhs, - const uint128_fallback& rhs) -> uint128_fallback { - auto result = uint128_fallback(lhs); - result += rhs; - return result; - } - friend auto operator*(const uint128_fallback& lhs, uint32_t rhs) - -> uint128_fallback { - FMT_ASSERT(lhs.hi_ == 0, ""); - uint64_t hi = (lhs.lo_ >> 32) * rhs; - uint64_t lo = (lhs.lo_ & ~uint32_t()) * rhs; - uint64_t new_lo = (hi << 32) + lo; - return {(hi >> 32) + (new_lo < lo ? 1 : 0), new_lo}; - } - friend auto operator-(const uint128_fallback& lhs, uint64_t rhs) - -> uint128_fallback { - return {lhs.hi_ - (lhs.lo_ < rhs ? 1 : 0), lhs.lo_ - rhs}; - } - FMT_CONSTEXPR auto operator>>(int shift) const -> uint128_fallback { - if (shift == 64) return {0, hi_}; - if (shift > 64) return uint128_fallback(0, hi_) >> (shift - 64); - return {hi_ >> shift, (hi_ << (64 - shift)) | (lo_ >> shift)}; - } - FMT_CONSTEXPR auto operator<<(int shift) const -> uint128_fallback { - if (shift == 64) return {lo_, 0}; - if (shift > 64) return uint128_fallback(lo_, 0) << (shift - 64); - return {hi_ << shift | (lo_ >> (64 - shift)), (lo_ << shift)}; - } - FMT_CONSTEXPR auto operator>>=(int shift) -> uint128_fallback& { - return *this = *this >> shift; - } - FMT_CONSTEXPR void operator+=(uint128_fallback n) { - uint64_t new_lo = lo_ + n.lo_; - uint64_t new_hi = hi_ + n.hi_ + (new_lo < lo_ ? 1 : 0); - FMT_ASSERT(new_hi >= hi_, ""); - lo_ = new_lo; - hi_ = new_hi; - } - - FMT_CONSTEXPR20 uint128_fallback& operator+=(uint64_t n) noexcept { - if (is_constant_evaluated()) { - lo_ += n; - hi_ += (lo_ < n ? 1 : 0); - return *this; - } -#if FMT_HAS_BUILTIN(__builtin_addcll) && !defined(__ibmxl__) - unsigned long long carry; - lo_ = __builtin_addcll(lo_, n, 0, &carry); - hi_ += carry; -#elif FMT_HAS_BUILTIN(__builtin_ia32_addcarryx_u64) && !defined(__ibmxl__) - unsigned long long result; - auto carry = __builtin_ia32_addcarryx_u64(0, lo_, n, &result); - lo_ = result; - hi_ += carry; -#elif defined(_MSC_VER) && defined(_M_X64) - auto carry = _addcarry_u64(0, lo_, n, &lo_); - _addcarry_u64(carry, hi_, 0, &hi_); -#else - lo_ += n; - hi_ += (lo_ < n ? 1 : 0); -#endif - return *this; - } -}; - -using uint128_t = conditional_t; - -#ifdef UINTPTR_MAX -using uintptr_t = ::uintptr_t; -#else -using uintptr_t = uint128_t; -#endif - -// Returns the largest possible value for type T. Same as -// std::numeric_limits::max() but shorter and not affected by the max macro. -template constexpr auto max_value() -> T { - return (std::numeric_limits::max)(); -} -template constexpr auto num_bits() -> int { - return std::numeric_limits::digits; -} -// std::numeric_limits::digits may return 0 for 128-bit ints. -template <> constexpr auto num_bits() -> int { return 128; } -template <> constexpr auto num_bits() -> int { return 128; } - -// A heterogeneous bit_cast used for converting 96-bit long double to uint128_t -// and 128-bit pointers to uint128_fallback. -template sizeof(From))> -inline auto bit_cast(const From& from) -> To { - constexpr auto size = static_cast(sizeof(From) / sizeof(unsigned)); - struct data_t { - unsigned value[static_cast(size)]; - } data = bit_cast(from); - auto result = To(); - if (const_check(is_big_endian())) { - for (int i = 0; i < size; ++i) - result = (result << num_bits()) | data.value[i]; - } else { - for (int i = size - 1; i >= 0; --i) - result = (result << num_bits()) | data.value[i]; - } - return result; -} - -FMT_INLINE void assume(bool condition) { - (void)condition; -#if FMT_HAS_BUILTIN(__builtin_assume) && !FMT_ICC_VERSION - __builtin_assume(condition); -#endif -} - -// An approximation of iterator_t for pre-C++20 systems. -template -using iterator_t = decltype(std::begin(std::declval())); -template using sentinel_t = decltype(std::end(std::declval())); - -// A workaround for std::string not having mutable data() until C++17. -template -inline auto get_data(std::basic_string& s) -> Char* { - return &s[0]; -} -template -inline auto get_data(Container& c) -> typename Container::value_type* { - return c.data(); -} - -#if defined(_SECURE_SCL) && _SECURE_SCL -// Make a checked iterator to avoid MSVC warnings. -template using checked_ptr = stdext::checked_array_iterator; -template -constexpr auto make_checked(T* p, size_t size) -> checked_ptr { - return {p, size}; -} -#else -template using checked_ptr = T*; -template constexpr auto make_checked(T* p, size_t) -> T* { - return p; -} -#endif - -// Attempts to reserve space for n extra characters in the output range. -// Returns a pointer to the reserved range or a reference to it. -template ::value)> -#if FMT_CLANG_VERSION >= 307 && !FMT_ICC_VERSION -__attribute__((no_sanitize("undefined"))) -#endif -inline auto -reserve(std::back_insert_iterator it, size_t n) - -> checked_ptr { - Container& c = get_container(it); - size_t size = c.size(); - c.resize(size + n); - return make_checked(get_data(c) + size, n); -} - -template -inline auto reserve(buffer_appender it, size_t n) -> buffer_appender { - buffer& buf = get_container(it); - buf.try_reserve(buf.size() + n); - return it; -} - -template -constexpr auto reserve(Iterator& it, size_t) -> Iterator& { - return it; -} - -template -using reserve_iterator = - remove_reference_t(), 0))>; - -template -constexpr auto to_pointer(OutputIt, size_t) -> T* { - return nullptr; -} -template auto to_pointer(buffer_appender it, size_t n) -> T* { - buffer& buf = get_container(it); - auto size = buf.size(); - if (buf.capacity() < size + n) return nullptr; - buf.try_resize(size + n); - return buf.data() + size; -} - -template ::value)> -inline auto base_iterator(std::back_insert_iterator& it, - checked_ptr) - -> std::back_insert_iterator { - return it; -} - -template -constexpr auto base_iterator(Iterator, Iterator it) -> Iterator { - return it; -} - -// is spectacularly slow to compile in C++20 so use a simple fill_n -// instead (#1998). -template -FMT_CONSTEXPR auto fill_n(OutputIt out, Size count, const T& value) - -> OutputIt { - for (Size i = 0; i < count; ++i) *out++ = value; - return out; -} -template -FMT_CONSTEXPR20 auto fill_n(T* out, Size count, char value) -> T* { - if (is_constant_evaluated()) { - return fill_n(out, count, value); - } - std::memset(out, value, to_unsigned(count)); - return out + count; -} - -#ifdef __cpp_char8_t -using char8_type = char8_t; -#else -enum char8_type : unsigned char {}; -#endif - -template -FMT_CONSTEXPR FMT_NOINLINE auto copy_str_noinline(InputIt begin, InputIt end, - OutputIt out) -> OutputIt { - return copy_str(begin, end, out); -} - -// A public domain branchless UTF-8 decoder by Christopher Wellons: -// https://github.com/skeeto/branchless-utf8 -/* Decode the next character, c, from s, reporting errors in e. - * - * Since this is a branchless decoder, four bytes will be read from the - * buffer regardless of the actual length of the next character. This - * means the buffer _must_ have at least three bytes of zero padding - * following the end of the data stream. - * - * Errors are reported in e, which will be non-zero if the parsed - * character was somehow invalid: invalid byte sequence, non-canonical - * encoding, or a surrogate half. - * - * The function returns a pointer to the next character. When an error - * occurs, this pointer will be a guess that depends on the particular - * error, but it will always advance at least one byte. - */ -FMT_CONSTEXPR inline auto utf8_decode(const char* s, uint32_t* c, int* e) - -> const char* { - constexpr const int masks[] = {0x00, 0x7f, 0x1f, 0x0f, 0x07}; - constexpr const uint32_t mins[] = {4194304, 0, 128, 2048, 65536}; - constexpr const int shiftc[] = {0, 18, 12, 6, 0}; - constexpr const int shifte[] = {0, 6, 4, 2, 0}; - - int len = code_point_length_impl(*s); - // Compute the pointer to the next character early so that the next - // iteration can start working on the next character. Neither Clang - // nor GCC figure out this reordering on their own. - const char* next = s + len + !len; - - using uchar = unsigned char; - - // Assume a four-byte character and load four bytes. Unused bits are - // shifted out. - *c = uint32_t(uchar(s[0]) & masks[len]) << 18; - *c |= uint32_t(uchar(s[1]) & 0x3f) << 12; - *c |= uint32_t(uchar(s[2]) & 0x3f) << 6; - *c |= uint32_t(uchar(s[3]) & 0x3f) << 0; - *c >>= shiftc[len]; - - // Accumulate the various error conditions. - *e = (*c < mins[len]) << 6; // non-canonical encoding - *e |= ((*c >> 11) == 0x1b) << 7; // surrogate half? - *e |= (*c > 0x10FFFF) << 8; // out of range? - *e |= (uchar(s[1]) & 0xc0) >> 2; - *e |= (uchar(s[2]) & 0xc0) >> 4; - *e |= uchar(s[3]) >> 6; - *e ^= 0x2a; // top two bits of each tail byte correct? - *e >>= shifte[len]; - - return next; -} - -constexpr uint32_t invalid_code_point = ~uint32_t(); - -// Invokes f(cp, sv) for every code point cp in s with sv being the string view -// corresponding to the code point. cp is invalid_code_point on error. -template -FMT_CONSTEXPR void for_each_codepoint(string_view s, F f) { - auto decode = [f](const char* buf_ptr, const char* ptr) { - auto cp = uint32_t(); - auto error = 0; - auto end = utf8_decode(buf_ptr, &cp, &error); - bool result = f(error ? invalid_code_point : cp, - string_view(ptr, error ? 1 : to_unsigned(end - buf_ptr))); - return result ? (error ? buf_ptr + 1 : end) : nullptr; - }; - auto p = s.data(); - const size_t block_size = 4; // utf8_decode always reads blocks of 4 chars. - if (s.size() >= block_size) { - for (auto end = p + s.size() - block_size + 1; p < end;) { - p = decode(p, p); - if (!p) return; - } - } - if (auto num_chars_left = s.data() + s.size() - p) { - char buf[2 * block_size - 1] = {}; - copy_str(p, p + num_chars_left, buf); - const char* buf_ptr = buf; - do { - auto end = decode(buf_ptr, p); - if (!end) return; - p += end - buf_ptr; - buf_ptr = end; - } while (buf_ptr - buf < num_chars_left); - } -} - -template -inline auto compute_width(basic_string_view s) -> size_t { - return s.size(); -} - -// Computes approximate display width of a UTF-8 string. -FMT_CONSTEXPR inline size_t compute_width(string_view s) { - size_t num_code_points = 0; - // It is not a lambda for compatibility with C++14. - struct count_code_points { - size_t* count; - FMT_CONSTEXPR auto operator()(uint32_t cp, string_view) const -> bool { - *count += detail::to_unsigned( - 1 + - (cp >= 0x1100 && - (cp <= 0x115f || // Hangul Jamo init. consonants - cp == 0x2329 || // LEFT-POINTING ANGLE BRACKET - cp == 0x232a || // RIGHT-POINTING ANGLE BRACKET - // CJK ... Yi except IDEOGRAPHIC HALF FILL SPACE: - (cp >= 0x2e80 && cp <= 0xa4cf && cp != 0x303f) || - (cp >= 0xac00 && cp <= 0xd7a3) || // Hangul Syllables - (cp >= 0xf900 && cp <= 0xfaff) || // CJK Compatibility Ideographs - (cp >= 0xfe10 && cp <= 0xfe19) || // Vertical Forms - (cp >= 0xfe30 && cp <= 0xfe6f) || // CJK Compatibility Forms - (cp >= 0xff00 && cp <= 0xff60) || // Fullwidth Forms - (cp >= 0xffe0 && cp <= 0xffe6) || // Fullwidth Forms - (cp >= 0x20000 && cp <= 0x2fffd) || // CJK - (cp >= 0x30000 && cp <= 0x3fffd) || - // Miscellaneous Symbols and Pictographs + Emoticons: - (cp >= 0x1f300 && cp <= 0x1f64f) || - // Supplemental Symbols and Pictographs: - (cp >= 0x1f900 && cp <= 0x1f9ff)))); - return true; - } - }; - // We could avoid branches by using utf8_decode directly. - for_each_codepoint(s, count_code_points{&num_code_points}); - return num_code_points; -} - -inline auto compute_width(basic_string_view s) -> size_t { - return compute_width( - string_view(reinterpret_cast(s.data()), s.size())); -} - -template -inline auto code_point_index(basic_string_view s, size_t n) -> size_t { - size_t size = s.size(); - return n < size ? n : size; -} - -// Calculates the index of the nth code point in a UTF-8 string. -inline auto code_point_index(string_view s, size_t n) -> size_t { - const char* data = s.data(); - size_t num_code_points = 0; - for (size_t i = 0, size = s.size(); i != size; ++i) { - if ((data[i] & 0xc0) != 0x80 && ++num_code_points > n) return i; - } - return s.size(); -} - -inline auto code_point_index(basic_string_view s, size_t n) - -> size_t { - return code_point_index( - string_view(reinterpret_cast(s.data()), s.size()), n); -} - -template struct is_integral : std::is_integral {}; -template <> struct is_integral : std::true_type {}; -template <> struct is_integral : std::true_type {}; - -template -using is_signed = - std::integral_constant::is_signed || - std::is_same::value>; - -template -using is_integer = - bool_constant::value && !std::is_same::value && - !std::is_same::value && - !std::is_same::value>; - -#ifndef FMT_USE_FLOAT128 -# ifdef __SIZEOF_FLOAT128__ -# define FMT_USE_FLOAT128 1 -# else -# define FMT_USE_FLOAT128 0 -# endif -#endif -#if FMT_USE_FLOAT128 -using float128 = __float128; -#else -using float128 = void; -#endif -template using is_float128 = std::is_same; - -template -using is_floating_point = - bool_constant::value || is_float128::value>; - -template ::value> -struct is_fast_float : bool_constant::is_iec559 && - sizeof(T) <= sizeof(double)> {}; -template struct is_fast_float : std::false_type {}; - -template -using is_double_double = bool_constant::digits == 106>; - -#ifndef FMT_USE_FULL_CACHE_DRAGONBOX -# define FMT_USE_FULL_CACHE_DRAGONBOX 0 -#endif - -template -template -void buffer::append(const U* begin, const U* end) { - while (begin != end) { - auto count = to_unsigned(end - begin); - try_reserve(size_ + count); - auto free_cap = capacity_ - size_; - if (free_cap < count) count = free_cap; - std::uninitialized_copy_n(begin, count, make_checked(ptr_ + size_, count)); - size_ += count; - begin += count; - } -} - -template -struct is_locale : std::false_type {}; -template -struct is_locale> : std::true_type {}; -} // namespace detail - -FMT_MODULE_EXPORT_BEGIN - -// The number of characters to store in the basic_memory_buffer object itself -// to avoid dynamic memory allocation. -enum { inline_buffer_size = 500 }; - -/** - \rst - A dynamically growing memory buffer for trivially copyable/constructible types - with the first ``SIZE`` elements stored in the object itself. - - You can use the ``memory_buffer`` type alias for ``char`` instead. - - **Example**:: - - auto out = fmt::memory_buffer(); - format_to(std::back_inserter(out), "The answer is {}.", 42); - - This will append the following output to the ``out`` object: - - .. code-block:: none - - The answer is 42. - - The output can be converted to an ``std::string`` with ``to_string(out)``. - \endrst - */ -template > -class basic_memory_buffer final : public detail::buffer { - private: - T store_[SIZE]; - - // Don't inherit from Allocator avoid generating type_info for it. - Allocator alloc_; - - // Deallocate memory allocated by the buffer. - FMT_CONSTEXPR20 void deallocate() { - T* data = this->data(); - if (data != store_) alloc_.deallocate(data, this->capacity()); - } - - protected: - FMT_CONSTEXPR20 void grow(size_t size) override; - - public: - using value_type = T; - using const_reference = const T&; - - FMT_CONSTEXPR20 explicit basic_memory_buffer( - const Allocator& alloc = Allocator()) - : alloc_(alloc) { - this->set(store_, SIZE); - if (detail::is_constant_evaluated()) detail::fill_n(store_, SIZE, T()); - } - FMT_CONSTEXPR20 ~basic_memory_buffer() { deallocate(); } - - private: - // Move data from other to this buffer. - FMT_CONSTEXPR20 void move(basic_memory_buffer& other) { - alloc_ = std::move(other.alloc_); - T* data = other.data(); - size_t size = other.size(), capacity = other.capacity(); - if (data == other.store_) { - this->set(store_, capacity); - detail::copy_str(other.store_, other.store_ + size, - detail::make_checked(store_, capacity)); - } else { - this->set(data, capacity); - // Set pointer to the inline array so that delete is not called - // when deallocating. - other.set(other.store_, 0); - other.clear(); - } - this->resize(size); - } - - public: - /** - \rst - Constructs a :class:`fmt::basic_memory_buffer` object moving the content - of the other object to it. - \endrst - */ - FMT_CONSTEXPR20 basic_memory_buffer(basic_memory_buffer&& other) noexcept { - move(other); - } - - /** - \rst - Moves the content of the other ``basic_memory_buffer`` object to this one. - \endrst - */ - auto operator=(basic_memory_buffer&& other) noexcept -> basic_memory_buffer& { - FMT_ASSERT(this != &other, ""); - deallocate(); - move(other); - return *this; - } - - // Returns a copy of the allocator associated with this buffer. - auto get_allocator() const -> Allocator { return alloc_; } - - /** - Resizes the buffer to contain *count* elements. If T is a POD type new - elements may not be initialized. - */ - FMT_CONSTEXPR20 void resize(size_t count) { this->try_resize(count); } - - /** Increases the buffer capacity to *new_capacity*. */ - void reserve(size_t new_capacity) { this->try_reserve(new_capacity); } - - // Directly append data into the buffer - using detail::buffer::append; - template - void append(const ContiguousRange& range) { - append(range.data(), range.data() + range.size()); - } -}; - -template -FMT_CONSTEXPR20 void basic_memory_buffer::grow( - size_t size) { - detail::abort_fuzzing_if(size > 5000); - const size_t max_size = std::allocator_traits::max_size(alloc_); - size_t old_capacity = this->capacity(); - size_t new_capacity = old_capacity + old_capacity / 2; - if (size > new_capacity) - new_capacity = size; - else if (new_capacity > max_size) - new_capacity = size > max_size ? size : max_size; - T* old_data = this->data(); - T* new_data = - std::allocator_traits::allocate(alloc_, new_capacity); - // The following code doesn't throw, so the raw pointer above doesn't leak. - std::uninitialized_copy(old_data, old_data + this->size(), - detail::make_checked(new_data, new_capacity)); - this->set(new_data, new_capacity); - // deallocate must not throw according to the standard, but even if it does, - // the buffer already uses the new storage and will deallocate it in - // destructor. - if (old_data != store_) alloc_.deallocate(old_data, old_capacity); -} - -using memory_buffer = basic_memory_buffer; - -template -struct is_contiguous> : std::true_type { -}; - -namespace detail { -#ifdef _WIN32 -FMT_API bool write_console(std::FILE* f, string_view text); -#endif -FMT_API void print(std::FILE*, string_view); -} // namespace detail - -/** An error reported from a formatting function. */ -FMT_CLASS_API -class FMT_API format_error : public std::runtime_error { - public: - using std::runtime_error::runtime_error; - format_error(const format_error&) = default; - format_error& operator=(const format_error&) = default; - format_error(format_error&&) = default; - format_error& operator=(format_error&&) = default; - ~format_error() noexcept override FMT_MSC_DEFAULT; -}; - -namespace detail_exported { -#if FMT_USE_NONTYPE_TEMPLATE_ARGS -template struct fixed_string { - constexpr fixed_string(const Char (&str)[N]) { - detail::copy_str(static_cast(str), - str + N, data); - } - Char data[N] = {}; -}; -#endif - -// Converts a compile-time string to basic_string_view. -template -constexpr auto compile_string_to_view(const Char (&s)[N]) - -> basic_string_view { - // Remove trailing NUL character if needed. Won't be present if this is used - // with a raw character array (i.e. not defined as a string). - return {s, N - (std::char_traits::to_int_type(s[N - 1]) == 0 ? 1 : 0)}; -} -template -constexpr auto compile_string_to_view(detail::std_string_view s) - -> basic_string_view { - return {s.data(), s.size()}; -} -} // namespace detail_exported - -class loc_value { - private: - basic_format_arg value_; - - public: - template ::value)> - loc_value(T value) : value_(detail::make_arg(value)) {} - - template ::value)> - loc_value(T) {} - - template auto visit(Visitor&& vis) -> decltype(vis(0)) { - return visit_format_arg(vis, value_); - } -}; - -// A locale facet that formats values in UTF-8. -// It is parameterized on the locale to avoid the heavy include. -template class format_facet : public Locale::facet { - private: - std::string separator_; - std::string grouping_; - std::string decimal_point_; - - protected: - virtual auto do_put(appender out, loc_value val, - const format_specs& specs) const -> bool; - - public: - static FMT_API typename Locale::id id; - - explicit format_facet(Locale& loc); - explicit format_facet(string_view sep = "", - std::initializer_list g = {3}, - std::string decimal_point = ".") - : separator_(sep.data(), sep.size()), - grouping_(g.begin(), g.end()), - decimal_point_(decimal_point) {} - - auto put(appender out, loc_value val, const format_specs& specs) const - -> bool { - return do_put(out, val, specs); - } -}; - -FMT_BEGIN_DETAIL_NAMESPACE - -// Returns true if value is negative, false otherwise. -// Same as `value < 0` but doesn't produce warnings if T is an unsigned type. -template ::value)> -constexpr auto is_negative(T value) -> bool { - return value < 0; -} -template ::value)> -constexpr auto is_negative(T) -> bool { - return false; -} - -template -FMT_CONSTEXPR auto is_supported_floating_point(T) -> bool { - if (std::is_same()) return FMT_USE_FLOAT; - if (std::is_same()) return FMT_USE_DOUBLE; - if (std::is_same()) return FMT_USE_LONG_DOUBLE; - return true; -} - -// Smallest of uint32_t, uint64_t, uint128_t that is large enough to -// represent all values of an integral type T. -template -using uint32_or_64_or_128_t = - conditional_t() <= 32 && !FMT_REDUCE_INT_INSTANTIATIONS, - uint32_t, - conditional_t() <= 64, uint64_t, uint128_t>>; -template -using uint64_or_128_t = conditional_t() <= 64, uint64_t, uint128_t>; - -#define FMT_POWERS_OF_10(factor) \ - factor * 10, (factor)*100, (factor)*1000, (factor)*10000, (factor)*100000, \ - (factor)*1000000, (factor)*10000000, (factor)*100000000, \ - (factor)*1000000000 - -// Converts value in the range [0, 100) to a string. -constexpr const char* digits2(size_t value) { - // GCC generates slightly better code when value is pointer-size. - return &"0001020304050607080910111213141516171819" - "2021222324252627282930313233343536373839" - "4041424344454647484950515253545556575859" - "6061626364656667686970717273747576777879" - "8081828384858687888990919293949596979899"[value * 2]; -} - -// Sign is a template parameter to workaround a bug in gcc 4.8. -template constexpr Char sign(Sign s) { -#if !FMT_GCC_VERSION || FMT_GCC_VERSION >= 604 - static_assert(std::is_same::value, ""); -#endif - return static_cast("\0-+ "[s]); -} - -template FMT_CONSTEXPR auto count_digits_fallback(T n) -> int { - int count = 1; - for (;;) { - // Integer division is slow so do it for a group of four digits instead - // of for every digit. The idea comes from the talk by Alexandrescu - // "Three Optimization Tips for C++". See speed-test for a comparison. - if (n < 10) return count; - if (n < 100) return count + 1; - if (n < 1000) return count + 2; - if (n < 10000) return count + 3; - n /= 10000u; - count += 4; - } -} -#if FMT_USE_INT128 -FMT_CONSTEXPR inline auto count_digits(uint128_opt n) -> int { - return count_digits_fallback(n); -} -#endif - -#ifdef FMT_BUILTIN_CLZLL -// It is a separate function rather than a part of count_digits to workaround -// the lack of static constexpr in constexpr functions. -inline auto do_count_digits(uint64_t n) -> int { - // This has comparable performance to the version by Kendall Willets - // (https://github.com/fmtlib/format-benchmark/blob/master/digits10) - // but uses smaller tables. - // Maps bsr(n) to ceil(log10(pow(2, bsr(n) + 1) - 1)). - static constexpr uint8_t bsr2log10[] = { - 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, - 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, - 10, 11, 11, 11, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 15, 15, - 15, 16, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 19, 20}; - auto t = bsr2log10[FMT_BUILTIN_CLZLL(n | 1) ^ 63]; - static constexpr const uint64_t zero_or_powers_of_10[] = { - 0, 0, FMT_POWERS_OF_10(1U), FMT_POWERS_OF_10(1000000000ULL), - 10000000000000000000ULL}; - return t - (n < zero_or_powers_of_10[t]); -} -#endif - -// Returns the number of decimal digits in n. Leading zeros are not counted -// except for n == 0 in which case count_digits returns 1. -FMT_CONSTEXPR20 inline auto count_digits(uint64_t n) -> int { -#ifdef FMT_BUILTIN_CLZLL - if (!is_constant_evaluated()) { - return do_count_digits(n); - } -#endif - return count_digits_fallback(n); -} - -// Counts the number of digits in n. BITS = log2(radix). -template -FMT_CONSTEXPR auto count_digits(UInt n) -> int { -#ifdef FMT_BUILTIN_CLZ - if (!is_constant_evaluated() && num_bits() == 32) - return (FMT_BUILTIN_CLZ(static_cast(n) | 1) ^ 31) / BITS + 1; -#endif - // Lambda avoids unreachable code warnings from NVHPC. - return [](UInt m) { - int num_digits = 0; - do { - ++num_digits; - } while ((m >>= BITS) != 0); - return num_digits; - }(n); -} - -#ifdef FMT_BUILTIN_CLZ -// It is a separate function rather than a part of count_digits to workaround -// the lack of static constexpr in constexpr functions. -FMT_INLINE auto do_count_digits(uint32_t n) -> int { -// An optimization by Kendall Willets from https://bit.ly/3uOIQrB. -// This increments the upper 32 bits (log10(T) - 1) when >= T is added. -# define FMT_INC(T) (((sizeof(# T) - 1ull) << 32) - T) - static constexpr uint64_t table[] = { - FMT_INC(0), FMT_INC(0), FMT_INC(0), // 8 - FMT_INC(10), FMT_INC(10), FMT_INC(10), // 64 - FMT_INC(100), FMT_INC(100), FMT_INC(100), // 512 - FMT_INC(1000), FMT_INC(1000), FMT_INC(1000), // 4096 - FMT_INC(10000), FMT_INC(10000), FMT_INC(10000), // 32k - FMT_INC(100000), FMT_INC(100000), FMT_INC(100000), // 256k - FMT_INC(1000000), FMT_INC(1000000), FMT_INC(1000000), // 2048k - FMT_INC(10000000), FMT_INC(10000000), FMT_INC(10000000), // 16M - FMT_INC(100000000), FMT_INC(100000000), FMT_INC(100000000), // 128M - FMT_INC(1000000000), FMT_INC(1000000000), FMT_INC(1000000000), // 1024M - FMT_INC(1000000000), FMT_INC(1000000000) // 4B - }; - auto inc = table[FMT_BUILTIN_CLZ(n | 1) ^ 31]; - return static_cast((n + inc) >> 32); -} -#endif - -// Optional version of count_digits for better performance on 32-bit platforms. -FMT_CONSTEXPR20 inline auto count_digits(uint32_t n) -> int { -#ifdef FMT_BUILTIN_CLZ - if (!is_constant_evaluated()) { - return do_count_digits(n); - } -#endif - return count_digits_fallback(n); -} - -template constexpr auto digits10() noexcept -> int { - return std::numeric_limits::digits10; -} -template <> constexpr auto digits10() noexcept -> int { return 38; } -template <> constexpr auto digits10() noexcept -> int { return 38; } - -template struct thousands_sep_result { - std::string grouping; - Char thousands_sep; -}; - -template -FMT_API auto thousands_sep_impl(locale_ref loc) -> thousands_sep_result; -template -inline auto thousands_sep(locale_ref loc) -> thousands_sep_result { - auto result = thousands_sep_impl(loc); - return {result.grouping, Char(result.thousands_sep)}; -} -template <> -inline auto thousands_sep(locale_ref loc) -> thousands_sep_result { - return thousands_sep_impl(loc); -} - -template -FMT_API auto decimal_point_impl(locale_ref loc) -> Char; -template inline auto decimal_point(locale_ref loc) -> Char { - return Char(decimal_point_impl(loc)); -} -template <> inline auto decimal_point(locale_ref loc) -> wchar_t { - return decimal_point_impl(loc); -} - -// Compares two characters for equality. -template auto equal2(const Char* lhs, const char* rhs) -> bool { - return lhs[0] == Char(rhs[0]) && lhs[1] == Char(rhs[1]); -} -inline auto equal2(const char* lhs, const char* rhs) -> bool { - return memcmp(lhs, rhs, 2) == 0; -} - -// Copies two characters from src to dst. -template -FMT_CONSTEXPR20 FMT_INLINE void copy2(Char* dst, const char* src) { - if (!is_constant_evaluated() && sizeof(Char) == sizeof(char)) { - memcpy(dst, src, 2); - return; - } - *dst++ = static_cast(*src++); - *dst = static_cast(*src); -} - -template struct format_decimal_result { - Iterator begin; - Iterator end; -}; - -// Formats a decimal unsigned integer value writing into out pointing to a -// buffer of specified size. The caller must ensure that the buffer is large -// enough. -template -FMT_CONSTEXPR20 auto format_decimal(Char* out, UInt value, int size) - -> format_decimal_result { - FMT_ASSERT(size >= count_digits(value), "invalid digit count"); - out += size; - Char* end = out; - while (value >= 100) { - // Integer division is slow so do it for a group of two digits instead - // of for every digit. The idea comes from the talk by Alexandrescu - // "Three Optimization Tips for C++". See speed-test for a comparison. - out -= 2; - copy2(out, digits2(static_cast(value % 100))); - value /= 100; - } - if (value < 10) { - *--out = static_cast('0' + value); - return {out, end}; - } - out -= 2; - copy2(out, digits2(static_cast(value))); - return {out, end}; -} - -template >::value)> -FMT_CONSTEXPR inline auto format_decimal(Iterator out, UInt value, int size) - -> format_decimal_result { - // Buffer is large enough to hold all digits (digits10 + 1). - Char buffer[digits10() + 1] = {}; - auto end = format_decimal(buffer, value, size).end; - return {out, detail::copy_str_noinline(buffer, end, out)}; -} - -template -FMT_CONSTEXPR auto format_uint(Char* buffer, UInt value, int num_digits, - bool upper = false) -> Char* { - buffer += num_digits; - Char* end = buffer; - do { - const char* digits = upper ? "0123456789ABCDEF" : "0123456789abcdef"; - unsigned digit = static_cast(value & ((1 << BASE_BITS) - 1)); - *--buffer = static_cast(BASE_BITS < 4 ? static_cast('0' + digit) - : digits[digit]); - } while ((value >>= BASE_BITS) != 0); - return end; -} - -template -inline auto format_uint(It out, UInt value, int num_digits, bool upper = false) - -> It { - if (auto ptr = to_pointer(out, to_unsigned(num_digits))) { - format_uint(ptr, value, num_digits, upper); - return out; - } - // Buffer should be large enough to hold all digits (digits / BASE_BITS + 1). - char buffer[num_bits() / BASE_BITS + 1]; - format_uint(buffer, value, num_digits, upper); - return detail::copy_str_noinline(buffer, buffer + num_digits, out); -} - -// A converter from UTF-8 to UTF-16. -class utf8_to_utf16 { - private: - basic_memory_buffer buffer_; - - public: - FMT_API explicit utf8_to_utf16(string_view s); - operator basic_string_view() const { return {&buffer_[0], size()}; } - auto size() const -> size_t { return buffer_.size() - 1; } - auto c_str() const -> const wchar_t* { return &buffer_[0]; } - auto str() const -> std::wstring { return {&buffer_[0], size()}; } -}; - -namespace dragonbox { - -// Type-specific information that Dragonbox uses. -template struct float_info; - -template <> struct float_info { - using carrier_uint = uint32_t; - static const int exponent_bits = 8; - static const int kappa = 1; - static const int big_divisor = 100; - static const int small_divisor = 10; - static const int min_k = -31; - static const int max_k = 46; - static const int shorter_interval_tie_lower_threshold = -35; - static const int shorter_interval_tie_upper_threshold = -35; -}; - -template <> struct float_info { - using carrier_uint = uint64_t; - static const int exponent_bits = 11; - static const int kappa = 2; - static const int big_divisor = 1000; - static const int small_divisor = 100; - static const int min_k = -292; - static const int max_k = 326; - static const int shorter_interval_tie_lower_threshold = -77; - static const int shorter_interval_tie_upper_threshold = -77; -}; - -// An 80- or 128-bit floating point number. -template -struct float_info::digits == 64 || - std::numeric_limits::digits == 113 || - is_float128::value>> { - using carrier_uint = detail::uint128_t; - static const int exponent_bits = 15; -}; - -// A double-double floating point number. -template -struct float_info::value>> { - using carrier_uint = detail::uint128_t; -}; - -template struct decimal_fp { - using significand_type = typename float_info::carrier_uint; - significand_type significand; - int exponent; -}; - -template FMT_API auto to_decimal(T x) noexcept -> decimal_fp; -} // namespace dragonbox - -// Returns true iff Float has the implicit bit which is not stored. -template constexpr bool has_implicit_bit() { - // An 80-bit FP number has a 64-bit significand an no implicit bit. - return std::numeric_limits::digits != 64; -} - -// Returns the number of significand bits stored in Float. The implicit bit is -// not counted since it is not stored. -template constexpr int num_significand_bits() { - // std::numeric_limits may not support __float128. - return is_float128() ? 112 - : (std::numeric_limits::digits - - (has_implicit_bit() ? 1 : 0)); -} - -template -constexpr auto exponent_mask() -> - typename dragonbox::float_info::carrier_uint { - using uint = typename dragonbox::float_info::carrier_uint; - return ((uint(1) << dragonbox::float_info::exponent_bits) - 1) - << num_significand_bits(); -} -template constexpr auto exponent_bias() -> int { - // std::numeric_limits may not support __float128. - return is_float128() ? 16383 - : std::numeric_limits::max_exponent - 1; -} - -// Writes the exponent exp in the form "[+-]d{2,3}" to buffer. -template -FMT_CONSTEXPR auto write_exponent(int exp, It it) -> It { - FMT_ASSERT(-10000 < exp && exp < 10000, "exponent out of range"); - if (exp < 0) { - *it++ = static_cast('-'); - exp = -exp; - } else { - *it++ = static_cast('+'); - } - if (exp >= 100) { - const char* top = digits2(to_unsigned(exp / 100)); - if (exp >= 1000) *it++ = static_cast(top[0]); - *it++ = static_cast(top[1]); - exp %= 100; - } - const char* d = digits2(to_unsigned(exp)); - *it++ = static_cast(d[0]); - *it++ = static_cast(d[1]); - return it; -} - -// A floating-point number f * pow(2, e) where F is an unsigned type. -template struct basic_fp { - F f; - int e; - - static constexpr const int num_significand_bits = - static_cast(sizeof(F) * num_bits()); - - constexpr basic_fp() : f(0), e(0) {} - constexpr basic_fp(uint64_t f_val, int e_val) : f(f_val), e(e_val) {} - - // Constructs fp from an IEEE754 floating-point number. - template FMT_CONSTEXPR basic_fp(Float n) { assign(n); } - - // Assigns n to this and return true iff predecessor is closer than successor. - template ::value)> - FMT_CONSTEXPR auto assign(Float n) -> bool { - static_assert(std::numeric_limits::digits <= 113, "unsupported FP"); - // Assume Float is in the format [sign][exponent][significand]. - using carrier_uint = typename dragonbox::float_info::carrier_uint; - const auto num_float_significand_bits = - detail::num_significand_bits(); - const auto implicit_bit = carrier_uint(1) << num_float_significand_bits; - const auto significand_mask = implicit_bit - 1; - auto u = bit_cast(n); - f = static_cast(u & significand_mask); - auto biased_e = static_cast((u & exponent_mask()) >> - num_float_significand_bits); - // The predecessor is closer if n is a normalized power of 2 (f == 0) - // other than the smallest normalized number (biased_e > 1). - auto is_predecessor_closer = f == 0 && biased_e > 1; - if (biased_e == 0) - biased_e = 1; // Subnormals use biased exponent 1 (min exponent). - else if (has_implicit_bit()) - f += static_cast(implicit_bit); - e = biased_e - exponent_bias() - num_float_significand_bits; - if (!has_implicit_bit()) ++e; - return is_predecessor_closer; - } - - template ::value)> - FMT_CONSTEXPR auto assign(Float n) -> bool { - static_assert(std::numeric_limits::is_iec559, "unsupported FP"); - return assign(static_cast(n)); - } -}; - -using fp = basic_fp; - -// Normalizes the value converted from double and multiplied by (1 << SHIFT). -template -FMT_CONSTEXPR basic_fp normalize(basic_fp value) { - // Handle subnormals. - const auto implicit_bit = F(1) << num_significand_bits(); - const auto shifted_implicit_bit = implicit_bit << SHIFT; - while ((value.f & shifted_implicit_bit) == 0) { - value.f <<= 1; - --value.e; - } - // Subtract 1 to account for hidden bit. - const auto offset = basic_fp::num_significand_bits - - num_significand_bits() - SHIFT - 1; - value.f <<= offset; - value.e -= offset; - return value; -} - -// Computes lhs * rhs / pow(2, 64) rounded to nearest with half-up tie breaking. -FMT_CONSTEXPR inline uint64_t multiply(uint64_t lhs, uint64_t rhs) { -#if FMT_USE_INT128 - auto product = static_cast<__uint128_t>(lhs) * rhs; - auto f = static_cast(product >> 64); - return (static_cast(product) & (1ULL << 63)) != 0 ? f + 1 : f; -#else - // Multiply 32-bit parts of significands. - uint64_t mask = (1ULL << 32) - 1; - uint64_t a = lhs >> 32, b = lhs & mask; - uint64_t c = rhs >> 32, d = rhs & mask; - uint64_t ac = a * c, bc = b * c, ad = a * d, bd = b * d; - // Compute mid 64-bit of result and round. - uint64_t mid = (bd >> 32) + (ad & mask) + (bc & mask) + (1U << 31); - return ac + (ad >> 32) + (bc >> 32) + (mid >> 32); -#endif -} - -FMT_CONSTEXPR inline fp operator*(fp x, fp y) { - return {multiply(x.f, y.f), x.e + y.e + 64}; -} - -template struct basic_data { - // Normalized 64-bit significands of pow(10, k), for k = -348, -340, ..., 340. - // These are generated by support/compute-powers.py. - static constexpr uint64_t pow10_significands[87] = { - 0xfa8fd5a0081c0288, 0xbaaee17fa23ebf76, 0x8b16fb203055ac76, - 0xcf42894a5dce35ea, 0x9a6bb0aa55653b2d, 0xe61acf033d1a45df, - 0xab70fe17c79ac6ca, 0xff77b1fcbebcdc4f, 0xbe5691ef416bd60c, - 0x8dd01fad907ffc3c, 0xd3515c2831559a83, 0x9d71ac8fada6c9b5, - 0xea9c227723ee8bcb, 0xaecc49914078536d, 0x823c12795db6ce57, - 0xc21094364dfb5637, 0x9096ea6f3848984f, 0xd77485cb25823ac7, - 0xa086cfcd97bf97f4, 0xef340a98172aace5, 0xb23867fb2a35b28e, - 0x84c8d4dfd2c63f3b, 0xc5dd44271ad3cdba, 0x936b9fcebb25c996, - 0xdbac6c247d62a584, 0xa3ab66580d5fdaf6, 0xf3e2f893dec3f126, - 0xb5b5ada8aaff80b8, 0x87625f056c7c4a8b, 0xc9bcff6034c13053, - 0x964e858c91ba2655, 0xdff9772470297ebd, 0xa6dfbd9fb8e5b88f, - 0xf8a95fcf88747d94, 0xb94470938fa89bcf, 0x8a08f0f8bf0f156b, - 0xcdb02555653131b6, 0x993fe2c6d07b7fac, 0xe45c10c42a2b3b06, - 0xaa242499697392d3, 0xfd87b5f28300ca0e, 0xbce5086492111aeb, - 0x8cbccc096f5088cc, 0xd1b71758e219652c, 0x9c40000000000000, - 0xe8d4a51000000000, 0xad78ebc5ac620000, 0x813f3978f8940984, - 0xc097ce7bc90715b3, 0x8f7e32ce7bea5c70, 0xd5d238a4abe98068, - 0x9f4f2726179a2245, 0xed63a231d4c4fb27, 0xb0de65388cc8ada8, - 0x83c7088e1aab65db, 0xc45d1df942711d9a, 0x924d692ca61be758, - 0xda01ee641a708dea, 0xa26da3999aef774a, 0xf209787bb47d6b85, - 0xb454e4a179dd1877, 0x865b86925b9bc5c2, 0xc83553c5c8965d3d, - 0x952ab45cfa97a0b3, 0xde469fbd99a05fe3, 0xa59bc234db398c25, - 0xf6c69a72a3989f5c, 0xb7dcbf5354e9bece, 0x88fcf317f22241e2, - 0xcc20ce9bd35c78a5, 0x98165af37b2153df, 0xe2a0b5dc971f303a, - 0xa8d9d1535ce3b396, 0xfb9b7cd9a4a7443c, 0xbb764c4ca7a44410, - 0x8bab8eefb6409c1a, 0xd01fef10a657842c, 0x9b10a4e5e9913129, - 0xe7109bfba19c0c9d, 0xac2820d9623bf429, 0x80444b5e7aa7cf85, - 0xbf21e44003acdd2d, 0x8e679c2f5e44ff8f, 0xd433179d9c8cb841, - 0x9e19db92b4e31ba9, 0xeb96bf6ebadf77d9, 0xaf87023b9bf0ee6b, - }; - -#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wnarrowing" -#endif - // Binary exponents of pow(10, k), for k = -348, -340, ..., 340, corresponding - // to significands above. - static constexpr int16_t pow10_exponents[87] = { - -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007, -980, -954, - -927, -901, -874, -847, -821, -794, -768, -741, -715, -688, -661, - -635, -608, -582, -555, -529, -502, -475, -449, -422, -396, -369, - -343, -316, -289, -263, -236, -210, -183, -157, -130, -103, -77, - -50, -24, 3, 30, 56, 83, 109, 136, 162, 189, 216, - 242, 269, 295, 322, 348, 375, 402, 428, 455, 481, 508, - 534, 561, 588, 614, 641, 667, 694, 720, 747, 774, 800, - 827, 853, 880, 907, 933, 960, 986, 1013, 1039, 1066}; -#if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 -# pragma GCC diagnostic pop -#endif - - static constexpr uint64_t power_of_10_64[20] = { - 1, FMT_POWERS_OF_10(1ULL), FMT_POWERS_OF_10(1000000000ULL), - 10000000000000000000ULL}; -}; - -#if FMT_CPLUSPLUS < 201703L -template constexpr uint64_t basic_data::pow10_significands[]; -template constexpr int16_t basic_data::pow10_exponents[]; -template constexpr uint64_t basic_data::power_of_10_64[]; -#endif - -// This is a struct rather than an alias to avoid shadowing warnings in gcc. -struct data : basic_data<> {}; - -// Returns a cached power of 10 `c_k = c_k.f * pow(2, c_k.e)` such that its -// (binary) exponent satisfies `min_exponent <= c_k.e <= min_exponent + 28`. -FMT_CONSTEXPR inline fp get_cached_power(int min_exponent, - int& pow10_exponent) { - const int shift = 32; - // log10(2) = 0x0.4d104d427de7fbcc... - const int64_t significand = 0x4d104d427de7fbcc; - int index = static_cast( - ((min_exponent + fp::num_significand_bits - 1) * (significand >> shift) + - ((int64_t(1) << shift) - 1)) // ceil - >> 32 // arithmetic shift - ); - // Decimal exponent of the first (smallest) cached power of 10. - const int first_dec_exp = -348; - // Difference between 2 consecutive decimal exponents in cached powers of 10. - const int dec_exp_step = 8; - index = (index - first_dec_exp - 1) / dec_exp_step + 1; - pow10_exponent = first_dec_exp + index * dec_exp_step; - // Using *(x + index) instead of x[index] avoids an issue with some compilers - // using the EDG frontend (e.g. nvhpc/22.3 in C++17 mode). - return {*(data::pow10_significands + index), - *(data::pow10_exponents + index)}; -} - -#ifndef _MSC_VER -# define FMT_SNPRINTF snprintf -#else -FMT_API auto fmt_snprintf(char* buf, size_t size, const char* fmt, ...) -> int; -# define FMT_SNPRINTF fmt_snprintf -#endif // _MSC_VER - -// Formats a floating-point number with snprintf using the hexfloat format. -template -auto snprintf_float(T value, int precision, float_specs specs, - buffer& buf) -> int { - // Buffer capacity must be non-zero, otherwise MSVC's vsnprintf_s will fail. - FMT_ASSERT(buf.capacity() > buf.size(), "empty buffer"); - FMT_ASSERT(specs.format == float_format::hex, ""); - static_assert(!std::is_same::value, ""); - - // Build the format string. - char format[7]; // The longest format is "%#.*Le". - char* format_ptr = format; - *format_ptr++ = '%'; - if (specs.showpoint) *format_ptr++ = '#'; - if (precision >= 0) { - *format_ptr++ = '.'; - *format_ptr++ = '*'; - } - if (std::is_same()) *format_ptr++ = 'L'; - *format_ptr++ = specs.upper ? 'A' : 'a'; - *format_ptr = '\0'; - - // Format using snprintf. - auto offset = buf.size(); - for (;;) { - auto begin = buf.data() + offset; - auto capacity = buf.capacity() - offset; - abort_fuzzing_if(precision > 100000); - // Suppress the warning about a nonliteral format string. - // Cannot use auto because of a bug in MinGW (#1532). - int (*snprintf_ptr)(char*, size_t, const char*, ...) = FMT_SNPRINTF; - int result = precision >= 0 - ? snprintf_ptr(begin, capacity, format, precision, value) - : snprintf_ptr(begin, capacity, format, value); - if (result < 0) { - // The buffer will grow exponentially. - buf.try_reserve(buf.capacity() + 1); - continue; - } - auto size = to_unsigned(result); - // Size equal to capacity means that the last character was truncated. - if (size < capacity) { - buf.try_resize(size + offset); - return 0; - } - buf.try_reserve(size + offset + 1); // Add 1 for the terminating '\0'. - } -} - -template -using convert_float_result = - conditional_t::value || - std::numeric_limits::digits == - std::numeric_limits::digits, - double, T>; - -template -constexpr auto convert_float(T value) -> convert_float_result { - return static_cast>(value); -} - -template -FMT_NOINLINE FMT_CONSTEXPR auto fill(OutputIt it, size_t n, - const fill_t& fill) -> OutputIt { - auto fill_size = fill.size(); - if (fill_size == 1) return detail::fill_n(it, n, fill[0]); - auto data = fill.data(); - for (size_t i = 0; i < n; ++i) - it = copy_str(data, data + fill_size, it); - return it; -} - -// Writes the output of f, padded according to format specifications in specs. -// size: output size in code units. -// width: output display width in (terminal) column positions. -template -FMT_CONSTEXPR auto write_padded(OutputIt out, - const basic_format_specs& specs, - size_t size, size_t width, F&& f) -> OutputIt { - static_assert(align == align::left || align == align::right, ""); - unsigned spec_width = to_unsigned(specs.width); - size_t padding = spec_width > width ? spec_width - width : 0; - // Shifts are encoded as string literals because static constexpr is not - // supported in constexpr functions. - auto* shifts = align == align::left ? "\x1f\x1f\x00\x01" : "\x00\x1f\x00\x01"; - size_t left_padding = padding >> shifts[specs.align]; - size_t right_padding = padding - left_padding; - auto it = reserve(out, size + padding * specs.fill.size()); - if (left_padding != 0) it = fill(it, left_padding, specs.fill); - it = f(it); - if (right_padding != 0) it = fill(it, right_padding, specs.fill); - return base_iterator(out, it); -} - -template -constexpr auto write_padded(OutputIt out, const basic_format_specs& specs, - size_t size, F&& f) -> OutputIt { - return write_padded(out, specs, size, size, f); -} - -template -FMT_CONSTEXPR auto write_bytes(OutputIt out, string_view bytes, - const basic_format_specs& specs) - -> OutputIt { - return write_padded( - out, specs, bytes.size(), [bytes](reserve_iterator it) { - const char* data = bytes.data(); - return copy_str(data, data + bytes.size(), it); - }); -} - -template -auto write_ptr(OutputIt out, UIntPtr value, - const basic_format_specs* specs) -> OutputIt { - int num_digits = count_digits<4>(value); - auto size = to_unsigned(num_digits) + size_t(2); - auto write = [=](reserve_iterator it) { - *it++ = static_cast('0'); - *it++ = static_cast('x'); - return format_uint<4, Char>(it, value, num_digits); - }; - return specs ? write_padded(out, *specs, size, write) - : base_iterator(out, write(reserve(out, size))); -} - -// Returns true iff the code point cp is printable. -FMT_API auto is_printable(uint32_t cp) -> bool; - -inline auto needs_escape(uint32_t cp) -> bool { - return cp < 0x20 || cp == 0x7f || cp == '"' || cp == '\\' || - !is_printable(cp); -} - -template struct find_escape_result { - const Char* begin; - const Char* end; - uint32_t cp; -}; - -template -using make_unsigned_char = - typename conditional_t::value, - std::make_unsigned, - type_identity>::type; - -template -auto find_escape(const Char* begin, const Char* end) - -> find_escape_result { - for (; begin != end; ++begin) { - uint32_t cp = static_cast>(*begin); - if (const_check(sizeof(Char) == 1) && cp >= 0x80) continue; - if (needs_escape(cp)) return {begin, begin + 1, cp}; - } - return {begin, nullptr, 0}; -} - -inline auto find_escape(const char* begin, const char* end) - -> find_escape_result { - if (!is_utf8()) return find_escape(begin, end); - auto result = find_escape_result{end, nullptr, 0}; - for_each_codepoint(string_view(begin, to_unsigned(end - begin)), - [&](uint32_t cp, string_view sv) { - if (needs_escape(cp)) { - result = {sv.begin(), sv.end(), cp}; - return false; - } - return true; - }); - return result; -} - -#define FMT_STRING_IMPL(s, base, explicit) \ - [] { \ - /* Use the hidden visibility as a workaround for a GCC bug (#1973). */ \ - /* Use a macro-like name to avoid shadowing warnings. */ \ - struct FMT_GCC_VISIBILITY_HIDDEN FMT_COMPILE_STRING : base { \ - using char_type FMT_MAYBE_UNUSED = fmt::remove_cvref_t; \ - FMT_MAYBE_UNUSED FMT_CONSTEXPR explicit \ - operator fmt::basic_string_view() const { \ - return fmt::detail_exported::compile_string_to_view(s); \ - } \ - }; \ - return FMT_COMPILE_STRING(); \ - }() - -/** - \rst - Constructs a compile-time format string from a string literal *s*. - - **Example**:: - - // A compile-time error because 'd' is an invalid specifier for strings. - std::string s = fmt::format(FMT_STRING("{:d}"), "foo"); - \endrst - */ -#define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::detail::compile_string, ) - -template -auto write_codepoint(OutputIt out, char prefix, uint32_t cp) -> OutputIt { - *out++ = static_cast('\\'); - *out++ = static_cast(prefix); - Char buf[width]; - fill_n(buf, width, static_cast('0')); - format_uint<4>(buf, cp, width); - return copy_str(buf, buf + width, out); -} - -template -auto write_escaped_cp(OutputIt out, const find_escape_result& escape) - -> OutputIt { - auto c = static_cast(escape.cp); - switch (escape.cp) { - case '\n': - *out++ = static_cast('\\'); - c = static_cast('n'); - break; - case '\r': - *out++ = static_cast('\\'); - c = static_cast('r'); - break; - case '\t': - *out++ = static_cast('\\'); - c = static_cast('t'); - break; - case '"': - FMT_FALLTHROUGH; - case '\'': - FMT_FALLTHROUGH; - case '\\': - *out++ = static_cast('\\'); - break; - default: - if (is_utf8()) { - if (escape.cp < 0x100) { - return write_codepoint<2, Char>(out, 'x', escape.cp); - } - if (escape.cp < 0x10000) { - return write_codepoint<4, Char>(out, 'u', escape.cp); - } - if (escape.cp < 0x110000) { - return write_codepoint<8, Char>(out, 'U', escape.cp); - } - } - for (Char escape_char : basic_string_view( - escape.begin, to_unsigned(escape.end - escape.begin))) { - out = write_codepoint<2, Char>(out, 'x', - static_cast(escape_char) & 0xFF); - } - return out; - } - *out++ = c; - return out; -} - -template -auto write_escaped_string(OutputIt out, basic_string_view str) - -> OutputIt { - *out++ = static_cast('"'); - auto begin = str.begin(), end = str.end(); - do { - auto escape = find_escape(begin, end); - out = copy_str(begin, escape.begin, out); - begin = escape.end; - if (!begin) break; - out = write_escaped_cp(out, escape); - } while (begin != end); - *out++ = static_cast('"'); - return out; -} - -template -auto write_escaped_char(OutputIt out, Char v) -> OutputIt { - *out++ = static_cast('\''); - if ((needs_escape(static_cast(v)) && v != static_cast('"')) || - v == static_cast('\'')) { - out = write_escaped_cp( - out, find_escape_result{&v, &v + 1, static_cast(v)}); - } else { - *out++ = v; - } - *out++ = static_cast('\''); - return out; -} - -template -FMT_CONSTEXPR auto write_char(OutputIt out, Char value, - const basic_format_specs& specs) - -> OutputIt { - bool is_debug = specs.type == presentation_type::debug; - return write_padded(out, specs, 1, [=](reserve_iterator it) { - if (is_debug) return write_escaped_char(it, value); - *it++ = value; - return it; - }); -} -template -FMT_CONSTEXPR auto write(OutputIt out, Char value, - const basic_format_specs& specs, - locale_ref loc = {}) -> OutputIt { - return check_char_specs(specs) - ? write_char(out, value, specs) - : write(out, static_cast(value), specs, loc); -} - -// Data for write_int that doesn't depend on output iterator type. It is used to -// avoid template code bloat. -template struct write_int_data { - size_t size; - size_t padding; - - FMT_CONSTEXPR write_int_data(int num_digits, unsigned prefix, - const basic_format_specs& specs) - : size((prefix >> 24) + to_unsigned(num_digits)), padding(0) { - if (specs.align == align::numeric) { - auto width = to_unsigned(specs.width); - if (width > size) { - padding = width - size; - size = width; - } - } else if (specs.precision > num_digits) { - size = (prefix >> 24) + to_unsigned(specs.precision); - padding = to_unsigned(specs.precision - num_digits); - } - } -}; - -// Writes an integer in the format -// -// where are written by write_digits(it). -// prefix contains chars in three lower bytes and the size in the fourth byte. -template -FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, int num_digits, - unsigned prefix, - const basic_format_specs& specs, - W write_digits) -> OutputIt { - // Slightly faster check for specs.width == 0 && specs.precision == -1. - if ((specs.width | (specs.precision + 1)) == 0) { - auto it = reserve(out, to_unsigned(num_digits) + (prefix >> 24)); - if (prefix != 0) { - for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8) - *it++ = static_cast(p & 0xff); - } - return base_iterator(out, write_digits(it)); - } - auto data = write_int_data(num_digits, prefix, specs); - return write_padded( - out, specs, data.size, [=](reserve_iterator it) { - for (unsigned p = prefix & 0xffffff; p != 0; p >>= 8) - *it++ = static_cast(p & 0xff); - it = detail::fill_n(it, data.padding, static_cast('0')); - return write_digits(it); - }); -} - -template class digit_grouping { - private: - std::string grouping_; - std::basic_string thousands_sep_; - - struct next_state { - std::string::const_iterator group; - int pos; - }; - next_state initial_state() const { return {grouping_.begin(), 0}; } - - // Returns the next digit group separator position. - int next(next_state& state) const { - if (thousands_sep_.empty()) return max_value(); - if (state.group == grouping_.end()) return state.pos += grouping_.back(); - if (*state.group <= 0 || *state.group == max_value()) - return max_value(); - state.pos += *state.group++; - return state.pos; - } - - public: - explicit digit_grouping(locale_ref loc, bool localized = true) { - if (!localized) return; - auto sep = thousands_sep(loc); - grouping_ = sep.grouping; - if (sep.thousands_sep) thousands_sep_.assign(1, sep.thousands_sep); - } - digit_grouping(std::string grouping, std::basic_string sep) - : grouping_(std::move(grouping)), thousands_sep_(std::move(sep)) {} - - bool has_separator() const { return !thousands_sep_.empty(); } - - int count_separators(int num_digits) const { - int count = 0; - auto state = initial_state(); - while (num_digits > next(state)) ++count; - return count; - } - - // Applies grouping to digits and write the output to out. - template - Out apply(Out out, basic_string_view digits) const { - auto num_digits = static_cast(digits.size()); - auto separators = basic_memory_buffer(); - separators.push_back(0); - auto state = initial_state(); - while (int i = next(state)) { - if (i >= num_digits) break; - separators.push_back(i); - } - for (int i = 0, sep_index = static_cast(separators.size() - 1); - i < num_digits; ++i) { - if (num_digits - i == separators[sep_index]) { - out = - copy_str(thousands_sep_.data(), - thousands_sep_.data() + thousands_sep_.size(), out); - --sep_index; - } - *out++ = static_cast(digits[to_unsigned(i)]); - } - return out; - } -}; - -// Writes a decimal integer with digit grouping. -template -auto write_int(OutputIt out, UInt value, unsigned prefix, - const basic_format_specs& specs, - const digit_grouping& grouping) -> OutputIt { - static_assert(std::is_same, UInt>::value, ""); - int num_digits = count_digits(value); - char digits[40]; - format_decimal(digits, value, num_digits); - unsigned size = to_unsigned((prefix != 0 ? 1 : 0) + num_digits + - grouping.count_separators(num_digits)); - return write_padded( - out, specs, size, size, [&](reserve_iterator it) { - if (prefix != 0) { - char sign = static_cast(prefix); - *it++ = static_cast(sign); - } - return grouping.apply(it, string_view(digits, to_unsigned(num_digits))); - }); -} - -// Writes a localized value. -FMT_API auto write_loc(appender out, loc_value value, const format_specs& specs, - locale_ref loc) -> bool; -template -inline auto write_loc(OutputIt, loc_value, const basic_format_specs&, - locale_ref) -> bool { - return false; -} - -FMT_CONSTEXPR inline void prefix_append(unsigned& prefix, unsigned value) { - prefix |= prefix != 0 ? value << 8 : value; - prefix += (1u + (value > 0xff ? 1 : 0)) << 24; -} - -template struct write_int_arg { - UInt abs_value; - unsigned prefix; -}; - -template -FMT_CONSTEXPR auto make_write_int_arg(T value, sign_t sign) - -> write_int_arg> { - auto prefix = 0u; - auto abs_value = static_cast>(value); - if (is_negative(value)) { - prefix = 0x01000000 | '-'; - abs_value = 0 - abs_value; - } else { - constexpr const unsigned prefixes[4] = {0, 0, 0x1000000u | '+', - 0x1000000u | ' '}; - prefix = prefixes[sign]; - } - return {abs_value, prefix}; -} - -template struct loc_writer { - buffer_appender out; - const basic_format_specs& specs; - std::basic_string sep; - std::string grouping; - std::basic_string decimal_point; - - template ::value)> - auto operator()(T value) -> bool { - auto arg = make_write_int_arg(value, specs.sign); - write_int(out, static_cast>(arg.abs_value), arg.prefix, - specs, digit_grouping(grouping, sep)); - return true; - } - - template ::value)> - auto operator()(T) -> bool { - return false; - } - - auto operator()(...) -> bool { return false; } -}; - -template -FMT_CONSTEXPR FMT_INLINE auto write_int(OutputIt out, write_int_arg arg, - const basic_format_specs& specs, - locale_ref) -> OutputIt { - static_assert(std::is_same>::value, ""); - auto abs_value = arg.abs_value; - auto prefix = arg.prefix; - switch (specs.type) { - case presentation_type::none: - case presentation_type::dec: { - auto num_digits = count_digits(abs_value); - return write_int( - out, num_digits, prefix, specs, [=](reserve_iterator it) { - return format_decimal(it, abs_value, num_digits).end; - }); - } - case presentation_type::hex_lower: - case presentation_type::hex_upper: { - bool upper = specs.type == presentation_type::hex_upper; - if (specs.alt) - prefix_append(prefix, unsigned(upper ? 'X' : 'x') << 8 | '0'); - int num_digits = count_digits<4>(abs_value); - return write_int( - out, num_digits, prefix, specs, [=](reserve_iterator it) { - return format_uint<4, Char>(it, abs_value, num_digits, upper); - }); - } - case presentation_type::bin_lower: - case presentation_type::bin_upper: { - bool upper = specs.type == presentation_type::bin_upper; - if (specs.alt) - prefix_append(prefix, unsigned(upper ? 'B' : 'b') << 8 | '0'); - int num_digits = count_digits<1>(abs_value); - return write_int(out, num_digits, prefix, specs, - [=](reserve_iterator it) { - return format_uint<1, Char>(it, abs_value, num_digits); - }); - } - case presentation_type::oct: { - int num_digits = count_digits<3>(abs_value); - // Octal prefix '0' is counted as a digit, so only add it if precision - // is not greater than the number of digits. - if (specs.alt && specs.precision <= num_digits && abs_value != 0) - prefix_append(prefix, '0'); - return write_int(out, num_digits, prefix, specs, - [=](reserve_iterator it) { - return format_uint<3, Char>(it, abs_value, num_digits); - }); - } - case presentation_type::chr: - return write_char(out, static_cast(abs_value), specs); - default: - throw_format_error("invalid type specifier"); - } - return out; -} -template -FMT_CONSTEXPR FMT_NOINLINE auto write_int_noinline( - OutputIt out, write_int_arg arg, const basic_format_specs& specs, - locale_ref loc) -> OutputIt { - return write_int(out, arg, specs, loc); -} -template ::value && - !std::is_same::value && - std::is_same>::value)> -FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value, - const basic_format_specs& specs, - locale_ref loc) -> OutputIt { - if (specs.localized && write_loc(out, value, specs, loc)) return out; - return write_int_noinline(out, make_write_int_arg(value, specs.sign), specs, - loc); -} -// An inlined version of write used in format string compilation. -template ::value && - !std::is_same::value && - !std::is_same>::value)> -FMT_CONSTEXPR FMT_INLINE auto write(OutputIt out, T value, - const basic_format_specs& specs, - locale_ref loc) -> OutputIt { - if (specs.localized && write_loc(out, value, specs, loc)) return out; - return write_int(out, make_write_int_arg(value, specs.sign), specs, loc); -} - -// An output iterator that counts the number of objects written to it and -// discards them. -class counting_iterator { - private: - size_t count_; - - public: - using iterator_category = std::output_iterator_tag; - using difference_type = std::ptrdiff_t; - using pointer = void; - using reference = void; - FMT_UNCHECKED_ITERATOR(counting_iterator); - - struct value_type { - template FMT_CONSTEXPR void operator=(const T&) {} - }; - - FMT_CONSTEXPR counting_iterator() : count_(0) {} - - FMT_CONSTEXPR size_t count() const { return count_; } - - FMT_CONSTEXPR counting_iterator& operator++() { - ++count_; - return *this; - } - FMT_CONSTEXPR counting_iterator operator++(int) { - auto it = *this; - ++*this; - return it; - } - - FMT_CONSTEXPR friend counting_iterator operator+(counting_iterator it, - difference_type n) { - it.count_ += static_cast(n); - return it; - } - - FMT_CONSTEXPR value_type operator*() const { return {}; } -}; - -template -FMT_CONSTEXPR auto write(OutputIt out, basic_string_view s, - const basic_format_specs& specs) -> OutputIt { - auto data = s.data(); - auto size = s.size(); - if (specs.precision >= 0 && to_unsigned(specs.precision) < size) - size = code_point_index(s, to_unsigned(specs.precision)); - bool is_debug = specs.type == presentation_type::debug; - size_t width = 0; - if (specs.width != 0) { - if (is_debug) - width = write_escaped_string(counting_iterator{}, s).count(); - else - width = compute_width(basic_string_view(data, size)); - } - return write_padded(out, specs, size, width, - [=](reserve_iterator it) { - if (is_debug) return write_escaped_string(it, s); - return copy_str(data, data + size, it); - }); -} -template -FMT_CONSTEXPR auto write(OutputIt out, - basic_string_view> s, - const basic_format_specs& specs, locale_ref) - -> OutputIt { - check_string_type_spec(specs.type); - return write(out, s, specs); -} -template -FMT_CONSTEXPR auto write(OutputIt out, const Char* s, - const basic_format_specs& specs, locale_ref) - -> OutputIt { - return check_cstring_type_spec(specs.type) - ? write(out, basic_string_view(s), specs, {}) - : write_ptr(out, bit_cast(s), &specs); -} - -template ::value && - !std::is_same::value && - !std::is_same::value)> -FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt { - auto abs_value = static_cast>(value); - bool negative = is_negative(value); - // Don't do -abs_value since it trips unsigned-integer-overflow sanitizer. - if (negative) abs_value = ~abs_value + 1; - int num_digits = count_digits(abs_value); - auto size = (negative ? 1 : 0) + static_cast(num_digits); - auto it = reserve(out, size); - if (auto ptr = to_pointer(it, size)) { - if (negative) *ptr++ = static_cast('-'); - format_decimal(ptr, abs_value, num_digits); - return out; - } - if (negative) *it++ = static_cast('-'); - it = format_decimal(it, abs_value, num_digits).end; - return base_iterator(out, it); -} - -template -FMT_CONSTEXPR20 auto write_nonfinite(OutputIt out, bool isnan, - basic_format_specs specs, - const float_specs& fspecs) -> OutputIt { - auto str = - isnan ? (fspecs.upper ? "NAN" : "nan") : (fspecs.upper ? "INF" : "inf"); - constexpr size_t str_size = 3; - auto sign = fspecs.sign; - auto size = str_size + (sign ? 1 : 0); - // Replace '0'-padding with space for non-finite values. - const bool is_zero_fill = - specs.fill.size() == 1 && *specs.fill.data() == static_cast('0'); - if (is_zero_fill) specs.fill[0] = static_cast(' '); - return write_padded(out, specs, size, [=](reserve_iterator it) { - if (sign) *it++ = detail::sign(sign); - return copy_str(str, str + str_size, it); - }); -} - -// A decimal floating-point number significand * pow(10, exp). -struct big_decimal_fp { - const char* significand; - int significand_size; - int exponent; -}; - -constexpr auto get_significand_size(const big_decimal_fp& f) -> int { - return f.significand_size; -} -template -inline auto get_significand_size(const dragonbox::decimal_fp& f) -> int { - return count_digits(f.significand); -} - -template -constexpr auto write_significand(OutputIt out, const char* significand, - int significand_size) -> OutputIt { - return copy_str(significand, significand + significand_size, out); -} -template -inline auto write_significand(OutputIt out, UInt significand, - int significand_size) -> OutputIt { - return format_decimal(out, significand, significand_size).end; -} -template -FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand, - int significand_size, int exponent, - const Grouping& grouping) -> OutputIt { - if (!grouping.has_separator()) { - out = write_significand(out, significand, significand_size); - return detail::fill_n(out, exponent, static_cast('0')); - } - auto buffer = memory_buffer(); - write_significand(appender(buffer), significand, significand_size); - detail::fill_n(appender(buffer), exponent, '0'); - return grouping.apply(out, string_view(buffer.data(), buffer.size())); -} - -template ::value)> -inline auto write_significand(Char* out, UInt significand, int significand_size, - int integral_size, Char decimal_point) -> Char* { - if (!decimal_point) - return format_decimal(out, significand, significand_size).end; - out += significand_size + 1; - Char* end = out; - int floating_size = significand_size - integral_size; - for (int i = floating_size / 2; i > 0; --i) { - out -= 2; - copy2(out, digits2(static_cast(significand % 100))); - significand /= 100; - } - if (floating_size % 2 != 0) { - *--out = static_cast('0' + significand % 10); - significand /= 10; - } - *--out = decimal_point; - format_decimal(out - integral_size, significand, integral_size); - return end; -} - -template >::value)> -inline auto write_significand(OutputIt out, UInt significand, - int significand_size, int integral_size, - Char decimal_point) -> OutputIt { - // Buffer is large enough to hold digits (digits10 + 1) and a decimal point. - Char buffer[digits10() + 2]; - auto end = write_significand(buffer, significand, significand_size, - integral_size, decimal_point); - return detail::copy_str_noinline(buffer, end, out); -} - -template -FMT_CONSTEXPR auto write_significand(OutputIt out, const char* significand, - int significand_size, int integral_size, - Char decimal_point) -> OutputIt { - out = detail::copy_str_noinline(significand, - significand + integral_size, out); - if (!decimal_point) return out; - *out++ = decimal_point; - return detail::copy_str_noinline(significand + integral_size, - significand + significand_size, out); -} - -template -FMT_CONSTEXPR20 auto write_significand(OutputIt out, T significand, - int significand_size, int integral_size, - Char decimal_point, - const Grouping& grouping) -> OutputIt { - if (!grouping.has_separator()) { - return write_significand(out, significand, significand_size, integral_size, - decimal_point); - } - auto buffer = basic_memory_buffer(); - write_significand(buffer_appender(buffer), significand, - significand_size, integral_size, decimal_point); - grouping.apply( - out, basic_string_view(buffer.data(), to_unsigned(integral_size))); - return detail::copy_str_noinline(buffer.data() + integral_size, - buffer.end(), out); -} - -template > -FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f, - const basic_format_specs& specs, - float_specs fspecs, locale_ref loc) - -> OutputIt { - auto significand = f.significand; - int significand_size = get_significand_size(f); - const Char zero = static_cast('0'); - auto sign = fspecs.sign; - size_t size = to_unsigned(significand_size) + (sign ? 1 : 0); - using iterator = reserve_iterator; - - Char decimal_point = - fspecs.locale ? detail::decimal_point(loc) : static_cast('.'); - - int output_exp = f.exponent + significand_size - 1; - auto use_exp_format = [=]() { - if (fspecs.format == float_format::exp) return true; - if (fspecs.format != float_format::general) return false; - // Use the fixed notation if the exponent is in [exp_lower, exp_upper), - // e.g. 0.0001 instead of 1e-04. Otherwise use the exponent notation. - const int exp_lower = -4, exp_upper = 16; - return output_exp < exp_lower || - output_exp >= (fspecs.precision > 0 ? fspecs.precision : exp_upper); - }; - if (use_exp_format()) { - int num_zeros = 0; - if (fspecs.showpoint) { - num_zeros = fspecs.precision - significand_size; - if (num_zeros < 0) num_zeros = 0; - size += to_unsigned(num_zeros); - } else if (significand_size == 1) { - decimal_point = Char(); - } - auto abs_output_exp = output_exp >= 0 ? output_exp : -output_exp; - int exp_digits = 2; - if (abs_output_exp >= 100) exp_digits = abs_output_exp >= 1000 ? 4 : 3; - - size += to_unsigned((decimal_point ? 1 : 0) + 2 + exp_digits); - char exp_char = fspecs.upper ? 'E' : 'e'; - auto write = [=](iterator it) { - if (sign) *it++ = detail::sign(sign); - // Insert a decimal point after the first digit and add an exponent. - it = write_significand(it, significand, significand_size, 1, - decimal_point); - if (num_zeros > 0) it = detail::fill_n(it, num_zeros, zero); - *it++ = static_cast(exp_char); - return write_exponent(output_exp, it); - }; - return specs.width > 0 ? write_padded(out, specs, size, write) - : base_iterator(out, write(reserve(out, size))); - } - - int exp = f.exponent + significand_size; - if (f.exponent >= 0) { - // 1234e5 -> 123400000[.0+] - size += to_unsigned(f.exponent); - int num_zeros = fspecs.precision - exp; - abort_fuzzing_if(num_zeros > 5000); - if (fspecs.showpoint) { - ++size; - if (num_zeros <= 0 && fspecs.format != float_format::fixed) num_zeros = 1; - if (num_zeros > 0) size += to_unsigned(num_zeros); - } - auto grouping = Grouping(loc, fspecs.locale); - size += to_unsigned(grouping.count_separators(exp)); - return write_padded(out, specs, size, [&](iterator it) { - if (sign) *it++ = detail::sign(sign); - it = write_significand(it, significand, significand_size, - f.exponent, grouping); - if (!fspecs.showpoint) return it; - *it++ = decimal_point; - return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it; - }); - } else if (exp > 0) { - // 1234e-2 -> 12.34[0+] - int num_zeros = fspecs.showpoint ? fspecs.precision - significand_size : 0; - size += 1 + to_unsigned(num_zeros > 0 ? num_zeros : 0); - auto grouping = Grouping(loc, fspecs.locale); - size += to_unsigned(grouping.count_separators(significand_size)); - return write_padded(out, specs, size, [&](iterator it) { - if (sign) *it++ = detail::sign(sign); - it = write_significand(it, significand, significand_size, exp, - decimal_point, grouping); - return num_zeros > 0 ? detail::fill_n(it, num_zeros, zero) : it; - }); - } - // 1234e-6 -> 0.001234 - int num_zeros = -exp; - if (significand_size == 0 && fspecs.precision >= 0 && - fspecs.precision < num_zeros) { - num_zeros = fspecs.precision; - } - bool pointy = num_zeros != 0 || significand_size != 0 || fspecs.showpoint; - size += 1 + (pointy ? 1 : 0) + to_unsigned(num_zeros); - return write_padded(out, specs, size, [&](iterator it) { - if (sign) *it++ = detail::sign(sign); - *it++ = zero; - if (!pointy) return it; - *it++ = decimal_point; - it = detail::fill_n(it, num_zeros, zero); - return write_significand(it, significand, significand_size); - }); -} - -template class fallback_digit_grouping { - public: - constexpr fallback_digit_grouping(locale_ref, bool) {} - - constexpr bool has_separator() const { return false; } - - constexpr int count_separators(int) const { return 0; } - - template - constexpr Out apply(Out out, basic_string_view) const { - return out; - } -}; - -template -FMT_CONSTEXPR20 auto write_float(OutputIt out, const DecimalFP& f, - const basic_format_specs& specs, - float_specs fspecs, locale_ref loc) - -> OutputIt { - if (is_constant_evaluated()) { - return do_write_float>(out, f, specs, fspecs, - loc); - } else { - return do_write_float(out, f, specs, fspecs, loc); - } -} - -template constexpr bool isnan(T value) { - return !(value >= value); // std::isnan doesn't support __float128. -} - -template -struct has_isfinite : std::false_type {}; - -template -struct has_isfinite> - : std::true_type {}; - -template ::value&& - has_isfinite::value)> -FMT_CONSTEXPR20 bool isfinite(T value) { - constexpr T inf = T(std::numeric_limits::infinity()); - if (is_constant_evaluated()) - return !detail::isnan(value) && value < inf && value > -inf; - return std::isfinite(value); -} -template ::value)> -FMT_CONSTEXPR bool isfinite(T value) { - T inf = T(std::numeric_limits::infinity()); - // std::isfinite doesn't support __float128. - return !detail::isnan(value) && value < inf && value > -inf; -} - -template ::value)> -FMT_INLINE FMT_CONSTEXPR bool signbit(T value) { - if (is_constant_evaluated()) { -#ifdef __cpp_if_constexpr - if constexpr (std::numeric_limits::is_iec559) { - auto bits = detail::bit_cast(static_cast(value)); - return (bits >> (num_bits() - 1)) != 0; - } -#endif - } - return std::signbit(static_cast(value)); -} - -enum class round_direction { unknown, up, down }; - -// Given the divisor (normally a power of 10), the remainder = v % divisor for -// some number v and the error, returns whether v should be rounded up, down, or -// whether the rounding direction can't be determined due to error. -// error should be less than divisor / 2. -FMT_CONSTEXPR inline round_direction get_round_direction(uint64_t divisor, - uint64_t remainder, - uint64_t error) { - FMT_ASSERT(remainder < divisor, ""); // divisor - remainder won't overflow. - FMT_ASSERT(error < divisor, ""); // divisor - error won't overflow. - FMT_ASSERT(error < divisor - error, ""); // error * 2 won't overflow. - // Round down if (remainder + error) * 2 <= divisor. - if (remainder <= divisor - remainder && error * 2 <= divisor - remainder * 2) - return round_direction::down; - // Round up if (remainder - error) * 2 >= divisor. - if (remainder >= error && - remainder - error >= divisor - (remainder - error)) { - return round_direction::up; - } - return round_direction::unknown; -} - -namespace digits { -enum result { - more, // Generate more digits. - done, // Done generating digits. - error // Digit generation cancelled due to an error. -}; -} - -struct gen_digits_handler { - char* buf; - int size; - int precision; - int exp10; - bool fixed; - - FMT_CONSTEXPR digits::result on_digit(char digit, uint64_t divisor, - uint64_t remainder, uint64_t error, - bool integral) { - FMT_ASSERT(remainder < divisor, ""); - buf[size++] = digit; - if (!integral && error >= remainder) return digits::error; - if (size < precision) return digits::more; - if (!integral) { - // Check if error * 2 < divisor with overflow prevention. - // The check is not needed for the integral part because error = 1 - // and divisor > (1 << 32) there. - if (error >= divisor || error >= divisor - error) return digits::error; - } else { - FMT_ASSERT(error == 1 && divisor > 2, ""); - } - auto dir = get_round_direction(divisor, remainder, error); - if (dir != round_direction::up) - return dir == round_direction::down ? digits::done : digits::error; - ++buf[size - 1]; - for (int i = size - 1; i > 0 && buf[i] > '9'; --i) { - buf[i] = '0'; - ++buf[i - 1]; - } - if (buf[0] > '9') { - buf[0] = '1'; - if (fixed) - buf[size++] = '0'; - else - ++exp10; - } - return digits::done; - } -}; - -inline FMT_CONSTEXPR20 void adjust_precision(int& precision, int exp10) { - // Adjust fixed precision by exponent because it is relative to decimal - // point. - if (exp10 > 0 && precision > max_value() - exp10) - FMT_THROW(format_error("number is too big")); - precision += exp10; -} - -// Generates output using the Grisu digit-gen algorithm. -// error: the size of the region (lower, upper) outside of which numbers -// definitely do not round to value (Delta in Grisu3). -FMT_INLINE FMT_CONSTEXPR20 auto grisu_gen_digits(fp value, uint64_t error, - int& exp, - gen_digits_handler& handler) - -> digits::result { - const fp one(1ULL << -value.e, value.e); - // The integral part of scaled value (p1 in Grisu) = value / one. It cannot be - // zero because it contains a product of two 64-bit numbers with MSB set (due - // to normalization) - 1, shifted right by at most 60 bits. - auto integral = static_cast(value.f >> -one.e); - FMT_ASSERT(integral != 0, ""); - FMT_ASSERT(integral == value.f >> -one.e, ""); - // The fractional part of scaled value (p2 in Grisu) c = value % one. - uint64_t fractional = value.f & (one.f - 1); - exp = count_digits(integral); // kappa in Grisu. - // Non-fixed formats require at least one digit and no precision adjustment. - if (handler.fixed) { - adjust_precision(handler.precision, exp + handler.exp10); - // Check if precision is satisfied just by leading zeros, e.g. - // format("{:.2f}", 0.001) gives "0.00" without generating any digits. - if (handler.precision <= 0) { - if (handler.precision < 0) return digits::done; - // Divide by 10 to prevent overflow. - uint64_t divisor = data::power_of_10_64[exp - 1] << -one.e; - auto dir = get_round_direction(divisor, value.f / 10, error * 10); - if (dir == round_direction::unknown) return digits::error; - handler.buf[handler.size++] = dir == round_direction::up ? '1' : '0'; - return digits::done; - } - } - // Generate digits for the integral part. This can produce up to 10 digits. - do { - uint32_t digit = 0; - auto divmod_integral = [&](uint32_t divisor) { - digit = integral / divisor; - integral %= divisor; - }; - // This optimization by Milo Yip reduces the number of integer divisions by - // one per iteration. - switch (exp) { - case 10: - divmod_integral(1000000000); - break; - case 9: - divmod_integral(100000000); - break; - case 8: - divmod_integral(10000000); - break; - case 7: - divmod_integral(1000000); - break; - case 6: - divmod_integral(100000); - break; - case 5: - divmod_integral(10000); - break; - case 4: - divmod_integral(1000); - break; - case 3: - divmod_integral(100); - break; - case 2: - divmod_integral(10); - break; - case 1: - digit = integral; - integral = 0; - break; - default: - FMT_ASSERT(false, "invalid number of digits"); - } - --exp; - auto remainder = (static_cast(integral) << -one.e) + fractional; - auto result = handler.on_digit(static_cast('0' + digit), - data::power_of_10_64[exp] << -one.e, - remainder, error, true); - if (result != digits::more) return result; - } while (exp > 0); - // Generate digits for the fractional part. - for (;;) { - fractional *= 10; - error *= 10; - char digit = static_cast('0' + (fractional >> -one.e)); - fractional &= one.f - 1; - --exp; - auto result = handler.on_digit(digit, one.f, fractional, error, false); - if (result != digits::more) return result; - } -} - -class bigint { - private: - // A bigint is stored as an array of bigits (big digits), with bigit at index - // 0 being the least significant one. - using bigit = uint32_t; - using double_bigit = uint64_t; - enum { bigits_capacity = 32 }; - basic_memory_buffer bigits_; - int exp_; - - FMT_CONSTEXPR20 bigit operator[](int index) const { - return bigits_[to_unsigned(index)]; - } - FMT_CONSTEXPR20 bigit& operator[](int index) { - return bigits_[to_unsigned(index)]; - } - - static constexpr const int bigit_bits = num_bits(); - - friend struct formatter; - - FMT_CONSTEXPR20 void subtract_bigits(int index, bigit other, bigit& borrow) { - auto result = static_cast((*this)[index]) - other - borrow; - (*this)[index] = static_cast(result); - borrow = static_cast(result >> (bigit_bits * 2 - 1)); - } - - FMT_CONSTEXPR20 void remove_leading_zeros() { - int num_bigits = static_cast(bigits_.size()) - 1; - while (num_bigits > 0 && (*this)[num_bigits] == 0) --num_bigits; - bigits_.resize(to_unsigned(num_bigits + 1)); - } - - // Computes *this -= other assuming aligned bigints and *this >= other. - FMT_CONSTEXPR20 void subtract_aligned(const bigint& other) { - FMT_ASSERT(other.exp_ >= exp_, "unaligned bigints"); - FMT_ASSERT(compare(*this, other) >= 0, ""); - bigit borrow = 0; - int i = other.exp_ - exp_; - for (size_t j = 0, n = other.bigits_.size(); j != n; ++i, ++j) - subtract_bigits(i, other.bigits_[j], borrow); - while (borrow > 0) subtract_bigits(i, 0, borrow); - remove_leading_zeros(); - } - - FMT_CONSTEXPR20 void multiply(uint32_t value) { - const double_bigit wide_value = value; - bigit carry = 0; - for (size_t i = 0, n = bigits_.size(); i < n; ++i) { - double_bigit result = bigits_[i] * wide_value + carry; - bigits_[i] = static_cast(result); - carry = static_cast(result >> bigit_bits); - } - if (carry != 0) bigits_.push_back(carry); - } - - template ::value || - std::is_same::value)> - FMT_CONSTEXPR20 void multiply(UInt value) { - using half_uint = - conditional_t::value, uint64_t, uint32_t>; - const int shift = num_bits() - bigit_bits; - const UInt lower = static_cast(value); - const UInt upper = value >> num_bits(); - UInt carry = 0; - for (size_t i = 0, n = bigits_.size(); i < n; ++i) { - UInt result = lower * bigits_[i] + static_cast(carry); - carry = (upper * bigits_[i] << shift) + (result >> bigit_bits) + - (carry >> bigit_bits); - bigits_[i] = static_cast(result); - } - while (carry != 0) { - bigits_.push_back(static_cast(carry)); - carry >>= bigit_bits; - } - } - - template ::value || - std::is_same::value)> - FMT_CONSTEXPR20 void assign(UInt n) { - size_t num_bigits = 0; - do { - bigits_[num_bigits++] = static_cast(n); - n >>= bigit_bits; - } while (n != 0); - bigits_.resize(num_bigits); - exp_ = 0; - } - - public: - FMT_CONSTEXPR20 bigint() : exp_(0) {} - explicit bigint(uint64_t n) { assign(n); } - - bigint(const bigint&) = delete; - void operator=(const bigint&) = delete; - - FMT_CONSTEXPR20 void assign(const bigint& other) { - auto size = other.bigits_.size(); - bigits_.resize(size); - auto data = other.bigits_.data(); - std::copy(data, data + size, make_checked(bigits_.data(), size)); - exp_ = other.exp_; - } - - template FMT_CONSTEXPR20 void operator=(Int n) { - FMT_ASSERT(n > 0, ""); - assign(uint64_or_128_t(n)); - } - - FMT_CONSTEXPR20 int num_bigits() const { - return static_cast(bigits_.size()) + exp_; - } - - FMT_NOINLINE FMT_CONSTEXPR20 bigint& operator<<=(int shift) { - FMT_ASSERT(shift >= 0, ""); - exp_ += shift / bigit_bits; - shift %= bigit_bits; - if (shift == 0) return *this; - bigit carry = 0; - for (size_t i = 0, n = bigits_.size(); i < n; ++i) { - bigit c = bigits_[i] >> (bigit_bits - shift); - bigits_[i] = (bigits_[i] << shift) + carry; - carry = c; - } - if (carry != 0) bigits_.push_back(carry); - return *this; - } - - template FMT_CONSTEXPR20 bigint& operator*=(Int value) { - FMT_ASSERT(value > 0, ""); - multiply(uint32_or_64_or_128_t(value)); - return *this; - } - - friend FMT_CONSTEXPR20 int compare(const bigint& lhs, const bigint& rhs) { - int num_lhs_bigits = lhs.num_bigits(), num_rhs_bigits = rhs.num_bigits(); - if (num_lhs_bigits != num_rhs_bigits) - return num_lhs_bigits > num_rhs_bigits ? 1 : -1; - int i = static_cast(lhs.bigits_.size()) - 1; - int j = static_cast(rhs.bigits_.size()) - 1; - int end = i - j; - if (end < 0) end = 0; - for (; i >= end; --i, --j) { - bigit lhs_bigit = lhs[i], rhs_bigit = rhs[j]; - if (lhs_bigit != rhs_bigit) return lhs_bigit > rhs_bigit ? 1 : -1; - } - if (i != j) return i > j ? 1 : -1; - return 0; - } - - // Returns compare(lhs1 + lhs2, rhs). - friend FMT_CONSTEXPR20 int add_compare(const bigint& lhs1, const bigint& lhs2, - const bigint& rhs) { - auto minimum = [](int a, int b) { return a < b ? a : b; }; - auto maximum = [](int a, int b) { return a > b ? a : b; }; - int max_lhs_bigits = maximum(lhs1.num_bigits(), lhs2.num_bigits()); - int num_rhs_bigits = rhs.num_bigits(); - if (max_lhs_bigits + 1 < num_rhs_bigits) return -1; - if (max_lhs_bigits > num_rhs_bigits) return 1; - auto get_bigit = [](const bigint& n, int i) -> bigit { - return i >= n.exp_ && i < n.num_bigits() ? n[i - n.exp_] : 0; - }; - double_bigit borrow = 0; - int min_exp = minimum(minimum(lhs1.exp_, lhs2.exp_), rhs.exp_); - for (int i = num_rhs_bigits - 1; i >= min_exp; --i) { - double_bigit sum = - static_cast(get_bigit(lhs1, i)) + get_bigit(lhs2, i); - bigit rhs_bigit = get_bigit(rhs, i); - if (sum > rhs_bigit + borrow) return 1; - borrow = rhs_bigit + borrow - sum; - if (borrow > 1) return -1; - borrow <<= bigit_bits; - } - return borrow != 0 ? -1 : 0; - } - - // Assigns pow(10, exp) to this bigint. - FMT_CONSTEXPR20 void assign_pow10(int exp) { - FMT_ASSERT(exp >= 0, ""); - if (exp == 0) return *this = 1; - // Find the top bit. - int bitmask = 1; - while (exp >= bitmask) bitmask <<= 1; - bitmask >>= 1; - // pow(10, exp) = pow(5, exp) * pow(2, exp). First compute pow(5, exp) by - // repeated squaring and multiplication. - *this = 5; - bitmask >>= 1; - while (bitmask != 0) { - square(); - if ((exp & bitmask) != 0) *this *= 5; - bitmask >>= 1; - } - *this <<= exp; // Multiply by pow(2, exp) by shifting. - } - - FMT_CONSTEXPR20 void square() { - int num_bigits = static_cast(bigits_.size()); - int num_result_bigits = 2 * num_bigits; - basic_memory_buffer n(std::move(bigits_)); - bigits_.resize(to_unsigned(num_result_bigits)); - auto sum = uint128_t(); - for (int bigit_index = 0; bigit_index < num_bigits; ++bigit_index) { - // Compute bigit at position bigit_index of the result by adding - // cross-product terms n[i] * n[j] such that i + j == bigit_index. - for (int i = 0, j = bigit_index; j >= 0; ++i, --j) { - // Most terms are multiplied twice which can be optimized in the future. - sum += static_cast(n[i]) * n[j]; - } - (*this)[bigit_index] = static_cast(sum); - sum >>= num_bits(); // Compute the carry. - } - // Do the same for the top half. - for (int bigit_index = num_bigits; bigit_index < num_result_bigits; - ++bigit_index) { - for (int j = num_bigits - 1, i = bigit_index - j; i < num_bigits;) - sum += static_cast(n[i++]) * n[j--]; - (*this)[bigit_index] = static_cast(sum); - sum >>= num_bits(); - } - remove_leading_zeros(); - exp_ *= 2; - } - - // If this bigint has a bigger exponent than other, adds trailing zero to make - // exponents equal. This simplifies some operations such as subtraction. - FMT_CONSTEXPR20 void align(const bigint& other) { - int exp_difference = exp_ - other.exp_; - if (exp_difference <= 0) return; - int num_bigits = static_cast(bigits_.size()); - bigits_.resize(to_unsigned(num_bigits + exp_difference)); - for (int i = num_bigits - 1, j = i + exp_difference; i >= 0; --i, --j) - bigits_[j] = bigits_[i]; - std::uninitialized_fill_n(bigits_.data(), exp_difference, 0); - exp_ -= exp_difference; - } - - // Divides this bignum by divisor, assigning the remainder to this and - // returning the quotient. - FMT_CONSTEXPR20 int divmod_assign(const bigint& divisor) { - FMT_ASSERT(this != &divisor, ""); - if (compare(*this, divisor) < 0) return 0; - FMT_ASSERT(divisor.bigits_[divisor.bigits_.size() - 1u] != 0, ""); - align(divisor); - int quotient = 0; - do { - subtract_aligned(divisor); - ++quotient; - } while (compare(*this, divisor) >= 0); - return quotient; - } -}; - -// format_dragon flags. -enum dragon { - predecessor_closer = 1, - fixup = 2, // Run fixup to correct exp10 which can be off by one. - fixed = 4, -}; - -// Formats a floating-point number using a variation of the Fixed-Precision -// Positive Floating-Point Printout ((FPP)^2) algorithm by Steele & White: -// https://fmt.dev/papers/p372-steele.pdf. -FMT_CONSTEXPR20 inline void format_dragon(basic_fp value, - unsigned flags, int num_digits, - buffer& buf, int& exp10) { - bigint numerator; // 2 * R in (FPP)^2. - bigint denominator; // 2 * S in (FPP)^2. - // lower and upper are differences between value and corresponding boundaries. - bigint lower; // (M^- in (FPP)^2). - bigint upper_store; // upper's value if different from lower. - bigint* upper = nullptr; // (M^+ in (FPP)^2). - // Shift numerator and denominator by an extra bit or two (if lower boundary - // is closer) to make lower and upper integers. This eliminates multiplication - // by 2 during later computations. - bool is_predecessor_closer = (flags & dragon::predecessor_closer) != 0; - int shift = is_predecessor_closer ? 2 : 1; - if (value.e >= 0) { - numerator = value.f; - numerator <<= value.e + shift; - lower = 1; - lower <<= value.e; - if (is_predecessor_closer) { - upper_store = 1; - upper_store <<= value.e + 1; - upper = &upper_store; - } - denominator.assign_pow10(exp10); - denominator <<= shift; - } else if (exp10 < 0) { - numerator.assign_pow10(-exp10); - lower.assign(numerator); - if (is_predecessor_closer) { - upper_store.assign(numerator); - upper_store <<= 1; - upper = &upper_store; - } - numerator *= value.f; - numerator <<= shift; - denominator = 1; - denominator <<= shift - value.e; - } else { - numerator = value.f; - numerator <<= shift; - denominator.assign_pow10(exp10); - denominator <<= shift - value.e; - lower = 1; - if (is_predecessor_closer) { - upper_store = 1ULL << 1; - upper = &upper_store; - } - } - int even = static_cast((value.f & 1) == 0); - if (!upper) upper = &lower; - if ((flags & dragon::fixup) != 0) { - if (add_compare(numerator, *upper, denominator) + even <= 0) { - --exp10; - numerator *= 10; - if (num_digits < 0) { - lower *= 10; - if (upper != &lower) *upper *= 10; - } - } - if ((flags & dragon::fixed) != 0) adjust_precision(num_digits, exp10 + 1); - } - // Invariant: value == (numerator / denominator) * pow(10, exp10). - if (num_digits < 0) { - // Generate the shortest representation. - num_digits = 0; - char* data = buf.data(); - for (;;) { - int digit = numerator.divmod_assign(denominator); - bool low = compare(numerator, lower) - even < 0; // numerator <[=] lower. - // numerator + upper >[=] pow10: - bool high = add_compare(numerator, *upper, denominator) + even > 0; - data[num_digits++] = static_cast('0' + digit); - if (low || high) { - if (!low) { - ++data[num_digits - 1]; - } else if (high) { - int result = add_compare(numerator, numerator, denominator); - // Round half to even. - if (result > 0 || (result == 0 && (digit % 2) != 0)) - ++data[num_digits - 1]; - } - buf.try_resize(to_unsigned(num_digits)); - exp10 -= num_digits - 1; - return; - } - numerator *= 10; - lower *= 10; - if (upper != &lower) *upper *= 10; - } - } - // Generate the given number of digits. - exp10 -= num_digits - 1; - if (num_digits == 0) { - denominator *= 10; - auto digit = add_compare(numerator, numerator, denominator) > 0 ? '1' : '0'; - buf.push_back(digit); - return; - } - buf.try_resize(to_unsigned(num_digits)); - for (int i = 0; i < num_digits - 1; ++i) { - int digit = numerator.divmod_assign(denominator); - buf[i] = static_cast('0' + digit); - numerator *= 10; - } - int digit = numerator.divmod_assign(denominator); - auto result = add_compare(numerator, numerator, denominator); - if (result > 0 || (result == 0 && (digit % 2) != 0)) { - if (digit == 9) { - const auto overflow = '0' + 10; - buf[num_digits - 1] = overflow; - // Propagate the carry. - for (int i = num_digits - 1; i > 0 && buf[i] == overflow; --i) { - buf[i] = '0'; - ++buf[i - 1]; - } - if (buf[0] == overflow) { - buf[0] = '1'; - ++exp10; - } - return; - } - ++digit; - } - buf[num_digits - 1] = static_cast('0' + digit); -} - -template -FMT_CONSTEXPR20 auto format_float(Float value, int precision, float_specs specs, - buffer& buf) -> int { - // float is passed as double to reduce the number of instantiations. - static_assert(!std::is_same::value, ""); - FMT_ASSERT(value >= 0, "value is negative"); - auto converted_value = convert_float(value); - - const bool fixed = specs.format == float_format::fixed; - if (value <= 0) { // <= instead of == to silence a warning. - if (precision <= 0 || !fixed) { - buf.push_back('0'); - return 0; - } - buf.try_resize(to_unsigned(precision)); - fill_n(buf.data(), precision, '0'); - return -precision; - } - - int exp = 0; - bool use_dragon = true; - unsigned dragon_flags = 0; - if (!is_fast_float()) { - const auto inv_log2_10 = 0.3010299956639812; // 1 / log2(10) - using info = dragonbox::float_info; - const auto f = basic_fp(converted_value); - // Compute exp, an approximate power of 10, such that - // 10^(exp - 1) <= value < 10^exp or 10^exp <= value < 10^(exp + 1). - // This is based on log10(value) == log2(value) / log2(10) and approximation - // of log2(value) by e + num_fraction_bits idea from double-conversion. - exp = static_cast( - std::ceil((f.e + count_digits<1>(f.f) - 1) * inv_log2_10 - 1e-10)); - dragon_flags = dragon::fixup; - } else if (!is_constant_evaluated() && precision < 0) { - // Use Dragonbox for the shortest format. - if (specs.binary32) { - auto dec = dragonbox::to_decimal(static_cast(value)); - write(buffer_appender(buf), dec.significand); - return dec.exponent; - } - auto dec = dragonbox::to_decimal(static_cast(value)); - write(buffer_appender(buf), dec.significand); - return dec.exponent; - } else { - // Use Grisu + Dragon4 for the given precision: - // https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf. - const int min_exp = -60; // alpha in Grisu. - int cached_exp10 = 0; // K in Grisu. - fp normalized = normalize(fp(converted_value)); - const auto cached_pow = get_cached_power( - min_exp - (normalized.e + fp::num_significand_bits), cached_exp10); - normalized = normalized * cached_pow; - gen_digits_handler handler{buf.data(), 0, precision, -cached_exp10, fixed}; - if (grisu_gen_digits(normalized, 1, exp, handler) != digits::error && - !is_constant_evaluated()) { - exp += handler.exp10; - buf.try_resize(to_unsigned(handler.size)); - use_dragon = false; - } else { - exp += handler.size - cached_exp10 - 1; - precision = handler.precision; - } - } - if (use_dragon) { - auto f = basic_fp(); - bool is_predecessor_closer = specs.binary32 - ? f.assign(static_cast(value)) - : f.assign(converted_value); - if (is_predecessor_closer) dragon_flags |= dragon::predecessor_closer; - if (fixed) dragon_flags |= dragon::fixed; - // Limit precision to the maximum possible number of significant digits in - // an IEEE754 double because we don't need to generate zeros. - const int max_double_digits = 767; - if (precision > max_double_digits) precision = max_double_digits; - format_dragon(f, dragon_flags, precision, buf, exp); - } - if (!fixed && !specs.showpoint) { - // Remove trailing zeros. - auto num_digits = buf.size(); - while (num_digits > 0 && buf[num_digits - 1] == '0') { - --num_digits; - ++exp; - } - buf.try_resize(num_digits); - } - return exp; -} -template -FMT_CONSTEXPR20 auto write_float(OutputIt out, T value, - basic_format_specs specs, locale_ref loc) - -> OutputIt { - float_specs fspecs = parse_float_type_spec(specs); - fspecs.sign = specs.sign; - if (detail::signbit(value)) { // value < 0 is false for NaN so use signbit. - fspecs.sign = sign::minus; - value = -value; - } else if (fspecs.sign == sign::minus) { - fspecs.sign = sign::none; - } - - if (!detail::isfinite(value)) - return write_nonfinite(out, detail::isnan(value), specs, fspecs); - - if (specs.align == align::numeric && fspecs.sign) { - auto it = reserve(out, 1); - *it++ = detail::sign(fspecs.sign); - out = base_iterator(out, it); - fspecs.sign = sign::none; - if (specs.width != 0) --specs.width; - } - - memory_buffer buffer; - if (fspecs.format == float_format::hex) { - if (fspecs.sign) buffer.push_back(detail::sign(fspecs.sign)); - snprintf_float(convert_float(value), specs.precision, fspecs, buffer); - return write_bytes(out, {buffer.data(), buffer.size()}, - specs); - } - int precision = specs.precision >= 0 || specs.type == presentation_type::none - ? specs.precision - : 6; - if (fspecs.format == float_format::exp) { - if (precision == max_value()) - throw_format_error("number is too big"); - else - ++precision; - } else if (fspecs.format != float_format::fixed && precision == 0) { - precision = 1; - } - if (const_check(std::is_same())) fspecs.binary32 = true; - int exp = format_float(convert_float(value), precision, fspecs, buffer); - fspecs.precision = precision; - auto f = big_decimal_fp{buffer.data(), static_cast(buffer.size()), exp}; - return write_float(out, f, specs, fspecs, loc); -} - -template ::value)> -FMT_CONSTEXPR20 auto write(OutputIt out, T value, - basic_format_specs specs, locale_ref loc = {}) - -> OutputIt { - if (const_check(!is_supported_floating_point(value))) return out; - return specs.localized && write_loc(out, value, specs, loc) - ? out - : write_float(out, value, specs, loc); -} - -template ::value)> -FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt { - if (is_constant_evaluated()) - return write(out, value, basic_format_specs()); - if (const_check(!is_supported_floating_point(value))) return out; - - auto fspecs = float_specs(); - if (detail::signbit(value)) { - fspecs.sign = sign::minus; - value = -value; - } - - constexpr auto specs = basic_format_specs(); - using floaty = conditional_t::value, double, T>; - using uint = typename dragonbox::float_info::carrier_uint; - uint mask = exponent_mask(); - if ((bit_cast(value) & mask) == mask) - return write_nonfinite(out, std::isnan(value), specs, fspecs); - - auto dec = dragonbox::to_decimal(static_cast(value)); - return write_float(out, dec, specs, fspecs, {}); -} - -template ::value && - !is_fast_float::value)> -inline auto write(OutputIt out, T value) -> OutputIt { - return write(out, value, basic_format_specs()); -} - -template -auto write(OutputIt out, monostate, basic_format_specs = {}, - locale_ref = {}) -> OutputIt { - FMT_ASSERT(false, ""); - return out; -} - -template -FMT_CONSTEXPR auto write(OutputIt out, basic_string_view value) - -> OutputIt { - auto it = reserve(out, value.size()); - it = copy_str_noinline(value.begin(), value.end(), it); - return base_iterator(out, it); -} - -template ::value)> -constexpr auto write(OutputIt out, const T& value) -> OutputIt { - return write(out, to_string_view(value)); -} - -// FMT_ENABLE_IF() condition separated to workaround an MSVC bug. -template < - typename Char, typename OutputIt, typename T, - bool check = - std::is_enum::value && !std::is_same::value && - mapped_type_constant>::value != - type::custom_type, - FMT_ENABLE_IF(check)> -FMT_CONSTEXPR auto write(OutputIt out, T value) -> OutputIt { - return write(out, static_cast>(value)); -} - -template ::value)> -FMT_CONSTEXPR auto write(OutputIt out, T value, - const basic_format_specs& specs = {}, - locale_ref = {}) -> OutputIt { - return specs.type != presentation_type::none && - specs.type != presentation_type::string - ? write(out, value ? 1 : 0, specs, {}) - : write_bytes(out, value ? "true" : "false", specs); -} - -template -FMT_CONSTEXPR auto write(OutputIt out, Char value) -> OutputIt { - auto it = reserve(out, 1); - *it++ = value; - return base_iterator(out, it); -} - -template -FMT_CONSTEXPR_CHAR_TRAITS auto write(OutputIt out, const Char* value) - -> OutputIt { - if (!value) { - throw_format_error("string pointer is null"); - } else { - out = write(out, basic_string_view(value)); - } - return out; -} - -template ::value)> -auto write(OutputIt out, const T* value, - const basic_format_specs& specs = {}, locale_ref = {}) - -> OutputIt { - check_pointer_type_spec(specs.type, error_handler()); - return write_ptr(out, bit_cast(value), &specs); -} - -// A write overload that handles implicit conversions. -template > -FMT_CONSTEXPR auto write(OutputIt out, const T& value) -> enable_if_t< - std::is_class::value && !is_string::value && - !is_floating_point::value && !std::is_same::value && - !std::is_same().map( - value))>>::value, - OutputIt> { - return write(out, arg_mapper().map(value)); -} - -template > -FMT_CONSTEXPR auto write(OutputIt out, const T& value) - -> enable_if_t::value == type::custom_type, - OutputIt> { - using formatter_type = - conditional_t::value, - typename Context::template formatter_type, - fallback_formatter>; - auto ctx = Context(out, {}, {}); - return formatter_type().format(value, ctx); -} - -// An argument visitor that formats the argument and writes it via the output -// iterator. It's a class and not a generic lambda for compatibility with C++11. -template struct default_arg_formatter { - using iterator = buffer_appender; - using context = buffer_context; - - iterator out; - basic_format_args args; - locale_ref loc; - - template auto operator()(T value) -> iterator { - return write(out, value); - } - auto operator()(typename basic_format_arg::handle h) -> iterator { - basic_format_parse_context parse_ctx({}); - context format_ctx(out, args, loc); - h.format(parse_ctx, format_ctx); - return format_ctx.out(); - } -}; - -template struct arg_formatter { - using iterator = buffer_appender; - using context = buffer_context; - - iterator out; - const basic_format_specs& specs; - locale_ref locale; - - template - FMT_CONSTEXPR FMT_INLINE auto operator()(T value) -> iterator { - return detail::write(out, value, specs, locale); - } - auto operator()(typename basic_format_arg::handle) -> iterator { - // User-defined types are handled separately because they require access - // to the parse context. - return out; - } -}; - -template struct custom_formatter { - basic_format_parse_context& parse_ctx; - buffer_context& ctx; - - void operator()( - typename basic_format_arg>::handle h) const { - h.format(parse_ctx, ctx); - } - template void operator()(T) const {} -}; - -template class width_checker { - public: - explicit FMT_CONSTEXPR width_checker(ErrorHandler& eh) : handler_(eh) {} - - template ::value)> - FMT_CONSTEXPR auto operator()(T value) -> unsigned long long { - if (is_negative(value)) handler_.on_error("negative width"); - return static_cast(value); - } - - template ::value)> - FMT_CONSTEXPR auto operator()(T) -> unsigned long long { - handler_.on_error("width is not integer"); - return 0; - } - - private: - ErrorHandler& handler_; -}; - -template class precision_checker { - public: - explicit FMT_CONSTEXPR precision_checker(ErrorHandler& eh) : handler_(eh) {} - - template ::value)> - FMT_CONSTEXPR auto operator()(T value) -> unsigned long long { - if (is_negative(value)) handler_.on_error("negative precision"); - return static_cast(value); - } - - template ::value)> - FMT_CONSTEXPR auto operator()(T) -> unsigned long long { - handler_.on_error("precision is not integer"); - return 0; - } - - private: - ErrorHandler& handler_; -}; - -template