[newchem-cpp] Remove Hard-coded injection path names from grackle_field_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
@@ -64,17 +62,17 @@ src/include/grackle_float.h.in
 src/include/grackle_misc.h
 src/include/grackle_rate_functions.h
 src/include/grackle_types.h
-tests/unit/grtest_cmd.cpp
-tests/unit/grtest_cmd.hpp
-tests/unit/grtest_os.cpp
-tests/unit/grtest_os.hpp
-tests/unit/grtest_utils.cpp
-tests/unit/grtest_utils.hpp
+tests/grtestutils/cmd.cpp
+tests/grtestutils/cmd.hpp
+tests/grtestutils/os.cpp
+tests/grtestutils/os.hpp
+tests/grtestutils/utils.cpp
+tests/grtestutils/utils.hpp
+tests/grtestutils/googletest/check_allclose.hpp
 tests/unit/test_chemistry_struct_synced.cpp
 tests/unit/test_ghost_zone.cpp
 tests/unit/test_interpolators_comparisons.cpp
 tests/unit/test_linalg.cpp
 tests/unit/test_status_reporting.cpp
 tests/unit/test_unit_interpolators_g.cpp
-tests/unit/utest_helpers.hpp
 

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

@@ -112,21 +112,28 @@ 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/load_data.cpp inject_model/load_data.hpp
+  inject_model/misc.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
-  rate_utils.cpp
+  ratequery.cpp ratequery.hpp
   solve_chemistry.cpp
   scale_fields.cpp scale_fields.hpp
   solve_rate_cool_g-cpp.cpp solve_rate_cool_g-cpp.h
+  support/SimpleVec.hpp
   step_rate_gauss_seidel.hpp
   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
@@ -174,11 +181,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
@@ -297,7 +302,16 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "^(Linux)|(Darwin)$")
   target_compile_definitions(Grackle_Grackle PRIVATE "LINUX")
 endif()
 
-# define macro to suppress warnings about C files using our deprecated public
-# headers (the files should include grackle.h instead). We're currently holding
-# off on this to minimize conflicts with the newchem-cpp branch
-target_compile_definitions(Grackle_Grackle PRIVATE GRIMPL_PUBLIC_INCLUDE=1)
+# define macro to slightly customize behavior in header files since we're compiling
+# the grackle library
+# - suppresses warnings about C files using our deprecated public headers (the files
+#   should include grackle.h instead). We're gradually making this transition. It will
+#   probably be complete once we're finished transcribing all Fortran
+# - indicate to the headers that they shouldn't undef certain macros
+#
+# In reality, a "cleaner" approach than this may be to have
+# - all files in the core library include a wrapper-header-file that wraps the public
+#   headers and have that wrapper-file define this macro instead
+# - this is appealing since there's one less custom argument that needs to be passed
+#   to the compiler
+target_compile_definitions(Grackle_Grackle PRIVATE GRIMPL_COMPILING_CORE_LIB=1)

src/clib/Make.config.assemble

@@ -199,7 +199,7 @@
     # this to minimize conflicts with the newchem-cpp branch
     DEFINES = $(MACH_DEFINES) \
               $(ASSEMBLE_IO_DEFINES) \
-              -DGRIMPL_PUBLIC_INCLUDE=1
+              -DGRIMPL_COMPILING_CORE_LIB=1
 
     PUBLIC_HEADER_SRCDIR = $(GRACKLE_DIR)/../include
     AUTOGEN_DIR = $(GRACKLE_DIR)/autogen

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 \
@@ -49,7 +50,7 @@ OBJS_CONFIG_LIB = \
         calc_tdust_3d.lo \
         calc_grain_size_increment_1d.lo \
         rate_functions.lo \
-        rate_utils.lo \
+        ratequery.lo \
         gaussj_g.lo \
         utils.lo \
         utils-cpp.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
 
 #-----------------------------------------------------------------------