diff options
-rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc | 25 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc | 17 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc | 21 |
3 files changed, 30 insertions, 33 deletions
diff --git a/Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc index 020158d4b..3cb27f8a6 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_o11_rf2.cc @@ -35,20 +35,19 @@ namespace CarpetLib { RT coeff (int const i) { - RT const one = 1; static const RT coeffs[ncoeffs] = { - 63/one*524288, - - 819/one*524288, - 5005/one*524288, - - 19305/one*524288, - 27027/one*262144, - - 63063/one*262144, - 189189/one*262144, - 135135/one*262144, - - 45045/one*524288, - 9009/one*524288, - - 1287/one*524288, - 91/one*524288 + 63/RT(524288.0), + - 819/RT(524288.0), + 5005/RT(524288.0), + - 19305/RT(524288.0), + 27027/RT(262144.0), + - 63063/RT(262144.0), + 189189/RT(262144.0), + 135135/RT(262144.0), + - 45045/RT(524288.0), + 9009/RT(524288.0), + - 1287/RT(524288.0), + 91/RT(524288.0) }; return coeffs[i]; } diff --git a/Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc index fcf4d710f..d48380659 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_o7_rf2.cc @@ -35,16 +35,15 @@ namespace CarpetLib { RT coeff (int const i) { - RT const one = 1; static const RT coeffs[ncoeffs] = { - - 5*one/2048, - 49*one/2048, - - 245*one/2048, - 1225*one/2048, - 1225*one/2048, - - 245*one/2048, - 49*one/2048, - - 5*one/2048 + - 5/RT(2048.0), + 49/RT(2048.0), + - 245/RT(2048.0), + 1225/RT(2048.0), + 1225/RT(2048.0), + - 245/RT(2048.0), + 49/RT(2048.0), + - 5/RT(2048.0) }; return coeffs[i]; } diff --git a/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc index 8e2d6fc18..045c7a627 100644 --- a/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc +++ b/Carpet/CarpetLib/src/prolongate_3d_o9_rf2.cc @@ -35,18 +35,17 @@ namespace CarpetLib { RT coeff (int const i) { - RT const one = 1; static const RT coeffs[ncoeffs] = { - - 35*one/65536, - 385*one/65536, - - 495*one/16384, - 1617*one/16384, - - 8085*one/32768, - 24255*one/32768, - 8085*one/16384, - - 1155*one/16384, - 693*one/65536, - - 55*one/65536 + - 35/RT(65536.0), + 385/RT(65536.0), + - 495/RT(16384.0), + 1617/RT(16384.0), + - 8085/RT(32768.0), + 24255/RT(32768.0), + 8085/RT(16384.0), + - 1155/RT(16384.0), + 693/RT(65536.0), + - 55/RT(65536.0) }; return coeffs[i]; } |