Codestin Search App

MFraters · 2026-07-31T13:06:20Z

This is a work in progess. The code itself hasn't really been cleaned, and still will at least require some refactors to make the usage a bit more ergonomic.

For the continental extension performance benchmark, I have been able to reduce the number of allocations from 107e6 to 64e6, as measured by heaptrack. This pull request of mostly to use the new testers to see if it actually makes a difference in the performance or not.

Before your first pull request:

I have read the guidelines in our CONTRIBUTING.md document.

For all pull requests:

I have followed the instructions for indenting my code.
I followed the AI Policy:
- Significant parts of this PR were written by AI (please add a sentence below).
- AI has not been used in significant ways.

bangerth · 2026-07-31T14:55:06Z

         */
        bool use_background_field_for_heat_production_averaging;
+
+        Utilities::ScratchSpace<std::vector<double>> volume_fractions_space;


Let's come up with a common name for these scratch space objects that we can use everywhere. I would suggest volume_fraction_scratch_space. I'm ok with other names, but "scratch" should be in there somewhere.

bangerth · 2026-07-31T14:55:13Z

 #ifndef _aspect_material_model_rheology_visco_plastic_h
 #define _aspect_material_model_rheology_visco_plastic_h

+#include "aspect/utilities.h"


Please use <...>

bangerth · 2026-07-31T15:36:51Z

+          calculate_isostrain_viscosities ( const MaterialModel::MaterialModelInputs<dim> &in,
+                                            const unsigned int i,
+                                            const std::vector<double> &volume_fractions,
+                                            IsostrainViscosities &output_parameters,
+                                            const std::vector<double> &phase_function_values = std::vector<double>(),
+                                            const std::vector<unsigned int> &n_phase_transitions_per_composition =
+                                              std::vector<unsigned int>()) const;


Suggested change

calculate_isostrain_viscosities ( const MaterialModel::MaterialModelInputs<dim> &in,

const unsigned int i,

const std::vector<double> &volume_fractions,

IsostrainViscosities &output_parameters,

const std::vector<double> &phase_function_values = std::vector<double>(),

const std::vector<unsigned int> &n_phase_transitions_per_composition =

std::vector<unsigned int>()) const;

calculate_isostrain_viscosities (const MaterialModel::MaterialModelInputs<dim> &in,

const unsigned int i,

const std::vector<double> &volume_fractions,

IsostrainViscosities &output_parameters,

const std::vector<double> &phase_function_values = {},

const std::vector<unsigned int> &n_phase_transitions_per_composition =

{}) const;

bangerth · 2026-07-31T15:47:12Z

+           * This function calculates viscosities assuming that all the compositional fields
+           * experience the same strain rate (isostrain).
+           * If @p n_phase_transitions_per_composition points to a vector of
+           * unsigned integers this is considered the number of phase transitions
+           * for each compositional field and viscosity will be first computed on
+           * each phase and then averaged for each compositional field.
+           */
+          void
+          calculate_isostrain_viscosities ( const MaterialModel::MaterialModelInputs<dim> &in,


You'll want to document what the difference to the previous function is. Or perhaps document it there and deprecate it.

bangerth · 2026-07-31T15:47:54Z

+       * For multicomponent material models: Given a vector of compositional
+       * field values of length N, of which M indices correspond to mass or
+       * volume fractions, this function returns a vector of fractions
+       * of length M+1, corresponding to the fraction of a ``background
+       * material'' as the first entry, and fractions for each of the input
+       * fields as the following entries. The returned vector will sum to one.
+       * If the sum of the compositional_fields is greater than
+       * one, we assume that there is no background field (i.e., that field value
+       * is zero). Otherwise, the difference between the sum of the compositional
+       * fields and 1.0 is assumed to be the amount of the background field.
+       * This function makes no assumptions about the units of the
+       * compositional field values; for example, they could correspond to
+       * mass or volume fractions.


same thing here and perhaps in other places below

bangerth · 2026-07-31T15:53:41Z

-      const std::vector<double> volume_fractions = MaterialUtilities::compute_only_composition_fractions(in.composition[0],
-                                                   this->introspection().chemical_composition_field_indices(),
-                                                   this->get_parameters().minimum_composition_fraction);
+      static Utilities::ScratchSpace<std::vector<double>> volume_fractions_space;


Make this into a member variable of the class.

bangerth · 2026-07-31T15:54:14Z

       * as documented in evaluate.
       */
-      const IsostrainViscosities isostrain_viscosities = rheology->calculate_isostrain_viscosities(in, 0, volume_fractions, phase_function_values, phase_function.n_phase_transitions_for_each_composition());
+      typename aspect::Utilities::ScratchSpace<IsostrainViscosities>::ScopedScratchObject scoped_isostrain_viscosities_space(isostrain_viscosities_space);


Suggested change

typename aspect::Utilities::ScratchSpace<IsostrainViscosities>::ScopedScratchObject scoped_isostrain_viscosities_space(isostrain_viscosities_space);

aspect::Utilities::ScratchSpace<IsostrainViscosities>::ScopedScratchObject scoped_isostrain_viscosities_space(isostrain_viscosities_space);

And perhaps in other places below that I won't mark up.

bangerth · 2026-07-31T15:54:46Z

-              plastic_yielding = isostrain_viscosities.composition_yielding[std::distance(volume_fractions.begin(), max_composition)];
+              plastic_yielding = isostrain_viscosities.composition_yielding[std::distance(volume_fractions.cbegin(), max_composition)];


Not wrong, but necessary?

bangerth · 2026-07-31T15:56:30Z

-            if (this->introspection().compositional_name_exists("noninitial_plastic_strain") && plastic_yielding == true)
+            if (compositional_name_exists_noninitial_plastic_strain && plastic_yielding == true)


Yes, nice. These are good improvements too. I would take these changes here as a separate uncontroversial pull request. (Or as part of this here, your choice.)

bangerth · 2026-07-31T15:56:51Z

-        prm.print_parameters(prm_out, ParameterHandler::PRM);
+        //prm.print_parameters(prm_out, ParameterHandler::PRM);

        std::ofstream json_out ((parameters.output_directory + "parameters.json"));
        AssertThrow (json_out,
                     ExcMessage (std::string("Could not open file <") +
                                 parameters.output_directory + "parameters.json>."));
-        prm.print_parameters(json_out, ParameterHandler::JSON);
+        //prm.print_parameters(json_out, ParameterHandler::JSON);


You'll have to undo these changes.

MFraters force-pushed the reduce_allocations_in_aspect branch from f33e503 to 0302b9f Compare July 31, 2026 15:01

MFraters added 2 commits July 31, 2026 17:03

reduce allocation in aspect.

8f3671a

address least squares particle interpolator.

0c9222d

MFraters force-pushed the reduce_allocations_in_aspect branch from 0302b9f to 0c9222d Compare July 31, 2026 15:04

bangerth reviewed Jul 31, 2026

View reviewed changes

Navigation Menu

Uh oh!

[WIP] Reduce allocations in aspect - #7262

[WIP] Reduce allocations in aspect#7262
MFraters wants to merge 2 commits into
geodynamics:mainfrom
MFraters:reduce_allocations_in_aspect

MFraters commented Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

bangerth Jul 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	typename aspect::Utilities::ScratchSpace<IsostrainViscosities>::ScopedScratchObject scoped_isostrain_viscosities_space(isostrain_viscosities_space);
	aspect::Utilities::ScratchSpace<IsostrainViscosities>::ScopedScratchObject scoped_isostrain_viscosities_space(isostrain_viscosities_space);

		plastic_yielding = isostrain_viscosities.composition_yielding[std::distance(volume_fractions.begin(), max_composition)];
		plastic_yielding = isostrain_viscosities.composition_yielding[std::distance(volume_fractions.cbegin(), max_composition)];

		if (this->introspection().compositional_name_exists("noninitial_plastic_strain") && plastic_yielding == true)
		if (compositional_name_exists_noninitial_plastic_strain && plastic_yielding == true)

Uh oh!

Conversation

MFraters commented Jul 31, 2026

Before your first pull request:

For all pull requests:

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants