Merge pull request #143 from AMReX-FHD/reservoir_compress

Reservoirs in the Compressible Staggered FHD
AMReX-FHD · Sep 20, 2023 · c39702f · c39702f
2 parents 9528ecc + 3b40fb7
commit c39702f
Show file tree

Hide file tree

Showing 11 changed files with 2,098 additions and 143 deletions.
diff --git a/exec/compressible_stag/GNUmakefile b/exec/compressible_stag/GNUmakefile
@@ -5,7 +5,7 @@ AMREX_HOME ?= ../../../amrex/
 DEBUG         = FALSE
 USE_MPI       = TRUE
 USE_OMP       = FALSE
-USE_CUDA      = TRUE
+USE_CUDA      = FALSE
 USE_HIP       = FALSE
 COMP          = gnu
 DIM           = 3

diff --git a/src_compressible/compressible_functions.cpp b/src_compressible/compressible_functions.cpp
@@ -8,6 +8,7 @@ AMREX_GPU_MANAGED int compressible::do_1D;
 AMREX_GPU_MANAGED int compressible::do_2D;
 AMREX_GPU_MANAGED int compressible::all_correl;
 AMREX_GPU_MANAGED int compressible::nspec_surfcov = 0;
+AMREX_GPU_MANAGED bool compressible::do_reservoir = false;
 
 void InitializeCompressibleNamespace()
 {
@@ -63,6 +64,12 @@ void InitializeCompressibleNamespace()
     pp.query("all_correl",all_correl);
 
 
+    // do reservoir?
+    if ((bc_mass_lo[0] == 4) or (bc_mass_lo[1] == 4) or (bc_mass_lo[2] == 4) or
+        (bc_mass_hi[0] == 4) or (bc_mass_hi[1] == 4) or (bc_mass_hi[2] == 4)) {
+        do_reservoir = true;
+    }
+
     return;
 }
 

diff --git a/src_compressible/compressible_namespace.H b/src_compressible/compressible_namespace.H
@@ -7,6 +7,7 @@ namespace compressible {
     extern AMREX_GPU_MANAGED int do_2D;
     extern AMREX_GPU_MANAGED int all_correl;
     extern AMREX_GPU_MANAGED int nspec_surfcov;
+    extern AMREX_GPU_MANAGED bool do_reservoir;
 
 }
 
diff --git a/src_compressible_stag/Make.package b/src_compressible_stag/Make.package
@@ -4,6 +4,7 @@ CEXE_sources += timeStepStag.cpp
 CEXE_sources += conservedPrimitiveConversionsStag.cpp
 CEXE_sources += boundaryStag.cpp
 CEXE_sources += membraneStag.cpp
+CEXE_sources += reservoirStag.cpp
 CEXE_sources += writePlotFileStag.cpp
 CEXE_sources += Checkpoint.cpp
 CEXE_sources += TurbForcingComp.cpp
@@ -14,5 +15,6 @@ CEXE_headers += compressible_functions_stag.H
 CEXE_sources += compressible_functions.cpp
 CEXE_headers += compressible_functions.H
 CEXE_headers += compressible_namespace.H
+CEXE_headers += reservoirStag_K.H
 CEXE_headers += TurbForcingComp.H