fix warning on GPUs

Author: glesur

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - added exception handling for the time integration, which saves a final vtk when a error is detected in the time integration loop (!190)
 - fixed a bug in the test shearing box setup which led to memory corruption and incorrect pressure when ISOTHERMAL approximation was disabled (!190)
 - make RKL faster when running in 3D with MHD diffusion terms by skipping the evolution of cell-centered fields (!215)
+- fixed the many warning messages when compiling on CUDA (!229)
 
 ### Added
 - single precision version is validated and fully operational. Can be enabled from cmake. (!197)

CMakeLists.txt

@@ -7,6 +7,7 @@ option(Idefix_MHD "enable MHD" OFF)
 option(Idefix_MPI "enable Message Passing Interface parallelisation" OFF)
 option(Idefix_HIGH_ORDER_FARGO "Force Fargo to use a PPM reconstruction scheme" OFF)
 option(Idefix_DEBUG "Enable Idefix debug features (makes the code very slow)" OFF)
+option(Idefix_WERROR "Treat compiler warnings as errors" OFF)
 set(Idefix_CXX_FLAGS "" CACHE STRING "Additional compiler/linker flag")
 set(Idefix_DEFS "definitions.hpp" CACHE FILEPATH "Problem definition header file")
 set(Idefix_RECONSTRUCTION "Linear" CACHE STRING "Type of cell reconstruction scheme")
@@ -36,6 +37,14 @@ add_subdirectory(src/kokkos build/kokkos)
 # Add Idefix CXX Flags
 add_compile_options(${Idefix_CXX_FLAGS})
 
+if(Idefix_WERROR)
+  if(Kokkos_ENABLE_CUDA)
+    add_compile_options(-Xcudafe --promote_warnings)
+  else()
+    add_compile_options(-Werror)
+  endif()
+endif()
+
 # sub directories should be called after add_executable
 # because the binary target "idefix" should be defined
 # before adding source files via "target_sources"
@@ -74,10 +83,8 @@ endif()
 if(Idefix_DEBUG)
   add_compile_definitions("DEBUG")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
-  set(Kokkos_ENABLE_DEBUG_BOUNDS_CHECK ON CACHE STRING "Enabled by Idefix_DEBUG" FORCE)
 endif()
 
-
 if(Idefix_HIGH_ORDER_FARGO)
   add_compile_definitions("HIGH_ORDER_FARGO")
 endif()

src/dataBlock/fargo.cpp

@@ -44,7 +44,6 @@ KOKKOS_INLINE_FUNCTION real FargoFlux(const IdefixArray4D<real> &Vin, int n, int
   int som2 = som1-1;
   if(!haveDomainDecomposition && (som2-sbeg< 0 )) som2 = som2+ds;
 
-  int sign = (eps>=0) ? 1 : -1;
   real dqm2,dqm1,dqp1,dqp2, q0,qm1, qp1;
   #if GEOMETRY == CARTESIAN || GEOMETRY == POLAR
     q0 = Vin(n,k,so,i);
@@ -140,11 +139,15 @@ void Fargo::Init(Input &input, DataBlock *data) {
   if(input.CheckBlock("Fargo")) {
     std::string opType = input.Get<std::string>("Fargo","velocity",0);
     if(opType.compare("userdef")==0) {
+       #if GEOMETRY != SPHERICAL && GEOMETRY != POLAR
+        IDEFIX_ERROR("Fargo+userdef is only compatible with SPHERICAL and POLAR geometries");
+      #endif
       this->type=userdef;
     } else if(opType.compare("shearingbox")==0) {
       this->type=shearingbox;
       #if GEOMETRY != CARTESIAN
-        IDEFIX_ERROR("Fargo+shearingbox only compatible with cartesian geometry");
+        // Actually, this has never really been tested, so assumes it doesn't work...
+        IDEFIX_ERROR("Fargo+shearingbox is only compatible with cartesian geometry");
       #endif
     } else {
       IDEFIX_ERROR("Unknown fargo velocity in the input file. "
@@ -302,8 +305,8 @@ void Fargo::CheckMaxDisplacement() {
     IdefixArray1D<real> xi;
     IdefixArray1D<real> xj;
     IdefixArray1D<real> dxk;
-    FargoType fargoType = type;
-    real sbS = hydro->sbS;
+    [[maybe_unused]] FargoType fargoType = type;
+    [[maybe_unused]] real sbS = hydro->sbS;
     real invDt = 0;
 
     // Get domain size
@@ -360,8 +363,8 @@ void Fargo::AddVelocity(const real t) {
   IdefixArray1D<real> x1 = data->x[IDIR];
   IdefixArray4D<real> Vc = hydro->Vc;
   IdefixArray2D<real> meanV = this->meanVelocity;
-  FargoType fargoType = type;
-  real sbS = hydro->sbS;
+  [[maybe_unused]] FargoType fargoType = type;
+  [[maybe_unused]] real sbS = hydro->sbS;
 
   idefix_for("FargoAddVelocity",
               0,data->np_tot[KDIR],
@@ -389,9 +392,9 @@ void Fargo::SubstractVelocity(const real t) {
   }
   IdefixArray1D<real> x1 = data->x[IDIR];
   IdefixArray4D<real> Vc = hydro->Vc;
-  IdefixArray2D<real> meanV = this->meanVelocity;
-  FargoType fargoType = type;
-  real sbS = hydro->sbS;
+  [[maybe_unused]] IdefixArray2D<real> meanV = this->meanVelocity;
+  [[maybe_unused]] FargoType fargoType = type;
+  [[maybe_unused]] real sbS = hydro->sbS;
 
   idefix_for("FargoSubstractVelocity",
               0,data->np_tot[KDIR],
@@ -500,8 +503,8 @@ void Fargo::ShiftSolution(const real t, const real dt) {
   IdefixArray1D<real> dx3 = data->dx[KDIR];
   IdefixArray1D<real> sinx2 = data->sinx2;
   IdefixArray1D<real> sinx2m = data->sinx2m;
-  FargoType fargoType = type;
-  real sbS = hydro->sbS;
+  [[maybe_unused]] FargoType fargoType = type;
+  [[maybe_unused]] real sbS = hydro->sbS;
   bool haveDomainDecomposition = this->haveDomainDecomposition;
   int maxShift = this->maxShift;
 
@@ -785,8 +788,6 @@ void Fargo::ShiftSolution(const real t, const real dt) {
       }
 
       // Compute EMF due to the shift via second order reconstruction
-      real dqm, dqp, dq;
-
       #if GEOMETRY == CARTESIAN || GEOMETRY == POLAR
         if(eps>=ZERO_F) {
           int som1;

src/hydro/HDsolvers/hllHD.hpp

@@ -35,10 +35,10 @@ void Hydro::HllHD() {
   // Required for high order interpolations
   IdefixArray1D<real> dx = this->data->dx[DIR];
 
-  real gamma = this->gamma;
-  real gamma_m1 = this->gamma - ONE_F;
-  real csIso = this->isoSoundSpeed;
-  HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
+  [[maybe_unused]] real gamma = this->gamma;
+  [[maybe_unused]] real gamma_m1 = gamma - ONE_F;
+  [[maybe_unused]] real csIso = this->isoSoundSpeed;
+  [[maybe_unused]] HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
 
   SlopeLimiter<DIR,NVAR> slopeLim(Vc,data->dx[DIR],shockFlattening);
 
@@ -48,9 +48,7 @@ void Hydro::HllHD() {
              data->beg[IDIR],data->end[IDIR]+ioffset,
     KOKKOS_LAMBDA (int k, int j, int i) {
       // Init the directions (should be in the kernel for proper optimisation by the compilers)
-      EXPAND( const int Xn = DIR+MX1;                    ,
-              const int Xt = (DIR == IDIR ? MX2 : MX1);  ,
-              const int Xb = (DIR == KDIR ? MX2 : MX3);  )
+      constexpr int Xn = DIR+MX1;
 
       // Primitive variables
       real vL[NVAR];

src/hydro/HDsolvers/hllcHD.hpp

@@ -42,10 +42,10 @@ void Hydro::HllcHD() {
   IdefixArray3D<real> cMax = this->cMax;
   IdefixArray3D<real> csIsoArr = this->isoSoundSpeedArray;
 
-  real gamma = this->gamma;
-  real gamma_m1 = this->gamma - ONE_F;
-  real csIso = this->isoSoundSpeed;
-  HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
+  [[maybe_unused]] real gamma = this->gamma;
+  [[maybe_unused]] real gamma_m1 = this->gamma - ONE_F;
+  [[maybe_unused]] real csIso = this->isoSoundSpeed;
+  [[maybe_unused]] HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
 
   SlopeLimiter<DIR,NVAR> slopeLim(Vc,data->dx[DIR],shockFlattening);
 
@@ -55,9 +55,9 @@ void Hydro::HllcHD() {
              data->beg[IDIR],data->end[IDIR]+ioffset,
     KOKKOS_LAMBDA (int k, int j, int i) {
       // Init the directions (should be in the kernel for proper optimisation by the compilers)
-      EXPAND( const int Xn = DIR+MX1;                    ,
-              const int Xt = (DIR == IDIR ? MX2 : MX1);  ,
-              const int Xb = (DIR == KDIR ? MX2 : MX3);  )
+      EXPAND( constexpr int Xn = DIR+MX1;                    ,
+              constexpr int Xt = (DIR == IDIR ? MX2 : MX1);  ,
+              constexpr int Xb = (DIR == KDIR ? MX2 : MX3);  )
 
       // Primitive variables
       real vL[NVAR];

src/hydro/HDsolvers/roeHD.hpp

@@ -59,10 +59,10 @@ void Hydro::RoeHD() {
   IdefixArray3D<real> cMax = this->cMax;
   IdefixArray3D<real> csIsoArr = this->isoSoundSpeedArray;
 
-  real gamma = this->gamma;
-  real gamma_m1 = this->gamma - ONE_F;
-  real csIso = this->isoSoundSpeed;
-  HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
+  [[maybe_unused]] real gamma = this->gamma;
+  [[maybe_unused]] real gamma_m1 = this->gamma - ONE_F;
+  [[maybe_unused]] real csIso = this->isoSoundSpeed;
+  [[maybe_unused]] HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
 
   SlopeLimiter<DIR,NVAR> slopeLim(Vc,data->dx[DIR],shockFlattening);
 

src/hydro/HDsolvers/tvdlfHD.hpp

@@ -36,9 +36,9 @@ void Hydro::TvdlfHD() {
   IdefixArray1D<real> dx = this->data->dx[DIR];
 
   real gamma = this->gamma;
-  real gamma_m1=this->gamma-ONE_F;
-  real csIso = this->isoSoundSpeed;
-  HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
+  [[maybe_unused]] real gamma_m1=gamma-ONE_F;
+  [[maybe_unused]] real csIso = this->isoSoundSpeed;
+  [[maybe_unused]] HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
 
   SlopeLimiter<DIR,NVAR> slopeLim(Vc,data->dx[DIR],shockFlattening);
 
@@ -48,9 +48,8 @@ void Hydro::TvdlfHD() {
              data->beg[IDIR],data->end[IDIR]+ioffset,
     KOKKOS_LAMBDA (int k, int j, int i) {
       // Init the directions (should be in the kernel for proper optimisation by the compilers)
-      EXPAND( const int Xn = DIR+MX1;                    ,
-              const int Xt = (DIR == IDIR ? MX2 : MX1);  ,
-              const int Xb = (DIR == KDIR ? MX2 : MX3);  )
+      constexpr int Xn = DIR+MX1;
+
       // Primitive variables
       real vL[NVAR];
       real vR[NVAR];

src/hydro/MHDsolvers/hllMHD.hpp

@@ -57,16 +57,16 @@ void Hydro::HllMHD() {
   IdefixArray3D<real> dR;
 
   real gamma = this->gamma;
-  real xHConstant = this->xH;
-  real gamma_m1=this->gamma-ONE_F;
-  real csIso = this->isoSoundSpeed;
-  HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
+  [[maybe_unused]] real xHConstant = this->xH;
+  [[maybe_unused]] real gamma_m1=gamma-ONE_F;
+  [[maybe_unused]] real csIso = this->isoSoundSpeed;
+  [[maybe_unused]] HydroModuleStatus haveIsoCs = this->haveIsoSoundSpeed;
 
   SlopeLimiter<DIR,NVAR> slopeLim(Vc,data->dx[DIR],shockFlattening);
 
   // Define normal, tangent and bi-tanget indices
   // st and sb will be useful only when Hall is included
-  real st,sb;
+  real st = ONE_F, sb = ONE_F;
 
   switch(DIR) {
     case(IDIR):
@@ -288,7 +288,7 @@ void Hydro::HllMHD() {
 
       // 4-- Compute the Hall flux
       if(haveHall) {
-        int ip1, jp1, kp1;
+        [[maybe_unused]] int ip1, jp1, kp1;
         real Jx1, Jx2, Jx3;
         ip1=i+1;
         #if DIMENSIONS >=2
@@ -427,9 +427,11 @@ void Hydro::HllMHD() {
         K_StoreContact<DIR>(i,j,k,st,sb,Flux,Et,Eb,SV);
       } else if (emfAverage==ElectroMotiveForce::uct_hll) {
         K_StoreHLL<DIR>(i,j,k,st,sb,sl,sr,vL,vR,Et,Eb,aL,aR,dL,dR);
-      } else if (emfAverage==ElectroMotiveForce::uct_hlld) {
-        K_StoreHLLD<DIR>(i,j,k,st,sb,c2Iso,SLb,SRb,vL,vR,uL,uR,Et,Eb,aL,aR,dL,dR);
       }
+      /* else if (emfAverage==ElectroMotiveForce::uct_hlld) {
+        // We do not have the Alfven speed in the HLL solver
+        K_StoreHLLD<DIR>(i,j,k,st,sb,c2Iso,SLb,SRb,vL,vR,uL,uR,Et,Eb,aL,aR,dL,dR);
+      }*/
   });
 
   idfx::popRegion();