Skip to content

Commit d5dc086

Browse files
committed
adjust tests
1 parent 428e9a0 commit d5dc086

File tree

6 files changed

+26
-19
lines changed

6 files changed

+26
-19
lines changed

tests/prescribed_solution_velocity_function_spherical_unit/screen-output

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ Number of degrees of freedom: 1,836 (1,122+153+561)
44

55
*** Timestep 0: t=0 years, dt=0 years
66
Solving temperature system... 0 iterations.
7-
Solving Stokes system (GMG)... 10+0 iterations.
7+
Solving Stokes system (GMG)... 28+0 iterations.
88

99
Postprocessing:
10-
RMS, max velocity: 0.167 m/year, 0.591 m/year
10+
RMS, max velocity: 9.59e-05 m/year, 0.000511 m/year
1111
Temperature min/avg/max: 273 K, 1552 K, 2014 K
12-
Heat fluxes through boundary parts: -1.101e+05 W, 1.439e+04 W, 0 W, 0 W
12+
Heat fluxes through boundary parts: -6.058e+04 W, 2.003e+05 W, 0 W, 0 W
1313
Writing graphical output: output-prescribed_solution_velocity_function_spherical_unit/solution/solution-00000
1414
Writing heat flux map output-prescribed_solution_velocity_function_spherical_unit/heat_flux.00000
1515

1616
*** Timestep 1: t=1 years, dt=1 years
17-
Solving temperature system... 3 iterations.
18-
Solving Stokes system (GMG)... 8+0 iterations.
17+
Solving temperature system... 2 iterations.
18+
Solving Stokes system (GMG)... 25+0 iterations.
1919

2020
Postprocessing:
21-
RMS, max velocity: 1e+06 m/year, 2.53e+06 m/year
21+
RMS, max velocity: 1.02e+06 m/year, 2.53e+06 m/year
2222
Temperature min/avg/max: 273 K, 1552 K, 2014 K
23-
Heat fluxes through boundary parts: 8.551e+11 W, 2.76e+13 W, 0 W, 0 W
23+
Heat fluxes through boundary parts: 8.551e+11 W, 2.815e+13 W, 0 W, 0 W
2424
Writing graphical output: output-prescribed_solution_velocity_function_spherical_unit/solution/solution-00001
2525
Writing heat flux map output-prescribed_solution_velocity_function_spherical_unit/heat_flux.00001
2626

tests/prescribed_velocity/screen-output

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Number of degrees of freedom: 948 (578+81+289)
66

77
*** Timestep 0: t=0 years, dt=0 years
88
Skipping temperature solve because RHS is zero.
9-
Solving Stokes system (GMG)... 13+0 iterations.
9+
Solving Stokes system (GMG)... 29+0 iterations.
1010

1111
Postprocessing:
12-
RMS, max velocity: 8.51e+06 m/year, 4.46e+07 m/year
12+
RMS, max velocity: 3.27e+07 m/year, 4.63e+07 m/year
1313

1414
Termination requested by criterion: end time
1515

tests/prescribed_velocity/statistics

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
# 10: Schur complement iterations in Stokes preconditioner
1111
# 11: RMS velocity (m/year)
1212
# 12: Max. velocity (m/year)
13-
0 0.000000000000e+00 0.000000000000e+00 64 659 289 0 13 14 14 8.50510440e+06 4.46282695e+07
13+
0 0.000000000000e+00 0.000000000000e+00 64 659 289 0 29 30 30 3.27071609e+07 4.63396811e+07

tests/pressure_constraint.cc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,15 @@ namespace aspect
3838

3939
const double value = 100;
4040

41-
current_constraints.add_line(first_pressure_dof);
42-
current_constraints.set_inhomogeneity (first_pressure_dof, value);
43-
44-
std::cout << "adding constraint idx= " << first_pressure_dof
45-
<< " to value= " << value
46-
<< std::endl;
41+
if (current_constraints.can_store_line(first_pressure_dof))
42+
{
43+
current_constraints.add_line(first_pressure_dof);
44+
current_constraints.set_inhomogeneity (first_pressure_dof, value);
45+
46+
std::cout << "adding constraint idx= " << first_pressure_dof
47+
<< " to value= " << value
48+
<< std::endl;
49+
}
4750
}
4851

4952
// Connect constraints function to correct signal.

tests/signals_connect/screen-output

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Number of active cells: 16 (on 3 levels)
66
Number of degrees of freedom: 268 (162+25+81)
77

88

9+
*** constraints signal called ***
10+
11+
912
*** constraints signal called ***
1013

1114
*** Timestep 0: t=0 seconds, dt=0 seconds

tests/signals_post_constraints/statistics

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
# 19: Outward heat flux through boundary with indicator 1 ("right") (W)
2020
# 20: Outward heat flux through boundary with indicator 2 ("bottom") (W)
2121
# 21: Outward heat flux through boundary with indicator 3 ("top") (W)
22+
260 0 0.000000000000e+00 0.000000000000e+00 0 0 0 0 0 0 0 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00
2223
390 0 0.000000000000e+00 0.000000000000e+00 0 0 0 0 0 0 0 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00
2324
390 0 0.000000000000e+00 0.000000000000e+00 1024 9539 4225 0 8 9 9 1.79112171e+01 2.53303041e+01 0.00000000e+00 5.00000000e-01 1.00000000e+00 5.00000000e-01 0.00000000e+00 0.00000000e+00 -4.88438682e+00 4.88438700e+00
2425
390 1 6.168500750772e-04 6.168500750772e-04 1024 9539 4225 29 8 9 9 1.79244868e+01 2.54944861e+01 0.00000000e+00 5.00000259e-01 1.00000000e+00 5.00000259e-01 0.00000000e+00 0.00000000e+00 -4.82475981e+00 4.82482619e+00
25-
390 2 1.229727696416e-03 6.128776213387e-04 1024 9539 4225 21 7 8 8 1.79669736e+01 2.57038384e+01 0.00000000e+00 5.00000701e-01 1.00000000e+00 5.00000701e-01 0.00000000e+00 0.00000000e+00 -4.70504606e+00 4.70521356e+00
26-
390 3 1.837613558742e-03 6.078858623263e-04 1024 9539 4225 21 7 8 8 1.80474105e+01 2.59702915e+01 0.00000000e+00 5.00001184e-01 1.00000000e+00 5.00001184e-01 0.00000000e+00 0.00000000e+00 -4.52419537e+00 4.52447515e+00
27-
390 4 2.000000000000e-03 1.623864412578e-04 1024 9539 4225 10 6 7 7 1.80758318e+01 2.60520559e+01 0.00000000e+00 5.00001313e-01 1.00000000e+00 5.00001313e-01 0.00000000e+00 0.00000000e+00 -4.46707367e+00 4.46738271e+00
26+
390 2 1.229727696416e-03 6.128776213385e-04 1024 9539 4225 21 7 8 8 1.79669736e+01 2.57038384e+01 0.00000000e+00 5.00000701e-01 1.00000000e+00 5.00000701e-01 0.00000000e+00 0.00000000e+00 -4.70504606e+00 4.70521356e+00
27+
390 3 1.837613558746e-03 6.078858623300e-04 1024 9539 4225 21 7 8 8 1.80474105e+01 2.59702915e+01 0.00000000e+00 5.00001184e-01 1.00000000e+00 5.00001184e-01 0.00000000e+00 0.00000000e+00 -4.52419537e+00 4.52447515e+00
28+
390 4 2.000000000000e-03 1.623864412543e-04 1024 9539 4225 10 6 7 7 1.80758318e+01 2.60520559e+01 0.00000000e+00 5.00001313e-01 1.00000000e+00 5.00001313e-01 0.00000000e+00 0.00000000e+00 -4.46707367e+00 4.46738271e+00

0 commit comments

Comments
 (0)