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 /par | |
| 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 'par')
| -rw-r--r-- | par/ks-mclachlan.par | 25 | ||||
| -rw-r--r-- | par/qc0-mclachlan.par | 24 |
2 files changed, 21 insertions, 28 deletions
diff --git a/par/ks-mclachlan.par b/par/ks-mclachlan.par index 4239b42..29f5cc8 100644 --- a/par/ks-mclachlan.par +++ b/par/ks-mclachlan.par @@ -175,8 +175,6 @@ Time::dtfac = 0.40 ActiveThorns = "ADMBase ADMCoupling ADMMacros CoordGauge SpaceMask StaticConformal TmunuBase" -ADMMacros::spatial_order = 4 - ActiveThorns = "Exact" @@ -251,10 +249,7 @@ Dissipation::vars = " -ActiveThorns = "ADMConstraints" - -ADMConstraints::constraints_persist = yes -ADMConstraints::constraints_timelevels = 3 +ActiveThorns = "ML_ADMConstraints" @@ -285,7 +280,7 @@ IOBasic::outInfo_every = 1280 IOBasic::outInfo_reductions = "norm2" IOBasic::outInfo_vars = " Carpet::physical_time_per_hour - ADMConstraints::ham + ML_ADMConstraints::H " @@ -303,8 +298,8 @@ IOScalar::outScalar_vars = " ADMBase::shift ADMBase::dtlapse ADMBase::dtshift - ADMConstraints::hamiltonian - ADMConstraints::momentum + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom SphericalSurface::sf_radius " @@ -327,8 +322,8 @@ IOASCII::out0D_vars = " ADMBase::shift ADMBase::dtlapse ADMBase::dtshift - ADMConstraints::hamiltonian - ADMConstraints::momentum + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom SphericalSurface::sf_active SphericalSurface::sf_valid SphericalSurface::sf_info @@ -346,8 +341,8 @@ IOASCII::out1D_vars = " ADMBase::shift ADMBase::dtlapse ADMBase::dtshift - ADMConstraints::hamiltonian - ADMConstraints::momentum + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom SphericalSurface::sf_radius " @@ -374,8 +369,8 @@ IOHDF5::out_vars = " ADMBase::shift ADMBase::dtlapse ADMBase::dtshift - ADMConstraints::hamiltonian - ADMConstraints::momentum + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom " #IOHDF5::checkpoint = yes diff --git a/par/qc0-mclachlan.par b/par/qc0-mclachlan.par index ca2d880..660339e 100644 --- a/par/qc0-mclachlan.par +++ b/par/qc0-mclachlan.par @@ -67,6 +67,7 @@ Carpet::prolongation_order_time = 2 Carpet::convergence_level = 0 Carpet::init_fill_timelevels = yes +#Carpet::init_3_timelevels = yes Carpet::poison_new_timelevels = yes CarpetLib::poison_new_memory = yes @@ -325,10 +326,7 @@ Dissipation::vars = " -ActiveThorns = "ADMConstraints" - -ADMConstraints::constraints_persist = yes -ADMConstraints::constraints_timelevels = 3 +ActiveThorns = "ML_ADMConstraints" @@ -397,7 +395,7 @@ IOBasic::outInfo_every = 128 IOBasic::outInfo_reductions = "norm2" IOBasic::outInfo_vars = " Carpet::physical_time_per_hour - ADMConstraints::ham + ML_ADMConstraints::H " @@ -415,8 +413,8 @@ IOScalar::outScalar_vars = " ADMBase::shift ADMBase::dtlapse ADMBase::dtshift - ADMConstraints::hamiltonian - ADMConstraints::momentum + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom SphericalSurface::sf_radius " @@ -439,8 +437,8 @@ IOASCII::out0D_vars = " ADMBase::shift ADMBase::dtlapse ADMBase::dtshift - ADMConstraints::hamiltonian - ADMConstraints::momentum + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom SphericalSurface::sf_active SphericalSurface::sf_valid SphericalSurface::sf_info @@ -458,8 +456,8 @@ IOASCII::out1D_vars = " ADMBase::shift ADMBase::dtlapse ADMBase::dtshift - ADMConstraints::hamiltonian - ADMConstraints::momentum + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom SphericalSurface::sf_radius " @@ -486,8 +484,8 @@ IOHDF5::out_vars = " ADMBase::shift ADMBase::dtlapse ADMBase::dtshift - ADMConstraints::hamiltonian - ADMConstraints::momentum + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom " IOHDF5::checkpoint = yes |