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

Jump to bottom

Unify derivatives between CarpetX and SpacetimeX. #2

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Unify derivatives between CarpetX and SpacetimeX. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ccfd465
Unify derivatives between CarpetX and SpacetimeX.
stevenrbrandt May 25, 2023
745cd25
Fix the test checkout
stevenrbrandt May 25, 2023
476ec25
Fix URL
stevenrbrandt May 26, 2023
27f0dc4
Merge remote-tracking branch 'upstream/main' into unify-derivs
stevenrbrandt Jul 24, 2023
0484154
Change headers
stevenrbrandt Jul 24, 2023
bede0c2
Use derivs_spacetimex.hxx instead of derivs.hxx
stevenrbrandt Jul 24, 2023
7b38b8e
Use namespace derivs_spactimex
stevenrbrandt Jul 25, 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
2 changes: 1 addition & 1 deletion Weyl/configuration.ccl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Configuration definitions for thorn Weyl

REQUIRES Arith Loop
REQUIRES Arith Loop Derivs
4 changes: 4 additions & 0 deletions Weyl/interface.ccl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ USES INCLUDE HEADER: ten3.hxx
USES INCLUDE HEADER: vec.hxx
USES INCLUDE HEADER: vect.hxx

INHERITS: Derivs
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

INHERITS is for grid functions, but we don't need any grid functions from Derivs.

To ensure that the derivative operators are actually present, thorn Derivs needs to provide a capability Derivs, and thorns Weyl and Z4c need to requires that derivative. Both are handled in the respective configuration.ccl files.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already done.


USES INCLUDE HEADER: derivs_spacetimex.hxx



# TODO: Declare these variables without ghost zones?
Expand Down
358 changes: 0 additions & 358 deletions Weyl/src/derivs.hxx
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion Weyl/src/weyl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#endif
#endif

#include "derivs.hxx"
#include "derivs_spacetimex.hxx"
#include "physics.hxx"
#include "weyl_vars.hxx"

Expand All @@ -27,6 +27,8 @@

#include <cmath>

using namespace derivs_spacetimex;

namespace Weyl {
using namespace Arith;
using namespace Loop;
Expand Down
Loading
Loading