Skip to content

Commit

Permalink
Merge pull request #6126 from gassmoeller/fix_unnecessary_pressure_no…
Browse files Browse the repository at this point in the history 
…rmalization

Fix unnecessary pressure normalization
  • Loading branch information
@tjhei
tjhei authored Nov 6, 2024
2 parents 4d576b2 + 9e36cbb commit 174e703
Show file tree
Hide file tree
Showing 26 changed files with 4,389 additions and 4,406 deletions.
2 changes: 0 additions & 2 deletions source/simulator/helper_functions.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2627,8 +2627,6 @@ namespace aspect

assemble_stokes_system();

last_pressure_normalization_adjustment = normalize_pressure(current_linearization_point);

const double initial_newton_residual_vel = system_rhs.block(introspection.block_indices.velocities).l2_norm();
const double initial_newton_residual_p = system_rhs.block(introspection.block_indices.pressure).l2_norm();
const double initial_newton_residual = std::sqrt(initial_newton_residual_vel * initial_newton_residual_vel + initial_newton_residual_p * initial_newton_residual_p);
Expand Down
4 changes: 2 additions & 2 deletions tests/compute-no-normal-flux-constraints/screen-output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Number of degrees of freedom: 1,836 (1,122+153+561)
Initial Newton Stokes residual = 1.83248e+13, v = 1.83248e+13, p = 0

Solving Stokes system (GMG)... 0+0 iterations.
Newton system information: Norm of the rhs: 64.5845
Relative nonlinear residual (Stokes system) after nonlinear iteration 1: 3.52443e-12
Newton system information: Norm of the rhs: 62.4708
Relative nonlinear residual (Stokes system) after nonlinear iteration 1: 3.40908e-12


Postprocessing:
Expand Down
18 changes: 9 additions & 9 deletions tests/iterated_advection_and_defect_correction_Stokes/screen-output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ Number of degrees of freedom: 9,141 (4,290+561+2,145+2,145)
Solving temperature system... 8 iterations.
Solving porosity system ... 7 iterations.
Solving Stokes system (GMG)... 3+0 iterations.
Newton system information: Norm of the rhs: 0.0888943, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 9.97362e-07, 3.91322e-07, 1.91793e-09
Newton system information: Norm of the rhs: 0.0888938, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 9.97362e-07, 3.91322e-07, 1.91792e-09
Relative nonlinear residual (total system) after nonlinear iteration 4: 9.97362e-07


Expand Down Expand Up @@ -158,7 +158,7 @@ Number of degrees of freedom: 9,141 (4,290+561+2,145+2,145)
Solving temperature system... 8 iterations.
Solving porosity system ... 7 iterations.
Solving Stokes system (GMG)... 3+0 iterations.
Newton system information: Norm of the rhs: 0.0775619, Derivative scaling factor: 0
Newton system information: Norm of the rhs: 0.0775618, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 7.53626e-07, 2.52268e-07, 1.65699e-09
Relative nonlinear residual (total system) after nonlinear iteration 4: 7.53626e-07

Expand Down Expand Up @@ -192,8 +192,8 @@ Number of degrees of freedom: 9,141 (4,290+561+2,145+2,145)
Solving temperature system... 8 iterations.
Solving porosity system ... 7 iterations.
Solving Stokes system (GMG)... 3+0 iterations.
Newton system information: Norm of the rhs: 0.0815927, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 7.29098e-07, 2.02145e-07, 1.72535e-09
Newton system information: Norm of the rhs: 0.0815926, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 7.29098e-07, 2.02145e-07, 1.72534e-09
Relative nonlinear residual (total system) after nonlinear iteration 4: 7.29098e-07


Expand Down Expand Up @@ -260,7 +260,7 @@ Number of degrees of freedom: 9,141 (4,290+561+2,145+2,145)
Solving temperature system... 7 iterations.
Solving porosity system ... 6 iterations.
Solving Stokes system (GMG)... 3+0 iterations.
Newton system information: Norm of the rhs: 0.0853343, Derivative scaling factor: 0
Newton system information: Norm of the rhs: 0.0853344, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 6.49554e-07, 1.56802e-07, 1.76195e-09
Relative nonlinear residual (total system) after nonlinear iteration 4: 6.49554e-07

Expand Down Expand Up @@ -294,8 +294,8 @@ Number of degrees of freedom: 9,141 (4,290+561+2,145+2,145)
Solving temperature system... 7 iterations.
Solving porosity system ... 6 iterations.
Solving Stokes system (GMG)... 3+0 iterations.
Newton system information: Norm of the rhs: 0.0889198, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 6.08983e-07, 1.51654e-07, 1.80383e-09
Newton system information: Norm of the rhs: 0.0889203, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 6.08983e-07, 1.51654e-07, 1.80384e-09
Relative nonlinear residual (total system) after nonlinear iteration 4: 6.08983e-07


Expand All @@ -321,7 +321,7 @@ Number of degrees of freedom: 9,141 (4,290+561+2,145+2,145)
Solving temperature system... 8 iterations.
Solving porosity system ... 7 iterations.
Solving Stokes system (GMG)... 3+0 iterations.
Newton system information: Norm of the rhs: 0.870833, Derivative scaling factor: 0
Newton system information: Norm of the rhs: 0.870832, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, compositional fields, Stokes system): 5.77068e-06, 1.59923e-06, 1.73586e-08
Relative nonlinear residual (total system) after nonlinear iteration 3: 5.77068e-06

Expand Down
119 changes: 56 additions & 63 deletions tests/nonlinear_channel_flow_tractions_Newton_Stokes/screen-output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,39 +232,31 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089)
Skipping temperature solve because RHS is zero.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 468+0 iterations.
Newton system information: Norm of the rhs: 198.673, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.77595e-10
Relative nonlinear residual (total system) after nonlinear iteration 2: 5.77595e-10
Newton system information: Norm of the rhs: 203.34, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.91163e-10
Relative nonlinear residual (total system) after nonlinear iteration 2: 5.91163e-10

Skipping temperature solve because RHS is zero.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 522+0 iterations.
Newton system information: Norm of the rhs: 183.167, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.32515e-10
Relative nonlinear residual (total system) after nonlinear iteration 3: 5.32515e-10
Solving Stokes system (AMG)... 469+0 iterations.
Newton system information: Norm of the rhs: 190.578, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.54062e-10
Relative nonlinear residual (total system) after nonlinear iteration 3: 5.54062e-10

Skipping temperature solve because RHS is zero.
Switching from defect correction form of Picard to the Newton solver scheme.
The linear solver tolerance is set to 0.1. Stabilization Preconditioner is SPD and A block is SPD.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 19+0 iterations.
Newton system information: Norm of the rhs: 175.911, Derivative scaling factor: 1
Relative nonlinear residuals (temperature, Stokes system): 0, 5.11422e-10
Relative nonlinear residual (total system) after nonlinear iteration 4: 5.11422e-10

Skipping temperature solve because RHS is zero.
The linear solver tolerance is set to 0.1. Stabilization Preconditioner is SPD and A block is SPD.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 24+0 iterations.
Line search iteration 0, with norm of the rhs 180.258 and going to 175.893, relative residual: 5.24057e-10
Newton system information: Norm of the rhs: 153.55, Derivative scaling factor: 1
Relative nonlinear residuals (temperature, Stokes system): 0, 4.46412e-10
Relative nonlinear residual (total system) after nonlinear iteration 5: 4.46412e-10
Solving Stokes system (AMG)... 22+0 iterations.
Line search iteration 0, with norm of the rhs 192.154 and going to 190.559, relative residual: 5.58643e-10
Newton system information: Norm of the rhs: 171.829, Derivative scaling factor: 1
Relative nonlinear residuals (temperature, Stokes system): 0, 4.99552e-10
Relative nonlinear residual (total system) after nonlinear iteration 4: 4.99552e-10


Postprocessing:
RMS, max velocity: 2.57e-08 m/s, 3.05e-08 m/s
Pressure min/avg/max: -9.277e-05 Pa, 5e+08 Pa, 1e+09 Pa
Pressure min/avg/max: -0.0004781 Pa, 5e+08 Pa, 1e+09 Pa
Mass fluxes through boundary parts: 0 kg/s, 0 kg/s, -0.8139 kg/s, 0.8139 kg/s

*** Timestep 2: t=2 seconds, dt=1 seconds
Expand All @@ -273,38 +265,39 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089)

Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 0+0 iterations.
Newton system information: Norm of the rhs: 193.963
Relative nonlinear residuals (temperature, Stokes system): 0, 5.63902e-10
Relative nonlinear residual (total system) after nonlinear iteration 1: 5.63902e-10
Newton system information: Norm of the rhs: 237.654
Relative nonlinear residuals (temperature, Stokes system): 0, 6.90925e-10
Relative nonlinear residual (total system) after nonlinear iteration 1: 6.90925e-10

Skipping temperature solve because RHS is zero.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 490+0 iterations.
Newton system information: Norm of the rhs: 188.55, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.48167e-10
Relative nonlinear residual (total system) after nonlinear iteration 2: 5.48167e-10
Solving Stokes system (AMG)... 471+0 iterations.
Newton system information: Norm of the rhs: 195.033, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.67014e-10
Relative nonlinear residual (total system) after nonlinear iteration 2: 5.67014e-10

Skipping temperature solve because RHS is zero.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 483+0 iterations.
Newton system information: Norm of the rhs: 185.306, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.38734e-10
Relative nonlinear residual (total system) after nonlinear iteration 3: 5.38734e-10
Solving Stokes system (AMG)... 574+0 iterations.
Newton system information: Norm of the rhs: 172.761, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.02264e-10
Relative nonlinear residual (total system) after nonlinear iteration 3: 5.02264e-10

Skipping temperature solve because RHS is zero.
Switching from defect correction form of Picard to the Newton solver scheme.
The linear solver tolerance is set to 0.1. Stabilization Preconditioner is SPD and A block is SPD.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 21+0 iterations.
Line search iteration 0, with norm of the rhs 203.801 and going to 185.287, relative residual: 5.92504e-10
Newton system information: Norm of the rhs: 155.795, Derivative scaling factor: 1
Relative nonlinear residuals (temperature, Stokes system): 0, 4.52938e-10
Relative nonlinear residual (total system) after nonlinear iteration 4: 4.52938e-10
Solving Stokes system (AMG)... 25+0 iterations.
Line search iteration 0, with norm of the rhs 178.947 and going to 172.745, relative residual: 5.20246e-10
Line search iteration 1, with norm of the rhs 174.558 and going to 172.751, relative residual: 5.07487e-10
Newton system information: Norm of the rhs: 165.09, Derivative scaling factor: 1
Relative nonlinear residuals (temperature, Stokes system): 0, 4.79962e-10
Relative nonlinear residual (total system) after nonlinear iteration 4: 4.79962e-10


Postprocessing:
RMS, max velocity: 2.57e-08 m/s, 3.05e-08 m/s
Pressure min/avg/max: -9.837e-05 Pa, 5e+08 Pa, 1e+09 Pa
Pressure min/avg/max: -0.0002592 Pa, 5e+08 Pa, 1e+09 Pa
Mass fluxes through boundary parts: 0 kg/s, 0 kg/s, -0.8139 kg/s, 0.8139 kg/s
Writing graphical output: output-nonlinear_channel_flow_tractions_Newton_Stokes/solution/solution-00001

Expand All @@ -314,38 +307,38 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089)

Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 0+0 iterations.
Newton system information: Norm of the rhs: 205.381
Relative nonlinear residuals (temperature, Stokes system): 0, 5.97097e-10
Relative nonlinear residual (total system) after nonlinear iteration 1: 5.97097e-10
Newton system information: Norm of the rhs: 234.664
Relative nonlinear residuals (temperature, Stokes system): 0, 6.82232e-10
Relative nonlinear residual (total system) after nonlinear iteration 1: 6.82232e-10

Skipping temperature solve because RHS is zero.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 473+0 iterations.
Newton system information: Norm of the rhs: 184.024, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.35008e-10
Relative nonlinear residual (total system) after nonlinear iteration 2: 5.35008e-10
Solving Stokes system (AMG)... 459+0 iterations.
Newton system information: Norm of the rhs: 196.49, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.7125e-10
Relative nonlinear residual (total system) after nonlinear iteration 2: 5.7125e-10

Skipping temperature solve because RHS is zero.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 527+0 iterations.
Newton system information: Norm of the rhs: 172.1, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.00341e-10
Relative nonlinear residual (total system) after nonlinear iteration 3: 5.00341e-10
Solving Stokes system (AMG)... 540+0 iterations.
Newton system information: Norm of the rhs: 174.544, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 5.07446e-10
Relative nonlinear residual (total system) after nonlinear iteration 3: 5.07446e-10

Skipping temperature solve because RHS is zero.
Switching from defect correction form of Picard to the Newton solver scheme.
The linear solver tolerance is set to 0.1. Stabilization Preconditioner is SPD and A block is SPD.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 23+0 iterations.
Line search iteration 0, with norm of the rhs 184.127 and going to 172.082, relative residual: 5.35307e-10
Newton system information: Norm of the rhs: 170.409, Derivative scaling factor: 1
Relative nonlinear residuals (temperature, Stokes system): 0, 4.95426e-10
Relative nonlinear residual (total system) after nonlinear iteration 4: 4.95426e-10
Solving Stokes system (AMG)... 26+0 iterations.
Line search iteration 0, with norm of the rhs 178.775 and going to 174.525, relative residual: 5.19747e-10
Newton system information: Norm of the rhs: 161.165, Derivative scaling factor: 1
Relative nonlinear residuals (temperature, Stokes system): 0, 4.68551e-10
Relative nonlinear residual (total system) after nonlinear iteration 4: 4.68551e-10


Postprocessing:
RMS, max velocity: 2.57e-08 m/s, 3.05e-08 m/s
Pressure min/avg/max: -0.0001605 Pa, 5e+08 Pa, 1e+09 Pa
Pressure min/avg/max: -0.0002169 Pa, 5e+08 Pa, 1e+09 Pa
Mass fluxes through boundary parts: 0 kg/s, 0 kg/s, -0.8139 kg/s, 0.8139 kg/s

*** Timestep 4: t=4 seconds, dt=1 seconds
Expand All @@ -354,21 +347,21 @@ Number of degrees of freedom: 3,556 (2,178+289+1,089)

Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 0+0 iterations.
Newton system information: Norm of the rhs: 230.209
Relative nonlinear residuals (temperature, Stokes system): 0, 6.69279e-10
Relative nonlinear residual (total system) after nonlinear iteration 1: 6.69279e-10
Newton system information: Norm of the rhs: 230.073
Relative nonlinear residuals (temperature, Stokes system): 0, 6.68883e-10
Relative nonlinear residual (total system) after nonlinear iteration 1: 6.68883e-10

Skipping temperature solve because RHS is zero.
Rebuilding Stokes preconditioner...
Solving Stokes system (AMG)... 384+0 iterations.
Newton system information: Norm of the rhs: 171.621, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 4.9895e-10
Relative nonlinear residual (total system) after nonlinear iteration 2: 4.9895e-10
Solving Stokes system (AMG)... 413+0 iterations.
Newton system information: Norm of the rhs: 161.788, Derivative scaling factor: 0
Relative nonlinear residuals (temperature, Stokes system): 0, 4.70362e-10
Relative nonlinear residual (total system) after nonlinear iteration 2: 4.70362e-10


Postprocessing:
RMS, max velocity: 2.57e-08 m/s, 3.05e-08 m/s
Pressure min/avg/max: -0.0002844 Pa, 5e+08 Pa, 1e+09 Pa
Pressure min/avg/max: -0.0006416 Pa, 5e+08 Pa, 1e+09 Pa
Mass fluxes through boundary parts: 0 kg/s, 0 kg/s, -0.8139 kg/s, 0.8139 kg/s
Writing graphical output: output-nonlinear_channel_flow_tractions_Newton_Stokes/solution/solution-00002

Expand Down
Loading

0 comments on commit 174e703

Please sign in to comment.