Skip to content

Simplify code and avoid dereferencing null pointer #6619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 28, 2025
Merged

Simplify code and avoid dereferencing null pointer #6619

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32f426e
Simplify code and avoid dereferencing null pointer
gassmoeller Jul 24, 2025
e701754
Simplify logic
gassmoeller Jul 25, 2025
b7118a5
Simplify code further
gassmoeller Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions source/material_model/reactive_fluid_transport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,23 +86,24 @@ namespace aspect
std::vector<double> &melt_fractions,
const MaterialModel::MaterialModelOutputs<dim> *out) const
{
const std::shared_ptr<const MeltOutputs<dim>> fluid_out = out->template get_additional_output_object<MeltOutputs<dim>>();
std::shared_ptr<const MeltOutputs<dim>> fluid_out;
if (out != nullptr)
fluid_out = out->template get_additional_output_object<MeltOutputs<dim>>();

if (fluid_out != nullptr && in.requests_property(MaterialProperties::additional_outputs))
{
const unsigned int porosity_idx = this->introspection().compositional_index_for_name("porosity");

for (unsigned int q=0; q<in.n_evaluation_points(); ++q)
{
const unsigned int porosity_idx = this->introspection().compositional_index_for_name("porosity");
switch (fluid_solid_reaction_scheme)
{
case no_reaction:
{
Assert(out != nullptr,
Copy link
Member

@tjhei tjhei Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, but this code looks like it requires out to be non-null in all cases (even if the current version references the nullptr first). Maybe require out to be non-null and see if anything breaks?

ExcMessage("The MaterialModelOutputs provided to the No Reactions reaction model is a nullptr."));
const double volume_fraction_porosity = in.composition[q][porosity_idx];
// Melt fractions outputs the mass fraction of equilibrium free water at each quadrature point. However,
// the free water is a volume fraction, while the bound water is a mass fraction. Convert the free water
// to a mass fraction so that we correctly compare the two values.
const std::shared_ptr<const MeltOutputs<dim>> fluid_out = out->template get_additional_output_object<MeltOutputs<dim>>();
const double bulk_density = compute_bulk_density(volume_fraction_porosity, out->densities[q], fluid_out->fluid_densities[q]);
const double mass_fraction_porosity = compute_mass_fraction(volume_fraction_porosity, fluid_out->fluid_densities[q], bulk_density);
// No reactions occur between the solid and fluid phases,
Expand All @@ -116,28 +117,23 @@ namespace aspect
// The fluid volume fraction in equilibrium with the solid
// at any point (stored in the melt_fractions vector) is
// equal to the sum of the bound fluid content and porosity.
Assert(out != nullptr,
ExcMessage("The MaterialModelOutputs provided to the Zero Solubility reaction model is a nullptr."));

const double volume_fraction_porosity = in.composition[q][porosity_idx];
const unsigned int bound_fluid_idx = this->introspection().compositional_index_for_name("bound_fluid");
// Melt fractions outputs the mass fraction of equilibrium free water at each quadrature point. However,
// the free water is a volume fraction, while the bound water is a mass fraction. Convert the free water
// to a mass fraction so that we correctly compare the two values.
const std::shared_ptr<const MeltOutputs<dim>> fluid_out = out->template get_additional_output_object<MeltOutputs<dim>>();
const double bulk_density = compute_bulk_density(volume_fraction_porosity, out->densities[q], fluid_out->fluid_densities[q]);
const double mass_fraction_porosity = compute_mass_fraction(volume_fraction_porosity, fluid_out->fluid_densities[q], bulk_density);
melt_fractions[q] = in.composition[q][bound_fluid_idx] + mass_fraction_porosity;
break;
}
case tian_approximation:
{
Assert(out != nullptr,
ExcMessage("The MaterialModelOutputs provided to the Tian 2019 reaction model is a nullptr."));
// The tian2019_model melt_fraction function requires the mass fraction of free water at each quadrature
// point as an input. However, the free water is stored in the porosity field as a volume fraction.
// We therefore convert the free water to a mass fraction so that we have the correct input.
const double volume_fraction_porosity = in.composition[q][porosity_idx];
const std::shared_ptr<const MeltOutputs<dim>> fluid_out = out->template get_additional_output_object<MeltOutputs<dim>>();
const double bulk_density = compute_bulk_density(volume_fraction_porosity, out->densities[q], fluid_out->fluid_densities[q]);;
const double mass_fraction_porosity = compute_mass_fraction(volume_fraction_porosity, fluid_out->fluid_densities[q], bulk_density);
melt_fractions[q] = tian2019_model.melt_fraction(in, mass_fraction_porosity, q);
Expand Down