Fix C derivative ghost-buffer indexing across FD orders
This commit is contained in:
@@ -86,11 +86,11 @@ void fderivs(const int ex[3],
|
||||
|
||||
if (i2_lo <= i2_hi && j2_lo <= j2_hi && k2_lo <= k2_hi) {
|
||||
for (int k0 = k2_lo; k0 <= k2_hi; ++k0) {
|
||||
const int kF = k0; // Fortran index for fh: kF = k0 (shift=0)
|
||||
const int kF = k0 + 1;
|
||||
for (int j0 = j2_lo; j0 <= j2_hi; ++j0) {
|
||||
const int jF = j0;
|
||||
const int jF = j0 + 1;
|
||||
for (int i0 = i2_lo; i0 <= i2_hi; ++i0) {
|
||||
const int iF = i0;
|
||||
const int iF = i0 + 1;
|
||||
const size_t p = idx_ex(i0, j0, k0, ex);
|
||||
|
||||
fx[p] = d2dx * (
|
||||
@@ -277,25 +277,25 @@ void fderivs(const int ex[3],
|
||||
}
|
||||
|
||||
/* 2nd-order pass: 3pt, widest */
|
||||
const int i2_lo = (iminF + 1 > 0) ? (iminF + 1) : 0;
|
||||
const int j2_lo = (jminF + 1 > 0) ? (jminF + 1) : 0;
|
||||
const int k2_lo = (kminF + 1 > 0) ? (kminF + 1) : 0;
|
||||
const int i2_lo = (iminF > 0) ? iminF : 0;
|
||||
const int j2_lo = (jminF > 0) ? jminF : 0;
|
||||
const int k2_lo = (kminF > 0) ? kminF : 0;
|
||||
const int i2_hi = ex1 - 2;
|
||||
const int j2_hi = ex2 - 2;
|
||||
const int k2_hi = ex3 - 2;
|
||||
|
||||
/* 4th-order pass: 5pt */
|
||||
const int i4_lo = (iminF + 2 > 0) ? (iminF + 2) : 0;
|
||||
const int j4_lo = (jminF + 2 > 0) ? (jminF + 2) : 0;
|
||||
const int k4_lo = (kminF + 2 > 0) ? (kminF + 2) : 0;
|
||||
const int i4_lo = (iminF + 1 > 0) ? (iminF + 1) : 0;
|
||||
const int j4_lo = (jminF + 1 > 0) ? (jminF + 1) : 0;
|
||||
const int k4_lo = (kminF + 1 > 0) ? (kminF + 1) : 0;
|
||||
const int i4_hi = ex1 - 3;
|
||||
const int j4_hi = ex2 - 3;
|
||||
const int k4_hi = ex3 - 3;
|
||||
|
||||
/* 6th-order pass: 7pt, narrowest interior */
|
||||
const int i6_lo = (iminF + 3 > 0) ? (iminF + 3) : 0;
|
||||
const int j6_lo = (jminF + 3 > 0) ? (jminF + 3) : 0;
|
||||
const int k6_lo = (kminF + 3 > 0) ? (kminF + 3) : 0;
|
||||
const int i6_lo = (iminF + 2 > 0) ? (iminF + 2) : 0;
|
||||
const int j6_lo = (jminF + 2 > 0) ? (jminF + 2) : 0;
|
||||
const int k6_lo = (kminF + 2 > 0) ? (kminF + 2) : 0;
|
||||
const int i6_hi = ex1 - 4;
|
||||
const int j6_hi = ex2 - 4;
|
||||
const int k6_hi = ex3 - 4;
|
||||
@@ -303,11 +303,11 @@ void fderivs(const int ex[3],
|
||||
/* 2nd-order */
|
||||
if (i2_lo <= i2_hi && j2_lo <= j2_hi && k2_lo <= k2_hi) {
|
||||
for (int k0 = k2_lo; k0 <= k2_hi; ++k0) {
|
||||
const int kF = k0 + 2;
|
||||
const int kF = k0 + 1;
|
||||
for (int j0 = j2_lo; j0 <= j2_hi; ++j0) {
|
||||
const int jF = j0 + 2;
|
||||
const int jF = j0 + 1;
|
||||
for (int i0 = i2_lo; i0 <= i2_hi; ++i0) {
|
||||
const int iF = i0 + 2;
|
||||
const int iF = i0 + 1;
|
||||
const size_t p = idx_ex(i0, j0, k0, ex);
|
||||
|
||||
fx[p] = d2dx * (
|
||||
@@ -327,11 +327,11 @@ void fderivs(const int ex[3],
|
||||
/* 4th-order overwrite */
|
||||
if (i4_lo <= i4_hi && j4_lo <= j4_hi && k4_lo <= k4_hi) {
|
||||
for (int k0 = k4_lo; k0 <= k4_hi; ++k0) {
|
||||
const int kF = k0 + 2;
|
||||
const int kF = k0 + 1;
|
||||
for (int j0 = j4_lo; j0 <= j4_hi; ++j0) {
|
||||
const int jF = j0 + 2;
|
||||
const int jF = j0 + 1;
|
||||
for (int i0 = i4_lo; i0 <= i4_hi; ++i0) {
|
||||
const int iF = i0 + 2;
|
||||
const int iF = i0 + 1;
|
||||
const size_t p = idx_ex(i0, j0, k0, ex);
|
||||
|
||||
fx[p] = d12dx * (
|
||||
@@ -359,11 +359,11 @@ void fderivs(const int ex[3],
|
||||
/* 6th-order overwrite: [-1,+9,-45,0,+45,-9,+1] / (60*dx) */
|
||||
if (i6_lo <= i6_hi && j6_lo <= j6_hi && k6_lo <= k6_hi) {
|
||||
for (int k0 = k6_lo; k0 <= k6_hi; ++k0) {
|
||||
const int kF = k0 + 2;
|
||||
const int kF = k0 + 1;
|
||||
for (int j0 = j6_lo; j0 <= j6_hi; ++j0) {
|
||||
const int jF = j0 + 2;
|
||||
const int jF = j0 + 1;
|
||||
for (int i0 = i6_lo; i0 <= i6_hi; ++i0) {
|
||||
const int iF = i0 + 2;
|
||||
const int iF = i0 + 1;
|
||||
const size_t p = idx_ex(i0, j0, k0, ex);
|
||||
|
||||
fx[p] = d60dx * (
|
||||
@@ -443,44 +443,44 @@ void fderivs(const int ex[3],
|
||||
}
|
||||
|
||||
/* 2nd: 3pt, widest */
|
||||
const int i2_lo = (iminF + 2 > 0) ? (iminF + 2) : 0;
|
||||
const int j2_lo = (jminF + 2 > 0) ? (jminF + 2) : 0;
|
||||
const int k2_lo = (kminF + 2 > 0) ? (kminF + 2) : 0;
|
||||
const int i2_lo = (iminF > 0) ? iminF : 0;
|
||||
const int j2_lo = (jminF > 0) ? jminF : 0;
|
||||
const int k2_lo = (kminF > 0) ? kminF : 0;
|
||||
const int i2_hi = ex1 - 2;
|
||||
const int j2_hi = ex2 - 2;
|
||||
const int k2_hi = ex3 - 2;
|
||||
|
||||
/* 4th: 5pt */
|
||||
const int i4_lo = (iminF + 3 > 0) ? (iminF + 3) : 0;
|
||||
const int j4_lo = (jminF + 3 > 0) ? (jminF + 3) : 0;
|
||||
const int k4_lo = (kminF + 3 > 0) ? (kminF + 3) : 0;
|
||||
const int i4_lo = (iminF + 1 > 0) ? (iminF + 1) : 0;
|
||||
const int j4_lo = (jminF + 1 > 0) ? (jminF + 1) : 0;
|
||||
const int k4_lo = (kminF + 1 > 0) ? (kminF + 1) : 0;
|
||||
const int i4_hi = ex1 - 3;
|
||||
const int j4_hi = ex2 - 3;
|
||||
const int k4_hi = ex3 - 3;
|
||||
|
||||
/* 6th: 7pt */
|
||||
const int i6_lo = (iminF + 4 > 0) ? (iminF + 4) : 0;
|
||||
const int j6_lo = (jminF + 4 > 0) ? (jminF + 4) : 0;
|
||||
const int k6_lo = (kminF + 4 > 0) ? (kminF + 4) : 0;
|
||||
const int i6_lo = (iminF + 2 > 0) ? (iminF + 2) : 0;
|
||||
const int j6_lo = (jminF + 2 > 0) ? (jminF + 2) : 0;
|
||||
const int k6_lo = (kminF + 2 > 0) ? (kminF + 2) : 0;
|
||||
const int i6_hi = ex1 - 4;
|
||||
const int j6_hi = ex2 - 4;
|
||||
const int k6_hi = ex3 - 4;
|
||||
|
||||
/* 8th: 9pt, narrowest */
|
||||
const int i8_lo = (iminF + 5 > 0) ? (iminF + 5) : 0;
|
||||
const int j8_lo = (jminF + 5 > 0) ? (jminF + 5) : 0;
|
||||
const int k8_lo = (kminF + 5 > 0) ? (kminF + 5) : 0;
|
||||
const int i8_lo = (iminF + 3 > 0) ? (iminF + 3) : 0;
|
||||
const int j8_lo = (jminF + 3 > 0) ? (jminF + 3) : 0;
|
||||
const int k8_lo = (kminF + 3 > 0) ? (kminF + 3) : 0;
|
||||
const int i8_hi = ex1 - 5;
|
||||
const int j8_hi = ex2 - 5;
|
||||
const int k8_hi = ex3 - 5;
|
||||
|
||||
if (i2_lo <= i2_hi && j2_lo <= j2_hi && k2_lo <= k2_hi) {
|
||||
for (int k0 = k2_lo; k0 <= k2_hi; ++k0) {
|
||||
const int kF = k0 + 3;
|
||||
const int kF = k0 + 1;
|
||||
for (int j0 = j2_lo; j0 <= j2_hi; ++j0) {
|
||||
const int jF = j0 + 3;
|
||||
const int jF = j0 + 1;
|
||||
for (int i0 = i2_lo; i0 <= i2_hi; ++i0) {
|
||||
const int iF = i0 + 3;
|
||||
const int iF = i0 + 1;
|
||||
const size_t p = idx_ex(i0, j0, k0, ex);
|
||||
|
||||
fx[p] = d2dx * (
|
||||
@@ -499,11 +499,11 @@ void fderivs(const int ex[3],
|
||||
|
||||
if (i4_lo <= i4_hi && j4_lo <= j4_hi && k4_lo <= k4_hi) {
|
||||
for (int k0 = k4_lo; k0 <= k4_hi; ++k0) {
|
||||
const int kF = k0 + 3;
|
||||
const int kF = k0 + 1;
|
||||
for (int j0 = j4_lo; j0 <= j4_hi; ++j0) {
|
||||
const int jF = j0 + 3;
|
||||
const int jF = j0 + 1;
|
||||
for (int i0 = i4_lo; i0 <= i4_hi; ++i0) {
|
||||
const int iF = i0 + 3;
|
||||
const int iF = i0 + 1;
|
||||
const size_t p = idx_ex(i0, j0, k0, ex);
|
||||
|
||||
fx[p] = d12dx * (
|
||||
@@ -530,11 +530,11 @@ void fderivs(const int ex[3],
|
||||
|
||||
if (i6_lo <= i6_hi && j6_lo <= j6_hi && k6_lo <= k6_hi) {
|
||||
for (int k0 = k6_lo; k0 <= k6_hi; ++k0) {
|
||||
const int kF = k0 + 3;
|
||||
const int kF = k0 + 1;
|
||||
for (int j0 = j6_lo; j0 <= j6_hi; ++j0) {
|
||||
const int jF = j0 + 3;
|
||||
const int jF = j0 + 1;
|
||||
for (int i0 = i6_lo; i0 <= i6_hi; ++i0) {
|
||||
const int iF = i0 + 3;
|
||||
const int iF = i0 + 1;
|
||||
const size_t p = idx_ex(i0, j0, k0, ex);
|
||||
|
||||
fx[p] = d60dx * (
|
||||
@@ -568,11 +568,11 @@ void fderivs(const int ex[3],
|
||||
/* 8th-order overwrite: [+3,-32,+168,-672,0,+672,-168,+32,-3] / (840*dx) */
|
||||
if (i8_lo <= i8_hi && j8_lo <= j8_hi && k8_lo <= k8_hi) {
|
||||
for (int k0 = k8_lo; k0 <= k8_hi; ++k0) {
|
||||
const int kF = k0 + 3;
|
||||
const int kF = k0 + 1;
|
||||
for (int j0 = j8_lo; j0 <= j8_hi; ++j0) {
|
||||
const int jF = j0 + 3;
|
||||
const int jF = j0 + 1;
|
||||
for (int i0 = i8_lo; i0 <= i8_hi; ++i0) {
|
||||
const int iF = i0 + 3;
|
||||
const int iF = i0 + 1;
|
||||
const size_t p = idx_ex(i0, j0, k0, ex);
|
||||
|
||||
fx[p] = d840dx * (
|
||||
|
||||
Reference in New Issue
Block a user