WIP: feedback overhaul

builds/make.type.disk

@@ -22,7 +22,7 @@ DFLAGS += -DGRAVITY_5_POINTS_GRADIENT
 
 DFLAGS    += -DMPI_CHOLLA
 DFLAGS    += -DPRECISION=2
-DFLAGS    += -DPLMC
+DFLAGS    += -DPLMP
 DFLAGS    += -DHLLC
 DFLAGS    += -DVL
 

builds/make.type.starblast

@@ -11,21 +11,21 @@ DFLAGS += -DANALYSIS
 #DFLAGS += -DPARTICLES_KDK
 
 
-DFLAGS += -DGRAVITY
-DFLAGS += -DGRAVITY_GPU
+#DFLAGS += -DGRAVITY
+#DFLAGS += -DGRAVITY_GPU
 # Use both -DSOR and -DPARIS_GALACTIC to run analytic test and compare solutions
 #DFLAGS += -DSOR
-DFLAGS += -DPARIS_GALACTIC
+#DFLAGS += -DPARIS_GALACTIC
 #DFLAGS += -DGRAVITY_ANALYTIC_COMP
-DFLAGS += -DGRAVITY_5_POINTS_GRADIENT
+#DFLAGS += -DGRAVITY_5_POINTS_GRADIENT
 
 #DFLAGS += -DSTATIC_GRAV
 
 #DFLAGS    += -DOUTPUT_ALWAYS
 DFLAGS    += -DCUDA
 DFLAGS    += -DMPI_CHOLLA 
 DFLAGS    += -DPRECISION=2
-DFLAGS    += -DPLMC
+DFLAGS    += -DPLMP
 DFLAGS    += -DHLLC
 DFLAGS    += -DVL
 

examples/3D/disk_particle.txt

@@ -19,10 +19,6 @@ n_hydro=10
 gamma=1.66666667
 # name of initial conditions
 init=Disk_3D_particles
-snr_filename=./src/feedback/starburst99_snr.txt
-sw_filename=./src/feedback/starburst99_sw.txt
-feedback_sn_model=legacy
-feedback_boundary_strategy=snap
 bc_potential_type=1
 # domain properties
 xmin=-2
@@ -51,3 +47,9 @@ ddelta_dt=-0.001
 # path to output directory
 outdir=./
 prng_seed=41
+
+
+feedback.snr_filename=./src/feedback/starburst99_snr.txt
+feedback.sw_filename=./src/feedback/starburst99_sw.txt
+feedback.sn_model=legacy
+feedback.boundary_strategy=snap

examples/3D/isolated_star_particle.txt

@@ -18,8 +18,8 @@ n_hydro=10
 gamma=1.66666667
 # name of initial conditions
 init=Isolated_Stellar_Cluster
-snr_filename=./src/feedback/starburst99_snr.txt
-sw_filename=./src/feedback/starburst99_sw.txt
+feedback.snr_filename=./src/feedback/starburst99_snr.txt
+feedback.sw_filename=./src/feedback/starburst99_sw.txt
 bc_potential_type=1
 # domain properties
 xmin=-0.5

src/cooling/chemistry.cu

@@ -0,0 +1,52 @@
+#include <string>
+
+#include "../cooling/cooling_cuda.h"  // provides configure_cooling_callback
+#include "../grid/grid3D.h"
+#include "../io/ParameterMap.h"
+#include "chemistry.h"
+
+std::function<void(Grid3D&)> configure_chemistry_callback(ParameterMap& pmap)
+{
+  // we need to enforce this check so that we can accurately identify unnecessary parameters at the end of this func
+  pmap.Enforce_Table_Content_Uniform_Access_Status("chemistry", true);
+
+  // we use the traditional macros to set default-chemistry kinds to avoid
+  // breaking older setups.
+  // -> in the future, I think we can do away with this...
+  std::string default_kind = "none";
+#if defined(COOLING_GPU) && defined(CLOUDY_COOL)
+  default_kind = "tabulated-cloudy";
+#elif defined(COOLING_GPU)
+  default_kind = "piecewise-cie";
+#elif defined(CHEMISTRY_GPU)
+  default_kind = "chemistry-gpu";
+#elif defined(COOLING_GRACKLE)
+  default_kind = "grackle";
+#endif
+
+  std::string chemistry_kind = pmap.value_or("chemistry.kind", default_kind);
+
+  std::function<void(Grid3D&)> out{};
+
+#if defined(CHEMISTRY_GPU) || defined(COOLING_GRACKLE)
+  CHOLLA_ASSERT(chemistry_kind == default_kind,
+                "based on the defined macros, it is currently an error to pass a value to the "
+                "chemistry.kind parameter other than \"%s\" (even \"none\" is invalid) This is "
+                "because the \"%s\" functionality is invoked outside of the chemistry_callback "
+                "machinery (this will be fixed in the near future)",
+                default_kind.c_str(), default_kind.c_str());
+#else
+  if (chemistry_kind == "none") {
+    // do nothing
+  } else if (chemistry_kind == "chemistry-gpu" or chemistry_kind == "grackle") {
+    CHOLLA_ERROR("chemistry.kind doesn't support %s yet (unless certain macros are defined)", chemistry_kind.c_str());
+  } else if (chemistry_kind != "none") {
+    out = configure_cooling_callback(chemistry_kind, pmap);
+    if (not out) CHOLLA_ERROR("\"%s\" is not a supported chemistry.kind parameter value.", chemistry_kind.c_str());
+  }
+#endif  // defined(CHEMISTRY_GPU) || defined(COOLING_GRACKLE)
+
+  // ensure any errors if there are any parameters in the chemistry group that we have not accessed
+  pmap.Enforce_Table_Content_Uniform_Access_Status("chemistry", false);
+  return out;
+}

src/cooling/chemistry.h

@@ -0,0 +1,14 @@
+// this is the public header for unified chemistry heating and cooling
+
+#pragma once
+
+#include <functional>
+
+#include "../global/global.h"
+#include "../grid/grid3D.h"
+
+/* construct the chemistry callback (or not based on the specified parameters & compilation mode)
+ *
+ * \note
+ * we always define the following function regardless of the defined compiler flags */
+std::function<void(Grid3D&)> configure_chemistry_callback(ParameterMap& pmap);