From 050b365963a0bfd54e73d48f12c80fd89978fc08 Mon Sep 17 00:00:00 2001
From: valeriabarra <valeriabarra21@gmail.com>
Date: Tue, 18 Aug 2020 22:02:48 -0600
Subject: [PATCH] SWE: Inside Setup QFunction make sure to project coordinate
 field onto unit sphere

---
 .../shallow-water/qfunctions/setup_geo.h       | 18 ++++++++++++++----
 examples/fluids/shallow-water/shallowwater.c   |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/examples/fluids/shallow-water/qfunctions/setup_geo.h b/examples/fluids/shallow-water/qfunctions/setup_geo.h
index 144791987e..708515497a 100644
--- a/examples/fluids/shallow-water/qfunctions/setup_geo.h
+++ b/examples/fluids/shallow-water/qfunctions/setup_geo.h
@@ -20,6 +20,8 @@
 #ifndef setupgeo_h
 #define setupgeo_h
 
+#include "../sw_headers.h"
+
 #ifndef __CUDACC__
 #  include <math.h>
 #endif
@@ -67,15 +69,23 @@ CEED_QFUNCTION(SetupGeo)(void *ctx, CeedInt Q,
   // Outputs
   CeedScalar (*qdata)[CEED_Q_VLA] = (CeedScalar(*)[CEED_Q_VLA])out[0];
   // *INDENT-ON*
+  // Context
+  const PhysicsContext context = (PhysicsContext)ctx;
+  const CeedScalar R           = context->R;
 
   CeedPragmaSIMD
   // Quadrature Point Loop
   for (CeedInt i=0; i<Q; i++) {
     // Read global Cartesian coordinates
-    const CeedScalar xx[3] = {X[0][i],
-                              X[1][i],
-                              X[2][i]
-                             };
+    CeedScalar xx[3] = {X[0][i],
+                        X[1][i],
+                        X[2][i]
+                       };
+    // Project quadrature point coordinates to sphere
+    CeedScalar rad = sqrt(xx[0]*xx[0] + xx[1]*xx[1] + xx[2]*xx[2]);
+    xx[0] *= R / rad;
+    xx[1] *= R / rad;
+    xx[2] *= R / rad;
     // Read dxxdX Jacobian entries, stored in columns
     // J_00 J_10
     // J_01 J_11
diff --git a/examples/fluids/shallow-water/shallowwater.c b/examples/fluids/shallow-water/shallowwater.c
index bfb661f720..d640fa15e5 100644
--- a/examples/fluids/shallow-water/shallowwater.c
+++ b/examples/fluids/shallow-water/shallowwater.c
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
   const PetscInt ncompx = 3;
   PetscInt viz_refine = 0;
   PetscBool read_mesh, simplex, test;
-  PetscInt topodim = 2, dim = 3, ncompq = 3, lnodes;
+  PetscInt topodim = 2, ncompq = 3, lnodes;
   // libCEED context
   char ceedresource[PETSC_MAX_PATH_LEN] = "/cpu/self",
                                           filename[PETSC_MAX_PATH_LEN];