Merge branch 'main' of https://github.com/EinsteinToolkit/SpacetimeX

Author: eschnett

NewRadX/interface.ccl

@@ -2,8 +2,6 @@
 
 IMPLEMENTS: NewRadX
 
-INHERITS: CarpetX
-
 USES INCLUDE HEADER: loop_device.hxx
 
 INCLUDE HEADER: newradx.hxx in newradx.hxx

TestNewRadX/interface.ccl

@@ -2,7 +2,7 @@
 
 IMPLEMENTS: TestNewRadX
 
-INHERITS: CarpetX
+INHERITS: CarpetXRegrid
 
 USES INCLUDE HEADER: loop_device.hxx
 USES INCLUDE HEADER: newradx.hxx

TestNewRadX/schedule.ccl

@@ -13,14 +13,14 @@ SCHEDULE TestNewRadX_EstimateError AT postinitial
 {
   LANG: C
   READS: state(everywhere)
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error for regridding"
 
 SCHEDULE TestNewRadX_EstimateError AT poststep
 {
   LANG: C
   READS: state(everywhere)
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error for regridding"
 
 SCHEDULE TestNewRadX_RHS IN ODESolvers_RHS

scripts/actions-cuda-real64.cfg

@@ -15,7 +15,7 @@ FC = gfortran
 F90 = gfortran
 LD = nvcc
 
-CPPFLAGS = -DSIMD_CPU
+CPPFLAGS = -DSIMD_DISABLE
 CFLAGS = -pipe -g -std=gnu11
 # - We use "--relocatable-device-code=true" to allow building with
 #   debug versions of AMReX

scripts/actions-rocm-real64.cfg

@@ -16,7 +16,7 @@ FC = gfortran
 F90 = gfortran
 LD = /opt/rocm/llvm/bin/clang++
 
-CPPFLAGS = -DSIMD_CPU
+CPPFLAGS = -DSIMD_DISABLE
 CFLAGS = -pipe -g -std=gnu11
 CXXFLAGS = -pipe -g -std=c++17 --offload-arch=gfx90a
 FPPFLAGS = -traditional

scripts/spacetimex.th

@@ -152,6 +152,7 @@ CarpetX/Algo
 CarpetX/Arith
 CarpetX/BoxInBox
 CarpetX/CarpetX
+CarpetX/CarpetXRegrid
 CarpetX/CoordinatesX
 CarpetX/Derivs
 CarpetX/ErrorEstimator