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

WIP: Pass tests #38

Merged
merged 48 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
c234337
Get rid of a Kokkos warning about All_t
Sep 28, 2023
f723196
Compile fixes for using custom linker & for personal machines
Sep 28, 2023
b99b160
Parthenon bump, callbacks
Sep 29, 2023
c1c940e
Remove unused reducers, add comments
Sep 29, 2023
17b5b81
Organize prob/, make problems request B fields
Sep 29, 2023
96c8792
Merge branch 'kharma-next' into fix/pass-tests
Sep 29, 2023
ca3b994
Reorganize parameter files
Oct 3, 2023
0e416cd
Better boundaries, options
Oct 3, 2023
efcf77e
Problem init & tests (round 1)
Oct 3, 2023
1303b9b
Fix propagating B3 in 2D with face CT, pass mhdmodes
Oct 3, 2023
c817f19
Pass bondi problem
Oct 3, 2023
c5d183f
Pass aniso_conduction, emhdmodes
bprather Oct 4, 2023
4229a12
Add back an old experimental option to cleanup
bprather Oct 4, 2023
c4588cf
Test updates & restarting
Oct 5, 2023
802bdb2
Fix B_Cleanup
Oct 5, 2023
26cf7f1
Fix some EMHD stuff
Oct 5, 2023
61de2e2
CI: try to fix CPU build
Oct 6, 2023
0a6585f
CI+tests stuff
Oct 6, 2023
c42db13
CI: fix pyharm via mamba
Oct 6, 2023
184f65b
CI: pyharm install fixes
Oct 6, 2023
15b4026
CI again
Oct 6, 2023
dd1a566
Rename AddMPIBoundarySync to AddBoundarySync
Oct 7, 2023
8ff9383
Get viscosity-only EMHD working again
Oct 7, 2023
9b06281
Bump Kokkos to fix CUDA bug
Oct 7, 2023
ea701f9
Bunch of test script fixes
Oct 7, 2023
de75557
Add some tests that are ready, fix artifacts
Oct 7, 2023
ff49d37
CI fix
Oct 7, 2023
a8b177d
Pass EMHDModes with Face CT. Clean up some other scripts.
Oct 7, 2023
aea831f
Tone down CI core usage a touch, use abs paths
Oct 7, 2023
a3f43eb
Fix the boundaries of EMHD problems
Oct 9, 2023
2a99504
Fix compile w/new Flux_CT B flags
Oct 9, 2023
0e363b2
CI: tar fixes
Oct 9, 2023
5619ebb
CI: more mamba installation
Oct 9, 2023
b92750d
CI: sometimes installation scripts are that way for a reason
Oct 9, 2023
b62fd11
Fix Noh test by parsing e- gamma correctly in checker
Oct 9, 2023
e4747eb
CI: sigh
Oct 9, 2023
d7d61e7
Get rid of sync_prims
Oct 10, 2023
f1e1cb9
Repair some tests for always syncing cons
Oct 10, 2023
868b033
Test fixes, but not the important ones
Oct 10, 2023
76d346e
Make ordering of GRMHD/EMHD ops consistent, drive-by fixes
Oct 10, 2023
20c2a11
Revert "Get rid of sync_prims"
Oct 10, 2023
0541185
Sync primitive variables if they're fundamental
Oct 10, 2023
4fc472f
Fix the build
Oct 11, 2023
218a875
Fix floors so we don't need to load Inverter pkg
Oct 11, 2023
ac46a45
Viscous Bondi test touchups, prototype SMR test
Oct 11, 2023
f774756
Add & repair conducting atmo so it fails properly
Oct 12, 2023
5eef03a
Converge on last tests
Oct 12, 2023
9750787
Fix viscous Bondi test script for hypothetical case without higher or…
Oct 12, 2023
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ logs/
*.rhdf
*.xdmf
*.hst
# Archival files
# Archival/test files
kharma_parsed_*.par
log_*.txt
bondi_analytic_*.txt
atmosphere_soln_*.txt

# Editor documents
.project
Expand Down
6 changes: 3 additions & 3 deletions external/kokkos-kernels/KokkosBatched_Util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -772,8 +772,8 @@ KOKKOS_INLINE_FUNCTION auto subview_wrapper(ViewType v, IdxType1 i1,
}
template <class ViewType, class IdxType1>
KOKKOS_INLINE_FUNCTION auto subview_wrapper(ViewType v, IdxType1 i1,
Kokkos::Impl::ALL_t i2,
Kokkos::Impl::ALL_t i3,
Kokkos::ALL_t i2,
Kokkos::ALL_t i3,
const BatchLayout::Left &layout_tag,
const Trans::Transpose) {
auto sv_nt = subview_wrapper(v, i1, i3, i2, layout_tag);
Expand Down Expand Up @@ -805,7 +805,7 @@ KOKKOS_INLINE_FUNCTION auto subview_wrapper(
}
template <class ViewType, class IdxType1>
KOKKOS_INLINE_FUNCTION auto subview_wrapper(
ViewType v, IdxType1 i1, Kokkos::Impl::ALL_t i2, Kokkos::Impl::ALL_t i3,
ViewType v, IdxType1 i1, Kokkos::ALL_t i2, Kokkos::ALL_t i3,
const BatchLayout::Right &layout_tag, const Trans::Transpose &) {
auto sv_nt = subview_wrapper(v, i1, i3, i2, layout_tag);

Expand Down
2 changes: 1 addition & 1 deletion external/parthenon
Submodule parthenon updated 2 files
+1 −0 .gitmodules
+1 −1 external/Kokkos
13 changes: 13 additions & 0 deletions external/patches/kokkos-rx7800.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/cmake/kokkos_arch.cmake b/cmake/kokkos_arch.cmake
index 244881187..869b0962b 100644
--- a/cmake/kokkos_arch.cmake
+++ b/cmake/kokkos_arch.cmake
@@ -105,7 +105,7 @@ LIST(APPEND SUPPORTED_AMD_ARCHS VEGA906 AMD_GFX906)
LIST(APPEND CORRESPONDING_AMD_FLAGS gfx906 gfx906)
LIST(APPEND SUPPORTED_AMD_GPUS RX7900XTX RX7900XTX V620/W6800 V620/W6800)
LIST(APPEND SUPPORTED_AMD_ARCHS NAVI1100 AMD_GFX1100 NAVI1030 AMD_GFX1030)
-LIST(APPEND CORRESPONDING_AMD_FLAGS gfx1100 gfx1100 gfx1030 gfx1030)
+LIST(APPEND CORRESPONDING_AMD_FLAGS gfx1100 gfx1101 gfx1030 gfx1030)

#FIXME CAN BE REPLACED WITH LIST_ZIP IN CMAKE 3.17
FOREACH(ARCH IN LISTS SUPPORTED_AMD_ARCHS)
2 changes: 2 additions & 0 deletions kharma/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} EXE_NAME_SRC)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/prob EXE_NAME_SRC)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/prob/elec EXE_NAME_SRC)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/prob/emhd EXE_NAME_SRC)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/prob/utils EXE_NAME_SRC)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/coordinates EXE_NAME_SRC)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/flux EXE_NAME_SRC)

Expand All @@ -40,6 +41,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/prob)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/prob/elec)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/prob/emhd)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/prob/utils)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/coordinates)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/flux)

Expand Down
4 changes: 3 additions & 1 deletion kharma/b_cd/b_cd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ namespace B_CD

std::shared_ptr<KHARMAPackage> Initialize(ParameterInput *pin, std::shared_ptr<Packages_t>& packages)
{
throw std::runtime_error("Constraint-damping transport is not functional with modern B field initialization!");

auto pkg = std::make_shared<KHARMAPackage>("B_CD");
Params &params = pkg->AllParams();

Expand Down Expand Up @@ -88,7 +90,7 @@ std::shared_ptr<KHARMAPackage> Initialize(ParameterInput *pin, std::shared_ptr<P
pkg->BlockUtoP = B_CD::BlockUtoP;

pkg->PostStepDiagnosticsMesh = B_CD::PostStepDiagnostics;
pkg->MeshPostStepUserWorkInLoop = B_CD::UpdateCtopMax;
pkg->PostStepWork = B_CD::UpdateCtopMax;

// List (vector) of HistoryOutputVar that will all be enrolled as output variables
parthenon::HstVar_list hst_vars = {};
Expand Down
159 changes: 106 additions & 53 deletions kharma/b_cleanup/b_cleanup.cpp

Large diffs are not rendered by default.

Loading