Skip to content

Commit

Permalink
Merge branch 'main' into c2p
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaykalinani
jaykalinani committed Jul 12, 2023
2 parents 84a1a92 + ac879c8 commit 0a8a85f
Show file tree
Hide file tree
Showing 206 changed files with 673 additions and 689 deletions.
2 changes: 1 addition & 1 deletion AsterSeeds/interface.ccl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Interface definition for thorn AsterSeeds

IMPLEMENTS: AsterSeeds
INHERITS: HydroBase AsterX
INHERITS: HydroBaseX AsterX

USES INCLUDE HEADER: loop_device.hxx
USES INCLUDE HEADER: eos.hxx eos_idealgas.hxx
Expand Down
16 changes: 8 additions & 8 deletions AsterSeeds/schedule.ccl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

if (CCTK_Equals(test_type, "1DTest")) {

SCHEDULE Tests1D_Initialize IN HydroBase_InitialData AFTER HydroBase_initial_data {
SCHEDULE Tests1D_Initialize IN HydroBaseX_InitialData AFTER HydroBaseX_initial_data {
LANG: C
WRITES: HydroBase::rho(everywhere) HydroBase::vel(everywhere) HydroBase::eps(everywhere) HydroBase::press(everywhere)
WRITES: HydroBaseX::rho(everywhere) HydroBaseX::vel(everywhere) HydroBaseX::eps(everywhere) HydroBaseX::press(everywhere)
WRITES: AsterX::Avec_x(everywhere) AsterX::Avec_y(everywhere) AsterX::Avec_z(everywhere)
}
"Set up initial conditions for 1D tests"
Expand All @@ -16,9 +16,9 @@ if (CCTK_Equals(test_type, "1DTest")) {

if (CCTK_Equals(test_type, "2DTest")) {

SCHEDULE Tests2D_Initialize IN HydroBase_InitialData AFTER HydroBase_initial_data {
SCHEDULE Tests2D_Initialize IN HydroBaseX_InitialData AFTER HydroBaseX_initial_data {
LANG: C
WRITES: HydroBase::rho(everywhere) HydroBase::vel(everywhere) HydroBase::eps(everywhere) HydroBase::press(everywhere)
WRITES: HydroBaseX::rho(everywhere) HydroBaseX::vel(everywhere) HydroBaseX::eps(everywhere) HydroBaseX::press(everywhere)
WRITES: AsterX::Avec_x(everywhere) AsterX::Avec_y(everywhere) AsterX::Avec_z(everywhere)
}
"Set up initial conditions for 2D tests"
Expand All @@ -28,9 +28,9 @@ if (CCTK_Equals(test_type, "2DTest")) {
if (CCTK_Equals(test_type, "3DTest")) {

if (CCTK_Equals(test_case, "spherical shock")) {
SCHEDULE Tests3D_Initialize IN HydroBase_InitialData AFTER HydroBase_initial_data {
SCHEDULE Tests3D_Initialize IN HydroBaseX_InitialData AFTER HydroBaseX_initial_data {
LANG: C
WRITES: HydroBase::rho(everywhere) HydroBase::vel(everywhere) HydroBase::eps(everywhere) HydroBase::press(everywhere)
WRITES: HydroBaseX::rho(everywhere) HydroBaseX::vel(everywhere) HydroBaseX::eps(everywhere) HydroBaseX::press(everywhere)
WRITES: AsterX::Avec_x(everywhere) AsterX::Avec_y(everywhere) AsterX::Avec_z(everywhere)
}
"Set up initial conditions for 3D tests"
Expand All @@ -41,9 +41,9 @@ if (CCTK_Equals(test_type, "3DTest")) {
if (CCTK_Equals(test_case, "magTOV")) {

STORAGE: Avec_cent
SCHEDULE AsterSeeds_InitializeCenteredAvec AT initial AFTER HydroBase_PostInitial BEFORE AsterX_ComputedBstagFromA {
SCHEDULE AsterSeeds_InitializeCenteredAvec AT initial AFTER HydroBaseX_PostInitial BEFORE AsterX_ComputedBstagFromA {
LANG: C
READS: HydroBase::press(everywhere)
READS: HydroBaseX::press(everywhere)
WRITES: Avec_x_cent(everywhere) Avec_y_cent(everywhere) Avec_z_cent(everywhere)
}
"Set up initial conditions for the cell-centered vector potential"
Expand Down
8 changes: 4 additions & 4 deletions AsterX/interface.ccl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

IMPLEMENTS: AsterX

INHERITS: CarpetX ADMBase HydroBase TmunuBase
INHERITS: CarpetX ADMBaseX HydroBaseX TmunuBaseX

USES INCLUDE HEADER: fixmath.hxx
USES INCLUDE HEADER: loop_device.hxx
Expand All @@ -13,14 +13,14 @@ USES INCLUDE HEADER: reconstruct.hxx

PUBLIC:

CCTK_REAL dens TYPE=gf CENTERING={ccc} TAGS='rhs="densrhs" dependents="HydroBase::rho TmunuBase::eTtt AsterX::flux_x AsterX::flux_y AsterX::flux_z"' "Conserved rest mass density"
CCTK_REAL dens TYPE=gf CENTERING={ccc} TAGS='rhs="densrhs" dependents="HydroBaseX::rho TmunuBaseX::eTtt AsterX::flux_x AsterX::flux_y AsterX::flux_z"' "Conserved rest mass density"

CCTK_REAL mom TYPE=gf CENTERING={ccc} TAGS='rhs="momrhs" dependents="HydroBase::vel TmunuBase::eTti"'
CCTK_REAL mom TYPE=gf CENTERING={ccc} TAGS='rhs="momrhs" dependents="HydroBaseX::vel TmunuBaseX::eTti"'
{
momx, momy, momz
} "Conserved momentum density"

CCTK_REAL tau TYPE=gf CENTERING={ccc} TAGS='rhs="taurhs" dependents="HydroBase::eps HydroBase::press HydroBase::temperature HydroBase::Ye HydroBase::Bvec TmunuBase::eTij"' "Conserved internal energy density"
CCTK_REAL tau TYPE=gf CENTERING={ccc} TAGS='rhs="taurhs" dependents="HydroBaseX::eps HydroBaseX::press HydroBaseX::temperature HydroBaseX::Ye HydroBaseX::Bvec TmunuBaseX::eTij"' "Conserved internal energy density"

CCTK_REAL flux_x TYPE=gf CENTERING={vcc} TAGS='checkpoint="no"'
{
Expand Down
36 changes: 18 additions & 18 deletions AsterX/par/Balsara1_shocktube_xdir.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ ActiveThorns = "
IOUtil
ODESolvers
TimerReport
ADMBase
HydroBase
TmunuBase
ADMBaseX
HydroBaseX
TmunuBaseX
AsterSeeds
AsterX
EOSX
Expand All @@ -21,11 +21,11 @@ Cactus::presync_mode = "mixed-error"
Cactus::terminate = "time"
Cactus::cctk_final_time = 0.40

ADMBase::initial_data = "Cartesian Minkowski"
ADMBase::initial_lapse = "one"
ADMBase::initial_shift = "zero"
ADMBase::initial_dtlapse = "none"
ADMBase::initial_dtshift = "none"
ADMBaseX::initial_data = "Cartesian Minkowski"
ADMBaseX::initial_lapse = "one"
ADMBaseX::initial_shift = "zero"
ADMBaseX::initial_dtlapse = "none"
ADMBaseX::initial_dtshift = "none"

CarpetX::verbose = no

Expand Down Expand Up @@ -83,20 +83,20 @@ ODESolvers::method = "RK4"
IO::out_dir = $parfile
IO::out_every = 10 #$ncells * 2 ** ($nlevels - 1) / 32
CarpetX::out_silo_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

CarpetX::out_tsv_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

Expand Down
36 changes: 18 additions & 18 deletions AsterX/par/Balsara1_shocktube_ydir.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ ActiveThorns = "
IOUtil
ODESolvers
TimerReport
ADMBase
HydroBase
TmunuBase
ADMBaseX
HydroBaseX
TmunuBaseX
AsterSeeds
AsterX
EOSX
Expand All @@ -21,11 +21,11 @@ Cactus::presync_mode = "mixed-error"
Cactus::terminate = "time"
Cactus::cctk_final_time = 0.40

ADMBase::initial_data = "Cartesian Minkowski"
ADMBase::initial_lapse = "one"
ADMBase::initial_shift = "zero"
ADMBase::initial_dtlapse = "none"
ADMBase::initial_dtshift = "none"
ADMBaseX::initial_data = "Cartesian Minkowski"
ADMBaseX::initial_lapse = "one"
ADMBaseX::initial_shift = "zero"
ADMBaseX::initial_dtlapse = "none"
ADMBaseX::initial_dtshift = "none"

CarpetX::verbose = no

Expand Down Expand Up @@ -83,20 +83,20 @@ ODESolvers::method = "RK4"
IO::out_dir = $parfile
IO::out_every = 10 #$ncells * 2 ** ($nlevels - 1) / 32
CarpetX::out_silo_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

CarpetX::out_tsv_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

Expand Down
36 changes: 18 additions & 18 deletions AsterX/par/Balsara1_shocktube_zdir.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ ActiveThorns = "
IOUtil
ODESolvers
TimerReport
ADMBase
HydroBase
TmunuBase
ADMBaseX
HydroBaseX
TmunuBaseX
AsterSeeds
AsterX
EOSX
Expand All @@ -21,11 +21,11 @@ Cactus::presync_mode = "mixed-error"
Cactus::terminate = "time"
Cactus::cctk_final_time = 0.40

ADMBase::initial_data = "Cartesian Minkowski"
ADMBase::initial_lapse = "one"
ADMBase::initial_shift = "zero"
ADMBase::initial_dtlapse = "none"
ADMBase::initial_dtshift = "none"
ADMBaseX::initial_data = "Cartesian Minkowski"
ADMBaseX::initial_lapse = "one"
ADMBaseX::initial_shift = "zero"
ADMBaseX::initial_dtlapse = "none"
ADMBaseX::initial_dtshift = "none"

CarpetX::verbose = no

Expand Down Expand Up @@ -83,20 +83,20 @@ ODESolvers::method = "RK4"
IO::out_dir = $parfile
IO::out_every = 10 #$ncells * 2 ** ($nlevels - 1) / 32
CarpetX::out_silo_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

CarpetX::out_tsv_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

Expand Down
36 changes: 18 additions & 18 deletions AsterX/par/Balsara2_shocktube_xdir.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ ActiveThorns = "
IOUtil
ODESolvers
TimerReport
ADMBase
HydroBase
TmunuBase
ADMBaseX
HydroBaseX
TmunuBaseX
AsterSeeds
AsterX
EOSX
Expand All @@ -21,11 +21,11 @@ Cactus::presync_mode = "mixed-error"
Cactus::terminate = "time"
Cactus::cctk_final_time = 0.40

ADMBase::initial_data = "Cartesian Minkowski"
ADMBase::initial_lapse = "one"
ADMBase::initial_shift = "zero"
ADMBase::initial_dtlapse = "none"
ADMBase::initial_dtshift = "none"
ADMBaseX::initial_data = "Cartesian Minkowski"
ADMBaseX::initial_lapse = "one"
ADMBaseX::initial_shift = "zero"
ADMBaseX::initial_dtlapse = "none"
ADMBaseX::initial_dtshift = "none"

CarpetX::verbose = no

Expand Down Expand Up @@ -83,20 +83,20 @@ ODESolvers::method = "RK4"
IO::out_dir = $parfile
IO::out_every = 10 #$ncells * 2 ** ($nlevels - 1) / 32
CarpetX::out_silo_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

CarpetX::out_tsv_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

Expand Down
36 changes: 18 additions & 18 deletions AsterX/par/Balsara2_shocktube_ydir.par
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ ActiveThorns = "
IOUtil
ODESolvers
TimerReport
ADMBase
HydroBase
TmunuBase
ADMBaseX
HydroBaseX
TmunuBaseX
AsterSeeds
AsterX
EOSX
Expand All @@ -21,11 +21,11 @@ Cactus::presync_mode = "mixed-error"
Cactus::terminate = "time"
Cactus::cctk_final_time = 0.40

ADMBase::initial_data = "Cartesian Minkowski"
ADMBase::initial_lapse = "one"
ADMBase::initial_shift = "zero"
ADMBase::initial_dtlapse = "none"
ADMBase::initial_dtshift = "none"
ADMBaseX::initial_data = "Cartesian Minkowski"
ADMBaseX::initial_lapse = "one"
ADMBaseX::initial_shift = "zero"
ADMBaseX::initial_dtlapse = "none"
ADMBaseX::initial_dtshift = "none"

CarpetX::verbose = no

Expand Down Expand Up @@ -83,20 +83,20 @@ ODESolvers::method = "RK4"
IO::out_dir = $parfile
IO::out_every = 10 #$ncells * 2 ** ($nlevels - 1) / 32
CarpetX::out_silo_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

CarpetX::out_tsv_vars = "
HydroBase::rho
HydroBase::vel
HydroBase::eps
HydroBase::press
HydroBase::Bvec
HydroBaseX::rho
HydroBaseX::vel
HydroBaseX::eps
HydroBaseX::press
HydroBaseX::Bvec
CarpetX::regrid_error
"

Expand Down
Loading

0 comments on commit 0a8a85f

Please sign in to comment.