diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-04-07 13:08:25 -0500 |
---|---|---|
committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-04-07 13:08:25 -0500 |
commit | 88c4be53a9f66a5a361e6ff0f2508219ae8f8ba6 (patch) | |
tree | b7d66c62c72e6cf20bdb6a6971cbcebccf57405b /ML_BSSN/param.ccl | |
parent | 45ed54319a54c7e7af3ff8931bd6ff5e3b5ca9f6 (diff) | |
parent | 86c485d0128966a78ddb0f62a41bdb3e63ba1b1d (diff) |
Merge branch 'master' of /Users/eschnett/Cbeta/arrangements/McLachlan
Conflicts:
ML_BSSN/src/ML_BSSN_RHS1.c
ML_BSSN_MP/src/ML_BSSN_MP_RHS1.c
ML_BSSN_O2/src/ML_BSSN_O2_RHS1.c
ML_BSSN_O8/src/ML_BSSN_O8_RHS1.c
m/McLachlan_BSSN.m
Diffstat (limited to 'ML_BSSN/param.ccl')
-rw-r--r-- | ML_BSSN/param.ccl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ML_BSSN/param.ccl b/ML_BSSN/param.ccl index 188e0f1..c0e80de 100644 --- a/ML_BSSN/param.ccl +++ b/ML_BSSN/param.ccl @@ -185,13 +185,13 @@ CCTK_INT ML_BSSN_MaxNumEvolvedVars "Number of evolved variables used by this tho restricted: CCTK_INT timelevels "Number of active timelevels" { - 0:4 :: "" + 0:3 :: "" } 3 restricted: CCTK_INT rhs_timelevels "Number of active RHS timelevels" { - 0:4 :: "" + 0:3 :: "" } 1 restricted: |