diff --git a/src/fields.cpp b/src/fields.cpp index 74991e10f..e9ed5bb80 100644 --- a/src/fields.cpp +++ b/src/fields.cpp @@ -214,7 +214,7 @@ fields_chunk::~fields_chunk() { } static void split_into_tiles(grid_volume gvol, std::vector &result) { - size_t base_nowned_min = 1000; + const size_t base_nowned_min = 1000; if (gvol.nowned_min() < base_nowned_min) { result.push_back(gvol); return; diff --git a/src/meep.hpp b/src/meep.hpp index 6a05d4896..fec8e2ad5 100644 --- a/src/meep.hpp +++ b/src/meep.hpp @@ -1368,7 +1368,7 @@ class fields_chunk { double a, Courant, dt; // resolution a, Courant number, and timestep dt=Courant/a grid_volume gv; - std::vector gvs; // subregions for cache-tiled execution of step_curl + std::vector gvs; // subdomains for cache-tiled execution of step_curl volume v; double m; // angular dependence in cyl. coords bool zero_fields_near_cylorigin; // fields=0 m pixels near r=0 for stability diff --git a/src/step_db.cpp b/src/step_db.cpp index 2448cd890..c768a24a0 100644 --- a/src/step_db.cpp +++ b/src/step_db.cpp @@ -108,8 +108,8 @@ bool fields_chunk::step_db(field_type ft) { for (int iz = 0; iz <= gv_sub.nz(); ++iz) { ptrdiff_t idx = ir * sr + iz; f_rderiv_int[idx] = - f_rderiv_int[idx - sr] + - rinv * (f_p[idx] * (ir + ir0) - f_p[idx - sr] * ((ir - 1) + ir0)); + f_rderiv_int[idx - sr] + + rinv * (f_p[idx] * (ir + ir0) - f_p[idx - sr] * ((ir - 1) + ir0)); } } f_p = f_rderiv_int;