Merge branch 'SimVascular:main' into svZeroD_unit_conversion_factor

Author: aabrown100-git

.github/workflows/tests.yml

@@ -39,7 +39,7 @@ jobs:
   test-ubuntu:
     name: Test Ubuntu
     runs-on: ubuntu-latest
-    container: simvascular/libraries:ubuntu22
+    container: simvascular/libraries:latest
     needs: check-for-changes
     if: ${{ needs.check-for-changes.outputs.run_full_tests == 'true' }}
     steps:

Code/Source/solver/CMakeLists.txt

@@ -290,9 +290,9 @@ if(ENABLE_COVERAGE)
   # add coverage target
   add_custom_target(coverage
     # gather data
-    COMMAND ${LCOV} --directory . --capture --output-file coverage.info
+    COMMAND ${LCOV} --directory . --capture --output-file coverage.info --ignore-errors mismatch --rc geninfo_unexecuted_blocks=1
     # exclude externals
-    COMMAND ${LCOV} --remove coverage.info -o coverage.info '/usr/*' '/opt/*' '${PROJECT_SOURCE_DIR}/ThirdParty/*' '/Library/*' 'v1/*'
+    COMMAND ${LCOV} --remove coverage.info -o coverage.info '/usr/*' '/opt/*' "${PROJECT_SOURCE_DIR}/ThirdParty/*" '/Library/*' 'v1/*' --ignore-errors unused
     # generate report
     COMMAND ${GENHTML} --demangle-cpp -o coverage coverage.info
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
@@ -371,5 +371,4 @@ if(ENABLE_UNIT_TEST)
   # gtest_discover_tests(runUnitTest)
   add_test(NAME all_unit_tests COMMAND run_all_unit_tests)
 
-endif()
-
+endif()

Code/Source/solver/FsilsLinearAlgebra.cpp

@@ -79,6 +79,12 @@ void FsilsLinearAlgebra::initialize(ComMod& com_mod, eqType& lEq)
   // Nothing is needed to initialize FSILS.
 }
 
+/// @brief Finalize framework.
+void FsilsLinearAlgebra::finalize()
+{
+  // Nothing is needed to finalize FSILS.
+}
+
 /// @brief Set the linear algebra package for assmbly.
 void FsilsLinearAlgebra::set_assembly(consts::LinearAlgebraType atype)
 {

Code/Source/solver/FsilsLinearAlgebra.h

@@ -23,6 +23,7 @@ class FsilsLinearAlgebra : public virtual LinearAlgebra {
     virtual void solve(ComMod& com_mod, eqType& lEq, const Vector<int>& incL, const Vector<double>& res);
     virtual void set_assembly(consts::LinearAlgebraType atype);
     virtual void set_preconditioner(consts::PreconditionerType prec_type);
+    virtual void finalize();
 
   private:
     /// @brief A list of linear algebra interfaces that can be used for assembly.

Code/Source/solver/LinearAlgebra.h

@@ -27,7 +27,8 @@ class LinearAlgebra {
     virtual void set_assembly(consts::LinearAlgebraType assembly_type) = 0;
     virtual void set_preconditioner(consts::PreconditionerType prec_type) = 0;
     virtual void solve(ComMod& com_mod, eqType& lEq, const Vector<int>& incL, const Vector<double>& res) = 0;
-
+    virtual void finalize() = 0;
+    
     virtual consts::LinearAlgebraType get_interface_type() { return interface_type; }
 
     consts::LinearAlgebraType interface_type = consts::LinearAlgebraType::none;

Code/Source/solver/PetscLinearAlgebra.cpp

@@ -90,6 +90,11 @@ void PetscLinearAlgebra::initialize(ComMod& com_mod, eqType& lEq)
   impl->initialize(com_mod, lEq);
 }
 
+void PetscLinearAlgebra::finalize()
+{
+  // No need to finalize PETSc.
+}
+
 /// @brief Initialize an FsilsLinearAlgebra object used for assembly.
 void PetscLinearAlgebra::initialize_fsils(ComMod& com_mod, eqType& lEq)
 {

Code/Source/solver/PetscLinearAlgebra.h

@@ -22,6 +22,7 @@ class PetscLinearAlgebra : public virtual LinearAlgebra {
     virtual void solve(ComMod& com_mod, eqType& lEq, const Vector<int>& incL, const Vector<double>& res);
     virtual void set_assembly(consts::LinearAlgebraType assembly_type);
     virtual void set_preconditioner(consts::PreconditionerType prec_type);
+    virtual void finalize();
 
   private:
     static std::set<consts::LinearAlgebraType> valid_assemblers;

Code/Source/solver/TrilinosLinearAlgebra.cpp

@@ -22,6 +22,7 @@ class TrilinosLinearAlgebra::TrilinosImpl {
     void set_preconditioner(consts::PreconditionerType prec_type) {};
     void solve(ComMod& com_mod, eqType& lEq, const Vector<int>& incL, const Vector<double>& res) {};
     void solve_assembled(ComMod& com_mod, eqType& lEq, const Vector<int>& incL, const Vector<double>& res) {};
+    void finalize(){};
 };
 #endif
 
@@ -113,6 +114,12 @@ void TrilinosLinearAlgebra::initialize(ComMod& com_mod, eqType& lEq)
   impl->initialize(com_mod);
 }
 
+/// @brief Finalize Trilinos.
+void TrilinosLinearAlgebra::finalize()
+{
+  impl->finalize();
+}
+
 /// @brief Create an fsils linear algebra interface for assembly.
 void TrilinosLinearAlgebra::initialize_fsils(ComMod& com_mod, eqType& lEq)
 {

Code/Source/solver/TrilinosLinearAlgebra.h

@@ -23,6 +23,7 @@ class TrilinosLinearAlgebra : public virtual LinearAlgebra {
     virtual void set_assembly(consts::LinearAlgebraType atype);
     virtual void set_preconditioner(consts::PreconditionerType prec_type);
     virtual void solve(ComMod& com_mod, eqType& lEq, const Vector<int>& incL, const Vector<double>& res);
+    virtual void finalize();
 
   private:
     static std::set<consts::LinearAlgebraType> valid_assemblers;

Code/Source/solver/consts.cpp

@@ -255,8 +255,8 @@ const std::set<PreconditionerType> trilinos_preconditioners = {
   PreconditionerType::PREC_TRILINOS_BLOCK_JACOBI,
   PreconditionerType::PREC_TRILINOS_ILU,
   PreconditionerType::PREC_TRILINOS_ILUT,
-  PreconditionerType::PREC_TRILINOS_IC,
-  PreconditionerType::PREC_TRILINOS_ICT,
+  PreconditionerType::PREC_TRILINOS_RILUK0,
+  PreconditionerType::PREC_TRILINOS_RILUK1,
   PreconditionerType::PREC_TRILINOS_ML
 };
 
@@ -286,8 +286,8 @@ const std::map<std::string,PreconditionerType> preconditioner_name_to_type =
   {"trilinos-blockjacobi", PreconditionerType::PREC_TRILINOS_BLOCK_JACOBI},
   {"trilinos-ilu", PreconditionerType::PREC_TRILINOS_ILU},
   {"trilinos-ilut", PreconditionerType::PREC_TRILINOS_ILUT},
-  {"trilinos-ic", PreconditionerType::PREC_TRILINOS_IC},
-  {"trilinos-ict", PreconditionerType::PREC_TRILINOS_ICT},
+  {"trilinos-riluk0", PreconditionerType::PREC_TRILINOS_RILUK0},
+  {"trilinos-riluk1", PreconditionerType::PREC_TRILINOS_RILUK1},
   {"trilinos-ml", PreconditionerType::PREC_TRILINOS_ML},
 
   {"petsc-jacobi", PreconditionerType::PREC_PETSC_JACOBI},
@@ -304,8 +304,8 @@ const std::map<PreconditionerType, std::string> preconditioner_type_to_name {
   {PreconditionerType::PREC_TRILINOS_BLOCK_JACOBI, "trilinos-blockjacobi"}, 
   {PreconditionerType::PREC_TRILINOS_ILU, "trilinos-ilu"}, 
   {PreconditionerType::PREC_TRILINOS_ILUT, "trilinos-ilut"}, 
-  {PreconditionerType::PREC_TRILINOS_IC, "trilinos-ic"}, 
-  {PreconditionerType::PREC_TRILINOS_IC, "trilinos-ict"}, 
+  {PreconditionerType::PREC_TRILINOS_RILUK0, "trilinos-riluk0"}, 
+  {PreconditionerType::PREC_TRILINOS_RILUK1, "trilinos-riluk1"}, 
   {PreconditionerType::PREC_TRILINOS_ML, "trilinos-ml"},
   {PreconditionerType::PREC_PETSC_JACOBI, "petsc-jacobi"},
   {PreconditionerType::PREC_PETSC_RCS, "petsc-rcs"}