shift handling of the anydust variable

Author: mabruzzo

src/clib/cool1d_multi_g.cpp

@@ -194,21 +194,12 @@ void grackle::impl::cool1d_multi_g(
 
   // Iteration mask
 
-  gr_mask_type anydust, interp;
+  gr_mask_type interp;
   std::vector<gr_mask_type> itmask_tab(my_fields->grid_dimension[0]);
 
   // \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\/////////////////////////////////
   // =======================================================================
 
-  // Set flag for dust-related options
-
-  if ((my_chemistry->h2_on_dust > 0) || (my_chemistry->dust_chemistry > 0) ||
-      (my_chemistry->dust_recombination_cooling > 0)) {
-    anydust = MASK_TRUE;
-  } else {
-    anydust = MASK_FALSE;
-  }
-
   // Set flag for needing interpolation variables
 
   if ((my_chemistry->primordial_chemistry > 0) ||
@@ -1124,7 +1115,7 @@ void grackle::impl::cool1d_multi_g(
       my_chemistry, my_rates, my_fields, idx_range, grain_temperatures,
       logTlininterp_buf, cool1dmulti_buf, dom, coolunit, comp2, gasgr.data(),
       myisrf.data(), alpha.data(), alphad.data(), internal_dust_prop_buf,
-      grain_kappa, kappa_tot.data(), gas_grainsp_heatrate, anydust);
+      grain_kappa, kappa_tot.data(), gas_grainsp_heatrate);
 
   for (i = idx_range.i_start; i <= idx_range.i_end; i++) {
     if (itmask[i] != MASK_FALSE) {

src/clib/dust/solver.hpp

@@ -40,7 +40,7 @@ void solve_props_update_alpha_and_edot(
     double comp2, double* gasgr, double* myisrf, double* alpha, double* alphad,
     InternalDustPropBuf internal_dust_prop_buf,
     GrainSpeciesCollection grain_kappa, double* kappa_tot,
-    GrainSpeciesCollection gas_grainsp_heatrate, gr_mask_type anydust) {
+    GrainSpeciesCollection gas_grainsp_heatrate) {
   grackle::impl::View<gr_float***> d(
       my_fields->density, my_fields->grid_dimension[0],
       my_fields->grid_dimension[1], my_fields->grid_dimension[2]);
@@ -53,6 +53,15 @@ void solve_props_update_alpha_and_edot(
 
   const double mh_local_var = mh_grflt;
 
+  // Set flag for dust-related options
+  gr_mask_type anydust;
+  if ((my_chemistry->h2_on_dust > 0) || (my_chemistry->dust_chemistry > 0) ||
+      (my_chemistry->dust_recombination_cooling > 0)) {
+    anydust = MASK_TRUE;
+  } else {
+    anydust = MASK_FALSE;
+  }
+
   // Compute grain size increment
   if ((my_chemistry->use_dust_density_field > 0) &&
       (my_chemistry->dust_species > 0)) {