1 files changed, 18 insertions, 50 deletions

diff --git a/src/Hydro_Analysis.c b/src/Hydro_Analysis.c
index 5fef8a1..7d182ea 100644
--- a/src/Hydro_Analysis.c
+++ b/src/Hydro_Analysis.c
@@ -4,13 +4,13 @@
 
 #include "loopcontrol.h"
 
+/* Populate grid functions to be reduced in Hydro_Analysis_Reduction */
 void Hydro_Analysis_PrepareReduction(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
-  printf("local\n");
 
-  if (Hydro_Analysis_weighted_center_of_mass)
+  if (Hydro_Analysis_comp_vol_weighted_center_of_mass)
   {
     #pragma omp parallel
     {
@@ -30,12 +30,11 @@ void Hydro_Analysis_PrepareReduction(CCTK_ARGUMENTS)
   }
 }
 
-// Hydro_Analysis_rho_center_volume_weighted
+/* Reduce grid functions */
 void Hydro_Analysis_Reduction(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
-  printf("global\n");
 
   CCTK_INT handle_max = CCTK_ReductionHandle("maximum");
   if (handle_max < 0)
@@ -44,68 +43,37 @@ void Hydro_Analysis_Reduction(CCTK_ARGUMENTS)
   if (handle_sum < 0)
     CCTK_WARN(0, "Unable to get reduction handle 'sum'.");
 
-  if (Hydro_Analysis_rho_max_search)
+  if (Hydro_Analysis_comp_rho_max)
   {
     if (CCTK_Reduce(cctkGH, -1, handle_max, 1, CCTK_VARIABLE_REAL,
                     Hydro_Analysis_rho_max, 1,
                     CCTK_VarIndex("HydroBase::rho")))
       CCTK_WARN(0, "Error while reducing HydroBase::rho");
   }
+  if (Hydro_Analysis_comp_vol_weighted_center_of_mass)
+  {
     if (CCTK_Reduce(cctkGH, -1, handle_sum, 1, CCTK_VARIABLE_REAL,
                     Hydro_Analysis_rho_sum, 1,
                     CCTK_VarIndex("HydroBase::rho")))
       CCTK_WARN(0, "Error while reducing HydroBase::rho");
     if (CCTK_Reduce(cctkGH, -1, handle_sum, 1, CCTK_VARIABLE_REAL,
                     &(Hydro_Analysis_rho_center_volume_weighted[0]), 1,
-                    CCTK_VarIndex("Hydro_Analysis::Hydro_Analysis_rho_center_volume_weighted_gf[0]")))
+                    CCTK_VarIndex(
+                      "Hydro_Analysis::Hydro_Analysis_rho_center_volume_weighted_gf[0]")) ||
+        CCTK_Reduce(cctkGH, -1, handle_sum, 1, CCTK_VARIABLE_REAL,
+                    &(Hydro_Analysis_rho_center_volume_weighted[1]), 1,
+                    CCTK_VarIndex(
+                      "Hydro_Analysis::Hydro_Analysis_rho_center_volume_weighted_gf[1]")) ||
+        CCTK_Reduce(cctkGH, -1, handle_sum, 1, CCTK_VARIABLE_REAL,
+                    &(Hydro_Analysis_rho_center_volume_weighted[2]), 1,
+                    CCTK_VarIndex(
+                      "Hydro_Analysis::Hydro_Analysis_rho_center_volume_weighted_gf[2]")))
       CCTK_WARN(0, "Error while reducing Hydro_Analysis_rho_center_volume_weighted_gf");
+  }
 }
 
+/* Look for the location of the density maximum */
 void Hydro_Analysis_LocationSearch(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
-  printf("search\n");
-
-  /* Initialized MPI-local quantities */
-  CCTK_REAL local_rho_max_loc[3];
-  local_rho_max_loc[0] = 0.0;
-  local_rho_max_loc[1] = 0.0;
-  local_rho_max_loc[2] = 0.0;
-
-  /* Look for the location of the global maximum.
-   * This algorithm will have problems when that occurs at more than
-   * one location. */
-  #pragma omp parallel
-  {
-    LC_LOOP3(location_reduction, i,j,k,
-             cctk_nghostzones[0], cctk_nghostzones[1], cctk_nghostzones[2],
-             cctk_lsh[0] - cctk_nghostzones[0], cctk_lsh[1] - cctk_nghostzones[1],
-             cctk_lsh[2] - cctk_nghostzones[2], cctk_lsh[0], cctk_lsh[1], cctk_lsh[2])
-    {
-      CCTK_INT i3D = CCTK_GFINDEX3D(cctkGH, i, j, k);
-      if (rho[i3D] == *Hydro_Analysis_rho_max &&
-          (!Hydro_Analysis_rho_max_loc_only_positive_x || x[i3D] >= 0.0))
-      {
-        #pragma omp critical
-        {
-          local_rho_max_loc[0] = x[i3D];
-          local_rho_max_loc[1] = y[i3D];
-          local_rho_max_loc[2] = z[i3D];
-        }
-      }
-    }
-    LC_ENDLOOP3(location_reduction);
-  }
-  /* After this at least one MPI process should have the location set.
-   * The others should have a value of 0.0, so that the sum reduction
-   * gives the value on each MPI process. This however is not true sometimes
-   * and this is the point where the algorithm can fail. */
-  CCTK_INT handle_sum = CCTK_LocalArrayReductionHandle("sum");
-  if (handle_sum < 0)
-     CCTK_WARN(0, "Unable to get reduction handle 'sum'.");
-  if (CCTK_ReduceLocArrayToArray1D(cctkGH, -1, handle_sum, &local_rho_max_loc,
-                                   Hydro_Analysis_rho_max_loc, 3, CCTK_VARIABLE_REAL))
-    CCTK_WARN(0, "Error while reducing local_rho_max_loc");
-}
-