Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/engines/grpic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,12 @@ namespace ntt {
if constexpr (M::Dim == Dim::_2D) {
if (domain.mesh.flds_bc_in({ 0, +1 }) == FldsBC::AXIS) {
range = CreateRangePolicy<Dim::_2D>(
{ domain.mesh.i_min(in::x1), domain.mesh.i_min(in::x2) },
{ domain.mesh.i_min(in::x1) - 1, domain.mesh.i_min(in::x2) },
{ domain.mesh.i_max(in::x1), domain.mesh.i_max(in::x2) + 1 });
} else {
range = CreateRangePolicy<Dim::_2D>(
{ domain.mesh.i_min(in::x1) - 1, domain.mesh.i_min(in::x2) },
{ domain.mesh.i_max(in::x1), domain.mesh.i_max(in::x2) });
}
} else if constexpr (M::Dim == Dim::_3D) {
raise::Error("Invalid dimension", HERE);
Expand Down
27 changes: 7 additions & 20 deletions src/metrics/qkerr_schild.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ namespace metric {
const real_t chi_min, eta_min, phi_min;
const real_t dchi, deta, dphi;
const real_t dchi_inv, deta_inv, dphi_inv;
const bool small_angle;

Inline auto Delta(const real_t& r) const -> real_t {
return SQR(r) - TWO * r + SQR(a);
Expand Down Expand Up @@ -90,8 +89,7 @@ namespace metric {
, dphi { (x3_max - phi_min) / nx3 }
, dchi_inv { ONE / dchi }
, deta_inv { ONE / deta }
, dphi_inv { ONE / dphi }
, small_angle { eta2theta(HALF * deta) < constant::SMALL_ANGLE } {
, dphi_inv { ONE / dphi } {
set_dxMin(find_dxMin());
}

Expand Down Expand Up @@ -487,23 +485,12 @@ namespace metric {
*/
Inline auto polar_area(const real_t& x1) const -> real_t {
if constexpr (D != Dim::_1D) {
if (small_angle) {
const real_t dtheta = eta2theta(HALF * deta);
return dchi * math::exp(x1 * dchi + chi_min) *
(SQR(r0 + math::exp(x1 * dchi + chi_min)) + SQR(a)) *
math::sqrt(
ONE + TWO * (r0 + math::exp(x1 * dchi + chi_min)) /
(SQR(r0 + math::exp(x1 * dchi + chi_min)) + SQR(a))) *
(static_cast<real_t>(48) - SQR(dtheta)) * SQR(dtheta) /
static_cast<real_t>(384);
} else {
return dchi * math::exp(x1 * dchi + chi_min) *
(SQR(r0 + math::exp(x1 * dchi + chi_min)) + SQR(a)) *
math::sqrt(
ONE + TWO * (r0 + math::exp(x1 * dchi + chi_min)) /
(SQR(r0 + math::exp(x1 * dchi + chi_min)) + SQR(a))) *
(ONE - math::cos(eta2theta(HALF * deta)));
}
return dchi * math::exp(x1 * dchi + chi_min) *
(SQR(r0 + math::exp(x1 * dchi + chi_min)) + SQR(a)) *
math::sqrt(
ONE + TWO * (r0 + math::exp(x1 * dchi + chi_min)) /
(SQR(r0 + math::exp(x1 * dchi + chi_min)) + SQR(a))) *
(ONE - math::cos(eta2theta(HALF * deta)));
}
}

Expand Down