diff options
| author | schnetter <> | 2004-02-27 15:22:00 +0000 |
|---|---|---|
| committer | schnetter <> | 2004-02-27 15:22:00 +0000 |
| commit | 240fd0d0fc67615c7747698caa62eb6ae073e6c9 (patch) | |
| tree | 98385e848aaea48fe0259cb891f66a184f047a1f | |
| parent | fd8dc694896b5b21fb18d792a76c61ed25bdb48c (diff) | |
Use the new vect::floor instead of vect::map(floor,)
darcs-hash:20040227152205-07bb3-33135e23f97ccb01f347189ca57b01003732863d.gz
| -rw-r--r-- | Carpet/CarpetInterp/src/interp.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc index 8adff3358..4df45e41d 100644 --- a/Carpet/CarpetInterp/src/interp.cc +++ b/Carpet/CarpetInterp/src/interp.cc @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.22 2004/02/15 11:15:16 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.23 2004/02/27 16:22:05 schnetter Exp $ #include <assert.h> #include <math.h> @@ -21,7 +21,7 @@ #include "interp.hh" extern "C" { - static char const * const rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.22 2004/02/15 11:15:16 schnetter Exp $"; + static char const * const rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.23 2004/02/27 16:22:05 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetInterp_interp_cc); } @@ -190,8 +190,7 @@ namespace CarpetInterp { for (int rl=maxrl-1; rl>=minrl; --rl) { const int fact = maxreflevelfact * ipow(mgfact, basemglevel + mglevel) / ipow(reffact, rl); - CCTK_REAL (* const rfloor) (CCTK_REAL const) = floor; - ivect const ipos = ivect(::map(rfloor, (pos - lower) / (delta * fact) + 0.5)) * fact; + ivect const ipos = ivect(floor((pos - lower) / (delta * fact) + 0.5)) * fact; assert (all(ipos % vhh.at(m)->bases.at(rl).at(ml).stride() == 0)); // TODO: use something faster than a linear search |