Merge pull request idaholab#24594 from Naktakala/stork_update

Stork update ahead of workshop
maxnezdyur · Jun 5, 2023 · 9903c96 · 9903c96
2 parents 968eb46 + 8e29cd2
commit 9903c96
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/stork/include/base/StorkApp.h b/stork/include/base/StorkApp.h
@@ -20,4 +20,5 @@ class StorkApp : public MooseApp
   virtual ~StorkApp();
 
   static void registerApps();
+  static void registerAll(Factory & f, ActionFactory & af, Syntax & s);
 };
diff --git a/stork/src/base/StorkApp.C.app b/stork/src/base/StorkApp.C.app
@@ -8,17 +8,27 @@ InputParameters
 StorkApp::validParams()
 {
   InputParameters params = MooseApp::validParams();
-
+  params.set<bool>("use_legacy_material_output") = false;
   return params;
 }
 
 StorkApp::StorkApp(InputParameters parameters) : MooseApp(parameters)
 {
-  ModulesApp::registerAllObjects<StorkApp>(_factory, _action_factory, _syntax);
+  StorkApp::registerAll(_factory, _action_factory, _syntax);
 }
 
 StorkApp::~StorkApp() {}
 
+void 
+StorkApp::registerAll(Factory & f, ActionFactory & af, Syntax & s)
+{
+  ModulesApp::registerAllObjects<StorkApp>(f, af, s);
+  Registry::registerObjectsTo(f, {"StorkApp"});
+  Registry::registerActionsTo(af, {"StorkApp"});
+
+  /* register custom execute flags, action syntax, etc. here */
+}
+
 void
 StorkApp::registerApps()
 {
@@ -31,7 +41,7 @@ StorkApp::registerApps()
 extern "C" void
 StorkApp__registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  ModulesApp::registerAllObjects<StorkApp>(f, af, s);
+  StorkApp::registerAll(f, af, s);
 }
 extern "C" void
 StorkApp__registerApps()

diff --git a/stork/src/base/StorkApp.C.module b/stork/src/base/StorkApp.C.module
@@ -7,7 +7,7 @@ InputParameters
 StorkApp::validParams()
 {
   InputParameters params = MooseApp::validParams();
-
+  params.set<bool>("use_legacy_material_output") = false;
   return params;
 }
 
@@ -21,7 +21,6 @@ StorkApp::~StorkApp() {}
 void
 StorkApp::registerAll(Factory & f, ActionFactory & af, Syntax & /*s*/)
 {
-  /* ModulesApp::registerAll(f, af, s); */
   Registry::registerObjectsTo(f, {"StorkApp"});
   Registry::registerActionsTo(af, {"StorkApp"});
 

diff --git a/stork/test/src/base/StorkTestApp.C.app b/stork/test/src/base/StorkTestApp.C.app
@@ -11,12 +11,12 @@
 #include "Moose.h"
 #include "AppFactory.h"
 #include "MooseSyntax.h"
-#include "ModulesApp.h"
 
 InputParameters
 StorkTestApp::validParams()
 {
   InputParameters params = StorkApp::validParams();
+  params.set<bool>("use_legacy_material_output") = false;
   return params;
 }
 
@@ -31,7 +31,7 @@ StorkTestApp::~StorkTestApp() {}
 void
 StorkTestApp::registerAll(Factory & f, ActionFactory & af, Syntax & s, bool use_test_objs)
 {
-  ModulesApp::registerAllObjects<StorkApp>(f, af, s);
+  StorkApp::registerAll(f, af, s);
   if (use_test_objs)
   {
     Registry::registerObjectsTo(f, {"StorkTestApp"});

diff --git a/stork/test/src/base/StorkTestApp.C.module b/stork/test/src/base/StorkTestApp.C.module
@@ -16,6 +16,7 @@ InputParameters
 StorkTestApp::validParams()
 {
   InputParameters params = StorkApp::validParams();
+  params.set<bool>("use_legacy_material_output") = false;
   return params;
 }