Merge Pull Request trilinos#12853 from trilinos/Trilinos/master_merge…

…_20240322_175834

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20240322_175834 branch to master'
PR Author: trilinos-autotester

.github/workflows/PR-gcc-openmpi.yml

@@ -44,7 +44,7 @@ jobs:
           mkdir -p /home/Trilinos/src/Trilinos
           mkdir -p /home/Trilinos/build
       - name: Clone trilinos
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           fetch-depth: 0
       - name: Repo status

.github/workflows/clang_format.yml

@@ -2,12 +2,14 @@ name: Check packages with clang-format
 
 on: [pull_request]
 
+permissions: read-all
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - uses: DoozyX/clang-format-lint-action@1566bcec081dcb246ab02e7c5f9786c0b629dd4d # v0.16.2
       with:
         source: './packages/muelu ./packages/tempus ./packages/teko ./packages/xpetra'

.github/workflows/dependency-review.yml

@@ -22,6 +22,6 @@ jobs:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3

.github/workflows/detect-git-lfs.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       with:
         fetch-depth: 0
 

.github/workflows/detect-mpi-comm-world.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       with:
         fetch-depth: 0
 

.github/workflows/scorecards.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 
@@ -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@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
+        uses: github/codeql-action/upload-sarif@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
         with:
           sarif_file: results.sarif

README.md

@@ -7,6 +7,10 @@
 [Packages](http://trilinos.github.io/packages.html)
 
 
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/trilinos/Trilinos/badge)](https://securityscorecards.dev/viewer/?uri=github.com/trilinos/Trilinos)
+
+
+
 The Trilinos Project is an effort to develop algorithms and enabling
 technologies within an object-oriented software framework for the solution of
 large-scale, complex multi-physics engineering and scientific problems. A

cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc-cuda.cmake

@@ -61,7 +61,7 @@ INCLUDE("${CTEST_SCRIPT_DIRECTORY}/../../TrilinosCTestDriverCore.cmake")
 #
 
 MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
-
+  SET(CTEST_DROP_SITE "sems-cdash-son.sandia.gov")
   # Base of Trilinos/cmake/ctest then BUILD_DIR_NAME
 
   IF(COMM_TYPE STREQUAL MPI)

cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc.cmake

@@ -61,7 +61,7 @@ INCLUDE("${CTEST_SCRIPT_DIRECTORY}/../../TrilinosCTestDriverCore.cmake")
 #
 
 MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
-
+  SET(CTEST_DROP_SITE "sems-cdash-son.sandia.gov")
   # Base of Trilinos/cmake/ctest then BUILD_DIR_NAME
 
   IF(COMM_TYPE STREQUAL MPI)

cmake/ctest/drivers/lightsaber/TrilinosCTestDriverCore.lightsaber.gcc.cmake

@@ -61,9 +61,7 @@ INCLUDE("${CTEST_SCRIPT_DIRECTORY}/../../TrilinosCTestDriverCore.cmake")
 #
 
 MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
-
-  SET(CTEST_DROP_SITE "testing.sandia.gov")
-
+  SET(CTEST_DROP_SITE "sems-cdash-son.sandia.gov")
   # Base of Trilinos/cmake/ctest then BUILD_DIR_NAME
 
   IF(COMM_TYPE STREQUAL MPI)

packages/framework/ini-files/config-specs.ini

@@ -2318,6 +2318,10 @@ use CUDA11-RUN-SERIAL-TESTS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
 
+[rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_all]
+use rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables
+use PACKAGE-ENABLES|ALL-NO-EPETRA
+
 [rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_rdc_uvm_deprecated-on_all]
 # uses sems-v2 modules
 use rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables

packages/intrepid2/src/Cell/Intrepid2_CellTools.hpp

@@ -222,14 +222,14 @@ namespace Intrepid2 {
         \param  startCell        [in] - first cell index in cellWorkset for which we should compute the Jacobian; corresponds to the 0 index in Jacobian and/or points container.  Default: 0.
         \param  endCell            [in] - first cell index in cellWorkset that we do not process; endCell - startCell must equal the extent of the Jacobian container in dimension 0.  Default: -1, a special value that indicates the extent of the cellWorkset should be used.
      */
-    template<typename jacobianValueType,    class ...jacobianProperties,
-             typename pointValueType,       class ...pointProperties,
+    template<typename JacobianViewType,
+             typename PointViewType,
              typename WorksetType,
              typename HGradBasisType>
     static void
-    setJacobian(       Kokkos::DynRankView<jacobianValueType,jacobianProperties...>       jacobian,
-                 const Kokkos::DynRankView<pointValueType,pointProperties...>             points,
-                 const WorksetType worksetCell,
+    setJacobian(       JacobianViewType             jacobian,
+                 const PointViewType                points,
+                 const WorksetType                  worksetCell,
                  const Teuchos::RCP<HGradBasisType> basis,
                  const int startCell=0, const int endCell=-1);
 
@@ -267,12 +267,12 @@ namespace Intrepid2 {
         \param  startCell        [in] - first cell index in cellWorkset for which we should compute the Jacobian; corresponds to the 0 index in Jacobian and/or points container.  Default: 0.
         \param  endCell            [in] - first cell index in cellWorkset that we do not process; endCell - startCell must equal the extent of the Jacobian container in dimension 0.  Default: -1, a special value that indicates the extent of the cellWorkset should be used.
      */
-    template<typename jacobianValueType,    class ...jacobianProperties,
+    template<typename JacobianViewType,
              typename BasisGradientsType,
              typename WorksetType>
     static void
-    setJacobian(       Kokkos::DynRankView<jacobianValueType,jacobianProperties...> jacobian,
-                 const WorksetType worksetCell,
+    setJacobian(       JacobianViewType   jacobian,
+                 const WorksetType        worksetCell,
                  const BasisGradientsType gradients,
                  const int startCell=0, const int endCell=-1);
 
@@ -310,15 +310,15 @@ namespace Intrepid2 {
         \param  cellTopo          [in]  - cell topology of the cells stored in \c cellWorkset
      */
 
-    template<typename jacobianValueType,    class ...jacobianProperties,
-             typename pointValueType,       class ...pointProperties,
-             typename worksetCellValueType, class ...worksetCellProperties>
+    template<typename JacobianViewType,
+             typename PointViewType,
+             typename WorksetCellViewType>
     static void
-    setJacobian(      Kokkos::DynRankView<jacobianValueType,jacobianProperties...> jacobian,
-                 const Kokkos::DynRankView<pointValueType,pointProperties...>       points,
-                 const Kokkos::DynRankView<worksetCellValueType,worksetCellProperties...> worksetCell,
+    setJacobian(       JacobianViewType    jacobian,
+                 const PointViewType       points,
+                 const WorksetCellViewType worksetCell,
                  const shards::CellTopology cellTopo ) {
-    using nonConstPointValueType = std::remove_const_t<pointValueType>;
+    using nonConstPointValueType = typename PointViewType::non_const_value_type;
     auto basis = createHGradBasis<nonConstPointValueType,nonConstPointValueType>(cellTopo);
     setJacobian(jacobian, 
                 points, 
@@ -336,11 +336,11 @@ namespace Intrepid2 {
         \param  jacobianInv       [out] - rank-4 array with dimensions (C,P,D,D) with the inverse Jacobians
         \param  jacobian          [in]  - rank-4 array with dimensions (C,P,D,D) with the Jacobians
     */
-    template<typename jacobianInvValueType, class ...jacobianInvProperties,
-             typename jacobianValueType,    class ...jacobianProperties>
+    template<typename JacobianInvViewType,
+             typename JacobianViewType>
     static void
-    setJacobianInv(       Kokkos::DynRankView<jacobianInvValueType,jacobianInvProperties...> jacobianInv,
-                    const Kokkos::DynRankView<jacobianValueType,jacobianProperties...>       jacobian );
+    setJacobianInv(       JacobianInvViewType jacobianInv,
+                    const JacobianViewType    jacobian );
 
     /** \brief  Computes the determinant of the Jacobian matrix \e DF of the reference-to-physical frame map \e F.
 
@@ -352,11 +352,11 @@ namespace Intrepid2 {
         \param  jacobianDet       [out] - rank-2 array with dimensions (C,P) with Jacobian determinants
         \param  jacobian          [in]  - rank-4 array with dimensions (C,P,D,D) with the Jacobians
     */
-    template<typename jacobianDetValueType, class ...jacobianDetProperties,
-             typename jacobianValueType,    class ...jacobianProperties>
+    template<typename JacobianDetViewType,
+             typename JacobianViewType>
     static void
-    setJacobianDet(       Kokkos::DynRankView<jacobianDetValueType,jacobianDetProperties...>  jacobianDet,
-                    const Kokkos::DynRankView<jacobianValueType,jacobianProperties...>        jacobian );
+    setJacobianDet(       JacobianDetViewType jacobianDet,
+                    const JacobianViewType    jacobian );
 
     /** \brief  Allocates and returns a Data container suitable for storing determinants corresponding to the Jacobians in the Data container provided
 
@@ -507,9 +507,9 @@ namespace Intrepid2 {
         \remark When \c subcellDim = dimension of the \c parentCell this method returns the Cartesian
         coordinates of the nodes of the reference cell itself. Note that this requires \c subcellOrd=0.
     */
-    template<typename subcellNodeValueType, class ...subcellNodeProperties>
+    template<typename SubcellNodeViewType>
     static void
-    getReferenceSubcellNodes(       Kokkos::DynRankView<subcellNodeValueType,subcellNodeProperties...> subcellNodes,
+    getReferenceSubcellNodes(       SubcellNodeViewType  subcellNodes,
                               const ordinal_type         subcellDim,
                               const ordinal_type         subcellOrd,
                               const shards::CellTopology parentCell );
@@ -539,11 +539,11 @@ namespace Intrepid2 {
         \param  edgeOrd           [in]  - ordinal of the edge whose tangent is computed
         \param  parentCell        [in]  - cell topology of the parent reference cell
     */
-    template<typename refEdgeTangentValueType, class ...refEdgeTangentProperties>
+    template<typename RefEdgeTangentViewType>
     static void
-    getReferenceEdgeTangent(       Kokkos::DynRankView<refEdgeTangentValueType,refEdgeTangentProperties...> refEdgeTangent,
-                             const ordinal_type         edgeOrd,
-                             const shards::CellTopology parentCell );
+    getReferenceEdgeTangent(       RefEdgeTangentViewType refEdgeTangent,
+                             const ordinal_type           edgeOrd,
+                             const shards::CellTopology   parentCell );
 
     /** \brief  Computes pairs of constant tangent vectors to faces of a 3D reference cells.
 
@@ -581,10 +581,10 @@ namespace Intrepid2 {
         \param  faceOrd           [in]  - ordinal of the face whose tangents are computed
         \param  parentCell        [in]  - cell topology of the parent 3D reference cell
     */
-    template<typename refFaceTanValueType, class ...refFaceTanProperties>
+    template<typename RefFaceTanViewType>
     static void
-    getReferenceFaceTangents(       Kokkos::DynRankView<refFaceTanValueType,refFaceTanProperties...> refFaceTanU,
-                                    Kokkos::DynRankView<refFaceTanValueType,refFaceTanProperties...> refFaceTanV,
+    getReferenceFaceTangents(       RefFaceTanViewType   refFaceTanU,
+                                    RefFaceTanViewType   refFaceTanV,
                               const ordinal_type         faceOrd,
                               const shards::CellTopology parentCell );
 
@@ -650,11 +650,11 @@ namespace Intrepid2 {
         \param  sideOrd           [in]  - ordinal of the side whose normal is computed
         \param  parentCell        [in]  - cell topology of the parent reference cell
     */
-    template<typename refSideNormalValueType, class ...refSideNormalProperties>
+    template<typename RefSideNormalViewType>
     static void
-    getReferenceSideNormal(       Kokkos::DynRankView<refSideNormalValueType,refSideNormalProperties...> refSideNormal,
-                            const ordinal_type         sideOrd,
-                            const shards::CellTopology parentCell );
+    getReferenceSideNormal(       RefSideNormalViewType refSideNormal,
+                            const ordinal_type          sideOrd,
+                            const shards::CellTopology  parentCell );
 
     /** \brief  Computes constant normal vectors to faces of 3D reference cell.
 
@@ -694,11 +694,11 @@ namespace Intrepid2 {
         \param  faceOrd           [in]  - ordinal of the face whose normal is computed
         \param  parentCell        [in]  - cell topology of the parent reference cell
     */
-    template<typename refFaceNormalValueType, class ...refFaceNormalProperties>
+    template<typename RefFaceNormalViewType>
     static void
-    getReferenceFaceNormal(       Kokkos::DynRankView<refFaceNormalValueType,refFaceNormalProperties...> refFaceNormal,
-                            const ordinal_type         faceOrd,
-                            const shards::CellTopology parentCell );
+    getReferenceFaceNormal(       RefFaceNormalViewType refFaceNormal,
+                            const ordinal_type          faceOrd,
+                            const shards::CellTopology  parentCell );
 
     /** \brief  Computes non-normalized tangent vectors to physical edges in an edge workset
         \f$\{\mathcal{E}_{c,i}\}_{c=0}^{N}\f$; (see \ref sec_cell_topology_subcell_wset for definition of edge worksets).
@@ -1028,15 +1028,15 @@ namespace Intrepid2 {
         \param  basis                   [in]  - pointer to HGrad basis used in reference-to-physical cell mapping
 
     */
-    template<typename physPointValueType,   class ...physPointProperties,
-             typename refPointValueType,    class ...refPointProperties,
+    template<typename PhysPointValueType,
+             typename RefPointValueType,
              typename WorksetType,
              typename HGradBasisPtrType>
     static void
-    mapToPhysicalFrame(       Kokkos::DynRankView<physPointValueType,physPointProperties...>     physPoints,
-                        const Kokkos::DynRankView<refPointValueType,refPointProperties...>       refPoints,
-                        const WorksetType worksetCell,
-                        const HGradBasisPtrType basis );
+    mapToPhysicalFrame(       PhysPointValueType physPoints,
+                        const RefPointValueType  refPoints,
+                        const WorksetType        worksetCell,
+                        const HGradBasisPtrType  basis );
 
     /** \brief  Computes \e F, the reference-to-physical frame map.
 
@@ -1078,15 +1078,15 @@ namespace Intrepid2 {
         \param  cellTopo          [in]  - cell topology of the cells stored in \c cellWorkset
 
     */
-    template<typename physPointValueType,   class ...physPointProperties,
-             typename refPointValueType,    class ...refPointProperties,
-             typename worksetCellValueType, class ...worksetCellProperties>
+    template<typename PhysPointViewType,
+             typename RefPointViewType,
+             typename WorksetCellViewType>
     static void
-    mapToPhysicalFrame(       Kokkos::DynRankView<physPointValueType,physPointProperties...>     physPoints,
-                        const Kokkos::DynRankView<refPointValueType,refPointProperties...>       refPoints,
-                        const Kokkos::DynRankView<worksetCellValueType,worksetCellProperties...> worksetCell,
+    mapToPhysicalFrame(       PhysPointViewType    physPoints,
+                        const RefPointViewType     refPoints,
+                        const WorksetCellViewType  worksetCell,
                         const shards::CellTopology cellTopo ) {
-      using nonConstRefPointValueType = std::remove_const_t<refPointValueType>;
+      using nonConstRefPointValueType = typename RefPointViewType::non_const_value_type;
       auto basis = createHGradBasis<nonConstRefPointValueType,nonConstRefPointValueType>(cellTopo);
       mapToPhysicalFrame(physPoints, 
                          refPoints,