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

refactoring LightBulb_functions #196

Merged
merged 26 commits into from
Jan 17, 2024
Merged

refactoring LightBulb_functions #196

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1c3a0f8
refactoring LightBulbCalcTau
mari2895 Jan 4, 2024
882565a
formatting
mari2895 Jan 4, 2024
8290819
creating new sync region for lightbulb functions
mari2895 Jan 4, 2024
6389fa5
refactoring CheckDoGian
mari2895 Jan 4, 2024
73a7883
fixed a typos
mari2895 Jan 4, 2024
7034107
typo fixed
mari2895 Jan 4, 2024
6ebdc38
typo fixed
mari2895 Jan 4, 2024
f837875
typo fixed
mari2895 Jan 4, 2024
5418296
typo fixed
mari2895 Jan 4, 2024
18790b5
typo fixed
mari2895 Jan 4, 2024
bbf0cbc
typo fixed
mari2895 Jan 4, 2024
01ca55f
stage_name[stage-1] replaced with base
mari2895 Jan 5, 2024
5c563ab
changing arguments of light bulb functions in radiation.hpp
mari2895 Jan 5, 2024
5ec5d55
fixed incorrectly deleted async region
mari2895 Jan 5, 2024
f57529a
refactored ApplyRadiationFourForce and CoolingFunctionCalculateFourForce
mari2895 Jan 8, 2024
1ea215b
more refactoring
mari2895 Jan 8, 2024
7519415
corrected indices
mari2895 Jan 11, 2024
60c0a6e
more typos
mari2895 Jan 11, 2024
97f35a5
index game agan
mari2895 Jan 11, 2024
9e25eb4
fixed loops in mu
mari2895 Jan 12, 2024
2520b98
GetFourVelocity changed to get Mesh as well as MeshBlock
mari2895 Jan 12, 2024
c480616
GetLorentzFactor modified to take both Mesh and Meshblock
mari2895 Jan 12, 2024
d4e01e3
typo
mari2895 Jan 12, 2024
ed2f05e
Update phoebus_driver.cpp
mari2895 Jan 17, 2024
a628465
Update src/radiation/radiation.cpp
mari2895 Jan 17, 2024
867a302
formating
mari2895 Jan 17, 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
27 changes: 14 additions & 13 deletions src/phoebus_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,11 +698,13 @@ TaskListStatus PhoebusDriver::RadiationPostStep() {
if (do_lightbulb) {
pdo_gain_reducer = rad->MutableParam<parthenon::AllReduce<bool>>("do_gain_reducer");
}
TaskRegion &async_region = tc.AddRegion(num_independent_task_lists);
for (int ib = 0; ib < num_independent_task_lists; ib++) {
auto pmb = blocks[ib].get();
auto &tl = async_region[ib];
auto &sc0 = pmb->meshblock_data.Get(stage_name[integrator->nstages]);
// creating a new sync region for light bulb functions
const int num_partitions = pmesh->DefaultNumPartitions();
TaskRegion &sync_region_lb = tc.AddRegion(num_partitions);
curiousmiah marked this conversation as resolved.
Show resolved Hide resolved
for (int ib = 0; ib < num_partitions; ++ib) {
auto &base = pmesh->mesh_data.GetOrAdd("base", ib);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably don't need to pull out base explicitly. Just use sc0.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed this line

auto &sc0 = pmesh->mesh_data.GetOrAdd("base", ib);
auto &tl = sync_region_lb[ib];
auto finish_gain_reducer = none;
if (do_lightbulb) {
auto calc_tau = tl.AddTask(none, radiation::LightBulbCalcTau, sc0.get());
Expand All @@ -717,9 +719,8 @@ TaskListStatus PhoebusDriver::RadiationPostStep() {
tl.AddTask(start_gain_reducer, &parthenon::AllReduce<bool>::CheckReduce,
pdo_gain_reducer);
int reg_dep_id = 0;
async_region.AddRegionalDependencies(reg_dep_id++, ib, finish_gain_reducer);
sync_region_lb.AddRegionalDependencies(reg_dep_id++, ib, finish_gain_reducer);
}

auto calculate_four_force =
tl.AddTask(finish_gain_reducer, radiation::CoolingFunctionCalculateFourForce,
sc0.get(), dt);
Expand Down Expand Up @@ -976,12 +977,12 @@ TaskListStatus PhoebusDriver::MonteCarloStep() {

// Finalization calls
{
TaskCollection tc;
TaskRegion &async_region1 = tc.AddRegion(num_task_lists_executed_independently);
for (int ib = 0; ib < num_task_lists_executed_independently; ib++) {
auto pmb = blocks[ib].get();
auto &tl = async_region1[ib];
auto &sc0 = pmb->meshblock_data.Get(stage_name[integrator->nstages]);
const int num_partitions = pmesh->DefaultNumPartitions();
TaskRegion &sync_region = tc.AddRegion(num_partitions);
for (int ib = 0; ib < num_partitions; ++ib) {
auto &base = pmesh->mesh_data.GetOrAdd("base", ib);
auto &sc0 = pmesh->mesh_data.GetOrAdd("base", ib);
auto &tl = sync_region[ib];
auto apply_four_force =
tl.AddTask(none, radiation::ApplyRadiationFourForce, sc0.get(), dt);
}
Expand Down
38 changes: 27 additions & 11 deletions src/phoebus_utils/relativity_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,22 @@ GetLorentzFactor(const Real vcon[Geometry::NDSPACE],
*
* RETURN - Lorentz factor in normal observer frame
*/
template <typename CoordinateSystem_t>
KOKKOS_INLINE_FUNCTION Real GetLorentzFactor(const Real vcon[Geometry::NDSPACE],
const Geometry::CoordSysMeshBlock &system,
CellLocation loc, const int k, const int j,
const int i) {
const CoordinateSystem_t &system,
CellLocation loc, const int b, const int k,
const int j, const int i) {
Real gamma[Geometry::NDSPACE][Geometry::NDSPACE];
system.Metric(loc, k, j, i, gamma);
system.Metric(loc, b, k, j, i, gamma);
return GetLorentzFactor(vcon, gamma);
}
template <typename CoordinateSystem_t>
KOKKOS_INLINE_FUNCTION Real GetLorentzFactor(const Real vcon[Geometry::NDSPACE],
const CoordinateSystem_t &system,
CellLocation loc, const int k, const int j,
const int i) {
return GetLorentzFactor(vcon, system, loc, 0, k, j, i);
}

/*
* Calculate the coordinate frame four-velocity from the normal observer three-velocity
Expand All @@ -90,20 +98,28 @@ KOKKOS_INLINE_FUNCTION Real GetLorentzFactor(const Real vcon[Geometry::NDSPACE],
* PARAM[IN] - i - X1 index of meshblock cell
* PARAM[OUT] - u - Coordinate frame contravariant four-velocity
*/
KOKKOS_INLINE_FUNCTION void GetFourVelocity(const Real v[3],
const Geometry::CoordSysMeshBlock &system,
CellLocation loc, const int k, const int j,
const int i, Real u[Geometry::NDFULL]) {
template <typename CoordinateSystem_t>
KOKKOS_INLINE_FUNCTION void
GetFourVelocity(const Real v[3], const CoordinateSystem_t &system, CellLocation loc,
const int b, const int k, const int j, const int i,
Real u[Geometry::NDFULL]) {
Real beta[Geometry::NDSPACE];
Real W = GetLorentzFactor(v, system, loc, k, j, i);
Real alpha = system.Lapse(loc, k, j, i);
system.ContravariantShift(loc, k, j, i, beta);
Real W = GetLorentzFactor(v, system, loc, b, k, j, i);
Real alpha = system.Lapse(loc, b, k, j, i);
system.ContravariantShift(loc, b, k, j, i, beta);
u[0] = robust::ratio(W, std::abs(alpha));
for (int l = 1; l < Geometry::NDFULL; ++l) {
u[l] = v[l - 1] - u[0] * beta[l - 1];
}
}

template <typename CoordinateSystem_t>
KOKKOS_INLINE_FUNCTION void
GetFourVelocity(const Real v[3], const CoordinateSystem_t &system, CellLocation loc,
const int k, const int j, const int i, Real u[Geometry::NDFULL]) {
GetFourVelocity(v, system, loc, 0, k, j, i, u);
}

/*
* Compute square of magnetic field from primitive velocity and magnetic field
*
Expand Down
Loading
Loading