Skip to content

Commit

Permalink
clean up to remove specificity to CAMR (#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
@asalmgren
asalmgren authored Sep 8, 2023
1 parent 9fcbd48 commit 90857ca
Show file tree
Hide file tree
Showing 32 changed files with 487 additions and 463 deletions.
13 changes: 0 additions & 13 deletions Source/EB/CMakeLists.txt
View file

This file was deleted.

28 changes: 16 additions & 12 deletions Source/Hydro/CAMR_construct_hydro_source.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "CAMR.H"
#include "CAMR_hydro.H"
#include "CAMR_ctoprim.H"
#include "Hydro.H"
#include "Hydro_ctoprim.H"
#include "CAMR_Constants.H"

using namespace amrex;

Expand Down Expand Up @@ -36,6 +37,8 @@ CAMR::construct_hydro_source (const MultiFab& S,

const auto& dx = geom.CellSizeArray();

const PassMap* lpmap = d_pass_map;

Real dx1 = dx[0];
for (int dir = 1; dir < AMREX_SPACEDIM; ++dir) {
dx1 *= dx[dir];
Expand Down Expand Up @@ -98,16 +101,15 @@ CAMR::construct_hydro_source (const MultiFab& S,
auto const& qauxar = qaux.array();
auto const& srcqarr = src_q.array();

BL_PROFILE_VAR("CAMR::ctoprim()", ctop);
const PassMap* lpmap = d_pass_map;
BL_PROFILE_VAR("ctoprim()", ctop);
const Real small_num = CAMRConstants::small_num;
const Real dual_energy_eta = CAMR::dual_energy_eta1;
ParallelFor(
qbx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept {
#ifdef AMREX_USE_EB
if (!flag_arr(i,j,k).isCovered()) {
#endif
CAMR_ctoprim(i, j, k, sarr, qarr, qauxar, *lpmap, small_num, dual_energy_eta);
hydro_ctoprim(i, j, k, sarr, qarr, qauxar, *lpmap, small_num, dual_energy_eta);
#ifdef AMREX_USE_EB
} else {
for (int n=0; n<QVAR; n++) qarr(i,j,k,n) = 0.;
Expand All @@ -126,7 +128,7 @@ CAMR::construct_hydro_source (const MultiFab& S,
const auto& src_in = sources_for_hydro.array(mfi);
ParallelFor(
qbx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept {
CAMR_srctoprim(i, j, k, qarr, qauxar, src_in, srcqarr, *lpmap);
hydro_srctoprim(i, j, k, qarr, qauxar, src_in, srcqarr, *lpmap);
});
}

Expand Down Expand Up @@ -180,16 +182,16 @@ CAMR::construct_hydro_source (const MultiFab& S,
// The dt we pass in here is used if (do_mol == 0), i.e.
// in the Godunov prediction, but also if we do StateRedistribution
//
CAMR_umdrv_eb(do_mol, bx, bxg_i, mfi, geom, &ebfact,
hydro_umdrv_eb(do_mol, bx, bxg_i, mfi, geom, &ebfact,
phys_bc.lo(), phys_bc.hi(),
sarr, hyd_src, qarr, qauxar, srcqarr,
vfrac_arr, flag_arr, dx, dxInv, flx_arr, a,
as_crse, p_drho_as_crse->array(), p_rrflag_as_crse->array(),
as_fine, dm_as_fine.array(), level_mask.const_array(mfi),
dt, ppm_type, plm_iorder, use_pslope,
use_flattening, transverse_reset_density,
small, small_dens, small_pres, difmag,
bcs_d.data(), redistribution_type, eb_weights_type);
small, small_dens, small_pres, CAMRConstants::smallu, difmag,
bcs_d.data(), redistribution_type, lpmap, eb_weights_type);

//
// Here fac_for_reflux = 1.0 if doing Godunov, 0.5 if doing MOL
Expand All @@ -199,13 +201,15 @@ CAMR::construct_hydro_source (const MultiFab& S,
getFluxReg(level + 1).CrseAdd(mfi,
{{AMREX_D_DECL(&(flux[0]), &(flux[1]), &(flux[2]))}},
dxDp, fac_for_reflux*dt, (*volfrac)[mfi],
// dxDp, 0.0*dt, (*volfrac)[mfi],
{AMREX_D_DECL(&(*areafrac[0])[mfi], &(*areafrac[1])[mfi], &(*areafrac[2])[mfi])},
amrex::RunOn::Device);
}
if (level > 0) {
getFluxReg(level).FineAdd(mfi,
{{AMREX_D_DECL(&(flux[0]), &(flux[1]), &(flux[2]))}},
dxDp, fac_for_reflux*dt, (*volfrac)[mfi],
// dxDp, 0.0*dt, (*volfrac)[mfi],
{AMREX_D_DECL(&(*areafrac[0])[mfi], &(*areafrac[1])[mfi], &(*areafrac[2])[mfi])},
dm_as_fine, amrex::RunOn::Device);
} // level > 0
Expand All @@ -218,12 +222,12 @@ CAMR::construct_hydro_source (const MultiFab& S,
// Note that the dt here is only used if (do_mol == 0), i.e.
// in the Godunov prediction
//
CAMR_umdrv(do_mol, bx, geom, phys_bc.lo(), phys_bc.hi(),
hydro_umdrv(do_mol, bx, geom, phys_bc.lo(), phys_bc.hi(),
sarr, hyd_src, qarr, qauxar, srcqarr, dx,
dt, ppm_type, plm_iorder, use_pslope,
use_flattening, transverse_reset_density,
small, small_dens, small_pres, difmag,
flx_arr, a, volume.array(mfi));
small, small_dens, small_pres, CAMRConstants::smallu, difmag,
flx_arr, a, volume.array(mfi), lpmap);

//
// Here fac_for_reflux = 1.0 if doing Godunov, 0.5 if doing MOL
Expand Down
132 changes: 0 additions & 132 deletions Source/Hydro/CAMR_hydro.H
View file

This file was deleted.

8 changes: 8 additions & 0 deletions Source/Hydro/Godunov/Godunov.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@ void Godunov_umeth (
const amrex::Real small,
const amrex::Real small_dens,
const amrex::Real small_pres,
const amrex::Real smallu,
const int ppm_type,
const int use_pslope,
const int use_flattening,
const int iorder,
const PassMap* lpmap,
const int transverse_reset_density);

#ifdef AMREX_USE_EB
Expand All @@ -66,10 +68,12 @@ void Godunov_umeth_eb (
const amrex::Real small,
const amrex::Real small_dens,
const amrex::Real small_pres,
const amrex::Real smallu,
const int ppm_type,
const int use_pslope,
const int use_flattening,
const int iorder,
const PassMap* lpmap,
const int transverse_reset_density);
#endif

Expand All @@ -95,10 +99,12 @@ void Godunov_umeth (
const amrex::Real small,
const amrex::Real small_dens,
const amrex::Real small_pres,
const amrex::Real smallu,
const int ppm_type,
const int use_pslope,
const int use_flattening,
const int iorder,
const PassMap* lpmap,
const int transverse_reset_density);

#ifdef AMREX_USE_EB
Expand All @@ -121,10 +127,12 @@ void Godunov_umeth_eb (
const amrex::Real small,
const amrex::Real small_dens,
const amrex::Real small_pres,
const amrex::Real smallu,
const int ppm_type,
const int use_pslope,
const int use_flattening,
const int iorder,
const PassMap* lpmap,
const int transverse_reset_density);
#endif
#endif
Expand Down
Loading

0 comments on commit 90857ca

Please sign in to comment.