Merge pull request idaholab#345 from idaholab/residual-object

Update to uniform ResidualObject APIs
cbolisetti · Nov 11, 2020 · 3194280 · 3194280
2 parents 6f022ca + b102f2b
commit 3194280
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 14 deletions.
diff --git a/include/kernels/StressDivergenceDamper.h b/include/kernels/StressDivergenceDamper.h
@@ -25,8 +25,7 @@ class StressDivergenceDamper : public Kernel
   StressDivergenceDamper(const InputParameters & parameters);
   virtual void computeResidual() override;
   virtual void computeJacobian() override;
-  virtual void computeOffDiagJacobian(MooseVariableFEBase & jvar) override;
-  using Kernel::computeOffDiagJacobian;
+  virtual void computeOffDiagJacobian(unsigned int jvar) override;
 
 protected:
   virtual Real computeQpResidual() override { return 0.0; }

diff --git a/include/kernels/StressDivergenceIsolator.h b/include/kernels/StressDivergenceIsolator.h
@@ -25,8 +25,7 @@ class StressDivergenceIsolator : public Kernel
   StressDivergenceIsolator(const InputParameters & parameters);
   virtual void computeResidual() override;
   virtual void computeJacobian() override;
-  virtual void computeOffDiagJacobian(MooseVariableFEBase & jvar) override;
-  using Kernel::computeOffDiagJacobian;
+  virtual void computeOffDiagJacobian(unsigned int jvar) override;
 
 protected:
   virtual Real computeQpResidual() override { return 0.0; }

diff --git a/include/kernels/StressDivergenceSpring.h b/include/kernels/StressDivergenceSpring.h
@@ -22,16 +22,14 @@ template <typename>
 class RankTwoTensorTempl;
 typedef RankTwoTensorTempl<Real> RankTwoTensor;
 
-
 class StressDivergenceSpring : public Kernel
 {
 public:
   static InputParameters validParams();
   StressDivergenceSpring(const InputParameters & parameters);
   virtual void computeResidual() override;
   virtual void computeJacobian() override;
-  virtual void computeOffDiagJacobian(MooseVariableFEBase & jvar) override;
-  using Kernel::computeOffDiagJacobian;
+  virtual void computeOffDiagJacobian(unsigned int jvar) override;
 
 protected:
   virtual Real computeQpResidual() override { return 0.0; }

diff --git a/moose b/moose
diff --git a/src/kernels/StressDivergenceDamper.C b/src/kernels/StressDivergenceDamper.C
@@ -102,10 +102,9 @@ StressDivergenceDamper::computeJacobian()
 }
 
 void
-StressDivergenceDamper::computeOffDiagJacobian(MooseVariableFEBase & jvar)
+StressDivergenceDamper::computeOffDiagJacobian(const unsigned int jvar_num)
 // coupling one variable to another (disp x to disp y, etc)
 {
-  size_t jvar_num = jvar.number();
   if (jvar_num == _var.number())
     // jacobian calculation if jvar is the same as the current variable i.e.,
     // diagonal elements

diff --git a/src/kernels/StressDivergenceIsolator.C b/src/kernels/StressDivergenceIsolator.C
@@ -125,10 +125,9 @@ StressDivergenceIsolator::computeJacobian()
 }
 
 void
-StressDivergenceIsolator::computeOffDiagJacobian(MooseVariableFEBase & jvar)
+StressDivergenceIsolator::computeOffDiagJacobian(const unsigned int jvar_num)
 // coupling one variable to another (disp x to disp y, etc)
 {
-  size_t jvar_num = jvar.number();
   if (jvar_num == _var.number())
     // jacobian calculation if jvar is the same as the current variable i.e.,
     // diagonal elements

diff --git a/src/kernels/StressDivergenceSpring.C b/src/kernels/StressDivergenceSpring.C
@@ -138,10 +138,9 @@ StressDivergenceSpring::computeJacobian()
 }
 
 void
-StressDivergenceSpring::computeOffDiagJacobian(MooseVariableFEBase & jvar)
+StressDivergenceSpring::computeOffDiagJacobian(const unsigned int jvar_num)
 // coupling one variable to another (disp x to disp y, etc)
 {
-  size_t jvar_num = jvar.number();
   if (jvar_num == _var.number())
     // jacobian calculation if jvar is the same as the current variable i.e.,
     // diagonal elements