move user-object, postprocessor and vector postprocessor interfaces d…

…own to the base class (note: this enabled vector postprocessor interface for few derived user object classes missing before) idaholab#14664
YaqiWang · Jan 30, 2020 · 26125a9 · 26125a9
1 parent 0a45fb1
commit 26125a9
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 44 deletions.
diff --git a/framework/include/userobject/ElementUserObject.h b/framework/include/userobject/ElementUserObject.h
@@ -13,11 +13,9 @@
 #include "UserObject.h"
 #include "BlockRestrictable.h"
 #include "MaterialPropertyInterface.h"
-#include "UserObjectInterface.h"
 #include "Coupleable.h"
 #include "MooseVariableDependencyInterface.h"
 #include "TransientInterface.h"
-#include "PostprocessorInterface.h"
 #include "RandomInterface.h"
 #include "ElementIDInterface.h"
 
@@ -36,11 +34,9 @@ InputParameters validParams<ElementUserObject>();
 class ElementUserObject : public UserObject,
                           public BlockRestrictable,
                           public MaterialPropertyInterface,
-                          public UserObjectInterface,
                           public Coupleable,
                           public MooseVariableDependencyInterface,
                           public TransientInterface,
-                          protected PostprocessorInterface,
                           public RandomInterface,
                           public ElementIDInterface
 {

diff --git a/framework/include/userobject/GeneralUserObject.h b/framework/include/userobject/GeneralUserObject.h
@@ -14,9 +14,6 @@
 #include "MaterialPropertyInterface.h"
 #include "TransientInterface.h"
 #include "DependencyResolverInterface.h"
-#include "UserObjectInterface.h"
-#include "PostprocessorInterface.h"
-#include "VectorPostprocessorInterface.h"
 
 // Forward Declarations
 class GeneralUserObject;
@@ -29,10 +26,7 @@ InputParameters validParams<GeneralUserObject>();
 class GeneralUserObject : public UserObject,
                           public MaterialPropertyInterface,
                           public TransientInterface,
-                          public DependencyResolverInterface,
-                          public UserObjectInterface,
-                          protected PostprocessorInterface,
-                          protected VectorPostprocessorInterface
+                          public DependencyResolverInterface
 {
 public:
   static InputParameters validParams();

diff --git a/framework/include/userobject/InterfaceUserObject.h b/framework/include/userobject/InterfaceUserObject.h
@@ -14,9 +14,7 @@
 #include "TwoMaterialPropertyInterface.h"
 #include "NeighborCoupleable.h"
 #include "MooseVariableDependencyInterface.h"
-#include "UserObjectInterface.h"
 #include "TransientInterface.h"
-#include "PostprocessorInterface.h"
 
 class InterfaceUserObject;
 
@@ -31,9 +29,7 @@ class InterfaceUserObject : public UserObject,
                             public TwoMaterialPropertyInterface,
                             public NeighborCoupleable,
                             public MooseVariableDependencyInterface,
-                            public UserObjectInterface,
-                            public TransientInterface,
-                            public PostprocessorInterface
+                            public TransientInterface
 {
 public:
   static InputParameters validParams();

diff --git a/framework/include/userobject/InternalSideUserObject.h b/framework/include/userobject/InternalSideUserObject.h
@@ -14,9 +14,7 @@
 #include "NeighborCoupleable.h"
 #include "TwoMaterialPropertyInterface.h"
 #include "MooseVariableDependencyInterface.h"
-#include "UserObjectInterface.h"
 #include "TransientInterface.h"
-#include "PostprocessorInterface.h"
 
 class InternalSideUserObject;
 
@@ -31,9 +29,7 @@ class InternalSideUserObject : public UserObject,
                                public TwoMaterialPropertyInterface,
                                public NeighborCoupleable,
                                public MooseVariableDependencyInterface,
-                               public UserObjectInterface,
-                               public TransientInterface,
-                               public PostprocessorInterface
+                               public TransientInterface
 {
 public:
   static InputParameters validParams();

diff --git a/framework/include/userobject/NodalUserObject.h b/framework/include/userobject/NodalUserObject.h
@@ -13,11 +13,9 @@
 #include "UserObject.h"
 #include "BlockRestrictable.h"
 #include "BoundaryRestrictable.h"
-#include "UserObjectInterface.h"
 #include "Coupleable.h"
 #include "MooseVariableDependencyInterface.h"
 #include "TransientInterface.h"
-#include "PostprocessorInterface.h"
 #include "RandomInterface.h"
 
 // Forward Declarations
@@ -33,11 +31,9 @@ InputParameters validParams<NodalUserObject>();
 class NodalUserObject : public UserObject,
                         public BlockRestrictable,
                         public BoundaryRestrictable,
-                        public UserObjectInterface,
                         public Coupleable,
                         public MooseVariableDependencyInterface,
                         public TransientInterface,
-                        protected PostprocessorInterface,
                         public RandomInterface
 {
 public:

diff --git a/framework/include/userobject/SideUserObject.h b/framework/include/userobject/SideUserObject.h
@@ -15,9 +15,7 @@
 #include "MaterialPropertyInterface.h"
 #include "Coupleable.h"
 #include "MooseVariableDependencyInterface.h"
-#include "UserObjectInterface.h"
 #include "TransientInterface.h"
-#include "PostprocessorInterface.h"
 
 // Forward Declarations
 class SideUserObject;
@@ -30,9 +28,7 @@ class SideUserObject : public UserObject,
                        public MaterialPropertyInterface,
                        public Coupleable,
                        public MooseVariableDependencyInterface,
-                       public UserObjectInterface,
-                       public TransientInterface,
-                       protected PostprocessorInterface
+                       public TransientInterface
 {
 public:
   static InputParameters validParams();

diff --git a/framework/include/userobject/UserObject.h b/framework/include/userobject/UserObject.h
@@ -12,6 +12,9 @@
 // MOOSE includes
 #include "DistributionInterface.h"
 #include "FunctionInterface.h"
+#include "UserObjectInterface.h"
+#include "PostprocessorInterface.h"
+#include "VectorPostprocessorInterface.h"
 #include "MeshChangedInterface.h"
 #include "MooseObject.h"
 #include "MooseTypes.h"
@@ -38,6 +41,9 @@ InputParameters validParams<UserObject>();
 class UserObject : public MooseObject,
                    public SetupInterface,
                    protected FunctionInterface,
+                   public UserObjectInterface,
+                   protected PostprocessorInterface,
+                   protected VectorPostprocessorInterface,
                    protected DistributionInterface,
                    protected Restartable,
                    protected MeshMetaDataInterface,

diff --git a/framework/src/userobject/ElementUserObject.C b/framework/src/userobject/ElementUserObject.C
@@ -31,11 +31,9 @@ ElementUserObject::ElementUserObject(const InputParameters & parameters)
   : UserObject(parameters),
     BlockRestrictable(this),
     MaterialPropertyInterface(this, blockIDs(), Moose::EMPTY_BOUNDARY_IDS),
-    UserObjectInterface(this),
     Coupleable(this, false),
     MooseVariableDependencyInterface(),
     TransientInterface(this),
-    PostprocessorInterface(this),
     RandomInterface(parameters, _fe_problem, _tid, false),
     ElementIDInterface(this),
     _mesh(_subproblem.mesh()),

diff --git a/framework/src/userobject/GeneralUserObject.C b/framework/src/userobject/GeneralUserObject.C
@@ -26,10 +26,7 @@ GeneralUserObject::GeneralUserObject(const InputParameters & parameters)
   : UserObject(parameters),
     MaterialPropertyInterface(this, Moose::EMPTY_BLOCK_IDS, Moose::EMPTY_BOUNDARY_IDS),
     TransientInterface(this),
-    DependencyResolverInterface(),
-    UserObjectInterface(this),
-    PostprocessorInterface(this),
-    VectorPostprocessorInterface(this)
+    DependencyResolverInterface()
 {
   _supplied_vars.insert(name());
 }

diff --git a/framework/src/userobject/InterfaceUserObject.C b/framework/src/userobject/InterfaceUserObject.C
@@ -36,9 +36,7 @@ InterfaceUserObject::InterfaceUserObject(const InputParameters & parameters)
     TwoMaterialPropertyInterface(this, Moose::EMPTY_BLOCK_IDS, boundaryIDs()),
     NeighborCoupleable(this, false, false),
     MooseVariableDependencyInterface(),
-    UserObjectInterface(this),
     TransientInterface(this),
-    PostprocessorInterface(this),
     _mesh(_subproblem.mesh()),
     _q_point(_assembly.qPointsFace()),
     _qrule(_assembly.qRuleFace()),

diff --git a/framework/src/userobject/InternalSideUserObject.C b/framework/src/userobject/InternalSideUserObject.C
@@ -34,9 +34,7 @@ InternalSideUserObject::InternalSideUserObject(const InputParameters & parameter
     TwoMaterialPropertyInterface(this, blockIDs(), Moose::EMPTY_BOUNDARY_IDS),
     NeighborCoupleable(this, false, false),
     MooseVariableDependencyInterface(),
-    UserObjectInterface(this),
     TransientInterface(this),
-    PostprocessorInterface(this),
     _mesh(_subproblem.mesh()),
     _q_point(_assembly.qPointsFace()),
     _qrule(_assembly.qRuleFace()),

diff --git a/framework/src/userobject/NodalUserObject.C b/framework/src/userobject/NodalUserObject.C
@@ -34,11 +34,9 @@ NodalUserObject::NodalUserObject(const InputParameters & parameters)
   : UserObject(parameters),
     BlockRestrictable(this),
     BoundaryRestrictable(this, blockIDs(), true), // true for applying to nodesets
-    UserObjectInterface(this),
     Coupleable(this, true),
     MooseVariableDependencyInterface(),
     TransientInterface(this),
-    PostprocessorInterface(this),
     RandomInterface(parameters, _fe_problem, _tid, true),
     _mesh(_subproblem.mesh()),
     _qp(0),

diff --git a/framework/src/userobject/SideUserObject.C b/framework/src/userobject/SideUserObject.C
@@ -29,9 +29,7 @@ SideUserObject::SideUserObject(const InputParameters & parameters)
     MaterialPropertyInterface(this, Moose::EMPTY_BLOCK_IDS, boundaryIDs()),
     Coupleable(this, false),
     MooseVariableDependencyInterface(),
-    UserObjectInterface(this),
     TransientInterface(this),
-    PostprocessorInterface(this),
     _mesh(_subproblem.mesh()),
     _q_point(_assembly.qPointsFace()),
     _qrule(_assembly.qRuleFace()),

diff --git a/framework/src/userobject/UserObject.C b/framework/src/userobject/UserObject.C
@@ -50,6 +50,9 @@ UserObject::UserObject(const InputParameters & parameters)
   : MooseObject(parameters),
     SetupInterface(this),
     FunctionInterface(this),
+    UserObjectInterface(this),
+    PostprocessorInterface(this),
+    VectorPostprocessorInterface(this),
     DistributionInterface(this),
     Restartable(this, "UserObjects"),
     MeshMetaDataInterface(this),