aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknarf <knarf@57fe0bb3-ccba-405f-9b23-de0201f165b7>2009-08-28 13:18:03 +0000
committerknarf <knarf@57fe0bb3-ccba-405f-9b23-de0201f165b7>2009-08-28 13:18:03 +0000
commite6db34f648744f270a36caf5930ce604f3f541de (patch)
tree25fdd989110ea2c5431c2d7cfd1eaefb25a7b577
parenta5731dd313cf44f876167d253841bc9f0165607b (diff)
rename parameter, more comments, rename Boundary schedule group names
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/HydroBase/trunk@7 57fe0bb3-ccba-405f-9b23-de0201f165b7
-rwxr-xr-xconfiguration.ccl1
-rwxr-xr-xinterface.ccl9
-rwxr-xr-xparam.ccl4
-rwxr-xr-xschedule.ccl22
4 files changed, 20 insertions, 16 deletions
diff --git a/configuration.ccl b/configuration.ccl
index 27ed326..a2c09d8 100755
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -1,4 +1,3 @@
# Configuration definition for thorn HydroBase
-REQUIRES Boundary CartGrid3D SpaceMask
diff --git a/interface.ccl b/interface.ccl
index 9e1843b..bad74fa 100755
--- a/interface.ccl
+++ b/interface.ccl
@@ -1,13 +1,12 @@
# Interface definition for thorn HydroBase
implements: HydroBase
-inherits: ADMBase
public:
-CCTK_REAL rho type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::HydroBase_Prolongation_Type" tensortypealias="Scalar" interpolator="matter"' "rest mass density"
-CCTK_REAL press type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::HydroBase_Prolongation_Type" tensortypealias="Scalar" interpolator="matter"' "gas pressure"
-CCTK_REAL eps type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::HydroBase_Prolongation_Type" tensortypealias="Scalar" interpolator="matter"' "internal energy"
+CCTK_REAL rho type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "rest mass density"
+CCTK_REAL press type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "gas pressure"
+CCTK_REAL eps type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "internal energy"
-CCTK_REAL vel[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::HydroBase_Prolongation_Type" tensortypealias="U" interpolator="matter"' "velocity"
+CCTK_REAL vel[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="U" interpolator="matter"' "velocity"
diff --git a/param.ccl b/param.ccl
index aa78e4b..33b5fba 100755
--- a/param.ccl
+++ b/param.ccl
@@ -5,9 +5,9 @@ restricted:
int timelevels "Number of time levels in evolution scheme"
{
1:3 :: "FMR/AMR runs probably need 3. Otherwise use 2"
-} 2
+} 1
-STRING HydroBase_Prolongation_Type "The prolongation operator used by Carpet for HydroBase variables"
+STRING prolongation_type "The prolongation operator used by Carpet for HydroBase variables"
{
"ENO" :: "Third order ENO operators; only third order is implemented"
"WENO" :: "Fifth order WENO operators; only fifth order is implemented"
diff --git a/schedule.ccl b/schedule.ccl
index b6f4ec6..2b3b5ac 100755
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -52,31 +52,37 @@ schedule group HydroBase_PostStep AT POSTRESTRICTINITIAL
{
} "Post step tasks for hydro thorns"
-# Hydro thorns should not schedule something in this group
-# (schedule them in HydroBase_Boundaries), but they can refer to it
+# Hydro thorns should not schedule something in group HydroBase_Boundaries
+# (schedule them in HydroBase_Select_Boundaries), but they can refer to it
# in order to schedule own routines before or after the boundary
-# treatment
-schedule group HydroBase_Do_Boundaries IN HydroBase_PostStep BEFORE HydroBase_Con2Prim
+# treatment or they can schedule the whole group
+schedule group HydroBase_Boundaries IN HydroBase_PostStep BEFORE HydroBase_Con2Prim
{
-} "HydroBase Boundary conditions group"
+} "HydroBase-internal Boundary conditions group"
-schedule group HydroBase_Boundaries IN HydroBase_Do_Boundaries
+# Here codes would have to schedule functions to specify which boundary conditions
+# should be applied to which variables
+schedule group HydroBase_Select_Boundaries IN HydroBase_Boundaries
{
} "Group to schedule the boundary condition functions"
-schedule group ApplyBCs AS HydroBase_ApplyBCs IN HydroBase_Do_Boundaries AFTER HydroBase_Boundaries
+# This will then later actually apply all the selected boundary conditions. Thorns
+# using HydroBase should not need to change something here.
+schedule group ApplyBCs AS HydroBase_ApplyBCs IN HydroBase_Boundaries AFTER HydroBase_Select_Boundaries
{
} "Apply the boundary conditions of HydroBase"
+# This is a group to schedule Con2Prim routines, scheduled at different times during
+# an evolution
schedule group HydroBase_Con2Prim IN HydroBase_PostStep
{
} "Convert from conservative to primitive variables"
-# I am not quite sure why this has to be scheduled in CCTK_PostPostInitial (roland)
schedule group HydroBase_Con2Prim AT CCTK_PostPostInitial AS Con2Prim BEFORE ADMConstraintsGroup
{
} "Convert from conservative to primitive variables (might be redundant)"
+# Schedule prim2con after initial data
schedule group HydroBase_Prim2ConInitial AT Initial AFTER HydroBase_Initial
{
} "Recover the conservative variables from the primitive variables"