User: knarf Date: 2011/01/25 03:48 PM

Modified: /trunk/ param.ccl, schedule.ccl

Log: 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.

File Changes:

Directory: /trunk/ ==================

File [modified]: param.ccl Delta lines: +1 -0 =================================================================== --- trunk/param.ccl 2010-11-21 03:28:57 UTC (rev 1553) +++ trunk/param.ccl 2011-01-25 21:48:16 UTC (rev 1554) @@ -20,6 +20,7 @@ # 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

File [modified]: schedule.ccl Delta lines: +13 -1 =================================================================== --- trunk/schedule.ccl 2010-11-21 03:28:57 UTC (rev 1553) +++ trunk/schedule.ccl 2011-01-25 21:48:16 UTC (rev 1554) @@ -2,8 +2,20 @@ # $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 #