Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add a distance() function and subtract off problem::center in position() #2988

Closed
wants to merge 13 commits into from
Closed

add a distance() function and subtract off problem::center in position() #2988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dbd972b
subtract off center in position and create separate distance function
zhichen3 Nov 7, 2024
ec20cb7
fix compile
zhichen3 Nov 7, 2024
ac9568b
name variable to geom when its amrex::Geometry to avoid confusion
zhichen3 Nov 7, 2024
44acb1e
merge correct_geom_variable_name and add corresponding geomdata when …
zhichen3 Nov 7, 2024
b9c7c1f
fix compiler warning and compilation error
zhichen3 Nov 7, 2024
bb9877c
fix typo
zhichen3 Nov 7, 2024
6f59152
more fix compilation error
zhichen3 Nov 7, 2024
6d10cc4
more fixes
zhichen3 Nov 7, 2024
78c1d02
fix
zhichen3 Nov 7, 2024
a697402
fix
zhichen3 Nov 7, 2024
00c76bd
fix compile warning
zhichen3 Nov 7, 2024
b38a018
name variable to geom when its amrex::Geometry to avoid confusion (#2…
zhichen3 Nov 8, 2024
c01d12d
Merge branch '2d_spherical_dist' of github.com:zhichen3/Castro into 2…
zhichen3 Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions Source/driver/Castro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3639,21 +3639,10 @@ Castro::apply_tagging_restrictions(TagBoxArray& tags, [[maybe_unused]] Real time
{
const Real* problo = geomdata.ProbLo();
const Real* probhi = geomdata.ProbHi();
const Real* dx = geomdata.CellSize();

Real loc[3] = {0.0};

loc[0] = problo[0] + (static_cast<Real>(i) + 0.5_rt) * dx[0];
#if AMREX_SPACEDIM >= 2
loc[1] = problo[1] + (static_cast<Real>(j) + 0.5_rt) * dx[1];
#endif
#if AMREX_SPACEDIM == 3
loc[2] = problo[2] + (static_cast<Real>(k) + 0.5_rt) * dx[2];
#endif

Real r = std::sqrt((loc[0] - problem::center[0]) * (loc[0] - problem::center[0]) +
(loc[1] - problem::center[1]) * (loc[1] - problem::center[1]) +
(loc[2] - problem::center[2]) * (loc[2] - problem::center[2]));
GpuArray<Real, 3> loc;
position(i, j, k, geomdata, loc);
Real r = distance(geomdata, loc);

Real max_dist_lo = 0.0;
Real max_dist_hi = 0.0;
Expand Down Expand Up @@ -4357,9 +4346,12 @@ Castro::define_new_center(const MultiFab& S, Real time)
// Now broadcast to everyone else.
ParallelDescriptor::Bcast(&problem::center[0], AMREX_SPACEDIM, owner);

// Make sure if R-Z that center stays exactly on axis
// Make sure if R-Z and SPHERICAL that center stays exactly on axis
if ( Geom().IsRZ() ) {
problem::center[0] = 0;
} else if ( Geom().IsSPHERICAL() ) {
problem::center[0] = 0;
problem::center[1] = 0;
}

}
Expand Down
25 changes: 23 additions & 2 deletions Source/driver/Castro_util.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ bool mom_flux_has_p (const int mom_dir, const int flux_dir, const int coord)
}



AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
void position(int i, int j, int k,
GeometryData const& geomdata, GpuArray<Real, 3>& loc,
Expand Down Expand Up @@ -147,7 +146,7 @@ void position(int i, int j, int k,
}

for (int dir = 0; dir < AMREX_SPACEDIM; ++dir) {
loc[dir] = offset[dir] + idx[dir] * dx[dir];
loc[dir] = offset[dir] + idx[dir] * dx[dir] - problem::center[dir];
}

for (int dir = AMREX_SPACEDIM; dir < 3; ++dir) {
Expand All @@ -156,6 +155,28 @@ void position(int i, int j, int k,

}


AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
Real distance(GeometryData const& geomdata, GpuArray<Real, 3>& loc)
{
// Returns the distance from the center provided with loc, the position.
// loc is the form of [x,y,z] in Cartesian, [r, z, phi] in cylindrical
// and [r, theta, phi] in spherical

const auto coord = geomdata.Coord();

if (coord == CoordSys::cartesian) {
return std::sqrt(loc[0]*loc[0] + loc[1]*loc[1] + loc[2]*loc[2]);
}

if (coord == CoordSys::RZ) {
return std::sqrt(loc[0]*loc[0] + loc[1]*loc[1]);
}

return loc[0];
}


namespace geometry_util
{

Expand Down
70 changes: 35 additions & 35 deletions Source/driver/Derive.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,125 +12,125 @@ extern "C"

void ca_derpres
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dereint1
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dereint2
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derlogden
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_deruplusc
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_deruminusc
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dersoundspeed
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dergamma1
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dermachnumber
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derentropy
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

#ifdef DIFFUSION
void ca_dercond
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derdiffcoeff
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derdiffterm
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);
#endif

void ca_derenuc
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derenuctimescale
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dervel
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dermagvel
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dermaggrav
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derradialvel
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dercircvel
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dermagmom
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derangmomx (const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int ncomp,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real time, const int* bcrec, int level);

void ca_derangmomy (const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int ncomp,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real time, const int* bcrec, int level);

void ca_derangmomz (const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int ncomp,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real time, const int* bcrec, int level);

void ca_derkineng (const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int ncomp,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real time, const int* bcrec, int level);

void ca_dernull
Expand All @@ -144,53 +144,53 @@ extern "C"

void ca_derspec
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derabar
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derye
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dermagvort
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derdivu
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derstate
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

#ifdef MHD
void ca_dermagcenx
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dermagceny
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_dermagcenz
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

void ca_derdivb
(const amrex::Box& bx, amrex::FArrayBox& derfab, int dcomp, int /*ncomp*/,
const amrex::FArrayBox& datfab, const amrex::Geometry& geomdata,
const amrex::FArrayBox& datfab, const amrex::Geometry& geom,
amrex::Real /*time*/, const int* /*bcrec*/, int /*level*/);

#endif
Expand Down
Loading
Loading