[newchem-cpp] Adding dust model with related parameters

src/clib/CMakeLists.txt

@@ -106,6 +106,7 @@ add_library(Grackle_Grackle
   dust/calc_kappa_grain.cpp dust/calc_kappa_grain.hpp
   dust/calc_tdust_1d_g.cpp dust/calc_tdust_1d_g.hpp
   dust/calc_tdust_3d.cpp dust/calc_tdust_3d.hpp
+  dust/dust_growth_and_destruction.cpp dust/dust_growth_and_destruction.hpp
   dust/gas_heat_cool.hpp
   dust/grain_species_info.cpp dust/grain_species_info.hpp
   dust/lookup_dust_rates1d.hpp

src/clib/Make.config.objects

@@ -31,6 +31,7 @@ OBJS_CONFIG_LIB = \
         dust/multi_grain_species/calc_grain_size_increment_species_1d.lo \
         dust/calc_kappa_grain.lo \
         dust/calc_tdust_1d_g.lo \
+        dust/dust_growth_and_destruction.lo \
         dust/grain_species_info.lo \
         dynamic_api.lo \
         api/units.lo \
@@ -49,7 +50,6 @@ OBJS_CONFIG_LIB = \
         solve_rate_cool.lo \
         support/status_reporting.lo \
         update_UVbackground_rates.lo \
-        calc_tdust_1d_g.lo \
         dust/calc_tdust_3d.lo \
         calc_grain_size_increment_1d.lo \
         rate_functions.lo \

src/clib/ceiling_species.hpp

@@ -69,7 +69,7 @@ inline void ceiling_species(int imetal, chemistry_data* my_chemistry,
   GRIMPL_NS::View<gr_float***> metal(
       my_fields->metal_density, my_fields->grid_dimension[0],
       my_fields->grid_dimension[1], my_fields->grid_dimension[2]);
-  GRIMPL_NS::View<gr_float***> dust(
+  grackle::impl::View<gr_float***> dust(
       my_fields->dust_density, my_fields->grid_dimension[0],
       my_fields->grid_dimension[1], my_fields->grid_dimension[2]);
   GRIMPL_NS::View<gr_float***> DM(

src/clib/cool1d_multi_g.cpp

@@ -883,7 +883,6 @@ void grackle::impl::cool1d_multi_g(
       itmask_metal[i] = MASK_FALSE;
     }
   }
-
   dust_related_props(anydust, tgas, cool1dmulti_buf.mynh, metallicity, itmask,
                      itmask_metal, my_chemistry, my_rates, my_fields, internalu,
                      idx_range, logTlininterp_buf, comp2, dust2gas, tdust,

src/clib/dust/calc_tdust_3d.cpp

@@ -154,17 +154,24 @@ void calc_tdust_3d(
         }
       }
 
-      // Compute grain size increment
-
-      if ( (my_chemistry->use_dust_density_field > 0)  &&  (my_chemistry->dust_species > 0) )  {
+      // // Set itmask to false for dust-poor cells
+      // if (my_chemistry->use_dust_density_field > 0) {
+      //   for (int i = idx_range.i_start; i < idx_range.i_stop; i++) {
+      //     if (dust(i,j,k) < 1.e-9 * d(i,j,k))  {
+      //       itmask_metal[i] = MASK_FALSE;
+      //     }
+      //   }
+      // }
 
-        calc_grain_size_increment_1d (
+      // Compute grain size increment
+      if ( (my_chemistry->use_dust_density_field > 0)  &&  (my_chemistry->dust_species > 0)
+           &&  (my_chemistry->dust_model == 0) )  {
+        grackle::impl::calc_grain_size_increment_1d (
           dom, idx_range, itmask_metal.data(), my_chemistry,
           my_rates->opaque_storage->grain_species_info,
           my_rates->opaque_storage->inject_pathway_props,
           my_fields, internal_dust_prop_buf
         );
-
       }
 
       for (int i = idx_range.i_start; i < idx_range.i_stop; i++) {
@@ -202,7 +209,7 @@ void calc_tdust_3d(
           //       endif
 
           if (my_chemistry->use_dust_density_field > 0)  {
-            dust2gas[i] = dust(i,j,k) / d(i,j,k);
+            dust2gas[i] = dust(i,j,k) / (d(i,j,k));
           } else {
             dust2gas[i] = my_chemistry->local_dust_to_gas_ratio * metallicity[i];
           }