Remove normalization from ErrorIndicator class (not used, the stored …

…indicators are already relative quantities)
awslabs · Oct 11, 2023 · 565d90c · 565d90c
1 parent 6cd38ea
commit 565d90c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 25 deletions.
diff --git a/palace/drivers/basesolver.cpp b/palace/drivers/basesolver.cpp
@@ -578,26 +578,23 @@ void BaseSolver::PostprocessErrorIndicator(const PostOperator &postop,
     return;
   }
   MPI_Comm comm = postop.GetComm();
-  std::array<double, 5> data = {indicator.Norml2(comm), indicator.Min(comm),
-                                indicator.Max(comm), indicator.Mean(comm),
-                                indicator.Normalization()};
+  std::array<double, 4> data = {indicator.Norml2(comm), indicator.Min(comm),
+                                indicator.Max(comm), indicator.Mean(comm)};
   if (root)
   {
     std::string path = post_dir + "error-indicators.csv";
     auto output = OutputFile(path, false);
     // clang-format off
-    output.print("{:>{}s},{:>{}s},{:>{}s},{:>{}s},{:>{}s}\n",
+    output.print("{:>{}s},{:>{}s},{:>{}s},{:>{}s}\n",
                  "Norm", table.w,
                  "Minimum", table.w,
                  "Maximum", table.w,
-                 "Mean", table.w,
-                 "Normalization", table.w);
-    output.print("{:+{}.{}e},{:+{}.{}e},{:+{}.{}e},{:+{}.{}e},{:+{}.{}e}\n",
+                 "Mean", table.w);
+    output.print("{:+{}.{}e},{:+{}.{}e},{:+{}.{}e},{:+{}.{}e}\n",
                  data[0], table.w, table.p,
                  data[1], table.w, table.p,
                  data[2], table.w, table.p,
-                 data[3], table.w, table.p,
-                 data[4], table.w, table.p);
+                 data[3], table.w, table.p);
     // clang-format on
   }
 }

diff --git a/palace/fem/errorindicator.cpp b/palace/fem/errorindicator.cpp
@@ -13,7 +13,6 @@ void ErrorIndicator::AddIndicator(const ErrorIndicator &indicator)
   if (n == 0)
   {
     local = indicator.local;
-    normalization = indicator.normalization;
     n = indicator.n;
     return;
   }
@@ -45,8 +44,6 @@ void ErrorIndicator::AddIndicator(const ErrorIndicator &indicator)
                });
 
   // More samples have been added, update for the running average.
-  normalization =
-      (normalization * n + indicator.normalization * indicator.n) / (n + indicator.n);
   n += indicator.n;
 }
 

diff --git a/palace/fem/errorindicator.hpp b/palace/fem/errorindicator.hpp
@@ -23,18 +23,12 @@ class ErrorIndicator
   // refinement and coarsening.
   Vector local;
 
-  // Normalization constant.
-  double normalization;
-
   // Number of samples.
   int n;
 
 public:
-  ErrorIndicator(Vector &&local, double normalization)
-    : local(std::move(local)), normalization(normalization), n(1)
-  {
-  }
-  ErrorIndicator() : normalization(0.0), n(0) {}
+  ErrorIndicator(Vector &&local) : local(std::move(local)), n(1) {}
+  ErrorIndicator() : n(0) {}
 
   // Add an indicator to the running total.
   void AddIndicator(const ErrorIndicator &indicator);
@@ -68,9 +62,6 @@ class ErrorIndicator
     Mpi::GlobalSum(1, &sum, comm);
     return sum / linalg::GlobalSize(comm, local);
   }
-
-  // Return the normalization constant for the absolute error.
-  auto Normalization() const { return normalization; }
 };
 
 }  // namespace palace

diff --git a/palace/linalg/errorestimator.cpp b/palace/linalg/errorestimator.cpp
@@ -266,7 +266,7 @@ ErrorIndicator CurlFluxErrorEstimator<VecType>::ComputeIndicators(const VecType
   {
     estimates *= 1.0 / normalization;
   }
-  return ErrorIndicator(std::move(estimates), normalization);
+  return ErrorIndicator(std::move(estimates));
 }
 
 GradFluxErrorEstimator::GradFluxErrorEstimator(
@@ -331,7 +331,7 @@ ErrorIndicator GradFluxErrorEstimator::ComputeIndicators(const Vector &U) const
   {
     estimates *= 1.0 / normalization;
   }
-  return ErrorIndicator(std::move(estimates), normalization);
+  return ErrorIndicator(std::move(estimates));
 }
 
 template void FluxProjector::Mult(const Vector &, Vector &) const;