Merge pull request #38 from AFD-Illinois/fix/pass-tests

WIP: Pass tests

.gitignore

@@ -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

external/kokkos-kernels/KokkosBatched_Util.hpp

@@ -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);
@@ -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);
 

external/patches/kokkos-rx7800.patch

@@ -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)

kharma/CMakeLists.txt

@@ -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)
 
@@ -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)
 

kharma/b_cd/b_cd.cpp

@@ -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();
 
@@ -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 = {};