examples/fluids: remove C99 designated initializers for use with CUDA

nvrtc does not support this construct.
CEED · Dec 12, 2022 · d64246e · d64246e
1 parent 0992c3d
commit d64246e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/examples/fluids/problems/newtonian.c b/examples/fluids/problems/newtonian.c
@@ -13,6 +13,9 @@
 #include "../navierstokes.h"
 #include "../qfunctions/setupgeo.h"
 
+// For use with PetscOptionsEnum
+static const char *const StateVariables[] = {"CONSERVATIVE", "PRIMITIVE", "StateVariable", "STATEVAR_", NULL};
+
 // Compute relative error |a - b|/|s|
 static PetscErrorCode CheckPrimitiveWithTolerance(StatePrimitive sY, StatePrimitive aY, StatePrimitive bY, const char *name, PetscReal rtol_pressure,
                                                   PetscReal rtol_velocity, PetscReal rtol_temperature) {

diff --git a/examples/fluids/qfunctions/freestream_bc.h b/examples/fluids/qfunctions/freestream_bc.h
@@ -21,15 +21,17 @@ typedef struct {
 
 CEED_QFUNCTION_HELPER RoeWeights RoeSetup(CeedScalar rho_left, CeedScalar rho_right) {
   CeedScalar sqrt_left = sqrt(rho_left), sqrt_right = sqrt(rho_right);
-  return (RoeWeights){sqrt_left / (sqrt_left + sqrt_right), sqrt_right / (sqrt_left + sqrt_right)};
+  RoeWeights w = {sqrt_left / (sqrt_left + sqrt_right), sqrt_right / (sqrt_left + sqrt_right)};
+  return w;
 }
 
 CEED_QFUNCTION_HELPER RoeWeights RoeSetup_fwd(CeedScalar rho_left, CeedScalar rho_right, CeedScalar drho_left, CeedScalar drho_right) {
   CeedScalar sqrt_left = sqrt(rho_left), sqrt_right = sqrt(rho_right);
   CeedScalar square_sum_root = Square(sqrt_left + sqrt_right);
   CeedScalar r_right = (sqrt_left / (2 * sqrt_right * square_sum_root)) * drho_right - (sqrt_right / (2 * sqrt_left * square_sum_root)) * drho_left;
   CeedScalar r_left  = (sqrt_right / (2 * sqrt_left * square_sum_root)) * drho_left - (sqrt_left / (2 * sqrt_right * square_sum_root)) * drho_right;
-  return (RoeWeights){r_left, r_right};
+  RoeWeights dw      = {r_left, r_right};
+  return dw;
 }
 
 CEED_QFUNCTION_HELPER CeedScalar RoeAverage(RoeWeights r, CeedScalar q_left, CeedScalar q_right) { return r.left * q_left + r.right * q_right; }
@@ -49,10 +51,12 @@ CEED_QFUNCTION_HELPER StateConservative Flux_HLL(State left, State right, StateC
   for (int i = 0; i < 5; i++) {
     F_hll[i] = (s_right * F_left[i] - s_left * F_right[i] + s_left * s_right * (U_right[i] - U_left[i])) / (s_right - s_left);
   }
-  return (StateConservative){
-      F_hll[0], {F_hll[1], F_hll[2], F_hll[3]},
-       F_hll[4]
+  StateConservative F = {
+      F_hll[0],
+      {F_hll[1], F_hll[2], F_hll[3]},
+      F_hll[4],
   };
+  return F;
 }
 
 CEED_QFUNCTION_HELPER StateConservative Flux_HLL_fwd(State left, State right, State dleft, State dright, StateConservative flux_left,
@@ -78,10 +82,12 @@ CEED_QFUNCTION_HELPER StateConservative Flux_HLL_fwd(State left, State right, St
     dF_hll[i] += ((-F_r[i] + S_r * U_diff) * S_diff + F_hll_denom) / Square(S_diff) * dS_l;
     dF_hll[i] += (S_r * dF_l[i] - S_l * dF_r[i] + S_r * S_l * dU_r[i] - S_r * S_l * dU_l[i]) / S_diff;
   }
-  return (StateConservative){
-      dF_hll[0], {dF_hll[1], dF_hll[2], dF_hll[3]},
-       dF_hll[4]
+  StateConservative dF = {
+      dF_hll[0],
+      {dF_hll[1], dF_hll[2], dF_hll[3]},
+      dF_hll[4],
   };
+  return dF;
 }
 
 CEED_QFUNCTION_HELPER void ComputeHLLSpeeds_Roe(NewtonianIdealGasContext gas, State left, CeedScalar u_left, State right, CeedScalar u_right,

diff --git a/examples/fluids/qfunctions/newtonian_types.h b/examples/fluids/qfunctions/newtonian_types.h
@@ -17,9 +17,6 @@ typedef enum {
   STATEVAR_PRIMITIVE    = 1,
 } StateVariable;
 
-// For use with PetscOptionsEnum
-static const char *const StateVariables[] = {"CONSERVATIVE", "PRIMITIVE", "StateVariable", "STATEVAR_", NULL};
-
 typedef struct SetupContext_ *SetupContext;
 struct SetupContext_ {
   CeedScalar theta0;