tboudreaux/MeanField
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(support): continued migration to new field dof support system

Browse Source 
mass normaliztion, gravity, displacement, and hydrostatic equilibrium are now migrated
This commit is contained in:
Emily Boudreaux
2026-08-24 15:44:24 -04:00
parent 0f3ca8050b
commit 177ae8b38a
48 changed files with 1738 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libmeanfield/interface/operators/contexts/gravity_field_context.cppm
View File

@@ -6,6 +6,7 @@ module;
export module mean_field:operators.context.gravity_field;
export import :fem;
export import :field.mfem;
export import :mapping.domain_mapper;
export import :operators.prepared_gravity_source;
export import :operators.prepared_hdiv_mass;
@@ -69,14 +70,15 @@ export namespace mean_field::operators::context::gravity_field {
GravityFieldGeometryContext &operator=(GravityFieldGeometryContext &&) = delete;
GravityFieldGeometryPreparation Prepare(
const mfem::Vector &displacement_true,
const mfem::Vector &displacement,
DiscretizationRevision discretization_revision,
DisplacementRevision displacement_revision
);
[[nodiscard]] const PreparedMappedHDivMassOperator &GetMassOperator() const;
[[nodiscard]] const PreparedMappedGravitySourceOperator &GetSourceOperator() const;
[[nodiscard]] const mfem::Vector &GetDisplacement() const;
[[nodiscard]] const mfem::Vector &GetDisplacementTrue() const;
[[nodiscard]] const field::FieldDofMap &GetDisplacementMap() const noexcept;
[[nodiscard]] DiscretizationRevision GetDiscretizationRevision() const noexcept;
[[nodiscard]] DisplacementRevision GetDisplacementRevision() const noexcept;
[[nodiscard]] bool IsPrepared() const noexcept;
@@ -88,6 +90,7 @@ export namespace mean_field::operators::context::gravity_field {
std::unique_ptr<PreparedMappedHDivMassOperator> m_mass_operator;
std::unique_ptr<PreparedMappedGravitySourceOperator> m_source_operator;
field::FieldDofMap m_displacement_map;
mfem::Vector m_displacement_true;
DiscretizationRevision m_discretization_revision;
@@ -124,8 +127,12 @@ export namespace mean_field::operators::context::gravity_field {
);
[[nodiscard]] const GravityFieldGeometryContext &GetGeometryContext() const;
[[nodiscard]] const mfem::Vector &GetDensity() const;
[[nodiscard]] const mfem::Vector &GetGravityGradient() const;
[[nodiscard]] const mfem::Vector &GetDensityTrue() const;
[[nodiscard]] const mfem::Vector &GetGravityGradientTrue() const;
[[nodiscard]] const field::FieldDofMap &GetDensityMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetDisplacementMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetGravityGradientMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetGravityPotentialMap() const noexcept;
[[nodiscard]] const GravityFieldRevisions &GetRevisions() const;
[[nodiscard]] bool IsPrepared() const noexcept;
@@ -134,10 +141,13 @@ export namespace mean_field::operators::context::gravity_field {
GravityFieldGeometryContext m_geometry_context;
field::FieldDofMap m_density_map;
field::FieldDofMap m_gravity_gradient_map;
field::FieldDofMap m_gravity_potential_map;
mfem::Vector m_density_true;
mfem::Vector m_gravity_gradient_true;
GravityFieldRevisions m_revisions;
bool m_is_prepared{false};
};
} // namespace mean_field::operators::context::gravity_field
} // namespace mean_field::operators::context::gravity_field

17
libmeanfield/interface/operators/contexts/hydrostatic_equilibrium_context.cppm
View File

@@ -8,6 +8,7 @@ module;
export module mean_field:operators.context.hydrostatic_equilibrium;
export import :fem;
export import :field.mfem;
export import :mapping.domain_mapper;
export namespace mean_field::operators::context::hydrostatic {
@@ -52,6 +53,12 @@ export namespace mean_field::operators::context::hydrostatic {
constexpr auto operator<=>(const HydrostaticEquilibriumDependencies &) const = default;
};
/*
* Frozen solver-facing state in registered FieldDof coordinates.
*
* The context owns the only expansion into MFEM true-DOF vectors used
* by the stateless hydrostatic kernels and prepared quadrature data.
*/
struct HydrostaticEquilibriumStateView {
const mfem::Vector &enthalpy;
const mfem::Vector &gravityPotential;
@@ -113,6 +120,12 @@ export namespace mean_field::operators::context::hydrostatic {
[[nodiscard]] const HydrostaticPreparationStatistics &GetPreparationStatistics() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetEnthalpyMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetGravityPotentialMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetDisplacementMap() const noexcept;
[[nodiscard]] const mfem::Vector &GetBaseEnthalpyTrue() const;
[[nodiscard]] const mfem::Vector &GetBaseGravityPotentialTrue() const;
@@ -127,6 +140,10 @@ export namespace mean_field::operators::context::hydrostatic {
const fem::FEM &m_f;
const mapping::DomainMapperStateless &m_domainMapper;
field::FieldDofMap m_enthalpyMap;
field::FieldDofMap m_gravityPotentialMap;
field::FieldDofMap m_displacementMap;
mfem::Vector m_baseEnthalpyTrue;
mfem::Vector m_baseGravityPotentialTrue;
mfem::Vector m_displacementTrue;

5
libmeanfield/interface/operators/contexts/rotation_displacement_force_context.cppm
View File

@@ -8,6 +8,7 @@ module;
export module mean_field:operators.context.rotational_displacement_force;
export import :fem;
export import :field.mfem;
export import :mapping.domain_mapper;
export namespace mean_field::operators::context::rotational_displacement_force {
@@ -108,12 +109,16 @@ export namespace mean_field::operators::context::rotational_displacement_force {
[[nodiscard]] const mfem::Vector &GetBaseDensityTrue() const;
[[nodiscard]] const mfem::Vector &GetDisplacementTrue() const;
[[nodiscard]] const field::FieldDofMap &GetDensityMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetDisplacementMap() const noexcept;
private:
void VerifyPrepared() const;
const fem::FEM &m_f;
field::FieldDofMap m_densityMap;
field::FieldDofMap m_displacementMap;
mfem::Vector m_baseDensityTrue;
mfem::Vector m_displacementTrue;

26
libmeanfield/interface/operators/gravity_field.cppm
View File

@@ -1,5 +1,4 @@
module;
#include <cstdint>
#include <memory>
#include <mfem.hpp>
@@ -10,21 +9,13 @@ export import :operators.gravity_field_jacobian;
export import :operators.context.gravity_field;
export namespace mean_field::operators {
enum class GravityResidualBlock : std::uint8_t { gradient_equation = 0, poisson_equation = 1, count = 2 };
constexpr int gravity_residual_block_index(const GravityResidualBlock block) noexcept {
return static_cast<int>(block);
}
inline constexpr int gravity_residual_block_count = gravity_residual_block_index(GravityResidualBlock::count);
class GravityFieldOperator final : public mfem::Operator {
public:
GravityFieldOperator(
fem::FEM &f,
const mapping::DomainMapperStateless &domain_mapper,
context::gravity_field::GravityFieldLinearizationContext &linearization_context,
const mfem::Array<int> &state_true_offsets,
const mfem::Array<int> &state_offsets,
GravityFieldJacobianOperator &jacobian
);
@@ -40,9 +31,9 @@ export namespace mean_field::operators {
Operator &GetGradient(const mfem::Vector &state) const override;
[[nodiscard]] const mfem::Array<int> &GetStateTrueOffsets() const noexcept;
[[nodiscard]] const mfem::Array<int> &GetStateOffsets() const noexcept;
[[nodiscard]] const mfem::Array<int> &GetResidualTrueOffsets() const noexcept;
[[nodiscard]] const mfem::Array<int> &GetResidualOffsets() const noexcept;
[[nodiscard]] context::gravity_field::GravityFieldLinearizationContext &GetLinearizationContext() noexcept;
@@ -66,8 +57,8 @@ export namespace mean_field::operators {
fem::FEM &m_fem;
const mapping::DomainMapperStateless &m_domain_mapper;
context::gravity_field::GravityFieldLinearizationContext &m_linearization_context;
mfem::Array<int> m_state_true_offsets;
mfem::Array<int> m_residual_true_offsets;
mfem::Array<int> m_state_offsets;
mfem::Array<int> m_residual_offsets;
GravityFieldJacobianOperator &m_jacobian;
};
@@ -106,7 +97,7 @@ export namespace mean_field::operators {
[[nodiscard]] const context::gravity_field::GravityFieldGeometryContext &GetGeometryContext() const noexcept;
[[nodiscard]] const mfem::Array<int> &GetGravityTrueOffsets() const noexcept;
[[nodiscard]] const mfem::Array<int> &GetGravityOffsets() const noexcept;
private:
void ValidateDisplacement(const mfem::Vector &displacement) const;
@@ -117,7 +108,8 @@ export namespace mean_field::operators {
private:
GravityFieldOperator &m_gravity_field_operator;
mfem::Array<int> m_gravity_true_offsets;
mfem::Array<int> m_gravity_offsets;
context::gravity_field::GravityFieldGeometryContext &m_gravity_field_geometry_context;
mfem::Vector m_displacement;
};
} // namespace mean_field::operators
} // namespace mean_field::operators

10
libmeanfield/interface/operators/gravity_field_jacobian.cppm
View File

@@ -13,8 +13,8 @@ export namespace mean_field::operators {
fem::FEM &f,
const mapping::DomainMapperStateless &domain_mapper,
const context::gravity_field::GravityFieldLinearizationContext &linearization_context,
const mfem::Array<int> &state_true_offsets,
const mfem::Array<int> &residual_true_offsets
const mfem::Array<int> &state_offsets,
const mfem::Array<int> &residual_offsets
);
void Mult(
@@ -29,7 +29,7 @@ export namespace mean_field::operators {
fem::FEM &m_fem;
const mapping::DomainMapperStateless &m_domain_mapper;
const context::gravity_field::GravityFieldLinearizationContext &m_linearization_context;
mfem::Array<int> m_state_true_offsets;
mfem::Array<int> m_residual_true_offsets;
mfem::Array<int> m_state_offsets;
mfem::Array<int> m_residual_offsets;
};
} // namespace mean_field::operators
} // namespace mean_field::operators

7
libmeanfield/interface/operators/kernels/gravity_kernels.cppm
View File

@@ -5,6 +5,13 @@ export import :mapping.domain_mapper;
export import :fem;
export namespace mean_field::operators::kernels {
/*
* Kernel boundary contract
* ------------------------
* These low-level element kernels operate on MFEM true-DOF vectors. The
* prepared operators and gravity contexts own FieldDof maps and are the
* only layer that gathers/scatters reduced public coordinates.
*/
void apply_mapped_hdiv_mass(
const fem::FEM &f,

5
libmeanfield/interface/operators/prepared_gravity_displacement_force.cppm
View File

@@ -113,6 +113,11 @@ export namespace mean_field::operators {
context::gravity_field::GravityFieldRevisions m_preparedRevisions;
mfem::Vector m_cachedResidual;
mutable mfem::Vector m_densityVariationTrue;
mutable mfem::Vector m_gravityGradientVariationTrue;
mutable mfem::Vector m_displacementVariationTrue;
mutable mfem::Vector m_actionTrue;
std::uint64_t m_residualPreparationCount{0};
mutable std::uint64_t m_residualApplicationCount{0};

20
libmeanfield/interface/operators/prepared_gravity_source.cppm
View File

@@ -6,6 +6,7 @@ module;
export module mean_field:operators.prepared_gravity_source;
export import :fem;
export import :field.mfem;
export import :mapping.domain_mapper;
export namespace mean_field::operators {
@@ -16,17 +17,21 @@ export namespace mean_field::operators {
const mapping::DomainMapperStateless &domain_mapper
);
void Prepare(const mfem::Vector &displacement_true);
void Prepare(const mfem::Vector &displacement);
void Mult(
const mfem::Vector &density_true,
const mfem::Vector &density,
mfem::Vector &action
) const override;
[[nodiscard]] bool IsPrepared() const noexcept;
[[nodiscard]] std::uint64_t GetPreparationCount() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetDensityMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetPotentialMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetDisplacementMap() const noexcept;
void MultTranspose(
const mfem::Vector &potential_true,
const mfem::Vector &potential,
mfem::Vector &action
) const override;
@@ -52,9 +57,18 @@ export namespace mean_field::operators {
const fem::FEM &m_fem;
const mapping::DomainMapperStateless &m_domain_mapper;
field::FieldDofMap m_density_map;
field::FieldDofMap m_potential_map;
field::FieldDofMap m_displacement_map;
mfem::Array<int> m_stellar_marker;
std::vector<ElementPAData> m_elements;
mutable mfem::Vector m_density_true;
mutable mfem::Vector m_potential_true;
mutable mfem::Vector m_action_true;
mfem::Vector m_displacement_true;
std::uint64_t m_preparation_count{0};
bool m_is_prepared{false};
};

16
libmeanfield/interface/operators/prepared_hdiv_mass.cppm
View File

@@ -5,6 +5,7 @@ module;
export module mean_field:operators.prepared_hdiv_mass;
export import :fem;
export import :field.mfem;
export import :mapping.domain_mapper;
export namespace mean_field::operators {
@@ -15,26 +16,35 @@ export namespace mean_field::operators {
const mapping::DomainMapperStateless &domain_mapper
);
void Prepare(const mfem::Vector &displacement_true);
void Prepare(const mfem::Vector &displacement);
void Mult(
const mfem::Vector &gravity_gradient_true,
const mfem::Vector &gravity_gradient,
mfem::Vector &action
) const override;
[[nodiscard]] bool IsPrepared() const noexcept;
[[nodiscard]] std::uint64_t GetPreparationCount() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetFluxMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetDisplacementMap() const noexcept;
private:
const fem::FEM &m_fem;
const mapping::DomainMapperStateless &m_domain_mapper;
field::FieldDofMap m_flux_map;
field::FieldDofMap m_displacement_map;
mfem::Array<int> m_stellar_marker;
mfem::Array<int> m_vacuum_marker;
std::unique_ptr<mfem::MatrixCoefficient> m_stellar_mass_coefficient;
std::unique_ptr<mfem::MatrixCoefficient> m_vacuum_mass_coefficient;
std::unique_ptr<mfem::ParBilinearForm> m_mass_form;
mutable mfem::Vector m_flux_true;
mutable mfem::Vector m_action_true;
mfem::Vector m_displacement_true;
std::uint64_t m_preparation_count{0};
bool m_is_prepared{false};
};
} // namespace mean_field::operators
} // namespace mean_field::operators

11
libmeanfield/interface/operators/prepared_hydrostatic_equilibrium_operator.cppm
View File

@@ -160,6 +160,12 @@ export namespace mean_field::operators {
[[nodiscard]] const fem::FEM &GetFEM() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetEnthalpyMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetGravityPotentialMap() const noexcept;
[[nodiscard]] const field::FieldDofMap &GetDisplacementMap() const noexcept;
private:
struct ElementPAData {
int elementId{-1};
@@ -219,6 +225,11 @@ export namespace mean_field::operators {
std::vector<ElementPAData> m_elements;
mfem::Vector m_cachedResidual;
mutable mfem::Vector m_enthalpyVariationTrue;
mutable mfem::Vector m_gravityPotentialVariationTrue;
mutable mfem::Vector m_displacementVariationTrue;
mutable mfem::Vector m_fullEnthalpyAction;
std::uint64_t m_residualPreparationCount{0};
mutable std::uint64_t m_residualApplicationCount{0};

5
libmeanfield/interface/operators/prepared_mass_normalization.cppm
View File

@@ -61,6 +61,8 @@ export namespace mean_field::operators {
* Density and displacement are borrowed from the shared gravity-field
* linearization context. This keeps the mass row on exactly the same
* frozen state and geometry as the gravity and mechanical rows.
* Jacobian directions use the corresponding registered FieldDof
* coordinates; expansion to MFEM true-DOF vectors is private.
*/
class PreparedMassNormalizationOperator final {
public:
@@ -153,6 +155,9 @@ export namespace mean_field::operators {
MassNormalizationDependencies m_preparedDependencies;
mfem::Vector m_cachedResidual;
mutable mfem::Vector m_densityVariationTrue;
mutable mfem::Vector m_displacementVariationTrue;
double m_currentMass{0.0};
double m_targetMass{0.0};

3
libmeanfield/interface/operators/prepared_rotation_displacement_force.cppm
View File

@@ -111,6 +111,9 @@ export namespace mean_field::operators {
std::optional<physics::RigidRotation> m_rotation;
mfem::Vector m_cachedResidual;
mutable mfem::Vector m_densityVariationTrue;
mutable mfem::Vector m_displacementVariationTrue;
mutable mfem::Vector m_actionTrue;
context::rotational_displacement_force::RotationalDisplacementForceDependencies m_preparedDependencies;

16
libmeanfield/interface/operators/prepared_stellar_equilibrium.cppm
View File

@@ -158,20 +158,8 @@ export namespace mean_field::operators {
mutable PreparedStellarEquilibriumStatistics m_statistics;
bool m_isPrepared{false};
field::FieldDofMap m_densityMap;
field::FieldDofMap m_displacementMap;
field::FieldDofMap m_gravityFluxMap;
field::FieldDofMap m_gravityPotentialMap;
field::FieldDofMap m_enthalpyMap;
mfem::Vector m_gravityState;
mfem::Vector m_fullDensity;
mfem::Vector m_fullEnthalpy;
mfem::Vector m_fullGravityState;
mutable mfem::Vector m_fullDensityVariation;
mutable mfem::Vector m_fullEnthalpyVariation;
mutable mfem::Vector m_fullGravityDirection;
mutable mfem::Vector m_fullEnthalpyAction;
mutable mfem::Vector m_gravityDirection;
};
} // namespace mean_field::operators