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

Merge from main branch to adapt the Driver name change #48

Merged
merged 19 commits into from
Nov 15, 2024
Merged

Merge from main branch to adapt the Driver name change #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a4ed50e
AHFinderDirect: update parfile for unit test
lwJi Aug 7, 2024
bf3c921
scripts: turn off AHFinderDirect because it's too expensive
lwJi Aug 9, 2024
c548f28
CI: update unit tests
lwJi Aug 28, 2024
9d9ece2
Merge pull request #41 from EinsteinToolkit/lwji/AHFinderDirect
lwJi Sep 9, 2024
5e2ff71
Merge pull request #42 from EinsteinToolkit/lwji/puncturetracker
lwJi Sep 9, 2024
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
11cad12
Merge pull request #46 from EinsteinToolkit/rhaas/no_carpetx
lwJi Oct 8, 2024
192e513
Z4c: Switch to nvtx3 (because AMReX uses it)
eschnett Oct 24, 2024
3c3e5c6
Merge branch 'main' of https://github.com/EinsteinToolkit/SpacetimeX
eschnett Oct 24, 2024
0a53528
Z4c: fix typo in calculating HC and MtC
lwJi Nov 12, 2024
534fba8
Z4c: add more comments for typo when calculate HC and MtC
lwJi Nov 12, 2024
ac18216
Merge pull request #47 from EinsteinToolkit/lwji/constraints
lwJi Nov 12, 2024
2008a69
Merge branch 'main' into lwji/merge_main
lwJi Nov 15, 2024
3ac8fa4
Z4cow: change implementation to Driver
lwJi Nov 15, 2024
8ce269a
Multipole: update unit test
lwJi Nov 15, 2024
5417087
Z4cow: switch to nvtx3 (because AMReX uses it)
lwJi Nov 15, 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
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l2_m-1_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.0002368732758375043611 6.666008712285539305e-07
0.208333 -0.0001289798240776825439 2.102884778684524451e-06
0.416667 -6.990571190784418756e-05 1.820370465888030275e-06
0.625000 -2.958838060523753108e-05 1.288609111325172931e-06
0.833333 4.008126019214592564e-07 8.015025778262599949e-07
0.000000 -0.0002368732758374085989 6.666008712489448723e-07
0.208333 -0.0001289798240775609235 2.10288477866517483e-06
0.416667 -6.990571190782777545e-05 1.820370465879737823e-06
0.625000 -2.958838060522839329e-05 1.288609111283530886e-06
0.833333 4.008126019282729483e-07 8.015025778267603796e-07
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l2_m-2_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.163354474942903366 -0.0008959503180925050938
0.208333 0.05187591099142307982 -0.001506529300352097301
0.416667 0.02048718330981963084 -0.001699256910188617952
0.625000 0.0078792480053175417 -0.001808077189221965735
0.833333 0.001874578344446319348 -0.001894464669028159912
0.000000 0.1633544749429033938 -0.0008959503180925144179
0.208333 0.05187591099142304513 -0.00150652930035209188
0.416667 0.02048718330981956146 -0.00169925691018859952
0.625000 0.007879248005317501802 -0.001808077189221954026
0.833333 0.001874578344446285738 -0.001894464669028157527
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l2_m0_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.2419469580598028746 -1.050769619247998585e-17
0.208333 0.09213899351836686569 -4.561390817482837798e-18
0.416667 0.04906407256839602493 -4.772096628480222168e-18
0.625000 0.03135805799914477554 -8.2990404682738569e-18
0.833333 0.02267446146971279289 -5.788942685070502476e-18
0.000000 0.2419469580598028746 -9.17332287602294512e-18
0.208333 0.09213899351836685181 -5.511860362039587528e-18
0.416667 0.0490640725683959486 -1.513697231927610896e-20
0.625000 0.03135805799914482411 -8.135563666334416424e-19
0.833333 0.02267446146971273391 -3.270381614957662645e-18
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l2_m1_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.0002368732758375686814 -6.666008712405688811e-07
0.208333 -0.0001289798240776148625 -2.102884778673264418e-06
0.416667 -6.990571190784836174e-05 -1.820370465873329807e-06
0.625000 -2.958838060522215913e-05 -1.288609111318822725e-06
0.833333 4.008126019202311116e-07 -8.015025778406075684e-07
0.000000 -0.0002368732758374528886 -6.666008712586046478e-07
0.208333 -0.0001289798240775159562 -2.102884778659501403e-06
0.416667 -6.990571190783539197e-05 -1.820370465881377255e-06
0.625000 -2.9588380605207807e-05 -1.288609111283960543e-06
0.833333 4.008126019304260002e-07 -8.01502577827898686e-07
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l2_m2_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.1633544749429036436 0.0008959503180924880718
0.208333 0.05187591099142306594 0.001506529300352091446
0.416667 0.02048718330981963778 0.001699256910188612748
0.625000 0.007879248005317526088 0.001808077189221955327
0.833333 0.001874578344446308723 0.001894464669028158178
0.000000 0.1633544749429036158 0.0008959503180924889391
0.208333 0.05187591099142305207 0.001506529300352091663
0.416667 0.02048718330981958574 0.001699256910188605375
0.625000 0.007879248005317508741 0.001808077189221956628
0.833333 0.001874578344446276848 0.001894464669028156877
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l3_m-1_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.000201937106973485613 3.338187209424203996e-06
0.208333 2.823370279533335539e-05 3.234171329304860246e-06
0.416667 3.670252334485536573e-06 2.669675930051770833e-06
0.625000 7.4263028553875373e-06 1.98459059072028673e-06
0.833333 1.7684725137990441e-05 1.316505610969884526e-06
0.000000 0.0002019371069735790712 3.338187209445547532e-06
0.208333 2.823370279534878155e-05 3.234171329316988063e-06
0.416667 3.670252334511862357e-06 2.669675930032729109e-06
0.625000 7.426302855427991594e-06 1.984590590688558146e-06
0.833333 1.768472513799926709e-05 1.316505610969211982e-06
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l3_m-2_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.1355126252198406434 -0.0009011010091674863951
0.208333 0.04915961764978991899 -0.001330725751219432196
0.416667 0.02460624596567990985 -0.001361150302657533357
0.625000 0.01465651364918085439 -0.001293270554144507634
0.833333 0.009867770273186450558 -0.001186883901585720916
0.000000 0.1355126252198405601 -0.0009011010091675004897
0.208333 0.04915961764978987042 -0.001330725751219431329
0.416667 0.02460624596567981964 -0.00136115030265751189
0.625000 0.0146565136491808648 -0.001293270554144483131
0.833333 0.009867770273186452293 -0.001186883901585733926
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l3_m-3_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.000524357118095527641 -2.906015706869769124e-07
0.208333 -0.0002068048830773968456 3.385926647986565795e-06
0.416667 -9.568922284099276761e-05 3.076522253670692801e-06
0.625000 -3.820651927807334699e-05 2.192978793822451683e-06
0.833333 -2.516202433590698308e-06 1.377294995151083448e-06
0.000000 -0.0005243571180955339294 -2.906015706807490497e-07
0.208333 -0.0002068048830773032518 3.385926647988008716e-06
0.416667 -9.568922284098191203e-05 3.076522253638092197e-06
0.625000 -3.820651927804451399e-05 2.192978793815989669e-06
0.833333 -2.516202433550341e-06 1.377294995143654545e-06
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l3_m0_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 2.968232104301835745e-16 -0.003708942125617168371
0.208333 1.033580921254468607e-16 -0.002700740708853890167
0.416667 4.53008668341722531e-17 -0.002438309625810909653
0.625000 2.511049163851192872e-17 -0.002281126116044357357
0.833333 4.849670536070778372e-18 -0.002112721874374070673
0.000000 2.726748984801768887e-16 -0.003708942125617130641
0.208333 1.122662747095017036e-16 -0.002700740708853890601
0.416667 3.984331973174811181e-17 -0.002438309625810964731
0.625000 3.20438714196911775e-17 -0.002281126116044372969
0.833333 1.882879114324751928e-17 -0.002112721874374088021
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l3_m1_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.0002019371069733665947 3.338187209458446574e-06
0.208333 -2.823370279527272477e-05 3.234171329278771631e-06
0.416667 -3.670252334466712112e-06 2.669675930006030207e-06
0.625000 -7.426302855380993124e-06 1.98459059072609187e-06
0.833333 -1.76847251379898413e-05 1.31650561097931772e-06
0.000000 -0.000201937106973472196 3.338187209445291728e-06
0.208333 -2.823370279532186623e-05 3.234171329302602479e-06
0.416667 -3.670252334490033047e-06 2.66967593001040005e-06
0.625000 -7.426302855428314313e-06 1.98459059070214159e-06
0.833333 -1.768472513799584168e-05 1.316505610958838369e-06
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l3_m2_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.1355126252198405878 -0.0009011010091674635184
0.208333 -0.04915961764978987736 -0.001330725751219414849
0.416667 -0.02460624596567987862 -0.001361150302657522081
0.625000 -0.01465651364918085092 -0.001293270554144499828
0.833333 -0.009867770273186445354 -0.001186883901585728939
0.000000 -0.1355126252198405046 -0.0009011010091674648195
0.208333 -0.04915961764978981491 -0.001330725751219416367
0.416667 -0.02460624596567978842 -0.001361150302657512324
0.625000 -0.01465651364918086133 -0.00129327055414448118
0.833333 -0.00986777027318644015 -0.001186883901585731324
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l3_m3_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.0005243571180954178113 -2.906015706817095851e-07
0.208333 0.0002068048830773277277 3.385926647976474244e-06
0.416667 9.568922284095472566e-05 3.076522253665459408e-06
0.625000 3.820651927807477001e-05 2.192978793830618775e-06
0.833333 2.516202433597053596e-06 1.377294995157096958e-06
0.000000 0.000524357118095359156 -2.906015706760149826e-07
0.208333 0.0002068048830772863382 3.385926647986087221e-06
0.416667 9.568922284097388894e-05 3.076522253618710389e-06
0.625000 3.820651927804171539e-05 2.19297879381807337e-06
0.833333 2.516202433555633262e-06 1.377294995168832811e-06
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m-1_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.0004808880142182785263 2.659478161899247858e-06
0.208333 -0.0001689616980701061388 8.597231952572932136e-07
0.416667 -8.510800889095376809e-05 5.275020872271219112e-07
0.625000 -5.377503360423527913e-05 4.009302782582937837e-07
0.833333 -3.99562899838952761e-05 2.77708617242379142e-07
0.000000 -0.0004808880142183465057 2.659478161913735086e-06
0.208333 -0.0001689616980700894421 8.597231952720290458e-07
0.416667 -8.510800889094081187e-05 5.275020872595902722e-07
0.625000 -5.377503360422663939e-05 4.009302782831021081e-07
0.833333 -3.995628998389270112e-05 2.777086172481642712e-07
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m-2_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.005055290416317105399 -0.003559185638414023335
0.208333 0.0108900053511946579 -0.002594981294975970843
0.416667 0.01356998912323651753 -0.002180666702349871346
0.625000 0.01377036830218968284 -0.001844098398609957286
0.833333 0.01330299273110349852 -0.001498137182590670961
0.000000 -0.005055290416317160043 -0.003559185638413964355
0.208333 0.01089000535119463708 -0.002594981294975960869
0.416667 0.01356998912323651406 -0.002180666702349831881
0.625000 0.0137703683021897054 -0.001844098398609926061
0.833333 0.01330299273110352454 -0.001498137182590676166
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m-3_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.0001112178358866480413 3.297362205391599834e-06
0.208333 -9.445085072232535419e-05 7.098777028623845491e-06
0.416667 -5.225274957870029165e-05 6.024654698906587716e-06
0.625000 -1.435982708063645559e-05 4.288211410874017268e-06
0.833333 1.651538011306612495e-05 2.707625004414920137e-06
0.000000 -0.0001112178358865760502 3.29736220539920619e-06
0.208333 -9.445085072230414449e-05 7.098777028591206771e-06
0.416667 -5.22527495787021619e-05 6.024654698901477566e-06
0.625000 -1.435982708063208151e-05 4.2882114108822013e-06
0.833333 1.651538011308540681e-05 2.707625004402752085e-06
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m-4_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.2019000898209012684 -0.001556867632319945943
0.208333 0.05813063815531462064 -0.002991065145752124996
0.416667 0.018969135603384122 -0.003483575023355278688
0.625000 0.003845427354571420188 -0.003737710795409918043
0.833333 -0.002986575652707265834 -0.003886920451869539921
0.000000 0.2019000898209011574 -0.001556867632319980854
0.208333 0.05813063815531454431 -0.0029910651457521302
0.416667 0.01896913560338407689 -0.003483575023355238789
0.625000 0.003845427354571419321 -0.003737710795409934089
0.833333 -0.002986575652707273206 -0.003886920451869554233
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m0_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.2402589499819359764 5.30692271210387931e-19
0.208333 0.07922656565379397609 2.564792825740008553e-19
0.416667 0.03272551231313391984 1.366342477179387283e-18
0.625000 0.01334720376285575098 -6.877843701697122642e-19
0.833333 0.003641226741145835253 1.26432401481009863e-18
0.000000 0.2402589499819360319 3.638498950571285929e-19
0.208333 0.07922656565379393445 -9.484674554170262351e-19
0.416667 0.03272551231313389902 2.446165674662177995e-18
0.625000 0.01334720376285573537 8.579912998454983653e-19
0.833333 0.003641226741145816605 -7.186311825508490965e-19
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m1_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.0004808880142184263572 -2.659478161895995251e-06
0.208333 -0.0001689616980701195016 -8.597231952355324078e-07
0.416667 -8.510800889099111885e-05 -5.27502087271792523e-07
0.625000 -5.377503360424549774e-05 -4.009302782507864248e-07
0.833333 -3.995628998391573364e-05 -2.77708617249410839e-07
0.000000 -0.0004808880142185214417 -2.659478161868931278e-06
0.208333 -0.0001689616980701201521 -8.597231952493306804e-07
0.416667 -8.510800889097077651e-05 -5.275020872835633163e-07
0.625000 -5.377503360424164204e-05 -4.009302782845154885e-07
0.833333 -3.995628998390752081e-05 -2.777086172527575191e-07
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m2_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.005055290416317578112 0.003559185638413915349
0.208333 0.01089000535119449831 0.002594981294975954797
0.416667 0.01356998912323643079 0.002180666702349865708
0.625000 0.01377036830218965856 0.001844098398609957286
0.833333 0.01330299273110349505 0.001498137182590671612
0.000000 -0.005055290416317605 0.003559185638413935732
0.208333 0.01089000535119449484 0.002594981294975961302
0.416667 0.01356998912323645161 0.002180666702349827978
0.625000 0.0137703683021896707 0.001844098398609913484
0.833333 0.01330299273110349678 0.001498137182590661854
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m3_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 -0.0001112178358866439484 -3.297362205376403639e-06
0.208333 -9.445085072235342148e-05 -7.098777028648644922e-06
0.416667 -5.225274957870720344e-05 -6.024654698887808995e-06
0.625000 -1.435982708064166823e-05 -4.288211410872141937e-06
0.833333 1.651538011307720076e-05 -2.707625004411668801e-06
0.000000 -0.0001112178358865690707 -3.297362205400181125e-06
0.208333 -9.445085072232704826e-05 -7.098777028633950594e-06
0.416667 -5.225274957872650902e-05 -6.024654698887001773e-06
0.625000 -1.435982708063594398e-05 -4.288211410884832185e-06
0.833333 1.65153801130809853e-05 -2.707625004405567199e-06
10 changes: 5 additions & 5 deletions Multipole/test/q1/mp_Psi4_l4_m4_r5.00.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.000000 0.201900089820901435 0.001556867632319953532
0.208333 0.05813063815531467615 0.002991065145752133669
0.416667 0.01896913560338414975 0.003483575023355263076
0.625000 0.003845427354571394601 0.003737710795409920211
0.833333 -0.002986575652707285783 0.00388692045186954209
0.000000 0.2019000898209013517 0.001556867632319948761
0.208333 0.05813063815531457901 0.002991065145752118491
0.416667 0.01896913560338407342 0.003483575023355238789
0.625000 0.003845427354571391999 0.003737710795409931921
0.833333 -0.002986575652707294457 0.003886920451869547294
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
9 changes: 6 additions & 3 deletions Z4c/src/z4c_vars.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,11 +538,14 @@ template <typename T> struct z4c_vars : z4c_vars_noderivs<T> {
// Constraints
// (13)
ZtC([&](int a) ARITH_INLINE { return (Gamt(a) - Gamtd(a)) / 2; }), //
// For the Hamiltonian and momentum constraints, the equations in
// 1212.2901 is incorrect, whereas the one in 0912.2920 is correct,
// as double-checked by Liwei Ji.
// (14)
HC(Rsc //
+ sum_symm<3>([&](int x, int y)
- sum_symm<3>([&](int x, int y)
ARITH_INLINE { return At(x, y) * Atu(x, y); }) //
- 2 / T(3) * pow2(Kh + 2 * Theta) //
+ 2 / T(3) * pow2(Kh + 2 * Theta) //
- 16 * T(M_PI) * rho),
// (15)
MtC([&](int a) ARITH_INLINE {
Expand All @@ -554,7 +557,7 @@ template <typename T> struct z4c_vars : z4c_vars_noderivs<T> {
return (delta3(a, x) + gammatu(a, x)) *
(dKh(x) + 2 * dTheta(x));
}) //
- 2 / T(3) * sum<3>([&](int x) ARITH_INLINE {
- 3 / T(2) * sum<3>([&](int x) ARITH_INLINE {
return Atu(a, x) * dchi(x) / (1 + chi);
}) //
- 8 * T(M_PI) * sum<3>([&](int x) ARITH_INLINE {
Expand Down
2 changes: 1 addition & 1 deletion Z4cow/param.ccl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@ CCTK_INT n_betaG "n power of outgoing boundary r^n fall off rate for beta"
0:2 :: "1 is my guess"
} 1

SHARES: CarpetX
SHARES: Driver

USES BOOLEAN use_subcycling_wip
2 changes: 1 addition & 1 deletion Z4cow/src/adm.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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 Z4cow/src/constraint.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <simd.hxx>

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

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

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

#include <cmath>
Expand Down
Loading