Skip to content

Commit

Permalink
WaveToyX: Correct RHS handling after ODESolver update
Browse files Browse the repository at this point in the history
  • Loading branch information
@eschnett
eschnett committed Nov 1, 2024
1 parent 7fcb4b8 commit 7f1f5c7
Show file tree
Hide file tree
Showing 11 changed files with 91 additions and 11 deletions.
23 changes: 15 additions & 8 deletions WaveToyX/schedule.ccl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,38 @@ SCHEDULE WaveToyX_Initial AT initial
# WRITES: CarpetXRegrid::regrid_error(interior)
# } "Estimate error for regridding"

SCHEDULE WaveToyX_Boundaries IN ODESolvers_PostStep
{
LANG: C
OPTIONS: global
SYNC: state
} "Apply boundary conditions"

SCHEDULE WaveToyX_RHS IN ODESolvers_RHS
{
LANG: C
READS: state(everywhere)
WRITES: rhs(interior)
# Sync for test output
SYNC: rhs
} "Calculate scalar wave RHS"

SCHEDULE WaveToyX_Boundaries IN ODESolvers_PostStep
SCHEDULE WaveToyX_RHS AT analysis
{
LANG: C
OPTIONS: global
SYNC: state
} "Apply boundary conditions"
READS: state(everywhere)
WRITES: rhs(interior)
# Sync for test output
SYNC: rhs
} "Calculate scalar wave RHS (so that it can be output)"

SCHEDULE WaveToyX_Energy IN ODESolvers_PostStep AFTER WaveToyX_Boundaries
SCHEDULE WaveToyX_Energy at analysis
{
LANG: C
READS: state(everywhere)
WRITES: energy(interior)
SYNC: energy
} "Calculate scalar wave energy density"

SCHEDULE WaveToyX_Error IN ODESolvers_PostStep
SCHEDULE WaveToyX_Error at analysis
{
LANG: C
READS: state(interior)
Expand Down
1 change: 1 addition & 0 deletions WaveToyX/test/presync.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ CarpetX::out_tsv_vars = "
WaveToyX::state
WaveToyX::energy
WaveToyX::error
WaveToyX::rhs
"
12 changes: 12 additions & 0 deletions WaveToyX/test/presync/wavetoyx-rhs.it000000.x.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 1:iteration 2:time 3:patch 4:level 5:i 6:j 7:k 8:x 9:y 10:z 11:u_rhs 12:rho_rhs
0 0.0000000000000000e+00 0 0 -1 4 4 -1.2500000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 0 4 4 -1.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 2.8117749006091444e+01
0 0.0000000000000000e+00 0 0 1 4 4 -7.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 2 4 4 -5.0000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 -0.0000000000000000e+00 -1.1478103773179512e-15
0 0.0000000000000000e+00 0 0 3 4 4 -2.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 -0.0000000000000000e+00 -1.9882250993908560e+01
0 0.0000000000000000e+00 0 0 4 4 4 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 -0.0000000000000000e+00 -2.8117749006091437e+01
0 0.0000000000000000e+00 0 0 5 4 4 2.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 -0.0000000000000000e+00 -1.9882250993908560e+01
0 0.0000000000000000e+00 0 0 6 4 4 5.0000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 -0.0000000000000000e+00 -1.1478103773179512e-15
0 0.0000000000000000e+00 0 0 7 4 4 7.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 8 4 4 1.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 2.8117749006091444e+01
0 0.0000000000000000e+00 0 0 9 4 4 1.2500000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
12 changes: 12 additions & 0 deletions WaveToyX/test/presync/wavetoyx-rhs.it000000.y.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 1:iteration 2:time 3:patch 4:level 5:i 6:j 7:k 8:x 9:y 10:z 11:u_rhs 12:rho_rhs
0 0.0000000000000000e+00 0 0 4 -1 4 0.0000000000000000e+00 -1.2500000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 4 0 4 0.0000000000000000e+00 -1.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 2.8117749006091444e+01
0 0.0000000000000000e+00 0 0 4 1 4 0.0000000000000000e+00 -7.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 4 2 4 0.0000000000000000e+00 -5.0000000000000000e-01 0.0000000000000000e+00 -0.0000000000000000e+00 -1.1478103773179512e-15
0 0.0000000000000000e+00 0 0 4 3 4 0.0000000000000000e+00 -2.5000000000000000e-01 0.0000000000000000e+00 -0.0000000000000000e+00 -1.9882250993908560e+01
0 0.0000000000000000e+00 0 0 4 4 4 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 -0.0000000000000000e+00 -2.8117749006091437e+01
0 0.0000000000000000e+00 0 0 4 5 4 0.0000000000000000e+00 2.5000000000000000e-01 0.0000000000000000e+00 -0.0000000000000000e+00 -1.9882250993908560e+01
0 0.0000000000000000e+00 0 0 4 6 4 0.0000000000000000e+00 5.0000000000000000e-01 0.0000000000000000e+00 -0.0000000000000000e+00 -1.1478103773179512e-15
0 0.0000000000000000e+00 0 0 4 7 4 0.0000000000000000e+00 7.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 4 8 4 0.0000000000000000e+00 1.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 2.8117749006091444e+01
0 0.0000000000000000e+00 0 0 4 9 4 0.0000000000000000e+00 1.2500000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
12 changes: 12 additions & 0 deletions WaveToyX/test/presync/wavetoyx-rhs.it000000.z.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 1:iteration 2:time 3:patch 4:level 5:i 6:j 7:k 8:x 9:y 10:z 11:u_rhs 12:rho_rhs
0 0.0000000000000000e+00 0 0 4 4 -1 0.0000000000000000e+00 0.0000000000000000e+00 -1.2500000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 4 4 0 0.0000000000000000e+00 0.0000000000000000e+00 -1.0000000000000000e+00 0.0000000000000000e+00 2.8117749006091440e+01
0 0.0000000000000000e+00 0 0 4 4 1 0.0000000000000000e+00 0.0000000000000000e+00 -7.5000000000000000e-01 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 4 4 2 0.0000000000000000e+00 0.0000000000000000e+00 -5.0000000000000000e-01 -0.0000000000000000e+00 -1.1478103773179512e-15
0 0.0000000000000000e+00 0 0 4 4 3 0.0000000000000000e+00 0.0000000000000000e+00 -2.5000000000000000e-01 -0.0000000000000000e+00 -1.9882250993908560e+01
0 0.0000000000000000e+00 0 0 4 4 4 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 -0.0000000000000000e+00 -2.8117749006091437e+01
0 0.0000000000000000e+00 0 0 4 4 5 0.0000000000000000e+00 0.0000000000000000e+00 2.5000000000000000e-01 -0.0000000000000000e+00 -1.9882250993908560e+01
0 0.0000000000000000e+00 0 0 4 4 6 0.0000000000000000e+00 0.0000000000000000e+00 5.0000000000000000e-01 -0.0000000000000000e+00 -1.1478103773179512e-15
0 0.0000000000000000e+00 0 0 4 4 7 0.0000000000000000e+00 0.0000000000000000e+00 7.5000000000000000e-01 0.0000000000000000e+00 1.9882250993908556e+01
0 0.0000000000000000e+00 0 0 4 4 8 0.0000000000000000e+00 0.0000000000000000e+00 1.0000000000000000e+00 0.0000000000000000e+00 2.8117749006091440e+01
0 0.0000000000000000e+00 0 0 4 4 9 0.0000000000000000e+00 0.0000000000000000e+00 1.2500000000000000e+00 0.0000000000000000e+00 1.9882250993908556e+01
12 changes: 12 additions & 0 deletions WaveToyX/test/presync/wavetoyx-rhs.it000010.x.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 1:iteration 2:time 3:patch 4:level 5:i 6:j 7:k 8:x 9:y 10:z 11:u_rhs 12:rho_rhs
10 1.2500000000000000e+00 0 0 -1 4 4 -1.2500000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.3167771636375232e+00 1.7190432592252996e+01
10 1.2500000000000000e+00 0 0 0 4 4 -1.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.8622041234393587e+00 2.4310942915024711e+01
10 1.2500000000000000e+00 0 0 1 4 4 -7.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 1.3167771636375234e+00 1.7190432592252975e+01
10 1.2500000000000000e+00 0 0 2 4 4 -5.0000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 -4.3684225283389090e-16 6.5263469327843072e-15
10 1.2500000000000000e+00 0 0 3 4 4 -2.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 -1.3167771636375218e+00 -1.7190432592253003e+01
10 1.2500000000000000e+00 0 0 4 4 4 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 -1.8622041234393623e+00 -2.4310942915024683e+01
10 1.2500000000000000e+00 0 0 5 4 4 2.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 -1.3167771636375218e+00 -1.7190432592253003e+01
10 1.2500000000000000e+00 0 0 6 4 4 5.0000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 6.9960068410921409e-17 4.0476782657880230e-15
10 1.2500000000000000e+00 0 0 7 4 4 7.5000000000000000e-01 0.0000000000000000e+00 0.0000000000000000e+00 1.3167771636375232e+00 1.7190432592252996e+01
10 1.2500000000000000e+00 0 0 8 4 4 1.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.8622041234393587e+00 2.4310942915024711e+01
10 1.2500000000000000e+00 0 0 9 4 4 1.2500000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.3167771636375234e+00 1.7190432592252975e+01
12 changes: 12 additions & 0 deletions WaveToyX/test/presync/wavetoyx-rhs.it000010.y.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 1:iteration 2:time 3:patch 4:level 5:i 6:j 7:k 8:x 9:y 10:z 11:u_rhs 12:rho_rhs
10 1.2500000000000000e+00 0 0 4 -1 4 0.0000000000000000e+00 -1.2500000000000000e+00 0.0000000000000000e+00 1.3167771636375232e+00 1.7190432592252996e+01
10 1.2500000000000000e+00 0 0 4 0 4 0.0000000000000000e+00 -1.0000000000000000e+00 0.0000000000000000e+00 1.8622041234393587e+00 2.4310942915024711e+01
10 1.2500000000000000e+00 0 0 4 1 4 0.0000000000000000e+00 -7.5000000000000000e-01 0.0000000000000000e+00 1.3167771636375234e+00 1.7190432592252975e+01
10 1.2500000000000000e+00 0 0 4 2 4 0.0000000000000000e+00 -5.0000000000000000e-01 0.0000000000000000e+00 -4.3684225283389090e-16 6.5263469327843072e-15
10 1.2500000000000000e+00 0 0 4 3 4 0.0000000000000000e+00 -2.5000000000000000e-01 0.0000000000000000e+00 -1.3167771636375218e+00 -1.7190432592253003e+01
10 1.2500000000000000e+00 0 0 4 4 4 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 -1.8622041234393623e+00 -2.4310942915024683e+01
10 1.2500000000000000e+00 0 0 4 5 4 0.0000000000000000e+00 2.5000000000000000e-01 0.0000000000000000e+00 -1.3167771636375218e+00 -1.7190432592253003e+01
10 1.2500000000000000e+00 0 0 4 6 4 0.0000000000000000e+00 5.0000000000000000e-01 0.0000000000000000e+00 6.9960068410921409e-17 4.0476782657880230e-15
10 1.2500000000000000e+00 0 0 4 7 4 0.0000000000000000e+00 7.5000000000000000e-01 0.0000000000000000e+00 1.3167771636375232e+00 1.7190432592252996e+01
10 1.2500000000000000e+00 0 0 4 8 4 0.0000000000000000e+00 1.0000000000000000e+00 0.0000000000000000e+00 1.8622041234393587e+00 2.4310942915024711e+01
10 1.2500000000000000e+00 0 0 4 9 4 0.0000000000000000e+00 1.2500000000000000e+00 0.0000000000000000e+00 1.3167771636375234e+00 1.7190432592252975e+01
12 changes: 12 additions & 0 deletions WaveToyX/test/presync/wavetoyx-rhs.it000010.z.tsv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 1:iteration 2:time 3:patch 4:level 5:i 6:j 7:k 8:x 9:y 10:z 11:u_rhs 12:rho_rhs
10 1.2500000000000000e+00 0 0 4 4 -1 0.0000000000000000e+00 0.0000000000000000e+00 -1.2500000000000000e+00 1.3167771636375223e+00 1.7190432592252996e+01
10 1.2500000000000000e+00 0 0 4 4 0 0.0000000000000000e+00 0.0000000000000000e+00 -1.0000000000000000e+00 1.8622041234393611e+00 2.4310942915024697e+01
10 1.2500000000000000e+00 0 0 4 4 1 0.0000000000000000e+00 0.0000000000000000e+00 -7.5000000000000000e-01 1.3167771636375225e+00 1.7190432592252986e+01
10 1.2500000000000000e+00 0 0 4 4 2 0.0000000000000000e+00 0.0000000000000000e+00 -5.0000000000000000e-01 -2.5450533252964536e-16 3.7656431876638559e-15
10 1.2500000000000000e+00 0 0 4 4 3 0.0000000000000000e+00 0.0000000000000000e+00 -2.5000000000000000e-01 -1.3167771636375218e+00 -1.7190432592252996e+01
10 1.2500000000000000e+00 0 0 4 4 4 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 -1.8622041234393623e+00 -2.4310942915024683e+01
10 1.2500000000000000e+00 0 0 4 4 5 0.0000000000000000e+00 0.0000000000000000e+00 2.5000000000000000e-01 -1.3167771636375234e+00 -1.7190432592252979e+01
10 1.2500000000000000e+00 0 0 4 4 6 0.0000000000000000e+00 0.0000000000000000e+00 5.0000000000000000e-01 -7.1556612141240883e-16 -1.7214687860755355e-15
10 1.2500000000000000e+00 0 0 4 4 7 0.0000000000000000e+00 0.0000000000000000e+00 7.5000000000000000e-01 1.3167771636375223e+00 1.7190432592252996e+01
10 1.2500000000000000e+00 0 0 4 4 8 0.0000000000000000e+00 0.0000000000000000e+00 1.0000000000000000e+00 1.8622041234393611e+00 2.4310942915024697e+01
10 1.2500000000000000e+00 0 0 4 4 9 0.0000000000000000e+00 0.0000000000000000e+00 1.2500000000000000e+00 1.3167771636375225e+00 1.7190432592252986e+01
2 changes: 1 addition & 1 deletion WaveToyX/test/radiative.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes

CarpetX::out_tsv_vars = "
WaveToyX::state
WaveToyX::rhs
WaveToyX::energy
WaveToyX::error
WaveToyX::rhs
"
2 changes: 1 addition & 1 deletion WaveToyX/test/reflecting.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes

CarpetX::out_tsv_vars = "
WaveToyX::state
WaveToyX::rhs
WaveToyX::energy
WaveToyX::error
WaveToyX::rhs
"
2 changes: 1 addition & 1 deletion WaveToyX/test/standing.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes

CarpetX::out_tsv_vars = "
WaveToyX::state
WaveToyX::rhs
WaveToyX::energy
WaveToyX::error
WaveToyX::rhs
"

0 comments on commit 7f1f5c7

Please sign in to comment.