diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-11-16 18:55:47 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-11-22 09:59:16 -0500 |
| commit | 53a1c146bc09c67ea709c14dab4c73ebebed86dc (patch) | |
| tree | b5bd034cf3c0e6de4cb422ceffe52e01de06f505 /Carpet/Carpet/src/modes.cc | |
| parent | df843816d07d18e2c0407915d1b8113bfe7ab720 (diff) | |
Allow padding in transport operators
Rewrite padding infrastructure.
Add padded array extents to transport operator APIs.
Diffstat (limited to 'Carpet/Carpet/src/modes.cc')
| -rw-r--r-- | Carpet/Carpet/src/modes.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Carpet/Carpet/src/modes.cc b/Carpet/Carpet/src/modes.cc index 84b58b349..9af0039eb 100644 --- a/Carpet/Carpet/src/modes.cc +++ b/Carpet/Carpet/src/modes.cc @@ -4,10 +4,12 @@ #include <cstdio> #include <cstdlib> #include <cstring> +#include <functional> #include <cctk.h> #include <cctk_Parameters.h> +#include <cacheinfo.hh> #include <defs.hh> #include <gdata.hh> #include <ggf.hh> @@ -138,7 +140,7 @@ namespace Carpet { ivect_ref(info.ubnd) = (ext.upper() - baseext.lower()) / ext.stride(); ivect_ref(info.lsh) = ext.shape() / ext.stride(); - ivect_ref(info.ash) = gdata::allocated_memory_shape (ext); + ivect_ref(info.ash) = pad_shape(ext); if (gp.disttype == CCTK_DISTRIB_CONSTANT) { int const dir = gp.dim==0 ? 0 : gp.dim-1; ivect & gsh = ivect_ref(info.gsh); @@ -611,7 +613,7 @@ namespace Carpet { ivect_ref(cctkGH->cctk_ubnd) = (ext.upper() - baseext.lower()) / ext.stride(); ivect_ref(cctkGH->cctk_lsh) = ext.shape() / ext.stride(); - ivect_ref(cctkGH->cctk_ash) = gdata::allocated_memory_shape (ext); + ivect_ref(cctkGH->cctk_ash) = pad_shape(ext); for (int d=0; d<dim; ++d) { cctkGH->cctk_bbox[2*d ] = obnds[0][d]; |