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.

Sign up for GitHub

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

NewRadX: remove superfluous inheritance from CarpetX #46

Merged
merged 4 commits into from
Oct 8, 2024
Merged

NewRadX: remove superfluous inheritance from CarpetX #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43061ab
NewRadX: remove superfluous inheritance from CarpetX
rhaas80 Aug 29, 2024
a5c3ed7
TestNewRadX: rename CarpetX to CarpetXRegrid
lwJi Oct 8, 2024
bc634c7
scripts: rename option -DSIMD_CPU to -DSIMD_DISABLE
lwJi Oct 8, 2024
c4199fb
Z4c: Update to nvtx3
lwJi Oct 8, 2024
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
2 changes: 0 additions & 2 deletions NewRadX/interface.ccl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

IMPLEMENTS: NewRadX

INHERITS: CarpetX

USES INCLUDE HEADER: loop_device.hxx

INCLUDE HEADER: newradx.hxx in newradx.hxx
2 changes: 1 addition & 1 deletion TestNewRadX/interface.ccl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

IMPLEMENTS: TestNewRadX

INHERITS: CarpetX
INHERITS: CarpetXRegrid

USES INCLUDE HEADER: loop_device.hxx
USES INCLUDE HEADER: newradx.hxx
Expand Down
4 changes: 2 additions & 2 deletions TestNewRadX/schedule.ccl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Z4c/src/adm.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <cctk_Parameters.h>

#ifdef __CUDACC__
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>
#endif

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion Z4c/src/adm2.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <cctk_Parameters.h>

#ifdef __CUDACC__
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>
#endif

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion Z4c/src/constraints.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <cctk_Parameters.h>

#ifdef __CUDACC__
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>
#endif

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion Z4c/src/enforce.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <cctk_Parameters.h>

#ifdef __CUDACC__
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>
#endif

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion Z4c/src/initial1.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <cctk_Arguments.h>

#ifdef __CUDACC__
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>
#endif

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion Z4c/src/initial2.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <cctk_Arguments.h>

#ifdef __CUDACC__
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>
#endif

namespace Z4c {
Expand Down
2 changes: 1 addition & 1 deletion Z4c/src/rhs.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <cctk_Parameters.h>

#ifdef __CUDACC__
#include <nvToolsExt.h>
#include <nvtx3/nvToolsExt.h>
#endif

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion scripts/actions-cuda-real64.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/actions-rocm-real64.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/spacetimex.th
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ CarpetX/Algo
CarpetX/Arith
CarpetX/BoxInBox
CarpetX/CarpetX
CarpetX/CarpetXRegrid
CarpetX/CoordinatesX
CarpetX/Derivs
CarpetX/ErrorEstimator
Expand Down