Skip to content

Commit 2a3a415

Browse files
committed
Rename method to avoid confusion
1 parent 3bd0fd4 commit 2a3a415

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

src/fsi/src/partitioned/model_evaluator/4C_fsi_str_model_evaluator_partitioned.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Solid::ModelEvaluator::PartitionedFSI::solve_relaxation_linear(
122122
const_cast<Solid::Nln::SOLVER::Generic&>(*(ti_impl->get_nln_solver_ptr()));
123123

124124
// get the solution group
125-
::NOX::Abstract::Group& grp = nlnsolver.solution_group();
125+
::NOX::Abstract::Group& grp = nlnsolver.get_solution_group();
126126
NOX::Nln::Group* grp_ptr = dynamic_cast<NOX::Nln::Group*>(&grp);
127127
if (grp_ptr == nullptr) FOUR_C_THROW("Dynamic cast failed!");
128128

src/structure_new/src/explicit/4C_structure_new_timint_explicit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void Solid::TimeInt::Explicit::evaluate()
109109
{
110110
check_init_setup();
111111
throw_if_state_not_in_sync_with_nox_group();
112-
::NOX::Abstract::Group& grp = nln_solver().solution_group();
112+
::NOX::Abstract::Group& grp = nln_solver().get_solution_group();
113113

114114
auto* grp_ptr = dynamic_cast<NOX::Nln::Group*>(&grp);
115115
if (grp_ptr == nullptr) FOUR_C_THROW("Dynamic cast failed!");

src/structure_new/src/implicit/4C_structure_new_timint_implicit.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void Solid::TimeInt::Implicit::set_state(const std::shared_ptr<Core::LinAlg::Vec
8484
integrator_ptr()->set_state(*x);
8585
::NOX::Epetra::Vector x_nox(
8686
Teuchos::rcpFromRef(*x->get_ptr_of_epetra_vector()), ::NOX::Epetra::Vector::CreateView);
87-
nln_solver().solution_group().setX(x_nox);
87+
nln_solver().get_solution_group().setX(x_nox);
8888
set_state_in_sync_with_nox_group(true);
8989
}
9090

@@ -109,7 +109,7 @@ void Solid::TimeInt::Implicit::prepare_time_step()
109109
double& time_np = data_global_state().get_time_np();
110110
time_np = data_global_state().get_time_n() + (*data_global_state().get_delta_time())[0]; */
111111

112-
::NOX::Abstract::Group& grp = nln_solver().solution_group();
112+
::NOX::Abstract::Group& grp = nln_solver().get_solution_group();
113113
predictor().predict(grp);
114114
}
115115

@@ -130,7 +130,7 @@ int Solid::TimeInt::Implicit::integrate_step()
130130
{
131131
check_init_setup();
132132
// do the predictor step
133-
::NOX::Abstract::Group& grp = nln_solver().solution_group();
133+
::NOX::Abstract::Group& grp = nln_solver().get_solution_group();
134134
predictor().predict(grp);
135135
return solve();
136136
}
@@ -158,7 +158,7 @@ void Solid::TimeInt::Implicit::update_state_incrementally(
158158

159159
check_init_setup();
160160
throw_if_state_not_in_sync_with_nox_group();
161-
::NOX::Abstract::Group& grp = nln_solver().solution_group();
161+
::NOX::Abstract::Group& grp = nln_solver().get_solution_group();
162162

163163
auto* grp_ptr = dynamic_cast<NOX::Nln::Group*>(&grp);
164164
FOUR_C_ASSERT(grp_ptr != nullptr, "Dynamic cast failed!");
@@ -202,7 +202,7 @@ void Solid::TimeInt::Implicit::evaluate()
202202
{
203203
check_init_setup();
204204
throw_if_state_not_in_sync_with_nox_group();
205-
::NOX::Abstract::Group& grp = nln_solver().solution_group();
205+
::NOX::Abstract::Group& grp = nln_solver().get_solution_group();
206206

207207
auto* grp_ptr = dynamic_cast<NOX::Nln::Group*>(&grp);
208208
FOUR_C_ASSERT(grp_ptr != nullptr, "Dynamic cast failed!");

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ ::NOX::Abstract::Group& Solid::Nln::SOLVER::Generic::group()
7070

7171
/*----------------------------------------------------------------------------*
7272
*----------------------------------------------------------------------------*/
73-
::NOX::Abstract::Group& Solid::Nln::SOLVER::Generic::solution_group() { return group(); }
73+
::NOX::Abstract::Group& Solid::Nln::SOLVER::Generic::get_solution_group()
74+
{
75+
return group();
76+
}
7477

7578
/*----------------------------------------------------------------------------*
7679
*----------------------------------------------------------------------------*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ namespace Solid
8181
*
8282
* The nox group has to be initialized in one of the derived setup() routines beforehand.
8383
*/
84-
::NOX::Abstract::Group& solution_group();
84+
::NOX::Abstract::Group& get_solution_group();
8585
const ::NOX::Abstract::Group& get_solution_group() const;
8686

8787
//! Get the number of nonlinear iterations

0 commit comments

Comments
 (0)