diff options
Diffstat (limited to 'src/patch/grid.cc')
| -rw-r--r-- | src/patch/grid.cc | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/src/patch/grid.cc b/src/patch/grid.cc index dc58ea6..8812ab1 100644 --- a/src/patch/grid.cc +++ b/src/patch/grid.cc @@ -13,8 +13,7 @@ #include <math.h> #include "jt/stdc.h" -#include "jt/util.hh" // jtutil::how_many_in_range(), - // round<fp>::, fuzzy<fp>:: +#include "jt/util.hh" #include "jt/array.hh" #include "jt/linear_map.hh" @@ -34,10 +33,9 @@ grid_arrays::grid_arrays(const grid_array_pars& grid_array_pars_in) : gridfn_data_(NULL), ghosted_gridfn_data_(NULL), - min_gfn_(gridfn_pars_in.min_gfn_in), - max_gfn_(gridfn_pars_in.max_gfn_in), - ghosted_min_gfn_(gridfn_pars_in.ghosted_min_gfn_in), - ghosted_max_gfn_(gridfn_pars_in.ghosted_max_gfn_in), + // these are all set properly by setup_gridfn_storage() + min_gfn_(0), max_gfn_(0), + ghosted_min_gfn_(0), ghosted_max_gfn_(0), min_irho_(grid_array_pars_in.min_irho), max_irho_(grid_array_pars_in.max_irho), @@ -62,33 +60,25 @@ grid_arrays::grid_arrays(const grid_array_pars& grid_array_pars_in) // void grid_arrays::setup_gridfn_storage (const gridfn_pars& gridfn_pars_in, - const gridfn_pars& ghosted_gridfn_pars_in, + const gridfn_pars& ghosted_gridfn_pars_in) { assert(gridfn_data_ == NULL); -gridfn_data_ = new jtutil::array3d<fp>(gridfn_pars_in.min_gfn_in, - gridfn_pars_in.max_gfn_in, - grid_array_pars_in.min_irho, - grid_array_pars_in.max_irho, - grid_array_pars_in.min_isigma, - grid_array_pars_in.max_isigma, +gridfn_data_ = new jtutil::array3d<fp>(gridfn_pars_in.min_gfn, + gridfn_pars_in.max_gfn, + min_irho(), max_irho(), + min_isigma(), max_isigma(), gridfn_pars_in.storage_array, gridfn_pars_in.gfn_stride, gridfn_pars_in.irho_stride, gridfn_pars_in.isigma_stride); -assert(ghosted_gridfn_data == NULL); -ghosted_gridfn_data +assert(ghosted_gridfn_data_ == NULL); +ghosted_gridfn_data_ = new jtutil::array3d<fp> - (gridfn_pars_in.ghosted_min_gfn_in, - gridfn_pars_in.ghosted_max_gfn_in, - grid_array_pars_in.min_irho - - grid_array_pars_in.min_rho_N_ghost_points, - grid_array_pars_in.max_irho - + grid_array_pars_in.max_rho_N_ghost_points, - grid_array_pars_in.min_isigma - - grid_array_pars_in.min_sigma_N_ghost_points, - grid_array_pars_in.max_isigma - + grid_array_pars_in.max_sigma_N_ghost_points, + (ghosted_gridfn_pars_in.min_gfn, + ghosted_gridfn_pars_in.max_gfn, + ghosted_min_irho(), ghosted_max_irho(), + ghosted_min_isigma(), ghosted_max_isigma(), ghosted_gridfn_pars_in.storage_array, ghosted_gridfn_pars_in.gfn_stride, ghosted_gridfn_pars_in.irho_stride, |