Merge remote-tracking branch 'upstream/develop' into develop

E3SM-Project · Jan 17, 2024 · f2b0342 · f2b0342
2 parents 5ffafae + c53bda4
commit f2b0342
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/amesos2/test/solvers/MUMPS_test.xml b/packages/amesos2/test/solvers/MUMPS_test.xml
@@ -29,8 +29,9 @@
 	<ParameterList name="run3">
 	  <Parameter name="Scalar" type="string" value="float"/>
 	  <Parameter name="LocalOrdinal" type="string" value="int"/>
-	  <Parameter name="GlobalOrdinal" type="strig" value="int"/>
+	  <Parameter name="GlobalOrdinal" type="string" value="int"/>
           <!-- The Node parameter is not yet supported -->
+        </ParameterList>
       </ParameterList>
 
     </ParameterList> <!-- end MUMPS -->

diff --git a/packages/kokkos-kernels/lapack/tpls/KokkosLapack_magma.hpp b/packages/kokkos-kernels/lapack/tpls/KokkosLapack_magma.hpp
@@ -30,6 +30,6 @@ struct MagmaSingleton {
 };
 
 }  // namespace Impl
-}  // namespace KokkosBlas
+}  // namespace KokkosLapack
 #endif  // KOKKOSKERNELS_ENABLE_TPL_MAGMA
-#endif // KOKKOSLAPACK_MAGMA_HPP_
+#endif  // KOKKOSLAPACK_MAGMA_HPP_
diff --git a/packages/rol/example/PDE-OPT/thermal-fluids/input_ex04.xml b/packages/rol/example/PDE-OPT/thermal-fluids/input_ex04.xml
@@ -114,7 +114,6 @@
       </ParameterList>
     </ParameterList>
   </ParameterList>
-  </ParameterList>
 
 
   <!-- ===========  SIMOPT SOLVER PARAMETER SUBLIST  =========== -->