Skip to content

Commit 6a88e4d

Browse files
committed
Remove obsolete group() method
1 parent 715affc commit 6a88e4d

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

src/structure_new/src/nonlinear_solver/4C_structure_new_nln_solver_generic.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,12 @@ Teuchos::RCP<::NOX::Abstract::Group>& Solid::Nln::SOLVER::Generic::group_ptr()
6161

6262
/*----------------------------------------------------------------------------*
6363
*----------------------------------------------------------------------------*/
64-
::NOX::Abstract::Group& Solid::Nln::SOLVER::Generic::group()
64+
::NOX::Abstract::Group& Solid::Nln::SOLVER::Generic::get_solution_group()
6565
{
66-
check_init();
66+
check_init_setup();
6767
FOUR_C_ASSERT(group_ptr_, "The group pointer should be initialized beforehand!");
68-
return *group_ptr_;
69-
}
7068

71-
/*----------------------------------------------------------------------------*
72-
*----------------------------------------------------------------------------*/
73-
::NOX::Abstract::Group& Solid::Nln::SOLVER::Generic::get_solution_group()
74-
{
75-
return group();
69+
return *group_ptr_;
7670
}
7771

7872
/*----------------------------------------------------------------------------*

src/structure_new/src/nonlinear_solver/4C_structure_new_nln_solver_generic.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ namespace Solid
188188
/*! returns the nox group (pointer) (only for internal use)
189189
*
190190
* The nox group has to be initialized in one of the derived setup() routines. */
191-
::NOX::Abstract::Group& group();
192191
Teuchos::RCP<::NOX::Abstract::Group>& group_ptr();
193192

194193
protected:

src/structure_new/src/nonlinear_solver/4C_structure_new_nln_solver_singlestep.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ enum Inpar::Solid::ConvergenceStatus Solid::Nln::SOLVER::SingleStep::solve()
104104
{
105105
check_init_setup();
106106

107-
auto& nln_group = dynamic_cast<NOX::Nln::Group&>(group());
107+
auto& nln_group = dynamic_cast<NOX::Nln::Group&>(*group_ptr());
108108

109-
const auto& x_epetra = dynamic_cast<const ::NOX::Epetra::Vector&>(group().getX());
109+
const auto& x_epetra = dynamic_cast<const ::NOX::Epetra::Vector&>(group_ptr()->getX());
110110

111111
nln_group.set_is_valid_newton(true); // to circumvent the check in ::NOX::Solver::SingleStep
112112
nln_group.set_is_valid_rhs(false); // force to compute the RHS

0 commit comments

Comments
 (0)