[cig-commits] [commit] master: Merge pull request #247 from tjhei/pull_234 (01f19ef)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Jan 13 11:48:56 PST 2015
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/36e4420c87fda8026b8a3d1f639e798f6c59f3d0...01f19ef36177d8c77f84b59ece4918ba5f3e7661
>---------------------------------------------------------------
commit 01f19ef36177d8c77f84b59ece4918ba5f3e7661
Merge: 36e4420 9d359c8
Author: Timo Heister <timo.heister at gmail.com>
Date: Tue Jan 13 14:48:26 2015 -0500
Merge pull request #247 from tjhei/pull_234
Increase limit for number of inner iterations and reduce AMG aggregation threshold
Also see #234.
>---------------------------------------------------------------
01f19ef36177d8c77f84b59ece4918ba5f3e7661
doc/modules/changes.h | 6 +
source/simulator/assembly.cc | 14 +-
source/simulator/solver.cc | 2 +-
tests/adiabatic_conditions/depth_average.gnuplot | 672 +-
tests/adiabatic_conditions/statistics | 2 +-
.../depth_average.gnuplot | 240 +-
tests/adiabatic_initial_conditions/statistics | 2 +-
.../depth_average.gnuplot | 744 +-
.../statistics | 2 +-
.../depth_average.gnuplot | 496 +-
.../screen-output | 24 +-
.../statistics | 2 +-
tests/box-end_time_1e7-terminate/screen-output | 6 +-
tests/box-end_time_1e7-terminate/statistics | 8 +-
tests/box-first-time-step-alternate-bc/statistics | 2 +-
tests/box-first-time-step/statistics | 2 +-
tests/box-origin/screen-output | 2 +-
tests/box-origin/statistics | 2 +-
tests/box-steady-state-terminate/screen-output | 20 +-
tests/box-steady-state-terminate/statistics | 26 +-
tests/composition_reaction/screen-output | 18 +-
tests/composition_reaction/statistics | 22 +-
tests/compressibility/screen-output | 9 +-
.../compressibility_iterated_stokes/screen-output | 14 +-
.../screen-output | 4 +-
tests/diffusion-velocity/screen-output | 18 +-
tests/diffusion-velocity/statistics | 8 +-
tests/diffusion/depth_average.gnuplot | 3912 +--
tests/diffusion/screen-output | 24 +-
tests/diffusion/statistics | 10 +-
tests/dynamic_topography/dynamic_topography.00000 | 128 +-
tests/dynamic_topography/screen-output | 10 +-
.../dynamic_topography/solution-00000.0000.gnuplot | 33084 +++++++++----------
tests/free_surface_blob/screen-output | 6 +-
tests/free_surface_blob/statistics | 24 +-
tests/free_surface_relaxation/screen-output | 4 +-
tests/free_surface_relaxation/statistics | 22 +-
tests/global_refine_amr/screen-output | 4 +-
tests/global_refine_amr/statistics | 2 +-
tests/gplates-1-3/screen-output | 9 +-
tests/gplates-1-3/statistics | 2 +-
tests/gplates-1-4/screen-output | 9 +-
tests/gplates-1-4/statistics | 2 +-
tests/gplates-3d/statistics | 2 +-
tests/gplates-rotation/screen-output | 9 +-
tests/gplates-rotation/statistics | 2 +-
tests/hexagonal_initial_temperature/screen-output | 2 +-
.../solution-00000.0000.gnuplot | 5580 ++--
tests/inclusion_4/screen-output | 12 +-
tests/inclusion_4/statistics | 2 +-
tests/inclusion_adaptive/screen-output | 13 +-
tests/inclusion_adaptive/statistics | 4 +-
tests/initial_condition_S20RTS/screen-output | 2 +-
.../solution-00000.0000.gnuplot | 1464 +-
tests/initial_condition_S20RTS/statistics | 2 +-
.../solution-00000.0000.gnuplot | 1290 +-
tests/initial_condition_S40RTS/statistics | 2 +-
tests/internal_heating_statistics/screen-output | 2 +-
tests/internal_heating_statistics/statistics | 2 +-
tests/iterated_IMPES/screen-output | 144 +-
tests/iterated_IMPES/statistics | 150 +-
tests/latent_heat/screen-output | 6 +-
tests/latent_heat/statistics | 4 +-
tests/maximum_refinement_function/screen-output | 6 +-
tests/maximum_refinement_function/statistics | 6 +-
.../screen-output | 6 +-
.../statistics | 6 +-
.../screen-output | 8 +-
.../solution-00005.0000.gnuplot | 184 +-
.../statistics | 10 +-
tests/maxtimestep/screen-output | 10 +-
tests/maxtimestep/statistics | 10 +-
tests/melt_postprocessor_peridotite/screen-output | 2 +-
tests/melt_postprocessor_peridotite/statistics | 2 +-
tests/melt_postprocessor_pyroxenite/screen-output | 2 +-
tests/melt_postprocessor_pyroxenite/statistics | 2 +-
tests/minimum_refinement_function/screen-output | 2 +-
tests/minimum_refinement_function/statistics | 4 +-
.../screen-output | 6 +-
.../statistics | 8 +-
.../screen-output | 2 +-
.../solution-00003.0000.gnuplot | 2302 +-
.../solution-00003.0001.gnuplot | 2302 +-
.../statistics | 4 +-
tests/morency_doin/statistics | 2 +-
tests/multicomponent_arithmetic/screen-output | 6 +-
tests/multicomponent_arithmetic/statistics | 8 +-
tests/multicomponent_geometric/screen-output | 6 +-
tests/multicomponent_geometric/statistics | 8 +-
tests/multicomponent_harmonic/screen-output | 8 +-
tests/multicomponent_harmonic/statistics | 8 +-
tests/multicomponent_max_composition/screen-output | 6 +-
tests/multicomponent_max_composition/statistics | 8 +-
tests/no_adiabatic_heating/screen-output | 280 +-
tests/no_adiabatic_heating_02/screen-output | 280 +-
tests/no_adiabatic_heating_03/screen-output | 52 +-
tests/passive_comp/screen-output | 8 +-
tests/passive_comp/statistics | 8 +-
tests/periodic_box/screen-output | 24 +-
tests/periodic_box/statistics | 24 +-
tests/periodic_box_freesurface/screen-output | 22 +-
tests/periodic_box_freesurface/statistics | 12 +-
tests/prmbackslash/screen-output | 10 +-
tests/prmbackslash/statistics | 10 +-
tests/radioactive_decay/screen-output | 4 +-
tests/radioactive_decay/statistics | 4 +-
tests/radiogenic_heating/screen-output | 4 +-
tests/radiogenic_heating/statistics | 2 +-
tests/refine_vel/screen-output | 78 +-
tests/refine_vel/statistics | 22 +-
tests/remove_angular_momentum/screen-output | 316 +-
tests/remove_angular_momentum/statistics | 116 +-
tests/remove_net_rotation/screen-output | 316 +-
tests/remove_net_rotation/statistics | 116 +-
.../screen-output | 14 +-
tests/simpler-box/statistics | 2 +-
tests/sol_cx_4/screen-output | 5 +-
tests/sol_cx_4/statistics | 2 +-
tests/sol_cx_4_conservative/statistics | 2 +-
tests/sol_cx_4_normalized_pressure/screen-output | 5 +-
tests/sol_cx_4_normalized_pressure/statistics | 2 +-
.../statistics | 2 +-
.../screen-output | 12 +-
.../statistics | 2 +-
tests/sol_cx_tracers/screen-output | 8 +-
tests/sol_cx_tracers/statistics | 6 +-
tests/sol_kz_4/statistics | 2 +-
tests/sol_kz_4_conservative/statistics | 2 +-
tests/solidus-initial-conditions/screen-output | 6 +-
tests/spherical_velocity_statistics/screen-output | 78 +-
tests/spherical_velocity_statistics/statistics | 22 +-
tests/stokes/screen-output | 8 +-
tests/stokes/statistics | 6 +-
.../statistics | 2 +-
tests/symbolic-boundary-names-box/statistics | 2 +-
.../statistics | 2 +-
.../screen-output | 2 +-
.../statistics | 2 +-
tests/tangurnis/screen-output | 22 +-
tests/tangurnis/statistics | 12 +-
.../screen-output | 4 +-
.../temperature-dependent-stokes-matrix/statistics | 10 +-
tests/terminate_user_request/statistics | 4 +-
tests/upwelling_melting_peridotite/screen-output | 10 +-
tests/upwelling_melting_peridotite/statistics | 12 +-
tests/upwelling_melting_pyroxenite/screen-output | 12 +-
tests/upwelling_melting_pyroxenite/statistics | 12 +-
tests/velocity_boundary_statistics/screen-output | 100 +-
tests/velocity_boundary_statistics/statistics | 22 +-
.../solution-00000.0000.gnuplot | 3778 +--
tests/vis_velocity_in_years/statistics | 2 +-
tests/viscous_dissipation_statistics/screen-output | 8 +-
.../solution-00000.0000.gnuplot | 6096 ++--
tests/viscous_dissipation_statistics/statistics | 6 +-
tests/zero-temperature/screen-output | 6 +-
tests/zero-temperature/statistics | 4 +-
156 files changed, 32670 insertions(+), 32611 deletions(-)
More information about the CIG-COMMITS
mailing list