AMReX-Combustion · marchdf · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023
diff --git a/Reactions/ReactorCvode.cpp b/Reactions/ReactorCvode.cpp
@@ -1736,7 +1736,6 @@ ReactorCvode::freeUserData(CVODEUserData* data_wk)
     delete[] (data_wk->PS);
 #endif
   } else if (data_wk->solve_type == cvode::customDirect) {
-    //    SUNMatDestroy(A);
     SUNMatDestroy(data_wk->PSc);
   }
 

diff --git a/Support/Mechanism/Models/Aromatic_KrNara/mechanism.H b/Support/Mechanism/Models/Aromatic_KrNara/mechanism.H
@@ -223,6 +223,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[158] = {
   0.9920634920634921, // H
   0.0312519532470779, // O2
@@ -383,6 +384,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[158] = {
   0.0092510361160450, // OC6H4O
   0.0356964374955379, // N2
 };
+#endif
 const amrex::Real h_global_imw[158] = {
   0.9920634920634921, // H
   0.0312519532470779, // O2
@@ -545,6 +547,7 @@ const amrex::Real h_global_imw[158] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[158] = {
   1.008000,   // H
   31.998000,  // O2
@@ -705,6 +708,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[158] = {
   108.096000, // OC6H4O
   28.014000,  // N2
 };
+#endif
 const amrex::Real h_global_mw[158] = {
   1.008000,   // H
   31.998000,  // O2

diff --git a/Support/Mechanism/Models/BurkeDryer/mechanism.H b/Support/Mechanism/Models/BurkeDryer/mechanism.H
@@ -79,6 +79,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[13] = {
   0.9920634920634921, // H
   0.4960317460317460, // H2
@@ -94,6 +95,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[13] = {
   0.0357015351660121, // CO
   0.0227226249176305, // CO2
 };
+#endif
 const amrex::Real h_global_imw[13] = {
   0.9920634920634921, // H
   0.4960317460317460, // H2
@@ -111,6 +113,7 @@ const amrex::Real h_global_imw[13] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[13] = {
   1.008000,  // H
   2.016000,  // H2
@@ -126,6 +129,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[13] = {
   28.010000, // CO
   44.009000, // CO2
 };
+#endif
 const amrex::Real h_global_mw[13] = {
   1.008000,  // H
   2.016000,  // H2

diff --git a/Support/Mechanism/Models/C1-C2-NO/mechanism.H b/Support/Mechanism/Models/C1-C2-NO/mechanism.H
@@ -109,6 +109,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[44] = {
   0.0250312891113892, // AR
   0.0356964374955379, // N2
@@ -155,6 +156,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[44] = {
   0.0237998905205036, // NCO
   0.0212616673399528, // CH3O2
 };
+#endif
 const amrex::Real h_global_imw[44] = {
   0.0250312891113892, // AR
   0.0356964374955379, // N2
@@ -203,6 +205,7 @@ const amrex::Real h_global_imw[44] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[44] = {
   39.950000, // AR
   28.014000, // N2
@@ -249,6 +252,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[44] = {
   42.017000, // NCO
   47.033000, // CH3O2
 };
+#endif
 const amrex::Real h_global_mw[44] = {
   39.950000, // AR
   28.014000, // N2

diff --git a/Support/Mechanism/Models/C1-C2-NO_qss/mechanism.H b/Support/Mechanism/Models/C1-C2-NO_qss/mechanism.H
@@ -104,6 +104,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[39] = {
   0.0250312891113892, // AR
   0.0356964374955379, // N2
@@ -145,6 +146,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[39] = {
   0.0237998905205036, // NCO
   0.0212616673399528, // CH3O2
 };
+#endif
 const amrex::Real h_global_imw[39] = {
   0.0250312891113892, // AR
   0.0356964374955379, // N2
@@ -188,6 +190,7 @@ const amrex::Real h_global_imw[39] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[39] = {
   39.950000, // AR
   28.014000, // N2
@@ -229,6 +232,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[39] = {
   42.017000, // NCO
   47.033000, // CH3O2
 };
+#endif
 const amrex::Real h_global_mw[39] = {
   39.950000, // AR
   28.014000, // N2

diff --git a/Support/Mechanism/Models/CH4_lean/mechanism.H b/Support/Mechanism/Models/CH4_lean/mechanism.H
@@ -82,6 +82,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[17] = {
   0.4960317460317460, // H2
   0.9920634920634921, // H
@@ -101,6 +102,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[17] = {
   0.0322227234645872, // CH2OH
   0.0356964374955379, // N2
 };
+#endif
 const amrex::Real h_global_imw[17] = {
   0.4960317460317460, // H2
   0.9920634920634921, // H
@@ -122,6 +124,7 @@ const amrex::Real h_global_imw[17] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[17] = {
   2.016000,  // H2
   1.008000,  // H
@@ -141,6 +144,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[17] = {
   31.034000, // CH2OH
   28.014000, // N2
 };
+#endif
 const amrex::Real h_global_mw[17] = {
   2.016000,  // H2
   1.008000,  // H

diff --git a/Support/Mechanism/Models/CH4_lean_qss/mechanism.H b/Support/Mechanism/Models/CH4_lean_qss/mechanism.H
@@ -77,6 +77,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[13] = {
   0.4960317460317460, // H2
   0.9920634920634921, // H
@@ -92,6 +93,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[13] = {
   0.0333044694598015, // CH2O
   0.0356964374955379, // N2
 };
+#endif
 const amrex::Real h_global_imw[13] = {
   0.4960317460317460, // H2
   0.9920634920634921, // H
@@ -109,6 +111,7 @@ const amrex::Real h_global_imw[13] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[13] = {
   2.016000,  // H2
   1.008000,  // H
@@ -124,6 +127,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[13] = {
   30.026000, // CH2O
   28.014000, // N2
 };
+#endif
 const amrex::Real h_global_mw[13] = {
   2.016000,  // H2
   1.008000,  // H

diff --git a/Support/Mechanism/Models/Davis/mechanism.H b/Support/Mechanism/Models/Davis/mechanism.H
@@ -80,6 +80,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[14] = {
   0.4960317460317460, // H2
   0.9920634920634921, // H
@@ -96,6 +97,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[14] = {
   0.0293996589639560, // H2O2
   0.0227226249176305, // CO2
 };
+#endif
 const amrex::Real h_global_imw[14] = {
   0.4960317460317460, // H2
   0.9920634920634921, // H
@@ -114,6 +116,7 @@ const amrex::Real h_global_imw[14] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[14] = {
   2.016000,  // H2
   1.008000,  // H
@@ -130,6 +133,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[14] = {
   34.014000, // H2O2
   44.009000, // CO2
 };
+#endif
 const amrex::Real h_global_mw[14] = {
   2.016000,  // H2
   1.008000,  // H

diff --git a/Support/Mechanism/Models/FFCM1_Red/mechanism.H b/Support/Mechanism/Models/FFCM1_Red/mechanism.H
@@ -86,6 +86,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[21] = {
   0.0356964374955379, // N2
   0.4960317460317460, // H2
@@ -109,6 +110,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[21] = {
   0.0312090381374446, // CH3OH
   0.2498374807187924, // HE
 };
+#endif
 const amrex::Real h_global_imw[21] = {
   0.0356964374955379, // N2
   0.4960317460317460, // H2
@@ -134,6 +136,7 @@ const amrex::Real h_global_imw[21] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[21] = {
   28.014000, // N2
   2.016000,  // H2
@@ -157,6 +160,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[21] = {
   32.042000, // CH3OH
   4.002602,  // HE
 };
+#endif
 const amrex::Real h_global_mw[21] = {
   28.014000, // N2
   2.016000,  // H2

diff --git a/Support/Mechanism/Models/IonizedAir/mechanism.H b/Support/Mechanism/Models/IonizedAir/mechanism.H
@@ -68,13 +68,15 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[5] = {
   0.0312519532470779,    // O2
   0.0356964374955379,    // N2
   1822.8884868472639482, // E
   0.0625017634094834,    // On
   0.0312514174667246,    // O2n
 };
+#endif
 const amrex::Real h_global_imw[5] = {
   0.0312519532470779,    // O2
   0.0356964374955379,    // N2
@@ -84,13 +86,15 @@ const amrex::Real h_global_imw[5] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[5] = {
   31.998000, // O2
   28.014000, // N2
   0.000549,  // E
   15.999549, // On
   31.998549, // O2n
 };
+#endif
 const amrex::Real h_global_mw[5] = {
   31.998000, // O2
   28.014000, // N2

diff --git a/Support/Mechanism/Models/IonizedAir/mechanism.cpp b/Support/Mechanism/Models/IonizedAir/mechanism.cpp
@@ -46,7 +46,10 @@ CKKFKR(
 // USES progressRate : todo switch to GPU
 void
 progressRateFR(
-  amrex::Real* q_f, amrex::Real* q_r, amrex::Real* sc, amrex::Real T)
+  amrex::Real* /*q_f*/,
+  amrex::Real* /*q_r*/,
+  amrex::Real* /*sc*/,
+  amrex::Real /*T*/)
 {
 }
 

diff --git a/Support/Mechanism/Models/JL4/mechanism.H b/Support/Mechanism/Models/JL4/mechanism.H
@@ -71,6 +71,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[7] = {
   0.0623324814560868, // CH4
   0.0312519532470779, // O2
@@ -80,6 +81,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[7] = {
   0.0227226249176305, // CO2
   0.4960317460317460, // H2
 };
+#endif
 const amrex::Real h_global_imw[7] = {
   0.0623324814560868, // CH4
   0.0312519532470779, // O2
@@ -91,6 +93,7 @@ const amrex::Real h_global_imw[7] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[7] = {
   16.043000, // CH4
   31.998000, // O2
@@ -100,6 +103,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[7] = {
   44.009000, // CO2
   2.016000,  // H2
 };
+#endif
 const amrex::Real h_global_mw[7] = {
   16.043000, // CH4
   31.998000, // O2

diff --git a/Support/Mechanism/Models/Kolla/mechanism.H b/Support/Mechanism/Models/Kolla/mechanism.H
@@ -76,6 +76,7 @@ CKINDX(int& mm, int& kk, int& ii, int& nfit)
 }
 
 //  inverse molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_imw[12] = {
   0.4960317460317460, // H2
   0.0312519532470779, // O2
@@ -90,6 +91,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_imw[12] = {
   0.0344613688055690, // HCO
   0.0356964374955379, // N2
 };
+#endif
 const amrex::Real h_global_imw[12] = {
   0.4960317460317460, // H2
   0.0312519532470779, // O2
@@ -106,6 +108,7 @@ const amrex::Real h_global_imw[12] = {
 };
 
 //  molecular weights
+#ifdef AMREX_USE_GPU
 AMREX_GPU_CONSTANT const amrex::Real global_mw[12] = {
   2.016000,  // H2
   31.998000, // O2
@@ -120,6 +123,7 @@ AMREX_GPU_CONSTANT const amrex::Real global_mw[12] = {
   29.018000, // HCO
   28.014000, // N2
 };
+#endif
 const amrex::Real h_global_mw[12] = {
   2.016000,  // H2
   31.998000, // O2