diff --git a/ProcessLib/LiquidFlow/Tests.cmake b/ProcessLib/LiquidFlow/Tests.cmake index d2933143d52615305e4acdd59e0ac982addc226f..e55c59e92002c1ade861139cde6bbba0b01257d6 100644 --- a/ProcessLib/LiquidFlow/Tests.cmake +++ b/ProcessLib/LiquidFlow/Tests.cmake @@ -105,10 +105,10 @@ AddTest( REQUIREMENTS NOT OGS_USE_MPI ABSTOL 1.1 RELTOL 1e-6 DIFF_DATA - mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_11_t_300.000000.vtu OGS5_PRESSURE1 pressure - mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_11_t_300.000000.vtu OGS5_TEMPERATURE1 temperature - mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_11_t_300.000000.vtu v_x_ref v_x - mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_11_t_300.000000.vtu v_y_ref v_y + mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu OGS5_PRESSURE1 pressure + mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu OGS5_TEMPERATURE1 temperature + mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu v_x_ref v_x + mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu v_y_ref v_y ) # PETSc/MPI @@ -218,8 +218,8 @@ AddTest( REQUIREMENTS OGS_USE_MPI ABSTOL 1.1 RELTOL 1e-7 DIFF_DATA - mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_11_t_300_000000_0.vtu OGS5_PRESSURE1 pressure - mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_11_t_300_000000_0.vtu OGS5_TEMPERATURE1 temperature + mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300_000000_0.vtu OGS5_PRESSURE1 pressure + mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300_000000_0.vtu OGS5_TEMPERATURE1 temperature # To be activated when the output of velocity is correct under PETSc version. # mesh2D.vtu gravity_driven_pcs_1_ts_5_t_300_000000_0.vtu v_x_ref v_x # mesh2D.vtu gravity_driven_pcs_1_ts_5_t_300_000000_0.vtu v_y_ref v_y diff --git a/ProcessLib/UncoupledProcessesTimeLoop.cpp b/ProcessLib/UncoupledProcessesTimeLoop.cpp index 564f87ec24ed8681de927a17c6cd1b75e1da27be..832ec7c0f225fa49b5021ab4a0e4cbe7e45dcfc8 100644 --- a/ProcessLib/UncoupledProcessesTimeLoop.cpp +++ b/ProcessLib/UncoupledProcessesTimeLoop.cpp @@ -634,7 +634,7 @@ double UncoupledProcessesTimeLoop::computeTimeStepping( WARN( "Time step %d is rejected. " "The computation is back to the previous time.", - accepted_steps + rejected_steps); + accepted_steps + 1); time_disc->popState(x); } } @@ -745,7 +745,7 @@ bool UncoupledProcessesTimeLoop::loop() t += dt; const double prev_dt = dt; - const std::size_t timesteps = accepted_steps + rejected_steps + 1; + const std::size_t timesteps = accepted_steps + 1; // TODO, input option for time unit. INFO("=== Time stepping at step #%u and time %g with step size %g", timesteps, t, dt); diff --git a/Tests/Data b/Tests/Data index d482ae358213a45b0887765ba6105e57194dba4d..7d37fea54339d33afa1670b23dca07b7798c3e79 160000 --- a/Tests/Data +++ b/Tests/Data @@ -1 +1 @@ -Subproject commit d482ae358213a45b0887765ba6105e57194dba4d +Subproject commit 7d37fea54339d33afa1670b23dca07b7798c3e79