From 370a3e2e1fa1ae180763ddda9b7720c6d7635df4 Mon Sep 17 00:00:00 2001 From: Liwei Ji Date: Sat, 20 Apr 2024 19:55:38 +0000 Subject: [PATCH] Subcycling: use CarpetX par use_subcycling_wip --- ODESolvers/schedule.ccl | 10 +++++----- Subcycling/param.ccl | 4 ++++ Subcycling/schedule.ccl | 38 ++++++++++++++++++++------------------ 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/ODESolvers/schedule.ccl b/ODESolvers/schedule.ccl index 52f535d53..690f71bd0 100644 --- a/ODESolvers/schedule.ccl +++ b/ODESolvers/schedule.ccl @@ -1,11 +1,11 @@ # Schedule definitions for thorn ODESolvers if(use_subcycling_wip) { - SCHEDULE ODESolvers_Solve_Subcycling AT evol - { - LANG: C - OPTIONS: level - } "Solve ODEs using Subcycling" + SCHEDULE ODESolvers_Solve_Subcycling AT evol + { + LANG: C + OPTIONS: level + } "Solve ODEs using Subcycling" } else { SCHEDULE ODESolvers_Solve AT evol diff --git a/Subcycling/param.ccl b/Subcycling/param.ccl index 9e4f8efef..a6476d94a 100644 --- a/Subcycling/param.ccl +++ b/Subcycling/param.ccl @@ -1 +1,5 @@ # Parameter definitions for thorn Subcycling + +SHARES: CarpetX + +USES BOOLEAN use_subcycling_wip diff --git a/Subcycling/schedule.ccl b/Subcycling/schedule.ccl index f5805ba54..a3fbceafe 100644 --- a/Subcycling/schedule.ccl +++ b/Subcycling/schedule.ccl @@ -1,23 +1,25 @@ # Schedule definitions for thorn Subcycling -SCHEDULE GROUP Subcycling_RMBndryGroup AT initial -{ -} "Check if the ghost points are at refinement boundary" +if(use_subcycling_wip) { + SCHEDULE GROUP Subcycling_RMBndryGroup AT initial + { + } "Check if the ghost points are at refinement boundary" -SCHEDULE GROUP Subcycling_RMBndryGroup AT postregrid -{ -} "Check if the ghost points are at refinement boundary" + SCHEDULE GROUP Subcycling_RMBndryGroup AT postregrid + { + } "Check if the ghost points are at refinement boundary" -SCHEDULE Subcycling_SetLevelNeighbor IN Subcycling_RMBndryGroup -{ - LANG: C - WRITES: level_neighbor(interior) - SYNC: level_neighbor -} "Set level_neighbor" + SCHEDULE Subcycling_SetLevelNeighbor IN Subcycling_RMBndryGroup + { + LANG: C + WRITES: level_neighbor(interior) + SYNC: level_neighbor + } "Set level_neighbor" -SCHEDULE Subcycling_SetIsRMBndry IN Subcycling_RMBndryGroup AFTER Subcycling_SetLevelNeighbor -{ - LANG: C - READS: level_neighbor(everywhere) - WRITES: isrmbndry(everywhere) -} "Set isrmbndry" + SCHEDULE Subcycling_SetIsRMBndry IN Subcycling_RMBndryGroup AFTER Subcycling_SetLevelNeighbor + { + LANG: C + READS: level_neighbor(everywhere) + WRITES: isrmbndry(everywhere) + } "Set isrmbndry" +}