fix some more compiler warnings (#359)

AMReX-Astro · Jul 26, 2020 · ca01493 · ca01493
1 parent 0cc507b
commit ca01493
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/EOS/eos_composition.H b/EOS/eos_composition.H
@@ -42,12 +42,12 @@ void composition(eos_t& state) {
 
 }
 
+#ifdef EXTRA_THERMO
 AMREX_GPU_HOST_DEVICE inline
 eos_xderivs_t composition_derivatives(const eos_t& state) {
 
   eos_xderivs_t state_xderivs;
 
-#ifdef EXTRA_THERMO
   for (int n = 0; n < NumSpec; n++) {
     state_xderivs.dpdX[n] =
       state.dpdA * (state.abar * aion_inv[n]) * (aion[n] - state.abar) +
@@ -65,9 +65,9 @@ eos_xderivs_t composition_derivatives(const eos_t& state) {
     }
   }
 
-#endif
-
   return state_xderivs;
 }
+#endif
+
 
 #endif
diff --git a/EOS/helmholtz/actual_eos.H b/EOS/helmholtz/actual_eos.H
@@ -657,7 +657,9 @@ void apply_coulomb_corrections(eos_t& state)
     Real ytot1 = 1.0e0_rt / state.abar;
     Real xni     = avo_eos * ytot1 * state.rho;
     Real dxnidd  = avo_eos * ytot1;
+#ifdef EXTRA_THERMO
     Real dxnida  = -xni * ytot1;
+#endif
 
     Real kt      = kerg * state.T;
     Real ktinv   = 1.0e0_rt / kt;
@@ -1337,7 +1339,7 @@ void actual_eos_finalize ()
 
 
 AMREX_GPU_HOST_DEVICE inline
-bool is_input_valid(eos_input_t input) {
+bool is_input_valid(eos_input_t /*input*/) {
 
   bool valid = true;
 

diff --git a/EOS/multigamma/eos_composition.H b/EOS/multigamma/eos_composition.H
@@ -46,6 +46,7 @@ void subroutine (eos_t& state)
 
 // Compute thermodynamic derivatives with respect to xn(:)
 
+#ifdef EXTRA_THERMO
 AMREX_GPU_HOST_DEVICE inline
 eos_x_derivs_t composition_derivatives (const eos_t& state)
 {
@@ -57,17 +58,16 @@ eos_x_derivs_t composition_derivatives (const eos_t& state)
 
     // Composition derivatives
 
-#ifdef EXTRA_THERMO
     for (int n = 0; n < NumSpec; ++n) {
         state_xderivs.dpdX[n] = state.rho * (k_B / m_nucleon) * state.T * aion_inv[n];
         state_xderivs.dedX[n] = (k_B / m_nucleon) * state.T * aion_inv[n] / (gammas[n] - 1.0_rt);
         state_xderivs.dhdX[n] = state_xderivs.dedX[n] + (state.p / (state.rho * state.rho) - state.dedr) *
                                                         state_xderivs.dpdX[n] / state.dpdr;
     }
-#endif
 
     return state_xderivs;
 
 }
+#endif
 
 #endif
diff --git a/interfaces/eos_override.H b/interfaces/eos_override.H
@@ -4,7 +4,7 @@
 #include <eos_type.H>
 
 AMREX_GPU_HOST_DEVICE inline
-void eos_override(eos_t& state) {}
+void eos_override(eos_t& /*state*/) {}
 
 #endif
 
diff --git a/interfaces/network.H b/interfaces/network.H
@@ -17,6 +17,7 @@ static int network_spec_index(const std::string name) {
   return idx;
 }
 
+#if NAUX_NET > 0
 static int network_aux_index(const std::string name) {
   int idx = -1;
   for (int n = 0; n < NumAux; n++) {
@@ -27,5 +28,6 @@ static int network_aux_index(const std::string name) {
   }
   return idx;
 }
+#endif
 
 #endif
diff --git a/networks/general_null/network_header.template b/networks/general_null/network_header.template
@@ -34,13 +34,15 @@ static const std::vector<std::string> spec_names_cxx = {
    @@SPEC_NAMES@@
   };
 
+#if NAUX_NET > 0
 static const std::vector<std::string> short_aux_names_cxx = {
    @@SHORT_AUX_NAMES@@
   };
 
 static const std::vector<std::string> aux_names_cxx = {
    @@AUX_NAMES@@
   };
+#endif
 
 namespace Species {
    enum NetworkSpecies {