diff options
| author | Christian Reisswig <reisswig@tapir.caltech.edu> | 2011-11-25 14:30:17 -0800 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 19:55:01 +0000 |
| commit | 97d0d01f080a36014a3cd0a7988ec2754025f641 (patch) | |
| tree | 85e0b20e699f2a527772ccdd91d4d61ba273bc2c /Carpet/CarpetLib/src/data.cc | |
| parent | bacf462840317b7a7d74809a639d474fba26e583 (diff) | |
Slight optimization of CC ENO operators.
Diffstat (limited to 'Carpet/CarpetLib/src/data.cc')
| -rw-r--r-- | Carpet/CarpetLib/src/data.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc index 58bb2adf1..4771601a4 100644 --- a/Carpet/CarpetLib/src/data.cc +++ b/Carpet/CarpetLib/src/data.cc @@ -837,7 +837,7 @@ transfer_prolongate (data const * const src, { & prolongate_3d_cc_eno_rf2<T,2>, & prolongate_3d_cc_eno_rf2<T,2>, // note that we cheat here: order is still 2 even though 3 was requested! - & prolongate_3d_cc_eno_rf2<T,3>, // note that we cheat here: order is 3 even though 4 was requested! + & prolongate_3d_cc_eno_rf2<T,2>, // note that we cheat here: order is 2 even though 4 was requested! & prolongate_3d_cc_eno_rf2<T,3> // note that we cheat here: order is 3 even though 5 was requested! // have cheated here for two reasons: first, the ENO prolongation operator stencil radius is larger than Lagrange (and dh.cc assumes that the stencil goes as order_space/2!), // and second, we want to allow spacetime interpolation to be of higher order while keeping the implemeneted ENO order! @@ -846,14 +846,6 @@ transfer_prolongate (data const * const src, CCTK_WARN (CCTK_WARN_ABORT, "There is no cell-centred stencil for op=\"ENO\" with order_space not in {2,3,4,5}"); } - /*if (order_space == 3) { - CCTK_WARN (1, - "Currently, in order to keep a consistent stencil radius in the buffer zone, we use 2nd order ENO. For third order ENO set order_space to 4 or 5!"); - } - if (order_space > 3) { - CCTK_WARN (1, - "Currently, in order to keep a consistent stencil radius in the buffer zone, we use 3rd order ENO. There are no higher orders than 3rd order implemented!"); - }*/ call_operator<T> (the_operators[order_space-2], static_cast <T const *> (src->storage()), @@ -911,7 +903,7 @@ transfer_prolongate (data const * const src, } timer.stop (0); } - + break; case op_TVD: { static Timer timer ("prolongate_TVD"); timer.start (); @@ -959,7 +951,7 @@ transfer_prolongate (data const * const src, timer.stop (0); break; } - + break; case op_Lagrange_monotone: { static Timer timer ("prolongate_Lagrange_monotone"); timer.start (); |