Address PR comments

sebastiangrimberg · sebastiangrimberg · commit 2a6c12603dc2 · 2023-02-17T11:27:48.000-08:00
diff --git a/tests/t324-basis.c b/tests/t324-basis.c
@@ -14,16 +14,16 @@ int main(int argc, char **argv) {
   CeedScalar        q_ref[dim * Q], q_weight[Q];
   CeedScalar        interp[P * Q], grad[dim * P * Q];
   const CeedScalar *out;
-  CeedScalar        colsum[P];
+  CeedScalar        column_sum[P];
 
   buildmats(q_ref, q_weight, interp, grad);
 
   CeedInit(argv[1], &ceed);
 
   for (int i = 0; i < P; i++) {
-    colsum[i] = 0;
+    column_sum[i] = 0;
     for (int j = 0; j < Q * dim; j++) {
-      colsum[i] += grad[i + j * P];
+      column_sum[i] += grad[i + j * P];
     }
   }
 
@@ -39,7 +39,7 @@ int main(int argc, char **argv) {
   // Check values at quadrature points
   CeedVectorGetArrayRead(Out, CEED_MEM_HOST, &out);
   for (int i = 0; i < P; i++) {
-    if (fabs(colsum[i] - out[i]) > 100. * CEED_EPSILON) printf("[%" CeedInt_FMT "] %f != %f\n", i, out[i], colsum[i]);
+    if (fabs(column_sum[i] - out[i]) > 100. * CEED_EPSILON) printf("[%" CeedInt_FMT "] %f != %f\n", i, out[i], column_sum[i]);
   }
   CeedVectorRestoreArrayRead(Out, &out);
 
diff --git a/tests/t325-basis.c b/tests/t325-basis.c
@@ -14,16 +14,16 @@ int main(int argc, char **argv) {
   CeedScalar        q_ref[dim * Q], q_weight[Q];
   CeedScalar        interp[P * Q], grad[dim * P * Q];
   const CeedScalar *out;
-  CeedScalar        colsum[P], *in;
+  CeedScalar        column_sum[P], *in;
 
   buildmats(q_ref, q_weight, interp, grad);
 
   CeedInit(argv[1], &ceed);
 
   for (int i = 0; i < P; i++) {
-    colsum[i] = 0;
+    column_sum[i] = 0;
     for (int j = 0; j < Q * dim; j++) {
-      colsum[i] += grad[i + j * P];
+      column_sum[i] += grad[i + j * P];
     }
   }
 
@@ -46,7 +46,8 @@ int main(int argc, char **argv) {
   CeedVectorGetArrayRead(Out, CEED_MEM_HOST, &out);
   for (int p = 0; p < P; p++) {
     for (int n = 0; n < num_comp; n++) {
-      if (fabs(n * colsum[p] - out[p + n * P]) > 100. * CEED_EPSILON) printf("[%" CeedInt_FMT "] %f != %f\n", p, out[p + n * P], n * colsum[p]);
+      if (fabs(n * column_sum[p] - out[p + n * P]) > 100. * CEED_EPSILON)
+        printf("[%" CeedInt_FMT "] %f != %f\n", p, out[p + n * P], n * column_sum[p]);
     }
   }
   CeedVectorRestoreArrayRead(Out, &out);
diff --git a/tests/t332-basis.c b/tests/t332-basis.c
@@ -14,7 +14,7 @@ int main(int argc, char **argv) {
   CeedScalar        q_ref[dim * num_qpts], q_weights[num_qpts];
   CeedScalar        interp[dim * P * num_qpts], div[P * num_qpts];
   CeedVector        X, Y;
-  const CeedScalar *y, *x, *div2;
+  const CeedScalar *y, *x, *div_in_basis;
 
   CeedInit(argv[1], &ceed);
 
@@ -23,9 +23,9 @@ int main(int argc, char **argv) {
   CeedBasisCreateHdiv(ceed, CEED_TOPOLOGY_QUAD, 1, P, num_qpts, interp, div, q_ref, q_weights, &b);
 
   // Test div for H(div)
-  CeedBasisGetDiv(b, &div2);
+  CeedBasisGetDiv(b, &div_in_basis);
   for (CeedInt i = 0; i < P * num_qpts; i++) {
-    if (fabs(div[i] - div2[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", div[i], div2[i]);
+    if (fabs(div[i] - div_in_basis[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", div[i], div_in_basis[i]);
   }
 
   CeedVectorCreate(ceed, P, &X);
diff --git a/tests/t341-basis.c b/tests/t341-basis.c
@@ -14,7 +14,7 @@ int main(int argc, char **argv) {
   CeedScalar        interp[dim * P * Q], curl[P * Q];
   CeedVector        X, Y;
   const CeedScalar *y, *x, *interp2;
-  CeedScalar        rowsum[dim * Q], colsum[P];
+  CeedScalar        row_sum[dim * Q], column_sum[P];
 
   CeedInit(argv[1], &ceed);
 
@@ -29,15 +29,15 @@ int main(int argc, char **argv) {
   }
 
   for (int i = 0; i < dim * Q; i++) {
-    rowsum[i] = 0;
+    row_sum[i] = 0;
     for (int j = 0; j < P; j++) {
-      rowsum[i] += interp[j + i * P];
+      row_sum[i] += interp[j + i * P];
     }
   }
   for (int i = 0; i < P; i++) {
-    colsum[i] = 0;
+    column_sum[i] = 0;
     for (int j = 0; j < dim * Q; j++) {
-      colsum[i] += interp[i + j * P];
+      column_sum[i] += interp[i + j * P];
     }
   }
 
@@ -50,7 +50,7 @@ int main(int argc, char **argv) {
 
   CeedVectorGetArrayRead(Y, CEED_MEM_HOST, &y);
   for (CeedInt i = 0; i < dim * Q; i++) {
-    if (fabs(rowsum[i] - y[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", rowsum[i], y[i]);
+    if (fabs(row_sum[i] - y[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", row_sum[i], y[i]);
   }
   CeedVectorRestoreArrayRead(Y, &y);
 
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
 
   CeedVectorGetArrayRead(X, CEED_MEM_HOST, &x);
   for (CeedInt i = 0; i < P; i++) {
-    if (fabs(colsum[i] - x[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", colsum[i], x[i]);
+    if (fabs(column_sum[i] - x[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", column_sum[i], x[i]);
   }
   CeedVectorRestoreArrayRead(X, &x);
 
diff --git a/tests/t342-basis.c b/tests/t342-basis.c
@@ -13,8 +13,8 @@ int main(int argc, char **argv) {
   CeedScalar        q_ref[dim * Q], q_weight[Q];
   CeedScalar        interp[dim * P * Q], curl[P * Q];
   CeedVector        X, Y;
-  const CeedScalar *y, *x, *curl2;
-  CeedScalar        rowsum[Q], colsum[P];
+  const CeedScalar *y, *x, *curl_in_basis;
+  CeedScalar        row_sum[Q], column_sum[P];
 
   CeedInit(argv[1], &ceed);
 
@@ -23,21 +23,21 @@ int main(int argc, char **argv) {
   CeedBasisCreateHcurl(ceed, CEED_TOPOLOGY_TRIANGLE, 1, P, Q, interp, curl, q_ref, q_weight, &b);
 
   // Test curl for H(curl)
-  CeedBasisGetCurl(b, &curl2);
+  CeedBasisGetCurl(b, &curl_in_basis);
   for (CeedInt i = 0; i < P * Q; i++) {
-    if (fabs(curl[i] - curl2[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", curl[i], curl2[i]);
+    if (fabs(curl[i] - curl_in_basis[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", curl[i], curl_in_basis[i]);
   }
 
   for (int i = 0; i < Q; i++) {
-    rowsum[i] = 0;
+    row_sum[i] = 0;
     for (int j = 0; j < P; j++) {
-      rowsum[i] += curl[j + i * P];
+      row_sum[i] += curl[j + i * P];
     }
   }
   for (int i = 0; i < P; i++) {
-    colsum[i] = 0;
+    column_sum[i] = 0;
     for (int j = 0; j < Q; j++) {
-      colsum[i] += curl[i + j * P];
+      column_sum[i] += curl[i + j * P];
     }
   }
 
@@ -50,7 +50,7 @@ int main(int argc, char **argv) {
 
   CeedVectorGetArrayRead(Y, CEED_MEM_HOST, &y);
   for (CeedInt i = 0; i < Q; i++) {
-    if (fabs(rowsum[i] - y[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", rowsum[i], y[i]);
+    if (fabs(row_sum[i] - y[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", row_sum[i], y[i]);
   }
   CeedVectorRestoreArrayRead(Y, &y);
 
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
 
   CeedVectorGetArrayRead(X, CEED_MEM_HOST, &x);
   for (CeedInt i = 0; i < P; i++) {
-    if (fabs(colsum[i] - x[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", colsum[i], x[i]);
+    if (fabs(column_sum[i] - x[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", column_sum[i], x[i]);
   }
   CeedVectorRestoreArrayRead(X, &x);
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ int main(int argc, char **argv) {`
`14`	`14`	`CeedScalar interp[dim * P * Q], curl[P * Q];`
`15`	`15`	`CeedVector X, Y;`
`16`	`16`	`const CeedScalar y, x, *interp2;`
`17`		`- CeedScalar rowsum[dim * Q], colsum[P];`
	`17`	`+ CeedScalar row_sum[dim * Q], column_sum[P];`
`18`	`18`
`19`	`19`	`CeedInit(argv[1], &ceed);`
`20`	`20`
`@@ -29,15 +29,15 @@ int main(int argc, char **argv) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`for (int i = 0; i < dim * Q; i++) {`
`32`		`- rowsum[i] = 0;`
	`32`	`+ row_sum[i] = 0;`
`33`	`33`	`for (int j = 0; j < P; j++) {`
`34`		`- rowsum[i] += interp[j + i * P];`
	`34`	`+ row_sum[i] += interp[j + i * P];`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`for (int i = 0; i < P; i++) {`
`38`		`- colsum[i] = 0;`
	`38`	`+ column_sum[i] = 0;`
`39`	`39`	`for (int j = 0; j < dim * Q; j++) {`
`40`		`- colsum[i] += interp[i + j * P];`
	`40`	`+ column_sum[i] += interp[i + j * P];`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`@@ -50,7 +50,7 @@ int main(int argc, char **argv) {`
`50`	`50`
`51`	`51`	`CeedVectorGetArrayRead(Y, CEED_MEM_HOST, &y);`
`52`	`52`	`for (CeedInt i = 0; i < dim * Q; i++) {`
`53`		`- if (fabs(rowsum[i] - y[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", rowsum[i], y[i]);`
	`53`	`+ if (fabs(row_sum[i] - y[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", row_sum[i], y[i]);`
`54`	`54`	`}`
`55`	`55`	`CeedVectorRestoreArrayRead(Y, &y);`
`56`	`56`
`@@ -61,7 +61,7 @@ int main(int argc, char **argv) {`
`61`	`61`
`62`	`62`	`CeedVectorGetArrayRead(X, CEED_MEM_HOST, &x);`
`63`	`63`	`for (CeedInt i = 0; i < P; i++) {`
`64`		`- if (fabs(colsum[i] - x[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", colsum[i], x[i]);`
	`64`	`+ if (fabs(column_sum[i] - x[i]) > 100. * CEED_EPSILON) printf("%f != %f\n", column_sum[i], x[i]);`
`65`	`65`	`}`
`66`	`66`	`CeedVectorRestoreArrayRead(X, &x);`
`67`	`67`