From 09864c38c259da9bc592c116e4e65f315e88f081 Mon Sep 17 00:00:00 2001 From: knarf Date: Tue, 25 Jan 2011 21:48:16 +0000 Subject: Change the number of timelevels of the ahmask to match the number which is used for the metric. Setting this to three unconditionally leads to problems when running with Carpet and prolongation_order_time=1 because all GFs in Carpet are expected to have the same number of timelevels: prolongation_order_time+1. This is not the ideal solution. That would eliminate also variables ala metric_timelevels, because they directly depend on prolongation_order_time and should not have to be set (correctly) in a parameter file. This could be done automatically. However, this patch for now uses metric_timelevels, in order to get AHFinderDirect working quickly. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1554 f88db872-0e4f-0410-b76b-b9085cfa78c5 --- param.ccl | 1 + schedule.ccl | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/param.ccl b/param.ccl index dbb29b6..ad6e3f6 100644 --- a/param.ccl +++ b/param.ccl @@ -20,6 +20,7 @@ USES KEYWORD rotation_axis # note our access is read-only shares: ADMBase USES KEYWORD metric_type +USES CCTK_INT metric_timelevels # we need to look at SpaceMask::use_mask in order to find out about the # excision region diff --git a/schedule.ccl b/schedule.ccl index b22e32f..edaf235 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -2,7 +2,19 @@ # $Header$ storage: ah_radius ah_origin ah_centroid ah_flags -storage: ahmask[3] + +if (metric_timelevels == 1) +{ + storage: ahmask[1] +} +else if (metric_timelevels == 2) +{ + storage: ahmask[2] +} +else if (metric_timelevels == 3) +{ + storage: ahmask[3] +} # # setup -- cgit v1.2.3