Merge branch 'develop' into ci/gitlab-dev-tests

LLNL · Jan 18, 2025 · 21b9878 · 21b9878
2 parents d3348c8 + cc5e58c
commit 21b9878
Show file tree

Hide file tree

Showing 208 changed files with 3,672 additions and 2,165 deletions.
diff --git a/benchmarks/diffusion_2D/diffusion_2D.hpp b/benchmarks/diffusion_2D/diffusion_2D.hpp
@@ -48,11 +48,10 @@
 #endif
 
 // Macros for problem constants
-#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  SUN_RCONST(0.0)
-#define ONE   SUN_RCONST(1.0)
-#define TWO   SUN_RCONST(2.0)
-#define EIGHT SUN_RCONST(8.0)
+#define PI   SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x, y, n) ((n) * (y) + (x))

diff --git a/cmake/SundialsSetupCompilers.cmake b/cmake/SundialsSetupCompilers.cmake
@@ -85,7 +85,8 @@ if(ENABLE_ALL_WARNINGS)
   set(WARNING_FLAGS
       "-Wno-unknown-warning-option -Wall -Wpedantic -Wextra -Wshadow \
 -Wwrite-strings -Wcast-align -Wdisabled-optimization -Wvla -Walloca \
--Wduplicated-cond -Wduplicated-branches")
+-Wduplicated-cond -Wduplicated-branches -Wunused-macros \
+-Wunused-local-typedefs")
   # TODO(SBR): Try to add -Wredundant-decls once SuperLU version is updated in
   # CI tests
 

diff --git a/doc/cvode/guide/source/Usage/index.rst b/doc/cvode/guide/source/Usage/index.rst
@@ -1140,7 +1140,7 @@ Main solver optional input functions
 
    **Notes:**
     SUNDIALS must be compiled appropriately for specialized kernels to be available. The CMake option ``SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS`` must be set to
-    ``ON`` when SUNDIALS is compiled. See the entry for this option in :numref:`Installation.CMake.options` for more information.
+    ``ON`` when SUNDIALS is compiled. See the entry for this option in :numref:`Installation.Options` for more information.
     Currently, the fused kernels are only supported when using CVODE with the :ref:`NVECTOR_CUDA <NVectors.CUDA>` and :ref:`NVECTOR_HIP <NVectors.Hip>` implementations of the ``N_Vector``.
 
 .. _CVODE.Usage.CC.optional_input.optin_ls:

diff --git a/doc/shared/FAQ.rst b/doc/shared/FAQ.rst
@@ -46,16 +46,18 @@ Installation
 
 .. collapse:: How do I install SUNDIALS on Windows systems?
 
-   One way of obtaining Windows libraries for the SUNDIALS solvers is to use cygwin
-   `cygwin <www.cygwin.com>`_, in which case the installation procedure is the same
-   as for any other Linux system.
+   One way of obtaining Windows libraries for the SUNDIALS solvers is to use
+   `cygwin <https://www.cygwin.com/>`__, in which case the installation
+   procedure is the same as for any other Linux/Unix system (see the
+   :ref:`Installation.CMake.Unix` installation section).
 
-   Otherwise, refer to :ref:`Installation.CMake.Windows`.
+   Otherwise, refer to the :ref:`Installation.CMake.Windows` installation
+   section.
 
 
 .. collapse:: Everything installed fine! How do I link the SUNDIALS libraries to my own application?
 
-   Refer to :ref:`Installation.Results`.
+   Refer to :ref:`Installation.UsingSUNDIALS`.
 
 
 CVODE(S) / IDA(S) / ARKODE

diff --git a/doc/shared/nvectors/NVector_Kokkos.rst b/doc/shared/nvectors/NVector_Kokkos.rst
@@ -24,7 +24,7 @@ variety of backends including serial, OpenMP, CUDA, HIP, and SYCL. Since Kokkos
 a modern C++ library, the module is also written in modern C++ (it requires
 C++14) as a header only library. To utilize this ``N_Vector`` users will need to
 include ``nvector/nvector_kokkos.hpp``. More instructions on building SUNDIALS
-with Kokkos enabled are given in :numref:`Installation.CMake.ExternalLibraries`.
+with Kokkos enabled are given in :numref:`Installation.Options.Kokkos`.
 For instructions on building and using Kokkos, refer to the `Kokkos
 <https://kokkos.github.io/kokkos-core-wiki/index.html>`_ documentation.