Merge branch 'main' into reactDiff

AMReX-FHD · Aug 21, 2024 · 1533f0f · 1533f0f
2 parents fba95df + b7a9ce4
commit 1533f0f
Show file tree

Hide file tree

Showing 18 changed files with 463 additions and 435 deletions.
diff --git a/exec/chemistry_testing/GNUmakefile b/exec/chemistry_testing/GNUmakefile
@@ -10,7 +10,8 @@ USE_OMP      = FALSE
 USE_CUDA     = FALSE
 COMP         = gnu
 DIM          = 3
-MAX_SPEC      = 8
+MAX_SPEC     = 8
+MAX_REAC     = 5
 
 TINY_PROFILE = FALSE
 
@@ -40,3 +41,6 @@ include $(AMREX_HOME)/Tools/GNUMake/Make.rules
 MAXSPECIES := $(strip $(MAX_SPEC))
 DEFINES += -DMAX_SPECIES=$(MAXSPECIES)
 
+MAXREACTION := $(strip $(MAX_REAC))
+DEFINES += -DMAX_REACTION=$(MAXREACTION)
+
diff --git a/exec/chemistry_testing/Make.package b/exec/chemistry_testing/Make.package
@@ -1,2 +1,3 @@
 CEXE_sources += main.cpp
-CEXE_headers += myfunc.H
+CEXE_sources += chemistry_testing_functions.cpp
+CEXE_headers += chemistry_testing_functions.H
diff --git a/exec/chemistry_testing/chemistry_testing_functions.H b/exec/chemistry_testing/chemistry_testing_functions.H
@@ -0,0 +1,31 @@
+#ifndef MYFUNC_H_
+#define MYFUNC_H_
+
+void main_main(const char* argv);
+
+void EMstep_chem_only(amrex::MultiFab& rho_old, amrex::MultiFab& rho_new,
+                      const amrex::Geometry geom, const amrex::Real dt);
+
+void RK3step_chem_only(amrex::MultiFab& rho_old, amrex::MultiFab& rho_new,
+                       const amrex::Geometry geom, const amrex::Real dt);
+
+void compute_chemistry_source_CLE_1(amrex::Real dt, amrex::Real dV, MultiFab& mf_in, int startComp_in,
+                                    MultiFab& source, int startComp_out);
+
+void compute_chemistry_source_CLE_2(amrex::Real dt, amrex::Real dV, MultiFab& mf_in, int startComp_in,
+                                    MultiFab& source, int startComp_out, MultiFab& ranchem);
+
+AMREX_GPU_HOST_DEVICE void compute_reaction_rates(GpuArray<amrex::Real,MAX_SPECIES>& n_dens,
+                                                  GpuArray<amrex::Real,MAX_REACTION>& a_r);
+
+AMREX_GPU_HOST_DEVICE void advance_reaction_det_cell(GpuArray<amrex::Real,MAX_SPECIES>& n_old,
+                                                     GpuArray<amrex::Real,MAX_SPECIES>& n_new,amrex::Real dt);
+
+AMREX_GPU_HOST_DEVICE void advance_reaction_CLE_cell(GpuArray<amrex::Real,MAX_SPECIES>& n_old,
+                                                     GpuArray<amrex::Real,MAX_SPECIES>& n_new,
+                                                     amrex::Real dt,amrex::Real dV,RandomEngine const& engine);
+
+AMREX_GPU_HOST_DEVICE void advance_reaction_SSA_cell(GpuArray<amrex::Real,MAX_SPECIES>& n_old,
+                                                     GpuArray<amrex::Real,MAX_SPECIES>& n_new,
+                                                     amrex::Real dt,amrex::Real dV,RandomEngine const& engine);
+#endif