#153: Provide `Tpetra` version of `CDR_Model` #120

JacobDomagala · 2023-08-17T13:59:32Z

Fixes #119 Fixes #153

packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

packages/tempus/test/TestModels/CDR_Model_Functors.hpp

packages/tempus/test/TestModels/CDR_Model_impl.hpp

JacobDomagala · 2023-09-19T17:12:12Z

Thanks @cwschilly for the comments. This PR is still in development, I've pushed the changes because I'm working on two separate machines and I want to keep the code in sync, it's not yet ready.

github-actions · 2023-09-20T23:51:32Z

⚡ Code quality check ⚡

🔴 clang-tidy found 24 issues! Click here to see details.

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 331 to 336 in 11ed636

    
           void CDR_Test(const Comm& comm, const int commSize, Teuchos::FancyOStream &out, bool& success){ 
        
             RCP<Tempus::IntegratorBasic<double> > integrator; 
        
             std::vector<RCP<Thyra::VectorBase<double>>> solutions; 
        
             std::vector<RCP<Thyra::VectorBase<double>>> solutionsDot; 
        
             std::vector<double> StepSize;

!Line: 331 - warning: function 'CDR_Test' has cognitive complexity of 26 (threshold 25) [readability-function-cognitive-complexity]
!Line: 400 - note: +2, including nesting penalty of 1, nesting level increased to 2
!Line: 400 - note: +1
!Line: 447 - note: +1, including nesting penalty of 0, nesting level increased to 1
!Line: 349 - note: inferred assignment of ID-dependent value from ID-dependent variable model_pl [altera-id-dependent-backward-branch]
!Line: 349 - note: inferred assignment of ID-dependent value from ID-dependent variable model_pl [altera-id-dependent-backward-branch]

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 472 to 477 in 11ed636

    
           TEUCHOS_UNIT_TEST(BackwardEuler, CDR) 
        
           { 
        
             // Create a communicator for Epetra objects 
        
             RCP<Epetra_Comm> comm; 
        
           #ifdef Tempus_ENABLE_MPI 
        
             comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));

!Line: 472 - warning: initialization of 'instance_BackwardEuler_CDR_UnitTest' with static storage duration may throw an exception that cannot be caught [cert-err58-cpp]
!Line: 472 - note: possibly throwing constructor declared here

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 472 to 477 in 11ed636

    
           TEUCHOS_UNIT_TEST(BackwardEuler, CDR) 
        
           { 
        
             // Create a communicator for Epetra objects 
        
             RCP<Epetra_Comm> comm; 
        
           #ifdef Tempus_ENABLE_MPI 
        
             comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));

!Line: 472 - warning: variable 'instance_BackwardEuler_CDR_UnitTest' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 472 to 477 in 11ed636

    
           TEUCHOS_UNIT_TEST(BackwardEuler, CDR) 
        
           { 
        
             // Create a communicator for Epetra objects 
        
             RCP<Epetra_Comm> comm; 
        
           #ifdef Tempus_ENABLE_MPI 
        
             comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));

!Line: 472 - warning: inheriting multiple classes that aren't pure virtual is discouraged [fuchsia-multiple-inheritance]

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 472 to 477 in 11ed636

    
           TEUCHOS_UNIT_TEST(BackwardEuler, CDR) 
        
           { 
        
             // Create a communicator for Epetra objects 
        
             RCP<Epetra_Comm> comm; 
        
           #ifdef Tempus_ENABLE_MPI 
        
             comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));

!Line: 472 - warning: static objects are disallowed; if possible, use a constexpr constructor instead [fuchsia-statically-constructed-objects]

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 487 to 492 in 11ed636

    
           TEUCHOS_UNIT_TEST(BackwardEuler, CDR_Tpetra) 
        
           { 
        
             // Get default Tpetra template types 
        
             using SC = Tpetra::Vector<>::scalar_type; 
        
             using LO = Tpetra::Vector<>::local_ordinal_type; 
        
             using GO = Tpetra::Vector<>::global_ordinal_type;

!Line: 487 - warning: initialization of 'instance_BackwardEuler_CDR_Tpetra_UnitTest' with static storage duration may throw an exception that cannot be caught [cert-err58-cpp]
!Line: 487 - note: possibly throwing constructor declared here

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 487 to 492 in 11ed636

    
           TEUCHOS_UNIT_TEST(BackwardEuler, CDR_Tpetra) 
        
           { 
        
             // Get default Tpetra template types 
        
             using SC = Tpetra::Vector<>::scalar_type; 
        
             using LO = Tpetra::Vector<>::local_ordinal_type; 
        
             using GO = Tpetra::Vector<>::global_ordinal_type;

!Line: 487 - warning: variable 'instance_BackwardEuler_CDR_Tpetra_UnitTest' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 487 to 492 in 11ed636

    
           TEUCHOS_UNIT_TEST(BackwardEuler, CDR_Tpetra) 
        
           { 
        
             // Get default Tpetra template types 
        
             using SC = Tpetra::Vector<>::scalar_type; 
        
             using LO = Tpetra::Vector<>::local_ordinal_type; 
        
             using GO = Tpetra::Vector<>::global_ordinal_type;

!Line: 487 - warning: inheriting multiple classes that aren't pure virtual is discouraged [fuchsia-multiple-inheritance]

Trilinos/packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp

Lines 487 to 492 in 11ed636

    
           TEUCHOS_UNIT_TEST(BackwardEuler, CDR_Tpetra) 
        
           { 
        
             // Get default Tpetra template types 
        
             using SC = Tpetra::Vector<>::scalar_type; 
        
             using LO = Tpetra::Vector<>::local_ordinal_type; 
        
             using GO = Tpetra::Vector<>::global_ordinal_type;

!Line: 487 - warning: static objects are disallowed; if possible, use a constexpr constructor instead [fuchsia-statically-constructed-objects]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 480 to 485 in 11ed636

    
           void CDR_Test(const Comm& comm, const int commSize, Teuchos::FancyOStream &out, bool& success){ 
        
             RCP<Tempus::IntegratorBasic<double> > integrator; 
        
             std::vector<RCP<Thyra::VectorBase<double>>> solutions; 
        
             std::vector<RCP<Thyra::VectorBase<double>>> solutionsDot; 
        
             std::vector<double> StepSize;

!Line: 480 - warning: function 'CDR_Test' has cognitive complexity of 35 (threshold 25) [readability-function-cognitive-complexity]
!Line: 555 - note: +2, including nesting penalty of 1, nesting level increased to 2
!Line: 555 - note: +1
!Line: 605 - note: +1, including nesting penalty of 0, nesting level increased to 1

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 490 to 495 in 11ed636

    
           auto pl = sublist(pList, "Tempus", true); 
        
           auto dt = pl->sublist("Demo Integrator").sublist("Time Step Control").get<double>("Initial Time Step"); 
        
           dt *= 2.0; 
        
           auto model_pl = sublist(pList, "CDR Model", true); 
        
           const auto nTimeStepSizes = model_pl->get<int>("Number of Time Step Sizes", 5);

!Line: 490 - warning: variable name 'pl' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 491 to 496 in 11ed636

    
           auto dt = pl->sublist("Demo Integrator").sublist("Time Step Control").get<double>("Initial Time Step"); 
        
           dt *= 2.0; 
        
           auto model_pl = sublist(pList, "CDR Model", true); 
        
           const auto nTimeStepSizes = model_pl->get<int>("Number of Time Step Sizes", 5);

!Line: 491 - warning: variable name 'dt' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 559 to 564 in 11ed636

    
           const auto dx = std::fabs(left_end-right_end) / 
        
                             static_cast<double>(num_elements); 
        
           auto solutionHistory = 
        
             integrator->getSolutionHistory(); 
        
           int nStates = solutionHistory->getNumStates(); 
        
           for (int i=0; i<nStates; i++) {

!Line: 559 - warning: variable name 'dx' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 566 to 571 in 11ed636

    
           auto x = solutionState->getX(); 
        
           auto ttime = solutionState->getTime(); 
        
           ftmp << "ZONE T=\"Time="<<ttime<<"\", I=" 
        
                <<num_elements+1<<", F=BLOCK\n"; 
        
           for (int j = 0; j < num_elements+1; j++) { 
        
             const auto x_coord = left_end + static_cast<double>(j) * dx;

!Line: 566 - warning: variable name 'x' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 612 to 617 in 11ed636

    
           const auto& x = *(solutions[solutions.size()-1]); 
        
           std::ofstream ftmp("Tempus_BDF2_CDR-Solution.dat"); 
        
           for (int n = 0; n < num_elements+1; n++) { 
        
             const auto dx = std::fabs(left_end-right_end) / 
        
                               static_cast<double>(num_elements);

!Line: 612 - warning: variable name 'x' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 616 to 621 in 11ed636

    
             const auto dx = std::fabs(left_end-right_end) / 
        
                               static_cast<double>(num_elements); 
        
             const auto x_coord = left_end + static_cast<double>(n) * dx; 
        
             ftmp << x_coord << "   " <<  Thyra::get_ele(x,n) << std::endl; 
        
           } 
        
           ftmp.close();

!Line: 616 - warning: variable name 'dx' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 629 to 634 in 11ed636

    
           TEUCHOS_UNIT_TEST(BDF2, CDR) 
        
           { 
        
             // Create a communicator for Epetra objects 
        
             RCP<Epetra_Comm> comm; 
        
           #ifdef Tempus_ENABLE_MPI 
        
             comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));

!Line: 629 - warning: initialization of 'instance_BDF2_CDR_UnitTest' with static storage duration may throw an exception that cannot be caught [cert-err58-cpp]
!Line: 629 - note: possibly throwing constructor declared here

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 629 to 634 in 11ed636

    
           TEUCHOS_UNIT_TEST(BDF2, CDR) 
        
           { 
        
             // Create a communicator for Epetra objects 
        
             RCP<Epetra_Comm> comm; 
        
           #ifdef Tempus_ENABLE_MPI 
        
             comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));

!Line: 629 - warning: variable 'instance_BDF2_CDR_UnitTest' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 629 to 634 in 11ed636

    
           TEUCHOS_UNIT_TEST(BDF2, CDR) 
        
           { 
        
             // Create a communicator for Epetra objects 
        
             RCP<Epetra_Comm> comm; 
        
           #ifdef Tempus_ENABLE_MPI 
        
             comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));

!Line: 629 - warning: inheriting multiple classes that aren't pure virtual is discouraged [fuchsia-multiple-inheritance]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 629 to 634 in 11ed636

    
           TEUCHOS_UNIT_TEST(BDF2, CDR) 
        
           { 
        
             // Create a communicator for Epetra objects 
        
             RCP<Epetra_Comm> comm; 
        
           #ifdef Tempus_ENABLE_MPI 
        
             comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));

!Line: 629 - warning: static objects are disallowed; if possible, use a constexpr constructor instead [fuchsia-statically-constructed-objects]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 644 to 649 in 11ed636

    
           TEUCHOS_UNIT_TEST(BDF2, CDR_Tpetra) 
        
           { 
        
             // Get default Tpetra template types 
        
             using SC = Tpetra::Vector<>::scalar_type; 
        
             using LO = Tpetra::Vector<>::local_ordinal_type; 
        
             using GO = Tpetra::Vector<>::global_ordinal_type;

!Line: 644 - warning: initialization of 'instance_BDF2_CDR_Tpetra_UnitTest' with static storage duration may throw an exception that cannot be caught [cert-err58-cpp]
!Line: 644 - note: possibly throwing constructor declared here

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 644 to 649 in 11ed636

    
           TEUCHOS_UNIT_TEST(BDF2, CDR_Tpetra) 
        
           { 
        
             // Get default Tpetra template types 
        
             using SC = Tpetra::Vector<>::scalar_type; 
        
             using LO = Tpetra::Vector<>::local_ordinal_type; 
        
             using GO = Tpetra::Vector<>::global_ordinal_type;

!Line: 644 - warning: variable 'instance_BDF2_CDR_Tpetra_UnitTest' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 644 to 649 in 11ed636

    
           TEUCHOS_UNIT_TEST(BDF2, CDR_Tpetra) 
        
           { 
        
             // Get default Tpetra template types 
        
             using SC = Tpetra::Vector<>::scalar_type; 
        
             using LO = Tpetra::Vector<>::local_ordinal_type; 
        
             using GO = Tpetra::Vector<>::global_ordinal_type;

!Line: 644 - warning: inheriting multiple classes that aren't pure virtual is discouraged [fuchsia-multiple-inheritance]

Trilinos/packages/tempus/test/BDF2/Tempus_BDF2Test.cpp

Lines 644 to 649 in 11ed636

    
           TEUCHOS_UNIT_TEST(BDF2, CDR_Tpetra) 
        
           { 
        
             // Get default Tpetra template types 
        
             using SC = Tpetra::Vector<>::scalar_type; 
        
             using LO = Tpetra::Vector<>::local_ordinal_type; 
        
             using GO = Tpetra::Vector<>::global_ordinal_type;

!Line: 644 - warning: static objects are disallowed; if possible, use a constexpr constructor instead [fuchsia-statically-constructed-objects]

JacobDomagala · 2023-09-28T13:48:42Z

@stmcgovern @cwschilly Ok I think it's ready to be reviewed

cwschilly

LGTM

JacobDomagala · 2023-09-28T14:52:41Z

I'll have to rebase the commits, one of them is not signed

…so it can be reused by both Epetra/Tpetra

JacobDomagala requested review from stmcgovern and thearusable August 17, 2023 13:59

JacobDomagala self-assigned this Aug 17, 2023

cwschilly mentioned this pull request Aug 16, 2023

List of PRs to Trilinos/develop and fork development #77

Open

thearusable previously approved these changes Aug 30, 2023

View reviewed changes

JacobDomagala dismissed thearusable’s stale review via fcc7ea9 September 7, 2023 15:46

cwschilly reviewed Sep 19, 2023

View reviewed changes

packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp Show resolved Hide resolved

packages/tempus/test/TestModels/CDR_Model_Functors.hpp Outdated Show resolved Hide resolved

packages/tempus/test/TestModels/CDR_Model_impl.hpp Outdated Show resolved Hide resolved

JacobDomagala force-pushed the 119-provide-tpetra-version-of-Tempus_HHTAlphaTest branch 2 times, most recently from 492b5a7 to 8776bf4 Compare September 20, 2023 21:42

JacobDomagala changed the title ~~#119: Remove Epetra dependency from Tempus_HHTAlpha~~ #119: Provide Tpetra version of CDR_Model Sep 20, 2023

JacobDomagala changed the title ~~#119: Provide Tpetra version of CDR_Model~~ #153: Provide Tpetra version of CDR_Model Sep 20, 2023

JacobDomagala marked this pull request as draft September 20, 2023 21:52

JacobDomagala force-pushed the 119-provide-tpetra-version-of-Tempus_HHTAlphaTest branch from d1ecd54 to efa30d1 Compare September 20, 2023 21:59

JacobDomagala force-pushed the 119-provide-tpetra-version-of-Tempus_HHTAlphaTest branch 2 times, most recently from a61bd1c to a4b2fed Compare September 28, 2023 13:45

JacobDomagala marked this pull request as ready for review September 28, 2023 13:48

cwschilly approved these changes Sep 28, 2023

View reviewed changes

JacobDomagala added 9 commits September 28, 2023 16:53

Tempus: Remove epetra includes that are not needed

37cf869

Tpetra changes

4c4f46b

Tempus: Finialized CDR_Model_Tpetra

08691e9

Tempus: Working CDR_Model_Tpetra

e96e5a6

Tempus: Extract the core logic from CDR test into separate function, …

da3d902

…so it can be reused by both Epetra/Tpetra

Tempus: Revert changes done to Epetra CDR Model

1521cb8

Tempus: Use common function for Epetra CDR test

cbdc97b

Tempus: Use CDR_Model_Tpetra for BDF2 Test

8998fb2

Tempus: Cleanup code

fb45636

JacobDomagala force-pushed the 119-provide-tpetra-version-of-Tempus_HHTAlphaTest branch from a4b2fed to fb45636 Compare September 28, 2023 14:53

stmcgovern approved these changes Sep 28, 2023

View reviewed changes

stmcgovern merged commit 09dcf6d into NGA-FY23-develop Sep 28, 2023
0 of 3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#153: Provide `Tpetra` version of `CDR_Model` #120

#153: Provide `Tpetra` version of `CDR_Model` #120

JacobDomagala commented Aug 17, 2023 •

edited

Loading

JacobDomagala commented Sep 19, 2023

github-actions bot commented Sep 20, 2023 •

edited

Loading

JacobDomagala commented Sep 28, 2023

cwschilly left a comment

JacobDomagala commented Sep 28, 2023

#153: Provide Tpetra version of CDR_Model #120

#153: Provide Tpetra version of CDR_Model #120

Conversation

JacobDomagala commented Aug 17, 2023 • edited Loading

JacobDomagala commented Sep 19, 2023

github-actions bot commented Sep 20, 2023 • edited Loading

⚡ Code quality check ⚡

JacobDomagala commented Sep 28, 2023

cwschilly left a comment

Choose a reason for hiding this comment

JacobDomagala commented Sep 28, 2023

#153: Provide `Tpetra` version of `CDR_Model` #120

#153: Provide `Tpetra` version of `CDR_Model` #120

JacobDomagala commented Aug 17, 2023 •

edited

Loading

github-actions bot commented Sep 20, 2023 •

edited

Loading