Merge pull request #13 from pkestene/refactor/gravity

Mini refactor of gravity

Author: pkestene

settings/test_rayleigh_taylor_2d.ini

@@ -30,6 +30,7 @@ problem=rayleigh_taylor
 riemann=approx
 
 [gravity]
+enabled=yes
 static=yes
 
 [rayleigh_taylor]

settings/test_rayleigh_taylor_3d.ini

@@ -36,6 +36,7 @@ problem=rayleigh_taylor
 riemann=approx
 
 [gravity]
+enabled=yes
 static=yes
 
 [rayleigh_taylor]

src/muscl/HydroInitFunctors2D.h

@@ -670,20 +670,20 @@ class RayleighTaylorInstabilityFunctor2D : public HydroBaseFunctor2D
   RayleighTaylorInstabilityFunctor2D(HydroParams                     params,
                                      RayleighTaylorInstabilityParams rtiparams,
                                      DataArray2d                     Udata,
-                                     VectorField2d                   gravity)
+                                     VectorField2d                   gravity_field)
     : HydroBaseFunctor2D(params)
     , rtiparams(rtiparams)
     , Udata(Udata)
-    , gravity(gravity){};
+    , gravity_field(gravity_field){};
 
   // static method which does it all: create and execute functor
   static void
   apply(HydroParams                     params,
         RayleighTaylorInstabilityParams rtiparams,
         DataArray2d                     Udata,
-        VectorField2d                   gravity)
+        VectorField2d                   gravity_field)
   {
-    RayleighTaylorInstabilityFunctor2D functor(params, rtiparams, Udata, gravity);
+    RayleighTaylorInstabilityFunctor2D functor(params, rtiparams, Udata, gravity_field);
     Kokkos::parallel_for(
       "RayleighTaylorInstabilityFunctor2D",
       Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
@@ -773,14 +773,14 @@ class RayleighTaylorInstabilityFunctor2D : public HydroBaseFunctor2D
     Udata(i, j, IE) = (P0 + Udata(i, j, ID) * (gravity_x * x + gravity_y * y)) / (gamma0 - 1.0);
 
     // init gravity field
-    gravity(i, j, IX) = gravity_x;
-    gravity(i, j, IY) = gravity_y;
+    gravity_field(i, j, IX) = gravity_x;
+    gravity_field(i, j, IY) = gravity_y;
 
   } // end operator ()
 
   RayleighTaylorInstabilityParams rtiparams;
   DataArray2d                     Udata;
-  VectorField2d                   gravity;
+  VectorField2d                   gravity_field;
 
 }; // class RayleighTaylorInstabilityFunctor2D
 

src/muscl/HydroInitFunctors3D.h

@@ -551,20 +551,20 @@ class RayleighTaylorInstabilityFunctor3D : public HydroBaseFunctor3D
   RayleighTaylorInstabilityFunctor3D(HydroParams                     params,
                                      RayleighTaylorInstabilityParams rtiparams,
                                      DataArray3d                     Udata,
-                                     VectorField3d                   gravity)
+                                     VectorField3d                   gravity_field)
     : HydroBaseFunctor3D(params)
     , rtiparams(rtiparams)
     , Udata(Udata)
-    , gravity(gravity){};
+    , gravity_field(gravity_field){};
 
   // static method which does it all: create and execute functor
   static void
   apply(HydroParams                     params,
         RayleighTaylorInstabilityParams rtiparams,
         DataArray3d                     Udata,
-        VectorField3d                   gravity)
+        VectorField3d                   gravity_field)
   {
-    RayleighTaylorInstabilityFunctor3D functor(params, rtiparams, Udata, gravity);
+    RayleighTaylorInstabilityFunctor3D functor(params, rtiparams, Udata, gravity_field);
     Kokkos::parallel_for("RayleighTaylorInstabilityFunctor3D",
                          Kokkos::MDRangePolicy<Kokkos::Rank<3>>(
                            { 0, 0, 0 }, { params.isize, params.jsize, params.ksize }),
@@ -663,15 +663,15 @@ class RayleighTaylorInstabilityFunctor3D : public HydroBaseFunctor3D
       (P0 + Udata(i, j, k, ID) * (gravity_x * x + gravity_y * y + gravity_z * z)) / (gamma0 - 1);
 
     // init gravity field
-    gravity(i, j, k, IX) = gravity_x;
-    gravity(i, j, k, IY) = gravity_y;
-    gravity(i, j, k, IZ) = gravity_z;
+    gravity_field(i, j, k, IX) = gravity_x;
+    gravity_field(i, j, k, IY) = gravity_y;
+    gravity_field(i, j, k, IZ) = gravity_z;
 
   } // end operator ()
 
   RayleighTaylorInstabilityParams rtiparams;
   DataArray3d                     Udata;
-  VectorField3d                   gravity;
+  VectorField3d                   gravity_field;
 
 }; // class RayleighTaylorInstabilityFunctor3D