Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary lines #6156

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Remove unnecessary lines #6156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions source/simulator/solver_schemes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,12 +846,7 @@ namespace aspect
<< std::endl;

if (parameters.run_postprocessors_on_nonlinear_iterations)
{
// Before postprocessing, we need to copy the actual solution into the solution vector
// (which is used for postprocessing)
solution = current_linearization_point;
postprocess ();
}
postprocess ();

++nonlinear_iteration;
}
Expand All @@ -862,10 +857,6 @@ namespace aspect
// Reset the linear tolerance to what it was at the beginning of the time step.
parameters.linear_stokes_solver_tolerance = begin_linear_tolerance;

// When we are finished iterating, we need to set the final solution to the current linearization point,
// because the solution vector is used in the postprocess.
solution = current_linearization_point;

signals.post_nonlinear_solver(nonlinear_solver_control);
}

Expand Down Expand Up @@ -1170,12 +1161,7 @@ namespace aspect
<< std::endl;

if (parameters.run_postprocessors_on_nonlinear_iterations)
{
// Before postprocessing, we need to copy the actual solution into the solution vector
// (which is used for postprocessing)
solution = current_linearization_point;
postprocess ();
}
postprocess ();

++nonlinear_iteration;
}
Expand All @@ -1188,10 +1174,6 @@ namespace aspect
// Reset the linear tolerance to what it was at the beginning of the time step.
parameters.linear_stokes_solver_tolerance = begin_linear_tolerance;

// When we are finished iterating, we need to set the final solution to the current linearization point,
// because the solution vector is used in the postprocess.
solution = current_linearization_point;

AssertThrow(nonlinear_solver_control.last_check() != SolverControl::failure, ExcNonlinearSolverNoConvergence());

signals.post_nonlinear_solver(nonlinear_solver_control);
Expand Down Expand Up @@ -1279,12 +1261,7 @@ namespace aspect
<< std::endl;

if (parameters.run_postprocessors_on_nonlinear_iterations)
{
// Before postprocessing, we need to copy the actual solution into the solution vector
// (which is used for postprocessing)
solution = current_linearization_point;
postprocess ();
}
postprocess ();

++nonlinear_iteration;
}
Expand All @@ -1297,10 +1274,6 @@ namespace aspect
// Reset the linear tolerance to what it was at the beginning of the time step.
parameters.linear_stokes_solver_tolerance = begin_linear_tolerance;

// When we are finished iterating, we need to set the final solution to the current linearization point,
// because the solution vector is used in the postprocess.
solution = current_linearization_point;

AssertThrow(nonlinear_solver_control.last_check() != SolverControl::failure, ExcNonlinearSolverNoConvergence());

signals.post_nonlinear_solver(nonlinear_solver_control);
Expand Down