[newchem-cpp] Only load needed injection pathway data

.clang-format-ignore

@@ -32,11 +32,9 @@ src/clib/init_misc_species_cool_rates.cpp
 src/clib/initialize_UVbackground_data.c
 src/clib/initialize_chemistry_data.cpp
 src/clib/initialize_cloudy_data.c
-src/clib/initialize_dust_yields.cpp
 src/clib/initialize_rates.cpp
 src/clib/internal_types.hpp
 src/clib/internal_units.h
-src/clib/interp_table_utils.h
 src/clib/interpolate.hpp
 src/clib/phys_constants.h
 src/clib/rate_functions.c

CMakePresets.json

@@ -51,7 +51,7 @@
           "cacheVariables" : {
             "CMAKE_COMPILE_WARNING_AS_ERROR": "ON",
             "CMAKE_C_FLAGS": "-Wall -Wpedantic -Wextra -Wno-error=unused-variable -Wno-error=newline-eof -Wno-unused-parameter",
-            "CMAKE_CXX_FLAGS": "-Wall -Wpedantic -Wno-c++17-attribute-extensions -Wno-unused-parameter"
+            "CMAKE_CXX_FLAGS": "-Wall -Wpedantic -Wno-c++17-attribute-extensions -Wno-unused-parameter -Wno-error=self-assign"
           }
       },
       {

src/clib/CMakeLists.txt

@@ -113,11 +113,16 @@ add_library(Grackle_Grackle
   cool_multi_time_g.cpp cool_multi_time_g.h
   dust_props.hpp
   dust/grain_species_info.cpp dust/grain_species_info.hpp
+  dust/multi_grain_species/calc_grain_size_increment_1d.hpp
   init_misc_species_cool_rates.cpp init_misc_species_cool_rates.hpp
   initialize_chemistry_data.cpp
-  initialize_dust_yields.cpp initialize_dust_yields.hpp
   initialize_rates.cpp initialize_rates.hpp
+  inject_model/grain_metal_inject_pathways.hpp
+  inject_model/inject_path_field_pack.hpp
+  inject_model/load_data.cpp inject_model/load_data.hpp
+  inject_model/raw_data.cpp inject_model/raw_data.hpp
   internal_types.cpp internal_types.hpp
+  interp_table_utils.hpp
   lookup_cool_rates1d.hpp
   make_consistent.cpp make_consistent.hpp
   opaque_storage.hpp
@@ -126,6 +131,7 @@ add_library(Grackle_Grackle
   solve_rate_cool_g-cpp.cpp solve_rate_cool_g-cpp.h
   step_rate_newton_raphson.hpp
   time_deriv_0d.hpp
+  utils/FrozenKeyIdxBiMap.hpp
   utils-cpp.cpp utils-cpp.hpp
   utils-field.hpp
   fortran_func_wrappers.hpp
@@ -173,11 +179,9 @@ add_library(Grackle_Grackle
   grackle_chemistry_data_fields.def # <-- acts as a C header
   grackle_macros.h
   index_helper.h
-  interp_table_utils.h
   phys_constants.h
   collisional_rxn_rate_members.def # <-- acts as a C header
   utils.h
-  dust_const.def
 
   # Fortran public headers
   ../include/grackle.def

src/clib/Make.config.objects

@@ -31,10 +31,11 @@ OBJS_CONFIG_LIB = \
 	index_helper.lo \
         initialize_chemistry_data.lo \
         initialize_cloudy_data.lo \
-        initialize_dust_yields.lo \
         init_misc_species_cool_rates.lo \
         initialize_rates.lo \
         initialize_UVbackground_data.lo \
+        inject_model/load_data.lo \
+        inject_model/raw_data.lo \
         interpolators_g.lo \
         make_consistent.lo \
         scale_fields.lo \

src/clib/Makefile

@@ -338,8 +338,10 @@ install:
 #-----------------------------------------------------------------------
 
 clean:
-	-@rm -f *.la .libs/* *.o *.lo DEPEND.bak *~ $(OUTPUT) *.exe DEPEND out.make.DEPEND
+	-@rm -f *.la DEPEND.bak *~ $(OUTPUT) *.exe DEPEND out.make.DEPEND
 	-@rm -rf $(AUTOGEN_DIR)
+	-@find . -type d -name '.libs' -exec rm -rf '{}' +
+	-@find . \( -name '*.o' -o -name '*.lo' \) -exec rm -f '{}' \;
 	-@touch DEPEND
 
 #-----------------------------------------------------------------------