update contact and fluid_properties modules

idaholab · Sep 21, 2018 · 40f7401 · 40f7401
1 parent be859e2
commit 40f7401
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 149 deletions.
diff --git a/libmesh b/libmesh
diff --git a/modules/contact/include/base/ContactApp.h b/modules/contact/include/base/ContactApp.h
@@ -24,6 +24,7 @@ class ContactApp : public MooseApp
   virtual ~ContactApp();
 
   static void registerApps();
+  static void registerAll(Factory & f, ActionFactory & af, Syntax & s);
   static void registerObjects(Factory & factory);
   static void associateSyntax(Syntax & syntax, ActionFactory & action_factory);
   static void registerExecFlags(Factory & factory);

diff --git a/modules/contact/src/base/ContactApp.C b/modules/contact/src/base/ContactApp.C
@@ -24,75 +24,70 @@ registerKnownLabel("ContactApp");
 
 ContactApp::ContactApp(const InputParameters & parameters) : MooseApp(parameters)
 {
-  Moose::registerObjects(_factory);
-  ContactApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ContactApp::associateSyntax(_syntax, _action_factory);
-
-  Moose::registerExecFlags(_factory);
-  ContactApp::registerExecFlags(_factory);
+  ContactApp::registerAll(_factory, _action_factory, _syntax);
 }
 
 ContactApp::~ContactApp() {}
 
-// External entry point for dynamic application loading
-extern "C" void
-ContactApp__registerApps()
+static void
+associateSyntaxInner(Syntax & syntax, ActionFactory & /*action_factory*/)
 {
-  ContactApp::registerApps();
+  registerSyntax("ContactAction", "Contact/*");
+
+  registerSyntax("ContactPenetrationAuxAction", "Contact/*");
+  registerSyntax("ContactPenetrationVarAction", "Contact/*");
+
+  registerSyntax("ContactPressureAuxAction", "Contact/*");
+  registerSyntax("ContactPressureVarAction", "Contact/*");
+
+  registerSyntax("NodalAreaAction", "Contact/*");
+  registerSyntax("NodalAreaVarAction", "Contact/*");
+
+  registerTask("output_penetration_info_vars", false);
+  syntax.addDependency("output_penetration_info_vars", "add_output");
 }
+
 void
-ContactApp::registerApps()
+ContactApp::registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  registerApp(ContactApp);
+  Registry::registerObjectsTo(f, {"ContactApp"});
+  Registry::registerActionsTo(af, {"ContactApp"});
+  associateSyntaxInner(s, af);
 }
 
-// External entry point for dynamic object registration
-extern "C" void
-ContactApp__registerObjects(Factory & factory)
+void
+ContactApp::registerApps()
 {
-  ContactApp::registerObjects(factory);
+  registerApp(ContactApp);
 }
+
 void
 ContactApp::registerObjects(Factory & factory)
 {
+  mooseDeprecated("use registerAll instead of registerObjects");
   Registry::registerObjectsTo(factory, {"ContactApp"});
 }
 
-// External entry point for dynamic syntax association
-extern "C" void
-ContactApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory)
-{
-  ContactApp::associateSyntax(syntax, action_factory);
-}
 void
 ContactApp::associateSyntax(Syntax & syntax, ActionFactory & action_factory)
 {
+  mooseDeprecated("use registerAll instead of associateSyntax");
   Registry::registerActionsTo(action_factory, {"ContactApp"});
+  associateSyntaxInner(syntax, action_factory);
+}
 
-  registerSyntax("ContactAction", "Contact/*");
-
-  registerSyntax("ContactPenetrationAuxAction", "Contact/*");
-  registerSyntax("ContactPenetrationVarAction", "Contact/*");
-
-  registerSyntax("ContactPressureAuxAction", "Contact/*");
-  registerSyntax("ContactPressureVarAction", "Contact/*");
-
-  registerSyntax("NodalAreaAction", "Contact/*");
-  registerSyntax("NodalAreaVarAction", "Contact/*");
-
-  registerTask("output_penetration_info_vars", false);
-  syntax.addDependency("output_penetration_info_vars", "add_output");
+void
+ContactApp::registerExecFlags(Factory & /*factory*/)
+{
 }
 
-// External entry point for dynamic execute flag registration
 extern "C" void
-ContactApp__registerExecFlags(Factory & factory)
+ContactApp__registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  ContactApp::registerExecFlags(factory);
+  ContactApp::registerAll(f, af, s);
 }
-void
-ContactApp::registerExecFlags(Factory & /*factory*/)
+extern "C" void
+ContactApp__registerApps()
 {
+  ContactApp::registerApps();
 }
diff --git a/modules/contact/test/include/base/ContactTestApp.h b/modules/contact/test/include/base/ContactTestApp.h
@@ -23,6 +23,7 @@ class ContactTestApp : public MooseApp
   virtual ~ContactTestApp();
 
   static void registerApps();
+  static void registerAll(Factory & f, ActionFactory & af, Syntax & s, bool use_test_objs = false);
   static void registerObjects(Factory & factory);
   static void associateSyntax(Syntax & syntax, ActionFactory & action_factory);
   static void registerExecFlags(Factory & factory);

diff --git a/modules/contact/test/src/base/ContactTestApp.C b/modules/contact/test/src/base/ContactTestApp.C
@@ -24,69 +24,54 @@ registerKnownLabel("ContactTestApp");
 
 ContactTestApp::ContactTestApp(InputParameters parameters) : MooseApp(parameters)
 {
-  Moose::registerObjects(_factory);
-  ContactApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ContactApp::associateSyntax(_syntax, _action_factory);
+  ContactTestApp::registerAll(
+      _factory, _action_factory, _syntax, getParam<bool>("allow_test_objects"));
+}
 
-  Moose::registerExecFlags(_factory);
-  ContactApp::registerExecFlags(_factory);
+ContactTestApp::~ContactTestApp() {}
 
-  bool use_test_objs = getParam<bool>("allow_test_objects");
+void
+ContactTestApp::registerAll(Factory & f, ActionFactory & af, Syntax & s, bool use_test_objs)
+{
+  ContactApp::registerAll(f, af, s);
   if (use_test_objs)
   {
-    ContactTestApp::registerObjects(_factory);
-    ContactTestApp::associateSyntax(_syntax, _action_factory);
+    Registry::registerObjectsTo(f, {"ContactTestApp"});
+    Registry::registerActionsTo(af, {"ContactTestApp"});
   }
 }
 
-ContactTestApp::~ContactTestApp() {}
-
-// External entry point for dynamic application loading
-extern "C" void
-ContactTestApp__registerApps()
-{
-  ContactTestApp::registerApps();
-}
 void
 ContactTestApp::registerApps()
 {
   registerApp(ContactApp);
   registerApp(ContactTestApp);
 }
 
-// External entry point for dynamic object registration
-extern "C" void
-ContactTestApp__registerObjects(Factory & factory)
-{
-  ContactTestApp::registerObjects(factory);
-}
 void
 ContactTestApp::registerObjects(Factory & factory)
 {
   Registry::registerObjectsTo(factory, {"ContactTestApp"});
 }
 
-// External entry point for dynamic syntax association
-extern "C" void
-ContactTestApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory)
-{
-  ContactTestApp::associateSyntax(syntax, action_factory);
-}
 void
 ContactTestApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
   Registry::registerActionsTo(action_factory, {"ContactTestApp"});
 }
 
-// External entry point for dynamic execute flag registration
+void
+ContactTestApp::registerExecFlags(Factory & /*factory*/)
+{
+}
+
 extern "C" void
-ContactTestApp__registerExecFlags(Factory & factory)
+ContactTestApp__registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  ContactTestApp::registerExecFlags(factory);
+  ContactTestApp::registerAll(f, af, s);
 }
-void
-ContactTestApp::registerExecFlags(Factory & /*factory*/)
+extern "C" void
+ContactTestApp__registerApps()
 {
+  ContactTestApp::registerApps();
 }
diff --git a/modules/fluid_properties/include/base/FluidPropertiesApp.h b/modules/fluid_properties/include/base/FluidPropertiesApp.h
@@ -24,6 +24,7 @@ class FluidPropertiesApp : public MooseApp
   virtual ~FluidPropertiesApp();
 
   static void registerApps();
+  static void registerAll(Factory & f, ActionFactory & af, Syntax & s);
   static void registerObjects(Factory & factory);
   static void associateSyntax(Syntax & syntax, ActionFactory & action_factory);
   static void registerExecFlags(Factory & factory);

diff --git a/modules/fluid_properties/src/base/FluidPropertiesApp.C b/modules/fluid_properties/src/base/FluidPropertiesApp.C
@@ -24,71 +24,62 @@ registerKnownLabel("FluidPropertiesApp");
 
 FluidPropertiesApp::FluidPropertiesApp(InputParameters parameters) : MooseApp(parameters)
 {
-  Moose::registerObjects(_factory);
-  FluidPropertiesApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  FluidPropertiesApp::associateSyntax(_syntax, _action_factory);
-
-  Moose::registerExecFlags(_factory);
-  FluidPropertiesApp::registerExecFlags(_factory);
+  FluidPropertiesApp::registerAll(_factory, _action_factory, _syntax);
 }
 
 FluidPropertiesApp::~FluidPropertiesApp() {}
 
-// External entry point for dynamic application loading
-extern "C" void
-FluidPropertiesApp__registerApps()
-{
-  FluidPropertiesApp::registerApps();
-}
-
 void
 FluidPropertiesApp::registerApps()
 {
   registerApp(FluidPropertiesApp);
 }
 
-// External entry point for dynamic object registration
-extern "C" void
-FluidPropertiesApp__registerObjects(Factory & factory)
+static void
+associateSyntaxInner(Syntax & syntax, ActionFactory & /*action_factory*/)
 {
-  FluidPropertiesApp::registerObjects(factory);
+  registerSyntaxTask(
+      "AddFluidPropertiesAction", "Modules/FluidProperties/*", "add_fluid_properties");
+  registerMooseObjectTask("add_fluid_properties", FluidProperties, false);
+  syntax.addDependency("add_fluid_properties", "init_displaced_problem");
 }
 
 void
-FluidPropertiesApp::registerObjects(Factory & factory)
+FluidPropertiesApp::registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  Registry::registerObjectsTo(factory, {"FluidPropertiesApp"});
+  Registry::registerObjectsTo(f, {"FluidPropertiesApp"});
+  Registry::registerActionsTo(af, {"FluidPropertiesApp"});
+  associateSyntaxInner(s, af);
 }
 
-// External entry point for dynamic syntax association
-extern "C" void
-FluidPropertiesApp__associateSyntax(Syntax & syntax, ActionFactory & action_factory)
+void
+FluidPropertiesApp::registerObjects(Factory & factory)
 {
-  FluidPropertiesApp::associateSyntax(syntax, action_factory);
+  mooseDeprecated("use registerAll instead of registerObjects");
+  Registry::registerObjectsTo(factory, {"FluidPropertiesApp"});
 }
 
 void
 FluidPropertiesApp::associateSyntax(Syntax & syntax, ActionFactory & action_factory)
 {
+  mooseDeprecated("use registerAll instead of associateSyntax");
   Registry::registerActionsTo(action_factory, {"FluidPropertiesApp"});
+  associateSyntaxInner(syntax, action_factory);
+}
 
-  registerSyntaxTask(
-      "AddFluidPropertiesAction", "Modules/FluidProperties/*", "add_fluid_properties");
-
-  registerMooseObjectTask("add_fluid_properties", FluidProperties, false);
-
-  syntax.addDependency("add_fluid_properties", "init_displaced_problem");
+void
+FluidPropertiesApp::registerExecFlags(Factory & /*factory*/)
+{
+  mooseDeprecated("use registerAll instead of registerExecFlags");
 }
 
-// External entry point for dynamic execute flag registration
 extern "C" void
-FluidPropertiesApp__registerExecFlags(Factory & factory)
+FluidPropertiesApp__registerAll(Factory & f, ActionFactory & af, Syntax & s)
 {
-  FluidPropertiesApp::registerExecFlags(factory);
+  FluidPropertiesApp::registerAll(f, af, s);
 }
-void
-FluidPropertiesApp::registerExecFlags(Factory & /*factory*/)
+extern "C" void
+FluidPropertiesApp__registerApps()
 {
+  FluidPropertiesApp::registerApps();
 }
diff --git a/modules/fluid_properties/test/include/base/FluidPropertiesTestApp.h b/modules/fluid_properties/test/include/base/FluidPropertiesTestApp.h
@@ -23,6 +23,7 @@ class FluidPropertiesTestApp : public MooseApp
   virtual ~FluidPropertiesTestApp();
 
   static void registerApps();
+  static void registerAll(Factory & f, ActionFactory & af, Syntax & s, bool use_test_objs = false);
   static void registerObjects(Factory & factory);
   static void associateSyntax(Syntax & syntax, ActionFactory & action_factory);
   static void registerExecFlags(Factory & factory);