Merge pull request #5941 from gassmoeller/update_update_script

Update update script

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
 

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
 

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

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
 
 

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")
 

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
 
 

benchmarks/newton_solver_benchmark_set/tosi_et_al_2015/paper_plots/v1_a9_g6.gnuplot

@@ -9,15 +9,15 @@ 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'
 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'

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
 

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
 

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

benchmarks/solubility/plugin/solubility.cc

@@ -359,7 +359,7 @@ namespace aspect
     melt_fractions (const MaterialModel::MaterialModelInputs<dim> &in,
                     std::vector<double> &melt_fractions) const
     {
-      for (unsigned int q=0; q<in.temperature.size(); ++q)
+      for (unsigned int q=0; q<in.n_evaluation_points(); ++q)
         {
           const unsigned int water_idx = this->introspection().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<ReactionRateOutputs<dim>>() == 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<MaterialModel::ReactionRateOutputs<dim>> (n_points, this->n_compositional_fields()));
         }

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

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"

contrib/utilities/update_scripts/source_files/update_source_files_to_2.0.0.sed → 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

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"

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

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

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

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

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;

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

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
 

cookbooks/tomography_based_plate_motions/plugins/tomography_based_plate_motions.cc

@@ -1635,15 +1635,15 @@ namespace aspect
       // reduce grain size.
       if (out.template get_additional_output<DislocationViscosityOutputs<dim>>() == 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<MaterialModel::DislocationViscosityOutputs<dim>> (n_points));
         }
 
       // We need the prescribed field outputs to interpolate the grain size onto a compositional field.
       if (out.template get_additional_output<PrescribedFieldOutputs<dim>>() == 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<MaterialModel::PrescribedFieldOutputs<dim>> (n_points, this->n_compositional_fields()));
         }
@@ -1652,30 +1652,30 @@ namespace aspect
       if (use_table_properties
           && out.template get_additional_output<SeismicAdditionalOutputs<dim>>() == 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<MaterialModel::SeismicAdditionalOutputs<dim>> (n_points));
         }
 
       if (this->get_parameters().temperature_method == Parameters<dim>::AdvectionFieldMethod::prescribed_field &&
           out.template get_additional_output<PrescribedTemperatureOutputs<dim>>() == 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<MaterialModel::PrescribedTemperatureOutputs<dim>> (n_points));
         }
 
       // We need additional field outputs for the unscaled viscosity
       if (out.template get_additional_output<UnscaledViscosityAdditionalOutputs<dim>>() == 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<UnscaledViscosityAdditionalOutputs<dim>> (n_points));
         }
 
       if (out.template get_additional_output<MaterialTypeAdditionalOutputs<dim>>() == 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<MaterialTypeAdditionalOutputs<dim>> (n_points));
         }

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