diff --git a/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/bash.sh b/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/bash.sh index 7929935a9c3..eaa150c7b40 100755 --- a/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/bash.sh +++ b/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/bash.sh @@ -44,11 +44,11 @@ elif [ $materialmodelnameShort == "VP2" ]; then materialmodelname="viscoplastic2" fi -SOLVER_SHORT="NS" #"itIMPES" #"NS" #NS" +SOLVER_SHORT="NS" #"itAdandSt" #"NS" #NS" SOLVER="NS" if [ $SOLVER_SHORT == "NS" ]; then SOLVER="Newton Stokes" -elif [ $SOLVER_SHORT == "itIMPES" ]; then +elif [ $SOLVER_SHORT == "itAdandSt" ]; then SOLVER="iterated Advection and Stokes" fi diff --git a/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/bash_itIMPES.sh b/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/bash_itIMPES.sh index 017d56ef2b5..8a70a2a50a5 100755 --- a/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/bash_itIMPES.sh +++ b/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/bash_itIMPES.sh @@ -42,11 +42,11 @@ elif [ $materialmodelnameShort == "VP2" ]; then materialmodelname="viscoplastic2" fi -SOLVER_SHORT="itIMPES" #"NS" #NS" +SOLVER_SHORT="itAdandSt" #"NS" #NS" SOLVER="NS" if [ $SOLVER_SHORT == "NS" ]; then SOLVER="Newton Stokes" -elif [ $SOLVER_SHORT == "itIMPES" ]; then +elif [ $SOLVER_SHORT == "itAdandSt" ]; then SOLVER="iterated Advection and Stokes" fi diff --git a/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/input_v.prm b/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/input_v.prm index 37534cc3107..1ceef140ad8 100644 --- a/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/input_v.prm +++ b/benchmarks/newton_solver_benchmark_set/nonlinear_channel_flow/input_v.prm @@ -2,7 +2,7 @@ # flow benchmark. This is used to test the velocity boundary conditions # of the Newton Stokes solver. -set Output directory = a2_itIMPES_ST1e-20_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_SF9e-1_NLT1e-14_ABT1e-2_LT1e-5_mLT9e-1_I150_P3_EW1_theta1_LS5_RSMfalse_AV-1_n5 +set Output directory = a2_itAdandSt_ST1e-20_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_SF9e-1_NLT1e-14_ABT1e-2_LT1e-5_mLT9e-1_I150_P3_EW1_theta1_LS5_RSMfalse_AV-1_n5 set Dimension = 2 set CFL number = 1.0 set Maximum time step = 1 diff --git a/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/bash.sh b/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/bash.sh index 1358a0a5f45..e475ab51e58 100755 --- a/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/bash.sh +++ b/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/bash.sh @@ -42,12 +42,12 @@ elif [ $materialmodelnameShort == "VP2" ]; then materialmodelname="viscoplastic2" fi -SOLVER_SHORT="NS" #"itIMPES" #"NS" #NS" +SOLVER_SHORT="NS" #"itAdandSt" #"NS" #NS" SOLVER="NS" if [ $SOLVER_SHORT == "NS" ]; then SOLVER="Newton Stokes" -elif [ $SOLVER_SHORT == "itIMPES" ]; then - SOLVER="iterated IMPES" +elif [ $SOLVER_SHORT == "itAdandSt" ]; then + SOLVER="iterated Advection and Stokes" fi diff --git a/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/cp_P-minLT-res-it-vel_BV.sh b/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/cp_P-minLT-res-it-vel_BV.sh index 94a815b52b8..880f4100be7 100755 --- a/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/cp_P-minLT-res-it-vel_BV.sh +++ b/benchmarks/newton_solver_benchmark_set/spiegelman_et_al_2016/cp_P-minLT-res-it-vel_BV.sh @@ -28,12 +28,12 @@ materialmodelname="DP" phi=30 declare -a vel=(25 50 125) declare -a BV=("1e23" "1e24" "5e24") -SOLVER_SHORT="NS" #"itIMPES" -SOLVER="iterated IMPES" +SOLVER_SHORT="NS" #"itAdandSt" +SOLVER="iterated Advection and Stokes" if [ $SOLVER_SHORT == "NS" ]; then SOLVER="Newton Stokes" -elif [ $SOLVER_SHORT == "itIMPES" ]; then -SOLVER="iterated IMPES" +elif [ $SOLVER_SHORT == "itAdandSt" ]; then +SOLVER="iterated Advection and Stokes" fi declare -a OS=("9e-1" "1e-1" "1e-2" "1e-8") #"1e-7" "1e-6" "1e-5" "1e-4" "1e-3" "1e-2" "1e-1" "5e-1" "9e-1") #"9e-1" "5e-1" "1e-1" "1e-2" "1e-4") diff --git a/benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/bash.sh b/benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/bash.sh index 6c7021bbdce..4fb4ce1a129 100755 --- a/benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/bash.sh +++ b/benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/bash.sh @@ -38,12 +38,12 @@ elif [ $materialmodelnameShort == "VP2" ]; then materialmodelname="viscoplastic2" fi -SOLVER_SHORT="NS" #"itIMPES" #"NS" #NS" +SOLVER_SHORT="NS" #"itAdandSt" #"NS" #NS" SOLVER="NS" if [ $SOLVER_SHORT == "NS" ]; then SOLVER="Newton Stokes" -elif [ $SOLVER_SHORT == "itIMPES" ]; then - SOLVER="iterated IMPES" +elif [ $SOLVER_SHORT == "itAdandSt" ]; then + SOLVER="iterated Advection and Stokes" fi diff --git a/benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/paper_plots/v1_a9_g6.gnuplot b/benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/paper_plots/v1_a9_g6.gnuplot index 36b08a750ad..f5718799dc9 100644 --- a/benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/paper_plots/v1_a9_g6.gnuplot +++ b/benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/paper_plots/v1_a9_g6.gnuplot @@ -9,7 +9,7 @@ set origin 0,0.48 unset key set title "0-50 iterations, maximum LT: 9e-1" plot \ -'results/a9TS_itIMPES_ST1e-20_UFSfalse_NSP-none_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-8_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:10 w l lw 2 t 'Picard', \ +'results/a9TS_itAdandSt_ST1e-20_UFSfalse_NSP-none_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-8_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:10 w l lw 2 t 'Picard', \ 'results/a9TS_NS_ST1e-20_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Defect correction Picard', \ 'results/a9TS_NS_ST1e-2_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Newton without stabilsation', \ 'results/a9TS_NS_ST1e-2_UFSfalse_NSP-SPD_NSA-SPD_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Newton with stabilsation' @@ -17,7 +17,7 @@ set origin 0,0 set xrange [500:600] set title "500-600 iterations, maximum LT: 9e-1" plot \ -'results/a9TS_itIMPES_ST1e-20_UFSfalse_NSP-none_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-8_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:10 w l lw 2 t 'Picard', \ +'results/a9TS_itAdandSt_ST1e-20_UFSfalse_NSP-none_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-8_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:10 w l lw 2 t 'Picard', \ 'results/a9TS_NS_ST1e-20_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Defect correction Picard', \ 'results/a9TS_NS_ST1e-2_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Newton without stabilsation', \ 'results/a9TS_NS_ST1e-2_UFSfalse_NSP-SPD_NSA-SPD_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Newton with stabilsation' @@ -26,7 +26,7 @@ set origin 0.5,0.48 set xrange [0:50] set title "0-50 iterations, maximum LT: 1e-2" plot \ -'results/a9TS_itIMPES_ST1e-20_UFSfalse_NSP-none_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-8_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:10 w l lw 2 t 'Picard', \ +'results/a9TS_itAdandSt_ST1e-20_UFSfalse_NSP-none_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-8_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:10 w l lw 2 t 'Picard', \ 'results/a9TS_NS_ST1e-20_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Defect correction Picard', \ 'results/a9TS_NS_ST1e-2_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT1e-2_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Newton without stabilsation', \ 'results/a9TS_NS_ST1e-2_UFSfalse_NSP-SPD_NSA-SPD_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT1e-2_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Newton with stabilsation' @@ -35,7 +35,7 @@ set origin 0.5,0 set xrange [500:600] set title "500-600 iterations, maximum LT: 1e-2" plot \ -'results/a9TS_itIMPES_ST1e-20_UFSfalse_NSP-none_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-8_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:10 w l lw 2 t 'Picard', \ +'results/a9TS_itAdandSt_ST1e-20_UFSfalse_NSP-none_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-8_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:10 w l lw 2 t 'Picard', \ 'results/a9TS_NS_ST1e-20_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT9e-1_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Defect correction Picard', \ 'results/a9TS_NS_ST1e-2_UFSfalse_NSP-SPD_NSA-none_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT1e-2_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Newton without stabilsation', \ 'results/a9TS_NS_ST1e-2_UFSfalse_NSP-SPD_NSA-SPD_C0_g6_ag0_AEWfalse_UDSfalse_SF9.99e-1_NLT1e-5_ABT1e-2_LT1e-5_mLT1e-2_I150_P150_EW1_theta1_LS0_RSMfalse_AV-1/plot.dat' u 0:11 w l lw 2 t 'Newton with stabilsation' diff --git a/benchmarks/nsinker/nsinker.prm b/benchmarks/nsinker/nsinker.prm index 3e7adb91f88..0716eaac90a 100644 --- a/benchmarks/nsinker/nsinker.prm +++ b/benchmarks/nsinker/nsinker.prm @@ -13,7 +13,6 @@ set Nonlinear solver scheme = no Advection, single Stokes set Max nonlinear iterations = 1 set Use years in output instead of seconds = false - # Follow as closely as possible the parameters from Rudi et al. (2017) subsection Solver parameters subsection Stokes solver parameters @@ -25,8 +24,9 @@ subsection Solver parameters set Use weighted BFBT for Schur complement = false set Krylov method for cheap solver steps = GMRES end + subsection AMG parameters - set AMG aggregation threshold = 0.02 + set AMG aggregation threshold = 0.02 end end diff --git a/benchmarks/nsinker/nsinker_bfbt.prm b/benchmarks/nsinker/nsinker_bfbt.prm index ed104447980..7de5ffda08f 100644 --- a/benchmarks/nsinker/nsinker_bfbt.prm +++ b/benchmarks/nsinker/nsinker_bfbt.prm @@ -14,10 +14,9 @@ set Nonlinear solver scheme = no Advection, single Stokes set Max nonlinear iterations = 1 set Use years in output instead of seconds = false - # Follow as closely as possible the parameters from Rudi et al. (2017) subsection Solver parameters - subsection Stokes solver parameters + subsection Stokes solver parameters set Use full A block as preconditioner = true set Number of cheap Stokes solver steps = 500 set Maximum number of expensive Stokes solver steps = 1000 @@ -26,8 +25,9 @@ subsection Solver parameters set Use weighted BFBT for Schur complement = true set Krylov method for cheap solver steps = GMRES end + subsection AMG parameters - set AMG aggregation threshold = 0.02 + set AMG aggregation threshold = 0.02 end end diff --git a/benchmarks/particle_integration_scheme/circle.prm b/benchmarks/particle_integration_scheme/circle.prm index 83ac384ab47..3b7a17da328 100644 --- a/benchmarks/particle_integration_scheme/circle.prm +++ b/benchmarks/particle_integration_scheme/circle.prm @@ -5,7 +5,7 @@ set Use years in output instead of seconds = false set CFL number = 1.0 set Output directory = circle_euler_1.0 set Timing output frequency = 100 -set Nonlinear solver scheme = Advection only +set Nonlinear solver scheme = single Advection, no Stokes subsection Geometry model set Model name = box diff --git a/benchmarks/solubility/plugin/solubility.cc b/benchmarks/solubility/plugin/solubility.cc index c899cb5ed8c..896ed59ffa9 100644 --- a/benchmarks/solubility/plugin/solubility.cc +++ b/benchmarks/solubility/plugin/solubility.cc @@ -359,7 +359,7 @@ namespace aspect melt_fractions (const MaterialModel::MaterialModelInputs &in, std::vector &melt_fractions) const { - for (unsigned int q=0; qintrospection().compositional_index_for_name("water_content"); const unsigned int porosity_idx = this->introspection().compositional_index_for_name("porosity"); @@ -399,7 +399,7 @@ namespace aspect if (this->get_parameters().use_operator_splitting && out.template get_additional_output>() == nullptr) { - const unsigned int n_points = out.viscosities.size(); + const unsigned int n_points = out.n_evaluation_points(); out.additional_outputs.push_back( std::make_unique> (n_points, this->n_compositional_fields())); } diff --git a/contrib/utilities/update_all_files.sh b/contrib/utilities/update_all_files.sh index 7057eff37e3..6bb7dd0e94a 100755 --- a/contrib/utilities/update_all_files.sh +++ b/contrib/utilities/update_all_files.sh @@ -14,7 +14,7 @@ SOURCE_FILES=`find $BASE_DIR -type f \( -name *.cc -or -name *.h \) -and -not -n bash ${UTIL_DIR}/update_source_files.sh $SOURCE_FILES # Update prm files -PRM_FILES=`find $BASE_DIR -type f -name *.prm* -not -name *update_script* -not -name *.bak` +PRM_FILES=`find $BASE_DIR -type f -name *.prm* -not -name *update_script* -not -name *prmbackslash_2.prm -not -name *.bak` bash ${UTIL_DIR}/update_prm_files.sh $PRM_FILES # To remove the backup files that are created you will likely want to use the diff --git a/contrib/utilities/update_prm_files.sh b/contrib/utilities/update_prm_files.sh index 93d9cc29f4b..8e4d0404af7 100755 --- a/contrib/utilities/update_prm_files.sh +++ b/contrib/utilities/update_prm_files.sh @@ -25,18 +25,18 @@ done # remove the backup file. We can not use this file # instead of the .bak file, because it is overwritten by every script, # and so it is only a backup of the last execution. -for script in `ls ${SCRIPT_FOLDER}/*.sed`; do +for script in `find ${SCRIPT_FOLDER} -maxdepth 1 -name *.sed`; do sed -i.tmp -f $script "$@" done -for script in `ls ${SCRIPT_FOLDER}/*.pl`; do +for script in `find ${SCRIPT_FOLDER} -maxdepth 1 -name *.pl`; do for file in $@ ; do cat "$file" | perl $script > "$file.tmp" mv "$file.tmp" "$file" done done -for script in `ls ${SCRIPT_FOLDER}/*.py`; do +for script in `find ${SCRIPT_FOLDER} -maxdepth 1 -name *.py`; do for file in $@ ; do echo $file python3 $script $file "$file.tmp" diff --git a/contrib/utilities/update_scripts/prm_files/update_prm_files_to_2.0.0.sed b/contrib/utilities/update_scripts/prm_files/outdated/update_prm_files_to_2.0.0.sed similarity index 100% rename from contrib/utilities/update_scripts/prm_files/update_prm_files_to_2.0.0.sed rename to contrib/utilities/update_scripts/prm_files/outdated/update_prm_files_to_2.0.0.sed diff --git a/contrib/utilities/update_scripts/source_files/update_source_files_to_2.0.0.sed b/contrib/utilities/update_scripts/source_files/outdated/update_source_files_to_2.0.0.sed similarity index 93% rename from contrib/utilities/update_scripts/source_files/update_source_files_to_2.0.0.sed rename to contrib/utilities/update_scripts/source_files/outdated/update_source_files_to_2.0.0.sed index 9d36b80f75c..a581ae78bf2 100644 --- a/contrib/utilities/update_scripts/source_files/update_source_files_to_2.0.0.sed +++ b/contrib/utilities/update_scripts/source_files/outdated/update_source_files_to_2.0.0.sed @@ -1,6 +1,11 @@ # A script for the stream editor sed to update .cc and .h files from the # naming scheme used in ASPECT 1.5.0 to ASPECT 2.0.0. +# This script is now outdated, because it interferes with valid names in the current +# ASPECT version. It is kept in case it is needed, and you can reactivate the +# script by moving it into the parent folder. Use with care and check +# every change that this script suggests. + # Rename fluid pressure boundary conditions s/fluid_pressure_boundary_conditions/boundary_fluid_pressure/g s/FluidPressureBoundaryConditions/BoundaryFluidPressure/g diff --git a/contrib/utilities/update_source_files.sh b/contrib/utilities/update_source_files.sh index 296bfcd3539..82bc85d5b3c 100755 --- a/contrib/utilities/update_source_files.sh +++ b/contrib/utilities/update_source_files.sh @@ -25,11 +25,11 @@ done # remove the backup file. We can not use this file # instead of the .bak file, because it is overwritten by every script, # and so it is only a backup of the last execution. -for script in `ls ${SCRIPT_FOLDER}/*.sed`; do +for script in `find ${SCRIPT_FOLDER} -maxdepth 1 -name *.sed`; do sed -i.tmp -f $script "$@" done -for script in `ls ${SCRIPT_FOLDER}/*.pl`; do +for script in `find ${SCRIPT_FOLDER} -maxdepth 1 -name *.pl`; do for file in $@ ; do cat "$file" | perl $script > "$file.tmp" mv "$file.tmp" "$file" diff --git a/cookbooks/allken_et_al_2012_rift_interaction/allken.prm b/cookbooks/allken_et_al_2012_rift_interaction/allken.prm index a42b73d30c3..fbe89f631e1 100644 --- a/cookbooks/allken_et_al_2012_rift_interaction/allken.prm +++ b/cookbooks/allken_et_al_2012_rift_interaction/allken.prm @@ -5,7 +5,7 @@ set Dimension = 3 set Start time = 0 set End time = 5e6 set Use years in output instead of seconds = true -set Nonlinear solver scheme = iterated Stokes +set Nonlinear solver scheme = single Advection, iterated Stokes set Nonlinear solver tolerance = 1e-4 set Max nonlinear iterations = 25 set Output directory = output-allken_etal_2012 diff --git a/cookbooks/convection-box/tutorial-onset-of-convection/model_input/tutorial.prm b/cookbooks/convection-box/tutorial-onset-of-convection/model_input/tutorial.prm index 5c8302c747c..1c33a21fda4 100644 --- a/cookbooks/convection-box/tutorial-onset-of-convection/model_input/tutorial.prm +++ b/cookbooks/convection-box/tutorial-onset-of-convection/model_input/tutorial.prm @@ -82,18 +82,6 @@ end # whereas all other parts of the boundary are insulated (i.e., # no heat flux through these boundaries; this is also often used # to specify symmetry boundaries). -# subsection Model settings OLD DEPRECATED -# set Fixed temperature boundary indicators = 2,3 OLD MOVED - -# The next parameters then describe on which parts of the -# boundary we prescribe a zero or nonzero velocity and -# on which parts the flow is allowed to be tangential. -# Here, all four sides of the box allow tangential -# unrestricted flow but with a zero normal component: -# set Zero velocity boundary indicators = OLD MOVED -# set Prescribed velocity boundary indicators = OLD MOVED -# set Tangential velocity boundary indicators = 0,1,2,3 OLD MOVED - subsection Boundary velocity model set Tangential velocity boundary indicators = left, right, bottom, top end @@ -118,7 +106,7 @@ end # at the left and right does not matter.) subsection Boundary temperature model set Fixed temperature boundary indicators = 2,3 - set Model name = box + set List of model names = box subsection Box set Bottom temperature = 3600 diff --git a/cookbooks/future/mantle_setup_start.prm b/cookbooks/future/mantle_setup_start.prm index 4b733a7e240..98a79045800 100644 --- a/cookbooks/future/mantle_setup_start.prm +++ b/cookbooks/future/mantle_setup_start.prm @@ -7,7 +7,7 @@ set Dimension = 2 set Use years in output instead of seconds = true set End time = 1.5e8 # run until 1.5e8, then restart with Melt scaling factor threshold = 1e-8 set Output directory = output_ULVZ_2 -set Nonlinear solver scheme = iterated IMPES +set Nonlinear solver scheme = iterated Advection and Stokes set Max nonlinear iterations = 20 #set Resume computation = true @@ -101,7 +101,7 @@ end subsection Boundary composition model set Allow fixed composition on outflow boundaries = false set Fixed composition boundary indicators = top - set Model name = initial composition + set List of model names = initial composition end subsection Heating model diff --git a/cookbooks/inner_core_convection/inner_core_traction.prm b/cookbooks/inner_core_convection/inner_core_traction.prm index 215f28bc066..01137135c4c 100644 --- a/cookbooks/inner_core_convection/inner_core_traction.prm +++ b/cookbooks/inner_core_convection/inner_core_traction.prm @@ -131,6 +131,6 @@ end subsection Solver parameters subsection Stokes solver parameters - set Stokes solver type = block AMG + set Stokes solver type = block AMG end end diff --git a/cookbooks/magnetic_stripes/magnetic_stripes.cc b/cookbooks/magnetic_stripes/magnetic_stripes.cc index 5a3cd1340f2..0c13a2b6ef9 100644 --- a/cookbooks/magnetic_stripes/magnetic_stripes.cc +++ b/cookbooks/magnetic_stripes/magnetic_stripes.cc @@ -63,7 +63,7 @@ namespace aspect break; } - for (unsigned int i=0; i < in.position.size(); ++i) + for (unsigned int i=0; i < in.n_evaluation_points(); ++i) { const double depth = this->get_geometry_model().depth(in.position[i]); const double reaction_depth = 7000.0; diff --git a/cookbooks/magnetic_stripes/magnetic_stripes.prm b/cookbooks/magnetic_stripes/magnetic_stripes.prm index 4dc64baec60..6a1b78eb189 100644 --- a/cookbooks/magnetic_stripes/magnetic_stripes.prm +++ b/cookbooks/magnetic_stripes/magnetic_stripes.prm @@ -107,7 +107,7 @@ end subsection Boundary composition model set Fixed composition boundary indicators = bottom - set Model name = initial composition + set List of model names = initial composition end subsection Material model diff --git a/cookbooks/morency_doin_2004/morency_doin.prm b/cookbooks/morency_doin_2004/morency_doin.prm index 40880818d7c..951205a24ca 100644 --- a/cookbooks/morency_doin_2004/morency_doin.prm +++ b/cookbooks/morency_doin_2004/morency_doin.prm @@ -103,7 +103,7 @@ end subsection Solver parameters subsection Stokes solver parameters - set Stokes solver type = block AMG + set Stokes solver type = block AMG end end diff --git a/cookbooks/tomography_based_plate_motions/plugins/tomography_based_plate_motions.cc b/cookbooks/tomography_based_plate_motions/plugins/tomography_based_plate_motions.cc index d3c61e9a379..8a9fde17252 100644 --- a/cookbooks/tomography_based_plate_motions/plugins/tomography_based_plate_motions.cc +++ b/cookbooks/tomography_based_plate_motions/plugins/tomography_based_plate_motions.cc @@ -1635,7 +1635,7 @@ namespace aspect // reduce grain size. if (out.template get_additional_output>() == nullptr) { - const unsigned int n_points = out.viscosities.size(); + const unsigned int n_points = out.n_evaluation_points(); out.additional_outputs.push_back( std::make_unique> (n_points)); } @@ -1643,7 +1643,7 @@ namespace aspect // We need the prescribed field outputs to interpolate the grain size onto a compositional field. if (out.template get_additional_output>() == nullptr) { - const unsigned int n_points = out.viscosities.size(); + const unsigned int n_points = out.n_evaluation_points(); out.additional_outputs.push_back( std::make_unique> (n_points, this->n_compositional_fields())); } @@ -1652,7 +1652,7 @@ namespace aspect if (use_table_properties && out.template get_additional_output>() == nullptr) { - const unsigned int n_points = out.viscosities.size(); + const unsigned int n_points = out.n_evaluation_points(); out.additional_outputs.push_back( std::make_unique> (n_points)); } @@ -1660,7 +1660,7 @@ namespace aspect if (this->get_parameters().temperature_method == Parameters::AdvectionFieldMethod::prescribed_field && out.template get_additional_output>() == nullptr) { - const unsigned int n_points = out.viscosities.size(); + const unsigned int n_points = out.n_evaluation_points(); out.additional_outputs.push_back( std::make_unique> (n_points)); } @@ -1668,14 +1668,14 @@ namespace aspect // We need additional field outputs for the unscaled viscosity if (out.template get_additional_output>() == nullptr) { - const unsigned int n_points = out.viscosities.size(); + const unsigned int n_points = out.n_evaluation_points(); out.additional_outputs.push_back( std::make_unique> (n_points)); } if (out.template get_additional_output>() == nullptr) { - const unsigned int n_points = out.viscosities.size(); + const unsigned int n_points = out.n_evaluation_points(); out.additional_outputs.push_back( std::make_unique> (n_points)); } diff --git a/include/aspect/particle/property/crystal_preferred_orientation.h b/include/aspect/particle/property/crystal_preferred_orientation.h index 1c10dcc087b..29c038f87c8 100644 --- a/include/aspect/particle/property/crystal_preferred_orientation.h +++ b/include/aspect/particle/property/crystal_preferred_orientation.h @@ -121,7 +121,7 @@ namespace aspect * * We store the same number of grains for all minerals (e.g. olivine and enstatite * grains), although their volume fractions may not be the same. This is because we need a minimum number - * of grains per tracer to perform reliable statistics on it. This minimum should be the same for all + * of grains per particle to perform reliable statistics on it. This minimum should be the same for all * minerals. * * @ingroup ParticleProperties diff --git a/source/material_model/melt_boukare.cc b/source/material_model/melt_boukare.cc index 2e0b0ab91c2..4022c8161ae 100644 --- a/source/material_model/melt_boukare.cc +++ b/source/material_model/melt_boukare.cc @@ -508,7 +508,7 @@ namespace aspect const unsigned int n_endmembers = endmember_names.size(); EndmemberProperties endmembers(n_endmembers); - for (unsigned int q=0; q endmember_mole_fractions_per_phase(n_endmembers); @@ -627,7 +627,7 @@ namespace aspect const unsigned int n_endmembers = endmember_names.size(); EndmemberProperties endmembers(n_endmembers); - for (unsigned int q=0; q endmember_mole_fractions_per_phase(n_endmembers); std::vector endmember_mole_fractions_in_composite(n_endmembers); diff --git a/source/material_model/reactive_fluid_transport.cc b/source/material_model/reactive_fluid_transport.cc index 84bd54dc09f..1f2d76610bb 100644 --- a/source/material_model/reactive_fluid_transport.cc +++ b/source/material_model/reactive_fluid_transport.cc @@ -123,7 +123,7 @@ namespace aspect melt_fractions (const MaterialModel::MaterialModelInputs &in, std::vector &melt_fractions) const { - for (unsigned int q=0; qintrospection().compositional_index_for_name("porosity"); switch (fluid_solid_reaction_scheme) diff --git a/source/particle/property/crystal_preferred_orientation.cc b/source/particle/property/crystal_preferred_orientation.cc index 3f849f0ca4d..58aab2dfdcb 100644 --- a/source/particle/property/crystal_preferred_orientation.cc +++ b/source/particle/property/crystal_preferred_orientation.cc @@ -139,7 +139,7 @@ namespace aspect // // Note that we store exactly the same number of grains of all minerals (e.g. olivine and enstatite // grains), although their volume fractions may not be the same. We need a minimum amount - // of grains per tracer to perform reliable statistics on it. This minimum is the same for all phases. + // of grains per particle to perform reliable statistics on it. This minimum is the same for all phases. // and enstatite. // // Furthermore, for this plugin the following dims are always 3. When using 2d an infinitely thin 3d domain is assumed. diff --git a/tests/boukare_bulk_composition.prm b/tests/boukare_bulk_composition.prm index f27f707aa8c..1bf3548a74f 100644 --- a/tests/boukare_bulk_composition.prm +++ b/tests/boukare_bulk_composition.prm @@ -13,7 +13,7 @@ set CFL number = 1.0 set Use years in output instead of seconds = true set End time = 6e5 set Output directory = output_bulk_3 -set Nonlinear solver scheme = iterated IMPES +set Nonlinear solver scheme = iterated Advection and Stokes set Max nonlinear iterations = 10 set Nonlinear solver tolerance = 1e-4 set Pressure normalization = surface @@ -114,7 +114,7 @@ end subsection Boundary composition model set Allow fixed composition on outflow boundaries = false set Fixed composition boundary indicators = top - set Model name = initial composition + set List of model names = initial composition end subsection Heating model diff --git a/tests/boukare_conserve_mass.prm b/tests/boukare_conserve_mass.prm index 992bdf8b545..51fe5e3a3de 100644 --- a/tests/boukare_conserve_mass.prm +++ b/tests/boukare_conserve_mass.prm @@ -12,7 +12,7 @@ set Dimension = 2 set CFL number = 1.0 set Use years in output instead of seconds = true set End time = 1e5 -set Nonlinear solver scheme = iterated IMPES +set Nonlinear solver scheme = iterated Advection and Stokes set Max nonlinear iterations = 20 set Nonlinear solver tolerance = 1e-4 set Pressure normalization = surface @@ -87,7 +87,7 @@ end subsection Boundary composition model set Allow fixed composition on outflow boundaries = false set Fixed composition boundary indicators = top - set Model name = initial composition + set List of model names = initial composition end subsection Heating model diff --git a/tests/boukare_latent_heat.prm b/tests/boukare_latent_heat.prm index ce06e480c7f..9d758dca743 100644 --- a/tests/boukare_latent_heat.prm +++ b/tests/boukare_latent_heat.prm @@ -105,7 +105,7 @@ end subsection Boundary composition model set Allow fixed composition on outflow boundaries = false - set Model name = initial composition + set List of model names = initial composition end subsection Heating model diff --git a/tests/box_simple_surface_strain_rate_residual.prm b/tests/box_simple_surface_strain_rate_residual.prm index 058a948ec39..6d44326dd22 100644 --- a/tests/box_simple_surface_strain_rate_residual.prm +++ b/tests/box_simple_surface_strain_rate_residual.prm @@ -23,7 +23,7 @@ end subsection Boundary temperature model set List of model names = initial temperature - set Fixed temperature boundary indicators = 0,1,2,3 # default: + set Fixed temperature boundary indicators = 0,1,2,3 subsection Initial temperature set Maximal temperature = 101.0 @@ -36,7 +36,7 @@ subsection Boundary composition model end subsection Geometry model - set Model name = box # default: + set Model name = box subsection Box set X extent = 100e3 @@ -64,7 +64,7 @@ subsection Boundary velocity model end subsection Initial temperature model - set Model name = function # default: + set Model name = function subsection Function set Function expression = 100.0 diff --git a/tests/box_surface_base_variables.prm b/tests/box_surface_base_variables.prm index ec646ea17f2..dfe51aa1cf9 100644 --- a/tests/box_surface_base_variables.prm +++ b/tests/box_surface_base_variables.prm @@ -53,10 +53,6 @@ subsection Initial temperature model end end -# The parameters below this comment were created by the update script -# as replacement for the old 'Model settings' subsection. They can be -# safely merged with any existing subsections with the same name. - subsection Boundary temperature model set List of model names = function set Fixed temperature boundary indicators = 5 diff --git a/tests/composition_reaction_iterated_IMPES.cc b/tests/composition_reaction_iterated_IMPES.cc index 43866fd7ba5..989242ca3da 100644 --- a/tests/composition_reaction_iterated_IMPES.cc +++ b/tests/composition_reaction_iterated_IMPES.cc @@ -85,7 +85,7 @@ namespace aspect "iterated reaction", "A simple material model that is like the " "'composition reaction' model, but requires an " - "iterated IMPES scheme to converge to the correct " + "iterated Advection and Stokes scheme to converge to the correct " "solution.") } } diff --git a/tests/darcy_convection_step.prm b/tests/darcy_convection_step.prm index 5a08c5e6b13..29df919cb9c 100644 --- a/tests/darcy_convection_step.prm +++ b/tests/darcy_convection_step.prm @@ -46,6 +46,7 @@ set Use operator splitting = true # 10 km x 10 km box subsection Geometry model set Model name = box + subsection Box set X extent = 10e3 set Y extent = 10e3 @@ -55,6 +56,7 @@ end # Uniform temperature of 293 K subsection Initial temperature model set Model name = function + subsection Function set Function expression = 293 end @@ -63,6 +65,7 @@ end subsection Boundary temperature model set List of model names = box set Fixed temperature boundary indicators = top, bottom, left, right + subsection Box set Bottom temperature = 293 set Top temperature = 293 @@ -114,6 +117,7 @@ end # the fluid from partitioning into the solid. subsection Material model set Model name = reactive fluid transport + subsection Reactive Fluid Transport Model set Base model = visco plastic set Reference fluid density = 1000 @@ -124,8 +128,8 @@ subsection Material model set Fluid-solid reaction scheme = zero solubility end -# Set the solid density to 3000 kg/m3, and set the minimum/maximum viscosity -# to 1e21 Pa s for an isoviscous model. + # Set the solid density to 3000 kg/m3, and set the minimum/maximum viscosity + # to 1e21 Pa s for an isoviscous model. subsection Visco Plastic set Reference temperature = 1600 set Prefactors for diffusion creep = 5e-21 diff --git a/tests/dc_Picard_compressible.prm b/tests/dc_Picard_compressible.prm index d7cbe095d27..d0f29a3152d 100644 --- a/tests/dc_Picard_compressible.prm +++ b/tests/dc_Picard_compressible.prm @@ -12,8 +12,6 @@ set Max nonlinear iterations = 150 set Max nonlinear iterations in pre-refinement = 0 set Pressure normalization = surface set Maximum time step = 1e6 - -#set Number of cheap Stokes solver steps = 200 # aspect 2.2 set Adiabatic surface temperature = 1600 set CFL number = 0.5 diff --git a/tests/free_surface_iterated_stokes_gmg.prm b/tests/free_surface_iterated_stokes_gmg.prm index b8dd281ac99..26f1f1b6a62 100644 --- a/tests/free_surface_iterated_stokes_gmg.prm +++ b/tests/free_surface_iterated_stokes_gmg.prm @@ -5,7 +5,7 @@ set Dimension = 2 set Output directory = output_free_surface_iterated_stokes_gmg subsection Mesh refinement - set Initial global refinement = 3 # default: 2 + set Initial global refinement = 3 end subsection Solver parameters diff --git a/tests/interpolor_particles_harmonic_average.prm b/tests/interpolor_particles_harmonic_average.prm index a2edd2fa67d..192e4b57515 100644 --- a/tests/interpolor_particles_harmonic_average.prm +++ b/tests/interpolor_particles_harmonic_average.prm @@ -15,7 +15,6 @@ subsection Compositional fields set Mapped particle properties = end - subsection Initial composition model set Model name = unspecified end diff --git a/tests/melt_boukare_EOS.prm b/tests/melt_boukare_EOS.prm index a66742a46dd..fc41a7d9818 100644 --- a/tests/melt_boukare_EOS.prm +++ b/tests/melt_boukare_EOS.prm @@ -89,7 +89,7 @@ end subsection Boundary composition model set Allow fixed composition on outflow boundaries = false set Fixed composition boundary indicators = top - set Model name = initial composition + set List of model names = initial composition end subsection Heating model diff --git a/tests/melt_boukare_averaging.prm b/tests/melt_boukare_averaging.prm index 6f88da030c5..35b70658038 100644 --- a/tests/melt_boukare_averaging.prm +++ b/tests/melt_boukare_averaging.prm @@ -89,7 +89,7 @@ end subsection Boundary composition model set Allow fixed composition on outflow boundaries = false set Fixed composition boundary indicators = top - set Model name = initial composition + set List of model names = initial composition end subsection Heating model diff --git a/tests/melt_visco_plastic_mohr_circle_compaction.prm b/tests/melt_visco_plastic_mohr_circle_compaction.prm index d8ed2f4bc8d..c2b990e5858 100644 --- a/tests/melt_visco_plastic_mohr_circle_compaction.prm +++ b/tests/melt_visco_plastic_mohr_circle_compaction.prm @@ -46,7 +46,6 @@ subsection Prescribed Stokes solution end end - subsection Material model set Model name = EXPERIMENTAL melt visco plastic diff --git a/tests/melt_visco_plastic_mohr_circle_shear.prm b/tests/melt_visco_plastic_mohr_circle_shear.prm index 6a9a756ae1f..12010e10714 100644 --- a/tests/melt_visco_plastic_mohr_circle_shear.prm +++ b/tests/melt_visco_plastic_mohr_circle_shear.prm @@ -45,7 +45,6 @@ subsection Prescribed Stokes solution end end - subsection Material model set Model name = EXPERIMENTAL melt visco plastic diff --git a/tests/no_dirichlet_on_outflow_refine.prm b/tests/no_dirichlet_on_outflow_refine.prm index 74cf957cc47..679c6360e4e 100644 --- a/tests/no_dirichlet_on_outflow_refine.prm +++ b/tests/no_dirichlet_on_outflow_refine.prm @@ -40,7 +40,7 @@ end subsection Boundary temperature model set Fixed temperature boundary indicators = bottom, top set Allow fixed temperature on outflow boundaries = false - set Model name = function + set List of model names = function subsection Function set Variable names = x,y diff --git a/tests/periodic_box_gmg.prm b/tests/periodic_box_gmg.prm index 1cc7f1860ed..941cda5467f 100644 --- a/tests/periodic_box_gmg.prm +++ b/tests/periodic_box_gmg.prm @@ -100,7 +100,7 @@ end subsection Mesh refinement set Additional refinement times = set Initial adaptive refinement = 2 - set Initial global refinement = 5 # default: 2 + set Initial global refinement = 5 set Minimum refinement level = 5 set Refinement fraction = 0.3 set Coarsening fraction = 0.03 diff --git a/tests/prmbackslash.prm b/tests/prmbackslash.prm index 63063c53811..735593109e8 100644 --- a/tests/prmbackslash.prm +++ b/tests/prmbackslash.prm @@ -51,11 +51,6 @@ subsection Mesh refinement set Initial global refinement = 5 end -# The parameters below this comment were created by the update script -# as replacement for the old 'Model settings' subsection. They can be -# safely merged with any existing subsections with the same name. - - subsection Boundary velocity model set Tangential velocity boundary indicators = 1 set Zero velocity boundary indicators = 0, 2, 3 diff --git a/tests/projected_density_vertical_pipe.prm b/tests/projected_density_vertical_pipe.prm index 608164a1ba8..c3ef1d902ac 100644 --- a/tests/projected_density_vertical_pipe.prm +++ b/tests/projected_density_vertical_pipe.prm @@ -13,7 +13,7 @@ set Nonlinear solver tolerance = 1e-5 subsection Boundary composition model set Allow fixed composition on outflow boundaries = true set Fixed composition boundary indicators = top, bottom - set Model name = box + set List of model names = box # The test is to make sure these values are ignored subsection Box diff --git a/tests/shearbox_particle_strain_rate.prm b/tests/shearbox_particle_strain_rate.prm index 725fb4c788a..8e29130e79f 100644 --- a/tests/shearbox_particle_strain_rate.prm +++ b/tests/shearbox_particle_strain_rate.prm @@ -110,7 +110,7 @@ subsection Gravity model end subsection Material model - set Model name = simple # default: + set Model name = simple subsection Simple model set Reference density = 1 diff --git a/tests/shell_surface_base_variables.prm b/tests/shell_surface_base_variables.prm index d47555aad0f..9d65bed9446 100644 --- a/tests/shell_surface_base_variables.prm +++ b/tests/shell_surface_base_variables.prm @@ -8,13 +8,9 @@ set End time = 1e300 set Start time = 0 set Adiabatic surface temperature = 1613.0 set Surface pressure = 0 -set Use years in output instead of seconds = false # default: true +set Use years in output instead of seconds = false set Nonlinear solver scheme = single Advection, single Stokes -# The parameters below this comment were created by the update script -# as replacement for the old 'Model settings' subsection. They can be -# safely merged with any existing subsections with the same name. - subsection Boundary temperature model set List of model names = initial temperature set Fixed temperature boundary indicators = 0, 1 @@ -49,10 +45,10 @@ subsection Material model subsection Simple model set Reference density = 3300 set Reference specific heat = 1250 - set Reference temperature = 1613 # default: 293 - set Thermal conductivity = 1e-6 # default: 4.7 + set Reference temperature = 1613 + set Thermal conductivity = 1e-6 set Thermal expansion coefficient = 2e-5 - set Viscosity = 1e22 # default: 5e24 + set Viscosity = 1e22 end end diff --git a/tests/stokes_solver_fail.prm b/tests/stokes_solver_fail.prm index ad8853c1ca5..0f46b4734dd 100644 --- a/tests/stokes_solver_fail.prm +++ b/tests/stokes_solver_fail.prm @@ -13,5 +13,5 @@ subsection Solver parameters set Maximum number of expensive Stokes solver steps = 0 set Linear solver tolerance = 1e-35 set Stokes solver type = block AMG - end + end end diff --git a/tests/update_script.prm b/tests/update_script.prm index 210ca0ef6c8..e990fb115f4 100644 --- a/tests/update_script.prm +++ b/tests/update_script.prm @@ -12,9 +12,9 @@ set Adiabatic surface temperature = 1600.0 set Use years in output instead of seconds = true subsection Adiabatic conditions model - set Model name = initial profile + set Model name = compute profile - subsection Initial profile + subsection Compute profile set Use surface condition function = true subsection Surface condition function set Function expression = 1e-2*t; 1613.0+1e-13*t @@ -27,15 +27,15 @@ subsection Compositional fields end subsection Boundary composition model - set Model name = function + set List of model names = function end -subsection Compositional initial conditions +subsection Initial composition model set Model name = function end subsection Boundary temperature model - set Model name = spherical constant + set List of model names = spherical constant subsection Spherical constant set Inner temperature = 4250 set Outer temperature = 273 @@ -61,7 +61,7 @@ subsection Gravity model end -subsection Initial conditions +subsection Initial temperature model set Model name = harmonic perturbation subsection Harmonic perturbation set Magnitude = 200.0 @@ -106,20 +106,19 @@ end subsection Postprocess - set List of postprocessors = visualization,velocity statistics, basic statistics, temperature statistics,heat flux statistics, depth average, dynamic topography, tracers, viscous dissipation statistics + set List of postprocessors = visualization,velocity statistics, basic statistics, temperature statistics,heat flux statistics, depth average, dynamic topography, particles, heating statistics - subsection Tracers - set Number of tracers = 50 + subsection Particles + set Number of particles = 50 end - subsection Dynamic Topography - set Subtract mean of dynamic topography = true + subsection Dynamic topography end subsection Visualization set Interpolate output = false set Output format = vtu - set List of output variables = density, friction heating + set List of output variables = density, heating set Time between graphical output = 0 end diff --git a/tests/update_script_2.prm b/tests/update_script_2.prm index b66783d9001..78fabd2abd8 100644 --- a/tests/update_script_2.prm +++ b/tests/update_script_2.prm @@ -16,9 +16,9 @@ set Adiabatic surface temperature = 1600.0 set Use years in output instead of seconds = true subsection Adiabatic conditions model - set Model name = initial profile + set Model name = compute profile - subsection Initial profile + subsection Compute profile set Use surface condition function = true subsection Surface condition function set Function expression = 1e-2*t; 1613.0+1e-13*t @@ -31,15 +31,15 @@ subsection Compositional fields end subsection Boundary composition model - set Model name = function + set List of model names = function end -subsection Compositional initial conditions +subsection Initial composition model set Model name = function end subsection Boundary temperature model - set Model name = spherical constant + set List of model names = spherical constant subsection Spherical constant set Inner temperature = 4250 set Outer temperature = 273 @@ -66,7 +66,7 @@ subsection Gravity model end -subsection Initial conditions +subsection Initial temperature model set Model name = harmonic perturbation subsection Harmonic perturbation set Magnitude = 200.0 @@ -111,20 +111,19 @@ end subsection Postprocess - set List of postprocessors = visualization,velocity statistics, basic statistics, temperature statistics,heat flux statistics, depth average, dynamic topography, tracers, viscous dissipation statistics + set List of postprocessors = visualization,velocity statistics, basic statistics, temperature statistics,heat flux statistics, depth average, dynamic topography, particles, heating statistics - subsection Tracers - set Number of tracers = 50 + subsection Particles + set Number of particles = 50 end - subsection Dynamic Topography - set Subtract mean of dynamic topography = true + subsection Dynamic topography end subsection Visualization set Interpolate output = false set Output format = vtu - set List of output variables = density, friction heating + set List of output variables = density, heating set Time between graphical output = 0 end