diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2009-04-27 11:15:22 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2009-04-27 11:15:22 -0500 |
| commit | 311e827317642ecf806d05ab2ec25bd307ebd65f (patch) | |
| tree | b95a3c79beebad5fec8d9489bc38c88f149e5786 /ML_ADM/param.ccl | |
| parent | 2ca9b048d3710cab763737790679bcc68a3bf122 (diff) | |
Resolve merge commits
Diffstat (limited to 'ML_ADM/param.ccl')
| -rw-r--r-- | ML_ADM/param.ccl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ML_ADM/param.ccl b/ML_ADM/param.ccl index b22e4ba..91ffeb8 100644 --- a/ML_ADM/param.ccl +++ b/ML_ADM/param.ccl @@ -1,5 +1,5 @@ -# File produced by user diener -# Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) +# File produced by user eschnett +# Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) # Mathematica script written by Ian Hinder and Sascha Husa @@ -16,7 +16,6 @@ USES CCTK_INT boundary_width shares: MethodOfLines USES CCTK_INT MoL_Num_Evolved_Vars -USES CCTK_INT MoL_Num_Constrained_Vars restricted: CCTK_INT verbose "verbose" @@ -45,12 +44,6 @@ CCTK_INT ML_ADM_MaxNumEvolvedVars "Number of evolved variables used by this thor } 16 restricted: -CCTK_INT ML_ADM_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars -{ - 65:65 :: "Number of constrained variables used by this thorn" -} 65 - -restricted: CCTK_INT timelevels "Number of active timelevels" { 0:3 :: "" |