Skip to content

Commit

Permalink
Fix documentation strings for example side_user_objects in tests. (Is…
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Lindsay authored and fdkong committed Nov 23, 2016
1 parent cf421c4 commit 3b412b5
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 11 deletions.
1 change: 0 additions & 1 deletion framework/include/base/FEProblem.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
class FEProblem;
class NonlinearSystem;


template<>
InputParameters validParams<FEProblem>();

Expand Down
1 change: 0 additions & 1 deletion framework/include/base/FEProblemBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ class Function;
class KernelBase;
class IntegratedBC;


// libMesh forward declarations
namespace libMesh
{
Expand Down
1 change: 0 additions & 1 deletion framework/src/base/FEProblem.C
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "FEProblem.h"
#include "Assembly.h"


template<>
InputParameters validParams<FEProblem>()
{
Expand Down
13 changes: 7 additions & 6 deletions framework/src/base/FEProblemBase.C
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
#include "XFEMInterface.h"
#include "ConsoleUtils.h"
#include "NonlocalKernel.h"
#include "NonlocalIntegratedBC.h"
#include "ShapeElementUserObject.h"
#include "ShapeSideUserObject.h"

#include "libmesh/exodusII_io.h"
Expand Down Expand Up @@ -697,7 +699,7 @@ FEProblemBase::checkNonlocalCoupling()
{
for (THREAD_ID tid = 0; tid < libMesh::n_threads(); tid++)
{
const KernelWarehouse & all_kernels = _nl.getKernelWarehouse();
const KernelWarehouse & all_kernels = _nl->getKernelWarehouse();
const std::vector<MooseSharedPointer<KernelBase> > & kernels = all_kernels.getObjects(tid);
for (const auto & kernel : kernels)
{
Expand All @@ -709,7 +711,7 @@ FEProblemBase::checkNonlocalCoupling()
_nonlocal_kernels.addObject(kernel, tid);
}
}
const MooseObjectWarehouse<IntegratedBC> & all_integrated_bcs = _nl.getIntegratedBCWarehouse();
const MooseObjectWarehouse<IntegratedBC> & all_integrated_bcs = _nl->getIntegratedBCWarehouse();
const std::vector<MooseSharedPointer<IntegratedBC> > & integrated_bcs = all_integrated_bcs.getObjects(tid);
for (const auto & integrated_bc : integrated_bcs)
{
Expand All @@ -724,9 +726,8 @@ FEProblemBase::checkNonlocalCoupling()
}
}


void
FEProblem::checkUserObjectJacobianRequirement(THREAD_ID tid)
FEProblemBase::checkUserObjectJacobianRequirement(THREAD_ID tid)
{
std::set<MooseVariable *> uo_jacobian_moose_vars;
const std::vector<MooseSharedPointer<ElementUserObject> > & e_objects = _elemental_user_objects.getActiveObjects(tid);
Expand Down Expand Up @@ -3096,9 +3097,9 @@ FEProblemBase::setCouplingMatrix(CouplingMatrix * cm)
void
FEProblemBase::setNonlocalCouplingMatrix()
{
unsigned int n_vars = _nl.nVariables();
unsigned int n_vars = _nl->nVariables();
_nonlocal_cm.resize(n_vars);
const std::vector<MooseVariable *> & vars = _nl.getVariables(0);
const std::vector<MooseVariable *> & vars = _nl->getVariables(0);
const std::vector<MooseSharedPointer<KernelBase> > & nonlocal_kernel = _nonlocal_kernels.getObjects();
const std::vector<MooseSharedPointer<IntegratedBC> > & nonlocal_integrated_bc = _nonlocal_integrated_bcs.getObjects();
for (const auto & ivar : vars)
Expand Down
2 changes: 1 addition & 1 deletion test/include/userobjects/DenomShapeSideUserObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ InputParameters validParams<DenomShapeSideUserObject>();
/**
* Test and proof of concept class for computing UserObject Jacobians using the
* ShapeSideUserObject base class. This object computes the integral
* \f$ \int_\Omega u^2v dr \f$
* \f$ \int_\Omega u dr \f$
* and builds a vector of all derivatives of the integral w.r.t. the DOFs of u and v.
* These Jacobian terms can be utilized by a Kernel that uses the integral in the
* calculation of its residual.
Expand Down
2 changes: 1 addition & 1 deletion test/include/userobjects/NumShapeSideUserObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ InputParameters validParams<NumShapeSideUserObject>();
/**
* Test and proof of concept class for computing UserObject Jacobians using the
* ShapeSideUserObject base class. This object computes the integral
* \f$ \int_\Omega u^2v dr \f$
* \f$ \int_\Omega \nabla u * \hat n dr \f$
* and builds a vector of all derivatives of the integral w.r.t. the DOFs of u and v.
* These Jacobian terms can be utilized by a Kernel that uses the integral in the
* calculation of its residual.
Expand Down

0 comments on commit 3b412b5

Please sign in to comment.