diff --git a/ProcessLib/LiquidFlow/Tests.cmake b/ProcessLib/LiquidFlow/Tests.cmake
index f647546ad8f5068e0086f09428db782b93c762b6..5281cc54cbc054ef7a276d25f0781a04cf42f380 100644
--- a/ProcessLib/LiquidFlow/Tests.cmake
+++ b/ProcessLib/LiquidFlow/Tests.cmake
@@ -117,7 +117,7 @@ AddTest(
EXECUTABLE_ARGS quad_5500x5500_adaptive_dt.prj
WRAPPER time
TESTER vtkdiff
- REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
+ REQUIREMENTS NOT OGS_USE_MPI
ABSTOL 1.e-16 RELTOL 1e-16
DIFF_DATA
ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu ThermalConvection_pcs_1_ts_232_t_50000000000.000000.vtu pressure pressure
@@ -131,8 +131,8 @@ AddTest(
EXECUTABLE_ARGS quad_5500x5500_adaptive_dt_constant_viscosity.prj
WRAPPER time
TESTER vtkdiff
- REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
- ABSTOL 1.e-16 RELTOL 1e-16
+ REQUIREMENTS NOT OGS_USE_MPI
+ ABSTOL 1.e-16 RELTOL 1e-9 ### increased RETOL for the case of lis solver
DIFF_DATA
ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu pressure pressure
ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu temperature temperature
diff --git a/ProcessLib/RichardsFlow/Tests.cmake b/ProcessLib/RichardsFlow/Tests.cmake
index ffc7cc614ec1cd0481c6d9df75fc0b76b849736c..73ae13549776e88df37b0ef4887d365a426dfff1 100644
--- a/ProcessLib/RichardsFlow/Tests.cmake
+++ b/ProcessLib/RichardsFlow/Tests.cmake
@@ -40,13 +40,13 @@ AddTest(
TESTER vtkdiff
ABSTOL 1e-8 RELTOL 1e-3
DIFF_DATA
- ref_t_1600.000000.vtu richards_pcs_0_ts_805_t_1600.000000.vtu pressure pressure
- REQUIREMENTS NOT (OGS_USE_MPI OR OGS_USE_LIS)
+ ref_t_1600.000000.vtu richards_pcs_0_ts_803_t_1600.000000.vtu pressure pressure
+ REQUIREMENTS NOT OGS_USE_MPI
)
#PETSc/MPI
AddTest(
- NAME 2D_RichardsFlow_h_us_quad_small_Adpative_dt
+ NAME 2D_RichardsFlow_h_us_quad_small_Adaptive_dt
PATH Parabolic/Richards
EXECUTABLE_ARGS RichardsFlow_2d_small_adaptive_dt.prj
WRAPPER mpirun
@@ -55,5 +55,5 @@ AddTest(
REQUIREMENTS OGS_USE_MPI
ABSTOL 1e-8 RELTOL 1e-3
DIFF_DATA
- ref_t_1600.000000.vtu richards_pcs_0_ts_805_t_1600_000000_0.vtu pressure pressure
+ ref_t_1600.000000.vtu richards_pcs_0_ts_803_t_1600_000000_0.vtu pressure pressure
)
diff --git a/ProcessLib/UncoupledProcessesTimeLoop.cpp b/ProcessLib/UncoupledProcessesTimeLoop.cpp
index 33f96af26a79c38e56e8edaeda22c1a9f5d36db2..594525cfbdc00eedf8692fb0f98350b44e0ecad6 100644
--- a/ProcessLib/UncoupledProcessesTimeLoop.cpp
+++ b/ProcessLib/UncoupledProcessesTimeLoop.cpp
@@ -126,6 +126,7 @@ struct SingleProcessData
//! other members of this struct to their concrety types.
NumLib::NonlinearSolverTag const nonlinear_solver_tag;
NumLib::NonlinearSolverBase& nonlinear_solver;
+ bool nonlinear_solver_converged;
std::unique_ptr<NumLib::ConvergenceCriterion> conv_crit;
std::unique_ptr<NumLib::TimeDiscretization> time_disc;
@@ -152,6 +153,7 @@ SingleProcessData::SingleProcessData(
: timestepper(std::move(timestepper_)),
nonlinear_solver_tag(NLTag),
nonlinear_solver(nonlinear_solver),
+ nonlinear_solver_converged(true),
conv_crit(std::move(conv_crit_)),
time_disc(std::move(time_disc_)),
process(process_),
@@ -164,6 +166,7 @@ SingleProcessData::SingleProcessData(SingleProcessData&& spd)
: timestepper(std::move(spd.timestepper)),
nonlinear_solver_tag(spd.nonlinear_solver_tag),
nonlinear_solver(spd.nonlinear_solver),
+ nonlinear_solver_converged(spd.nonlinear_solver_converged),
conv_crit(std::move(spd.conv_crit)),
time_disc(std::move(spd.time_disc)),
tdisc_ode_sys(std::move(spd.tdisc_ode_sys)),
@@ -572,6 +575,7 @@ double UncoupledProcessesTimeLoop::computeTimeStepping(
: time_disc->getRelativeChangeFromPreviousTimestep(
x, norm_type))
: 0.;
+
if (!timestepper->next(solution_error) &&
// In case of FixedTimeStepping, which makes timestepper->next(...)
// return false when the ending time is reached.
@@ -581,6 +585,12 @@ double UncoupledProcessesTimeLoop::computeTimeStepping(
all_process_steps_accepted = false;
}
+ if (!ppd.nonlinear_solver_converged)
+ {
+ WARN("Time step will be rejected due to nonlinear solver diverged");
+ all_process_steps_accepted = false;
+ }
+
if (timestepper->getTimeStep().dt() >
std::numeric_limits<double>::min() ||
std::abs(t - timestepper->end()) <
@@ -658,17 +668,6 @@ double UncoupledProcessesTimeLoop::computeTimeStepping(
}
else
{
- if (std::abs(dt -prev_dt) < std::numeric_limits<double>::min()
- && _last_step_rejected)
- {
- OGS_FATAL("\tThis time step is rejected and the new computed"
- " step size is the same as\n"
- "\tthat was just used.\n"
- "\tSuggest to adjust the parameters of the time"
- " stepper or try other time stepper.\n"
- "\tThe program stops");
- }
-
if (t < _end_time)
{
t -= prev_dt;
@@ -769,20 +768,6 @@ bool UncoupledProcessesTimeLoop::loop()
INFO("[time] Time step #%u took %g s.", timesteps,
time_timestep.elapsed());
- if (!nonlinear_solver_succeeded)
- {
- WARN(
- "Time step %d is rejected due to "
- "the divergence of the non-linear solver.\n"
- "\tThe time stepping steps back to the previous time\n"
- "\tand starts again with the half of the current step size.",
- timesteps);
- t -= prev_dt;
- dt *= 0.5;
- rejected_steps++;
- continue;
- }
-
dt = computeTimeStepping(prev_dt, t, accepted_steps, rejected_steps);
if (t + dt > _end_time ||
@@ -797,6 +782,36 @@ bool UncoupledProcessesTimeLoop::loop()
dt, timesteps, t);
break;
}
+
+ // If this step was rejected twice with the same time step size, jump
+ // out this function directly with a failure flag and let the main
+ // function terminate the program.
+ if (std::abs(dt - prev_dt) < std::numeric_limits<double>::min() &&
+ _last_step_rejected)
+ {
+ ALERT(
+ "\tTime step %u is rejected and the new computed"
+ " step size is the same as\n"
+ "\tthat was just used.\n"
+ "\tSuggest to adjust the parameters of the time"
+ " stepper or try other time stepper.\n"
+ "\tThe program will stop.",
+ timesteps);
+ // save unsuccessful solution
+ unsigned pcs_idx = 0;
+ for (auto const& spd : _per_process_data)
+ {
+ auto const& x = *_process_solutions[++pcs_idx];
+ // If nonlinear solver diverged, the solution has already been
+ // saved.
+ if (!spd->nonlinear_solver_converged)
+ continue;
+
+ _output->doOutputAlways(spd->process, spd->process_output,
+ timesteps, t, x);
+ }
+ return false;
+ }
}
INFO(
@@ -855,6 +870,7 @@ bool UncoupledProcessesTimeLoop::solveUncoupledEquationSystems(
const auto nonlinear_solver_succeeded =
solveOneTimeStepOneProcess(x, timestep_id, t, dt, *spd,
void_staggered_coupling_term, *_output);
+ spd->nonlinear_solver_converged = nonlinear_solver_succeeded;
pcs.postTimestep(x);
pcs.computeSecondaryVariable(t, x, void_staggered_coupling_term);
@@ -933,6 +949,7 @@ bool UncoupledProcessesTimeLoop::solveCoupledEquationSystemsByStaggeredScheme(
const auto nonlinear_solver_succeeded = solveOneTimeStepOneProcess(
x, timestep_id, t, dt, *spd, coupling_term, *_output);
+ spd->nonlinear_solver_converged = nonlinear_solver_succeeded;
INFO(
"[time] Solving process #%u took %g s in time step #%u "
diff --git a/Tests/Data b/Tests/Data
index 9b8783f292abcb7158752c1185d98dd67a341220..634084daae2e2039d72bd941697d839e3a2ee7c5 160000
--- a/Tests/Data
+++ b/Tests/Data
@@ -1 +1 @@
-Subproject commit 9b8783f292abcb7158752c1185d98dd67a341220
+Subproject commit 634084daae2e2039d72bd941697d839e3a2ee7c5