Merge branch 'lwJi:main' into main

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
   download-build-test:
     strategy:
       matrix:
-        accelerator: [cpu, cuda]
+        accelerator: [cpu, cuda, rocm]
         real-precision: [real64]
         mode: [debug, optimize]
         exclude:

Docs/thornlist/spacetimex.th

@@ -0,0 +1,180 @@
+# Component list for the Einstein Toolkit <http://einsteintoolkit.org/>
+# $Revision$
+# $Date$
+# $HeadURL$
+
+!CRL_VERSION = 1.0
+
+!DEFINE ROOT = Cactus
+!DEFINE ARR  = $ROOT/arrangements
+!DEFINE COMPONENTLIST_TARGET = $ROOT/thornlists/
+
+# This thorn list
+!TARGET   = $ROOT
+!TYPE     = git
+!URL      = https://bitbucket.org/einsteintoolkit/manifest.git
+!REPO_PATH= $1
+!NAME     = manifest
+!CHECKOUT = ./manifest
+
+# Cactus Flesh
+!TARGET   = $ROOT
+!TYPE     = git
+!URL      = https://bitbucket.org/cactuscode/cactus.git
+!NAME     = flesh
+!CHECKOUT = .clang-format CONTRIBUTORS COPYRIGHT doc lib Makefile README.md src
+
+# Simulation Factory
+!TARGET   = $ROOT
+!TYPE     = git
+!URL      = https://bitbucket.org/simfactory/simfactory2.git
+!REPO_PATH=$1
+!NAME     = simfactory2
+!CHECKOUT = ./simfactory
+
+# Example parameter files
+!TARGET   = $ROOT
+!TYPE     = git
+!URL      = https://bitbucket.org/einsteintoolkit/einsteinexamples.git
+!CHECKOUT = par
+
+# Various Cactus utilities
+!TARGET   = $ROOT/utils
+!TYPE     = git
+!URL      = https://bitbucket.org/cactuscode/utilities.git
+!REPO_PATH= $2
+!CHECKOUT = ./ParameterFiles ./Scripts ./Syntax
+
+# The GetComponents script
+!TARGET   = $ROOT/bin
+!TYPE     = git
+!URL      = https://github.com/gridaphobe/CRL.git
+!CHECKOUT = GetComponents
+
+# CactusDoc thorns
+!TARGET   = $ARR/CactusDoc
+!TYPE     = git
+!URL      = https://bitbucket.org/cactuscode/coredoc.git
+!NAME     = CoreDoc
+!REPO_PATH= $1
+!CHECKOUT = ./CoreDoc
+
+# CactusBase thorns
+!TARGET   = $ARR
+!TYPE     = git
+!URL      = https://bitbucket.org/cactuscode/cactusbase.git
+!REPO_PATH= $2
+!CHECKOUT =
+CactusBase/Boundary
+CactusBase/CoordBase
+CactusBase/Fortran
+CactusBase/InitBase
+CactusBase/IOUtil
+CactusBase/SymBase
+CactusBase/Time
+
+# CactusUtils thorns
+!TARGET   = $ARR
+!TYPE     = git
+!URL      = https://bitbucket.org/cactuscode/cactusutils.git
+!REPO_PATH= $2
+!CHECKOUT = CactusUtils/Accelerator CactusUtils/OpenCLRunTime
+CactusUtils/Formaline
+CactusUtils/MemSpeed
+CactusUtils/NaNCatcher
+CactusUtils/Nice
+CactusUtils/NoMPI
+CactusUtils/SystemStatistics
+CactusUtils/SystemTopology
+CactusUtils/TerminationTrigger
+CactusUtils/TimerReport
+CactusUtils/Trigger
+CactusUtils/Vectors
+CactusUtils/WatchDog
+
+# Additional Cactus thorns
+!TARGET   = $ARR
+!TYPE     = git
+!URL      = https://github.com/EinsteinToolkit/$1-$2
+!REPO_PATH = ../$1-$2
+!CHECKOUT =
+ExternalLibraries/BLAS
+ExternalLibraries/FFTW3
+ExternalLibraries/GSL
+ExternalLibraries/HDF5
+ExternalLibraries/hwloc
+ExternalLibraries/LAPACK
+ExternalLibraries/libjpeg
+ExternalLibraries/MPI
+ExternalLibraries/OpenSSL
+ExternalLibraries/PAPI
+ExternalLibraries/pthreads
+ExternalLibraries/zlib
+
+# Thorns required for CarpetX
+!TARGET   = $ARR
+!TYPE     = git
+!URL      = https://github.com/rhaas80/$1-$2
+!REPO_PATH = ../$1-$2
+!CHECKOUT =
+ExternalLibraries/ADIOS2
+ExternalLibraries/AMReX
+ExternalLibraries/NSIMD
+ExternalLibraries/openPMD
+ExternalLibraries/Silo
+ExternalLibraries/ssht
+ExternalLibraries/yaml_cpp
+
+# Boost library
+!TARGET   = $ARR
+!TYPE     = git
+!URL      = https://github.com/dradice/Boost.git
+!REPO_PATH = ../$2
+!CHECKOUT =
+ExternalLibraries/Boost
+
+# Numerical
+!TARGET   = $ARR
+!TYPE     = git
+!URL      = https://bitbucket.org/cactuscode/numerical.git
+!REPO_PATH= $2
+!CHECKOUT =
+Numerical/AEILocalInterp
+
+# CarpetX thorns
+!TARGET   = $ARR
+!TYPE     = git
+!URL      = https://github.com/eschnett/CarpetX.git
+!REPO_PATH= $2
+!CHECKOUT =
+CarpetX/ADMBaseX
+CarpetX/Algo
+CarpetX/Arith
+CarpetX/BoxInBox
+CarpetX/CarpetX
+CarpetX/CoordinatesX
+CarpetX/Derivs
+CarpetX/ErrorEstimator
+CarpetX/HydroBaseX
+CarpetX/Loop
+CarpetX/ODESolvers
+CarpetX/TmunuBaseX
+
+# SpacetimeX thorns
+!TARGET   = $ARR
+!TYPE     = git
+!URL      = https://github.com/lwJi/SpacetimeX.git
+!REPO_PATH= $2
+!CHECKOUT =
+SpacetimeX/AHFinderDirect
+SpacetimeX/AHFinderX
+SpacetimeX/BrillLindquist
+SpacetimeX/Cowling
+SpacetimeX/Punctures
+SpacetimeX/PunctureTracker
+SpacetimeX/SphericalHarmonics
+SpacetimeX/SphericalSurface
+SpacetimeX/StaticTrumpet
+SpacetimeX/TwoPunctures
+SpacetimeX/Weyl
+SpacetimeX/Z4c

NewRadX/src/newradx.cxx

@@ -110,7 +110,7 @@ void NewRadX_Apply(const cGH *restrict const cctkGH,
       };
 
   const Loop::GridDescBaseDevice grid(cctkGH);
-  grid.loop_radbnd<0,0,0>(
+  grid.loop_outermost_int<0,0,0>(
     grid.nghostzones,
     [=] CCTK_DEVICE CCTK_HOST(const Loop::PointDesc &p)
         CCTK_ATTRIBUTE_ALWAYS_INLINE {

PunctureTracker/interface.ccl

@@ -2,7 +2,7 @@
 
 IMPLEMENTS: PunctureTracker
 
-INHERITS: ADMBaseX Coordinates BoxInBox
+INHERITS: ADMBaseX CoordinatesX BoxInBox
 
 USES INCLUDE HEADER: loop_device.hxx
 

PunctureTracker/schedule.ccl

@@ -27,7 +27,7 @@ if (read_shifts)
 		READS: ADMBaseX::shift(interior)
 		READS: BoxInBox::num_levels
 		READS: pt_loc
-		READS: Coordinates::vertex_coords(interior)
+		READS: CoordinatesX::vertex_coords(interior)
 		OPTIONS: LOCAL
 	} "Outputs nearby shift quantities to stdout"
 }