From 973a13bdbb6413aa3f149021f1ece1c7ab3836a4 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Sun, 22 Sep 2024 08:28:42 -0600
Subject: [PATCH 1/2] Add support for block restriction of indicators, closes
 #14531

---
 .../doc/content/source/kernels/ADMatBodyForce.md   |  2 +-
 framework/include/loops/UpdateErrorVectorsThread.h |  2 ++
 framework/src/loops/UpdateErrorVectorsThread.C     | 14 +++++++++++---
 framework/src/markers/IndicatorMarker.C            |  4 ++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/framework/doc/content/source/kernels/ADMatBodyForce.md b/framework/doc/content/source/kernels/ADMatBodyForce.md
index 0f62e4b0dcec..7811c93f771c 100644
--- a/framework/doc/content/source/kernels/ADMatBodyForce.md
+++ b/framework/doc/content/source/kernels/ADMatBodyForce.md
@@ -1,4 +1,4 @@
-# BodyForce
+# ADMatBodyForce
 
 ## Description
 
diff --git a/framework/include/loops/UpdateErrorVectorsThread.h b/framework/include/loops/UpdateErrorVectorsThread.h
index 605c107b0bb5..8ddafbe52696 100644
--- a/framework/include/loops/UpdateErrorVectorsThread.h
+++ b/framework/include/loops/UpdateErrorVectorsThread.h
@@ -31,11 +31,13 @@ class UpdateErrorVectorsThread : public ThreadedElementLoop<ConstElemRange>
   void join(const UpdateErrorVectorsThread & /*y*/);
 
 protected:
+  /// Map from indicators to error vectors (markers solution vector)
   const std::map<std::string, std::unique_ptr<ErrorVector>> & _indicator_field_to_error_vector;
   AuxiliarySystem & _aux_sys;
   unsigned int _system_number;
   Adaptivity & _adaptivity;
   NumericVector<Number> & _solution;
 
+  /// Map from indicator variable number to error vectors (markers solution vector)
   std::map<unsigned int, ErrorVector *> _indicator_field_number_to_error_vector;
 };
diff --git a/framework/src/loops/UpdateErrorVectorsThread.C b/framework/src/loops/UpdateErrorVectorsThread.C
index 4f1ef02bdbf1..928137d66bb1 100644
--- a/framework/src/loops/UpdateErrorVectorsThread.C
+++ b/framework/src/loops/UpdateErrorVectorsThread.C
@@ -58,9 +58,17 @@ UpdateErrorVectorsThread::onElement(const Elem * elem)
     unsigned int var_num = it.first;
     ErrorVector & ev = *(it.second);
 
-    dof_id_type dof_number = elem->dof_number(_system_number, var_num, 0);
-    Real value = _solution(dof_number);
-    ev[elem->id()] = value;
+    // Must obey the block restriction of the indicator (error vector is global)
+    // we have to check here because the loop is over all indicators, and other indicators
+    // might have larger block restrictions.
+    if (_aux_sys.getVariable(_tid, var_num).hasBlocks(elem->subdomain_id()))
+    {
+      dof_id_type dof_number = elem->dof_number(_system_number, var_num, 0);
+      Real value = _solution(dof_number);
+      ev[elem->id()] = value;
+    }
+    else
+      ev[elem->id()] = 0;
   }
 }
 
diff --git a/framework/src/markers/IndicatorMarker.C b/framework/src/markers/IndicatorMarker.C
index 00c592a85984..c4a1b5b6f19e 100644
--- a/framework/src/markers/IndicatorMarker.C
+++ b/framework/src/markers/IndicatorMarker.C
@@ -21,4 +21,8 @@ IndicatorMarker::validParams()
 IndicatorMarker::IndicatorMarker(const InputParameters & parameters)
   : Marker(parameters), _error_vector(getErrorVector(parameters.get<IndicatorName>("indicator")))
 {
+  if (!_subproblem.getVariable(0, getParam<IndicatorName>("indicator")).hasBlocks(blockIDs()))
+    mooseWarning("The block restriction of the marker is larger than the block restriction of its "
+                 "indicator. Blocks on which the indicator is not active will not be marked, and "
+                 "therefore will not be refined or coarsened");
 }

From a8982c896e21b3d250fbd059aa91740c2b352231 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Sun, 22 Sep 2024 08:29:06 -0600
Subject: [PATCH 2/2] Add test for block restriciton of indicators

---
 .../block_restriction/gold/test_out.e-s002    | Bin 0 -> 21004 bytes
 .../tests/adaptivity/block_restriction/test.i |  87 ++++++++++++++++++
 test/tests/adaptivity/block_restriction/tests |  17 ++++
 3 files changed, 104 insertions(+)
 create mode 100644 test/tests/adaptivity/block_restriction/gold/test_out.e-s002
 create mode 100644 test/tests/adaptivity/block_restriction/test.i
 create mode 100644 test/tests/adaptivity/block_restriction/tests

diff --git a/test/tests/adaptivity/block_restriction/gold/test_out.e-s002 b/test/tests/adaptivity/block_restriction/gold/test_out.e-s002
new file mode 100644
index 0000000000000000000000000000000000000000..7699c63018b2ba8bd7fc7d802ade8174a2a27aeb
GIT binary patch
literal 21004
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

literal 0
HcmV?d00001

diff --git a/test/tests/adaptivity/block_restriction/test.i b/test/tests/adaptivity/block_restriction/test.i
new file mode 100644
index 000000000000..d631179614ef
--- /dev/null
+++ b/test/tests/adaptivity/block_restriction/test.i
@@ -0,0 +1,87 @@
+[Mesh]
+  [box]
+    type = GeneratedMeshGenerator
+    dim = 3
+    nx = 3
+    ny = 3
+    nz = 3
+    xmin = 0
+    xmax = 1
+    ymin = 0
+    ymax = 1
+    zmin = 0
+    zmax = 1
+  []
+  [box1]
+    type = SubdomainBoundingBoxGenerator
+    input = box
+    block_id = 1
+    bottom_left = '0 0.5 0'
+    top_right = '1 1 1'
+  []
+[]
+
+[Variables]
+  [u]
+  []
+[]
+
+[Kernels]
+  [diff]
+    type = Diffusion
+    variable = u
+  []
+  [source]
+    type = BodyForce
+    variable = u
+    function = '(x-0.5) * (x-0.5) * (x-0.5)'
+  []
+[]
+
+[BCs]
+  [archor_x]
+    type = DirichletBC
+    boundary = 'bottom'
+    variable = u
+    value = 0
+  []
+[]
+
+[Adaptivity]
+  marker = errorfrac
+  max_h_level = 2
+  [Indicators]
+    [error]
+      type = GradientJumpIndicator
+      variable = u
+      block = '0'
+    []
+  []
+  [Markers]
+    [errorfrac]
+      type = ErrorFractionMarker
+      refine = 0.5
+      indicator = error
+      block = '0'
+    []
+  []
+[]
+
+[Executioner]
+  type = Transient
+
+  end_time = 200
+  dt = 100
+
+  solve_type = 'PJFNK'
+
+  nl_abs_tol = 1E-5
+  nl_max_its = 400
+
+  l_tol = 1E-8
+  l_max_its = 200
+[]
+
+[Outputs]
+  exodus = true
+[]
diff --git a/test/tests/adaptivity/block_restriction/tests b/test/tests/adaptivity/block_restriction/tests
new file mode 100644
index 000000000000..67b6c9dc27c1
--- /dev/null
+++ b/test/tests/adaptivity/block_restriction/tests
@@ -0,0 +1,17 @@
+[Tests]
+  design = 'syntax/Adaptivity/index.md'
+  issues = '#14531'
+  [block]
+    type = Exodiff
+    input = 'test.i'
+    exodiff = 'test_out.e-s002'
+    requirement = 'The system shall be able to use block-restricted indicators for adaptivity.'
+  []
+  [mismatch]
+    type = RunException
+    input = test.i
+    cli_args = 'Adaptivity/Markers/errorfrac/block="0 1"'
+    expect_err = 'The block restriction of the marker is larger than the block restriction of its indicator.'
+    requirement = 'The system shall emit a warning if the block restriction of the marker is larger than that of its indicator.'
+  []
+[]