Merge pull request #29363 from NamjaeChoi/execution_group

Let UserObject initialSetup honor execution group
idaholab · Dec 6, 2024 · 7e73546 · 7e73546
2 parents 82cdfd9 + 7de4efa
commit 7e73546
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/framework/src/problems/FEProblemBase.C b/framework/src/problems/FEProblemBase.C
@@ -1011,8 +1011,13 @@ FEProblemBase::initialSetup()
   groupUserObjects(
       theWarehouse(), getAuxiliarySystem(), _app.getExecuteOnEnum(), userobjs, depend_objects_ic);
 
+  std::map<int, std::vector<UserObject *>> group_userobjs;
   for (auto obj : userobjs)
-    obj->initialSetup();
+    group_userobjs[obj->getParam<int>("execution_order_group")].push_back(obj);
+
+  for (auto & [group, objs] : group_userobjs)
+    for (auto obj : objs)
+      obj->initialSetup();
 
   // check if jacobian calculation is done in userobject
   for (THREAD_ID tid = 0; tid < n_threads; ++tid)

diff --git a/modules/xfem/test/tests/solid_mechanics_basic/edge_crack_3d_fatigue.i b/modules/xfem/test/tests/solid_mechanics_basic/edge_crack_3d_fatigue.i
@@ -37,6 +37,7 @@
     growth_direction_z = growth_func_z
     growth_rate = growth_func_v
     crack_front_nodes = '7 6 5 4'
+    execution_order_group = -2
   [../]
 []
 

diff --git a/modules/xfem/test/tests/solid_mechanics_basic/edge_crack_3d_mhs.i b/modules/xfem/test/tests/solid_mechanics_basic/edge_crack_3d_mhs.i
@@ -33,6 +33,7 @@
     n_step_growth = 1
     growth_rate = growth_func_v
     crack_front_nodes = '7 6 5 4'
+    execution_order_group = -2
   [../]
 []