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

Jump to bottom

fix coord calculation in shock detection #3001

Merged
merged 1 commit into from
Nov 25, 2024
Merged

fix coord calculation in shock detection #3001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions Source/hydro/advection_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Castro::shock(const Box& bx,
// This is basically the method in Gronow et al. 2020

const auto dx = geom.CellSizeArray();
const auto problo = geom.ProbLoArray();
const int coord_type = geom.Coord();

Real dxinv = 1.0_rt / dx[0];
Expand Down Expand Up @@ -100,9 +101,9 @@ Castro::shock(const Box& bx,
} else if (coord_type == 1) {

// r-z
Real rc = (i + 0.5_rt) * dx[0];
Real rm = (i - 1 + 0.5_rt) * dx[0];
Real rp = (i + 1 + 0.5_rt) * dx[0];
Real rc = problo[0] + (static_cast<Real>(i) + 0.5_rt) * dx[0];
Real rm = problo[0] + (static_cast<Real>(i) - 0.5_rt) * dx[0];
Real rp = problo[0] + (static_cast<Real>(i) + 1.5_rt) * dx[0];

#if (AMREX_SPACEDIM == 1)
div_u += 0.5_rt * (rp * q_arr(i+1,j,k,QU) - rm * q_arr(i-1,j,k,QU)) / (rc * dx[0]);
Expand All @@ -116,20 +117,20 @@ Castro::shock(const Box& bx,
} else if (coord_type == 2) {

// 1-d spherical
Real rc = (i + 0.5_rt) * dx[0];
Real rm = (i - 1 + 0.5_rt) * dx[0];
Real rp = (i + 1 + 0.5_rt) * dx[0];
Real rc = problo[0] + (static_cast<Real>(i) + 0.5_rt) * dx[0];
Real rm = problo[0] + (static_cast<Real>(i) - 0.5_rt) * dx[0];
Real rp = problo[0] + (static_cast<Real>(i) + 1.5_rt) * dx[0];

div_u += 0.5_rt * (rp * rp * q_arr(i+1,j,k,QU) - rm * rm * q_arr(i-1,j,k,QU)) / (rc * rc * dx[0]);
#if AMREX_SPACEDIM == 2

Real thetac = (j + 0.5_rt) * dx[1];
Real thetam = (j - 1 + 0.5_rt) * dx[1];
Real thetap = (j + 1 + 0.5_rt) * dx[1];
Real thetac = problo[1] + (static_cast<Real>(j) + 0.5_rt) * dx[1];
Real thetam = problo[1] + (static_cast<Real>(j) - 0.5_rt) * dx[1];
Real thetap = problo[1] + (static_cast<Real>(j) + 1.5_rt) * dx[1];

div_u += 0.5_rt * (std::sin(thetap) * q_arr(i,j+1,k,QV) -
std::sin(thetam) * q_arr(i,j-1,k,QV)) /
(rc * sin(thetac) * dx[1]);
(rc * std::sin(thetac) * dx[1]);
#endif

#ifndef AMREX_USE_GPU
Expand Down