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.

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

Update submodules, API changes, tracer swarm packs, Monte Carlo packs, formatting CI #225

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
00205d1
cleanup pgens, fix tracer init in advection problem and move to postinit
AstroBarker Oct 17, 2024
e33d1c7
boundary condition work
AstroBarker Oct 17, 2024
59b10ab
refactoring, misc, lots of changes, bad commit practice...
AstroBarker Oct 17, 2024
498bc46
update parthenon
AstroBarker Oct 17, 2024
f28bcdd
fix: swarm positon names
AstroBarker Nov 15, 2024
8c30be3
BC
AstroBarker Nov 15, 2024
f687fa2
bump parthenon
AstroBarker Nov 15, 2024
ffc7a5b
dump submodules
AstroBarker Jan 6, 2025
4bc1327
revert something
AstroBarker Jan 6, 2025
b374060
updates to mean opacity API
AstroBarker Jan 6, 2025
0f679cb
fmt
AstroBarker Jan 6, 2025
55e5ef3
fast logs disabled by default
AstroBarker Jan 6, 2025
7fee7f8
Merge branch 'main' into blb/update_parthenon
AstroBarker Jan 6, 2025
94955cb
ubuntu clang format broke. attempting to switch to pip provided.. mor…
AstroBarker Jan 6, 2025
ac9945b
broke yaml
AstroBarker Jan 6, 2025
6800e14
hate actions
AstroBarker Jan 6, 2025
27d1be3
clang format is the most version unstable software
AstroBarker Jan 6, 2025
6423e9b
mean opac param type
AstroBarker Jan 6, 2025
8c338cd
cleanup
AstroBarker Jan 7, 2025
ec1499e
pack fix?
AstroBarker Jan 7, 2025
64aae21
fighting types
AstroBarker Jan 7, 2025
2bc3a91
weird changed behavior in regression testing
AstroBarker Jan 7, 2025
e76eccc
fmt
AstroBarker Jan 7, 2025
bf398c4
feat: tracers work on MeshData, use SWARM_VARIABLES for tracer vars
AstroBarker Jan 9, 2025
13a84dd
WIP + compile time number of tracies for MOCMC
AstroBarker Jan 17, 2025
a2990dd
WIP MOCMC refactor to use swarm packs and MeshData and work with mode…
AstroBarker Jan 17, 2025
41c06e1
remove debugging prints
AstroBarker Jan 17, 2025
3691f4b
add check that number of species is consistent with compile time
AstroBarker Jan 17, 2025
e03dfeb
thread compile time neutrino species into tests
AstroBarker Jan 21, 2025
2d3ce81
update golds
AstroBarker Jan 28, 2025
1404cb8
thread in correct radiation K Source with FMKS
AstroBarker Jan 28, 2025
d089b52
cleanup
AstroBarker Jan 28, 2025
6bd24ce
start moving moments to MeshData & packs
AstroBarker Jan 28, 2025
1981869
monte carlo variables & packs refactor
AstroBarker Jan 28, 2025
3f799b2
BCs and input decks
AstroBarker Jan 29, 2025
862de2d
bump external
AstroBarker Jan 29, 2025
dc53266
thread compile time neutrino options into actions
AstroBarker Jan 29, 2025
482c992
get lienar modes test and pin back in order
AstroBarker Jan 29, 2025
dbb7c70
weird golds..
AstroBarker Jan 30, 2025
bf1a96b
workflow error?
AstroBarker Jan 30, 2025
21ed0ed
make cmake_extra_args a list instead of string
AstroBarker Jan 31, 2025
f9e65c3
typo
AstroBarker Jan 31, 2025
97add41
forgotten comments
AstroBarker Jan 31, 2025
d421164
invert and correct constexpr logic for radiation/geodesics:GetKSource
AstroBarker Jan 31, 2025
f04c744
cleanup of boundar conditions registration logic
AstroBarker Jan 31, 2025
b3d4ebf
make temporary MeshDat level fixup Tasks that loop over blocks
AstroBarker Jan 31, 2025
d3e3412
MeshData level swarms comms, MeshData level MomentFluidSource, refact…
AstroBarker Feb 5, 2025
c187136
update golds
AstroBarker Feb 5, 2025
e494815
fmt
AstroBarker Feb 5, 2025
2e6a8ee
fmt with correct version...
AstroBarker Feb 5, 2025
1079876
upgold lin modes, lower tolerance, use O1 for Release
AstroBarker Feb 10, 2025
88ce8fa
cleanup
AstroBarker Feb 10, 2025
b77b158
simplify pattern to loop over blocks on MeshData and call MeshBlockDa…
AstroBarker Feb 10, 2025
e61bdf0
forgot to remove unnecessary bc flags
AstroBarker Feb 10, 2025
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
7 changes: 7 additions & 0 deletions src/fixup/fixup.cpp
AstroBarker marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,13 @@ TaskStatus ApplyFloors(T *rc) {
}

template TaskStatus ApplyFloors<MeshBlockData<Real>>(MeshBlockData<Real> *rc);
template <>
TaskStatus ApplyFloors<MeshData<Real>>(MeshData<Real> *rc) {
AstroBarker marked this conversation as resolved.
Show resolved Hide resolved
for (int b = 0; b < rc->NumBlocks(); b++) {
ApplyFloors(rc->GetBlockData(b).get());
AstroBarker marked this conversation as resolved.
Show resolved Hide resolved
}
return TaskStatus::complete;
}

TaskStatus FixFluxes(MeshBlockData<Real> *rc) {
using parthenon::BoundaryFace;
Expand Down
8 changes: 8 additions & 0 deletions src/fixup/fixup_c2p.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -383,5 +383,13 @@ TaskStatus ConservedToPrimitiveFixup(T *rc) {

template TaskStatus
ConservedToPrimitiveFixup<MeshBlockData<Real>>(MeshBlockData<Real> *rc);
// template TaskStatus
template <>
TaskStatus ConservedToPrimitiveFixup<MeshData<Real>>(MeshData<Real> *rc) {
for (int b = 0; b < rc->NumBlocks(); b++) {
ConservedToPrimitiveFixup(rc->GetBlockData(b).get());
}
return TaskStatus::complete;
}

} // namespace fixup
7 changes: 7 additions & 0 deletions src/fixup/fixup_radc2p.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,5 +251,12 @@ TaskStatus RadConservedToPrimitiveFixup(T *rc) {

template TaskStatus
RadConservedToPrimitiveFixup<MeshBlockData<Real>>(MeshBlockData<Real> *rc);
template <>
TaskStatus RadConservedToPrimitiveFixup<MeshData<Real>>(MeshData<Real> *rc) {
for (int b = 0; b < rc->NumBlocks(); b++) {
RadConservedToPrimitiveFixup(rc->GetBlockData(b).get());
}
return TaskStatus::complete;
}

} // namespace fixup
37 changes: 12 additions & 25 deletions src/phoebus_driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -560,40 +560,27 @@ TaskCollection PhoebusDriver::RungeKuttaStage(const int stage) {
}

// Fix up flux failures
// TODO (BLB) once the fixups can work with MeshData,
// -- then stitch this section back together
TaskRegion &async_region_2 = 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_2[ib];

// first make other useful containers
// auto &base = pmb->meshblock_data.Get();
TaskRegion &sync_region_fixup = tc.AddRegion(num_partitions);
TaskID gas_rad_int(0);
for (int ib = 0; ib < num_partitions; ib++) {
auto &tl = sync_region_fixup[ib];

// pull out the container we'll use to get fluxes and/or compute RHSs
auto &sc1 = pmb->meshblock_data.Get(stage_name[stage]);
using MDT = std::remove_pointer<decltype(sc1.get())>::type;
auto &sc1 = pmesh->mesh_data.GetOrAdd(stage_name[stage], ib);

// fill in derived fields
auto fill_derived =
tl.AddTask(none, parthenon::Update::FillDerived<MeshBlockData<Real>>, sc1.get());
tl.AddTask(none, parthenon::Update::FillDerived<MeshData<Real>>, sc1.get());

auto fixup = tl.AddTask(
fill_derived, fixup::ConservedToPrimitiveFixup<MeshBlockData<Real>>, sc1.get());

auto radfixup = tl.AddTask(
fixup, fixup::RadConservedToPrimitiveFixup<MeshBlockData<Real>>, sc1.get());
auto fixup = tl.AddTask(fill_derived,
fixup::ConservedToPrimitiveFixup<MeshData<Real>>, sc1.get());

auto floors =
tl.AddTask(radfixup, fixup::ApplyFloors<MeshBlockData<Real>>, sc1.get());
}
auto radfixup =
tl.AddTask(fixup, fixup::RadConservedToPrimitiveFixup<MeshData<Real>>, sc1.get());

TaskRegion &sync_region_fixup = tc.AddRegion(num_partitions);
TaskID gas_rad_int(0);
if (rad_mocmc_active) {
for (int ib = 0; ib < num_partitions; ib++) {
auto &tl = sync_region_fixup[ib];
auto floors = tl.AddTask(radfixup, fixup::ApplyFloors<MeshData<Real>>, sc1.get());

if (rad_mocmc_active) {
auto &base = pmesh->mesh_data.GetOrAdd("base", ib);
auto &sc1 = pmesh->mesh_data.GetOrAdd(stage_name[stage], ib);
using MDT = std::remove_pointer<decltype(base.get())>::type;
Expand Down
Loading