From 4c3072db9ec097f27f5d2e73cc3739e9ca08fae3 Mon Sep 17 00:00:00 2001
From: Geoffroy Lesur <geoffroy.lesur@univ-grenoble-alpes.fr>
Date: Fri, 30 Jan 2026 17:27:50 +0100
Subject: [PATCH 1/2] fix UCT HLLD when using DIMENSIONS<COMPONENTS

---
 src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp b/src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp
index c50cadb83..d47c916b2 100644
--- a/src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp
+++ b/src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp
@@ -201,7 +201,7 @@ KOKKOS_FORCEINLINE_FUNCTION void K_StoreHLLD( const int i, const int j, const in
   }
 
   #if COMPONENTS > 1
-  EXPAND( Et(k,j,i) = -st*(ar*vL[Xt] - al*vR[Xt])*scrh;  ,
+  D_EXPAND( Et(k,j,i) = -st*(ar*vL[Xt] - al*vR[Xt])*scrh;  ,
                                                           ,
           Eb(k,j,i) = -sb*(ar*vL[Xb] - al*vR[Xb])*scrh;  );
   #endif

From 250c64163a5cc08adcf8a5bc64552f8064f770d9 Mon Sep 17 00:00:00 2001
From: Geoffroy Lesur <geoffroy.lesur@univ-grenoble-alpes.fr>
Date: Tue, 3 Mar 2026 13:53:46 +0100
Subject: [PATCH 2/2] fix unused variable warning with nvcc

---
 src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp b/src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp
index d47c916b2..921a312ac 100644
--- a/src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp
+++ b/src/fluid/RiemannSolver/MHDsolvers/storeFlux.hpp
@@ -87,9 +87,9 @@ KOKKOS_FORCEINLINE_FUNCTION void K_StoreHLLD( const int i, const int j, const in
                                         const IdefixArray3D<real> &aR,
                                         const IdefixArray3D<real> &dL,
                                         const IdefixArray3D<real> &dR) {
-  EXPAND( const int Xn = DIR+MX1;                    ,
-        const int Xt = (DIR == IDIR ? MX2 : MX1);  ,
-        const int Xb = (DIR == KDIR ? MX2 : MX3);  )
+  EXPAND(                const int Xn = DIR+MX1;                    ,
+                         const int Xt = (DIR == IDIR ? MX2 : MX1);  ,
+        [[maybe_unused]] const int Xb = (DIR == KDIR ? MX2 : MX3);  )
   // Compute magnetic pressure
   [[maybe_unused]] real ptR, ptL;