feat(FieldDofMap): Completed FieldDofMap migration
also removed legacy BarotropicPolytrope implementation
This commit is contained in:
@@ -9,6 +9,20 @@ import test_helpers;
|
||||
using namespace mean_field;
|
||||
|
||||
namespace {
|
||||
struct SerialMappingData {
|
||||
explicit SerialMappingData(mfem::Mesh &mesh)
|
||||
: compactification_fes(&mesh, &compactification_fec),
|
||||
compactification_coordinate(&compactification_fes),
|
||||
mapper(field_dof_test_utils::make_domain_mapper()) {
|
||||
compactification_coordinate = 0.0;
|
||||
}
|
||||
|
||||
mfem::H1_FECollection compactification_fec{1, 3};
|
||||
mfem::FiniteElementSpace compactification_fes;
|
||||
mfem::GridFunction compactification_coordinate;
|
||||
mapping::DomainMapper mapper;
|
||||
};
|
||||
|
||||
double compute_roche_surface_scale(
|
||||
const double rotation_fraction,
|
||||
const double sine_theta_squared
|
||||
@@ -29,7 +43,7 @@ namespace {
|
||||
|
||||
TEST_CASE(
|
||||
"Centrifugal Integrator Matches Manufactured Cartesian Load",
|
||||
tags::unit &tags::solver &tags::integrator &tags::centrifugal
|
||||
tags::rotation_integrator_unit
|
||||
) {
|
||||
constexpr int dim = 3;
|
||||
constexpr double density = 1.7;
|
||||
@@ -49,13 +63,15 @@ TEST_CASE(
|
||||
mfem::GridFunction displacement(&displacement_fes);
|
||||
displacement = 0.0;
|
||||
|
||||
mapping::DomainMapper domain_mapper(displacement, 1.0, 2.0);
|
||||
SerialMappingData mapping_data(mesh);
|
||||
|
||||
mfem::Vector omega(dim);
|
||||
omega = 0.0;
|
||||
omega(2) = omega_value;
|
||||
|
||||
integrators::CentrifugalForceIntegrator integrator(domain_mapper, omega);
|
||||
integrators::CentrifugalForceIntegrator integrator(
|
||||
mapping_data.mapper, displacement, mapping_data.compactification_coordinate, omega
|
||||
);
|
||||
|
||||
const mfem::FiniteElement *velocity_element = velocity_fes.GetFE(0);
|
||||
const mfem::FiniteElement *density_element = density_fes.GetFE(0);
|
||||
@@ -66,8 +82,7 @@ TEST_CASE(
|
||||
quadrature::Policy policy(std::move(rule_set));
|
||||
quadrature::RuleFactory quadrature_factory(std::move(policy));
|
||||
|
||||
const quadrature::MappingKind mapping_kind =
|
||||
!domain_mapper.HasDisplacementField() ? quadrature::MappingKind::none : quadrature::MappingKind::general;
|
||||
const quadrature::MappingKind mapping_kind = quadrature::MappingKind::general;
|
||||
const int position_order = displacement_element->GetOrder();
|
||||
|
||||
quadrature_factory.configure_centrifugal(
|
||||
@@ -127,7 +142,7 @@ TEST_CASE(
|
||||
|
||||
TEST_CASE(
|
||||
"Centrifugal Integrator Jacobian Matches Residual Linearization",
|
||||
tags::unit &tags::solver &tags::integrator &tags::centrifugal
|
||||
tags::rotation_integrator_unit
|
||||
) {
|
||||
constexpr int dim = 3;
|
||||
constexpr double step = 1.0e-6;
|
||||
@@ -147,14 +162,16 @@ TEST_CASE(
|
||||
mfem::GridFunction displacement(&displacement_fes);
|
||||
displacement = 0.0;
|
||||
|
||||
mapping::DomainMapper domain_mapper(displacement, 1.0, 2.0);
|
||||
SerialMappingData mapping_data(mesh);
|
||||
|
||||
mfem::Vector omega(dim);
|
||||
omega(0) = 0.7;
|
||||
omega(1) = -1.1;
|
||||
omega(2) = 1.6;
|
||||
|
||||
integrators::CentrifugalForceIntegrator integrator(domain_mapper, omega);
|
||||
integrators::CentrifugalForceIntegrator integrator(
|
||||
mapping_data.mapper, displacement, mapping_data.compactification_coordinate, omega
|
||||
);
|
||||
|
||||
const mfem::FiniteElement *velocity_element = velocity_fes.GetFE(0);
|
||||
const mfem::FiniteElement *density_element = density_fes.GetFE(0);
|
||||
@@ -165,8 +182,7 @@ TEST_CASE(
|
||||
quadrature::Policy policy(std::move(rule_set));
|
||||
quadrature::RuleFactory quadrature_factory(std::move(policy));
|
||||
|
||||
const quadrature::MappingKind mapping_kind =
|
||||
!domain_mapper.HasDisplacementField() ? quadrature::MappingKind::none : quadrature::MappingKind::general;
|
||||
const quadrature::MappingKind mapping_kind = quadrature::MappingKind::general;
|
||||
const int position_order = displacement_element->GetOrder();
|
||||
|
||||
quadrature_factory.configure_centrifugal(
|
||||
@@ -287,7 +303,7 @@ TEST_CASE(
|
||||
|
||||
TEST_CASE(
|
||||
"Centrifugal Integrator Preserves Rotation Identities",
|
||||
tags::unit &tags::solver &tags::integrator &tags::centrifugal
|
||||
tags::rotation_integrator_unit
|
||||
) {
|
||||
constexpr int dim = 3;
|
||||
constexpr double density = 1.4;
|
||||
@@ -307,14 +323,16 @@ TEST_CASE(
|
||||
mfem::GridFunction displacement(&displacement_fes);
|
||||
displacement = 0.0;
|
||||
|
||||
mapping::DomainMapper domain_mapper(displacement, 1.0, 2.0);
|
||||
SerialMappingData mapping_data(mesh);
|
||||
|
||||
mfem::Vector omega(dim);
|
||||
omega(0) = 0.7;
|
||||
omega(1) = -1.1;
|
||||
omega(2) = 1.6;
|
||||
|
||||
integrators::CentrifugalForceIntegrator integrator(domain_mapper, omega);
|
||||
integrators::CentrifugalForceIntegrator integrator(
|
||||
mapping_data.mapper, displacement, mapping_data.compactification_coordinate, omega
|
||||
);
|
||||
|
||||
const mfem::FiniteElement *velocity_element = velocity_fes.GetFE(0);
|
||||
const mfem::FiniteElement *density_element = density_fes.GetFE(0);
|
||||
@@ -325,8 +343,7 @@ TEST_CASE(
|
||||
quadrature::Policy policy(std::move(rule_set));
|
||||
quadrature::RuleFactory quadrature_factory(std::move(policy));
|
||||
|
||||
const quadrature::MappingKind mapping_kind =
|
||||
!domain_mapper.HasDisplacementField() ? quadrature::MappingKind::none : quadrature::MappingKind::general;
|
||||
const quadrature::MappingKind mapping_kind = quadrature::MappingKind::general;
|
||||
const int position_order = displacement_element->GetOrder();
|
||||
|
||||
quadrature_factory.configure_centrifugal(
|
||||
@@ -424,7 +441,7 @@ TEST_CASE(
|
||||
|
||||
TEST_CASE(
|
||||
"Centrifugal Integrator Matches Rotational Virial On Roche Mappings",
|
||||
tags::integration &tags::solver &tags::integrator &tags::centrifugal
|
||||
tags::rotation_integrator_integration
|
||||
) {
|
||||
auto args = test_utils::setup_args();
|
||||
fem::FEM f = fem::setup_fem(args.mesh_file, args, 0);
|
||||
@@ -486,16 +503,20 @@ TEST_CASE(
|
||||
|
||||
mfem::VectorFunctionCoefficient displacement_coefficient(dim, rotation_displacement);
|
||||
displacement.ProjectCoefficient(displacement_coefficient);
|
||||
f.mapping->SetDisplacement(displacement);
|
||||
*f.displacement = displacement;
|
||||
mapping::GridFunctionMappingEvaluator mapping_evaluator(
|
||||
*f.domainMapperStateless, *f.displacement, *f.compactificationCoordinate
|
||||
);
|
||||
|
||||
mfem::Vector omega(dim);
|
||||
omega = 0.0;
|
||||
omega(2) = rotation_fraction;
|
||||
|
||||
integrators::CentrifugalForceIntegrator integrator(*f.mapping, omega);
|
||||
integrators::CentrifugalForceIntegrator integrator(
|
||||
*f.domainMapperStateless, *f.displacement, *f.compactificationCoordinate, omega
|
||||
);
|
||||
|
||||
const quadrature::MappingKind mapping_kind =
|
||||
!f.mapping->HasDisplacementField() ? quadrature::MappingKind::none : quadrature::MappingKind::general;
|
||||
const quadrature::MappingKind mapping_kind = quadrature::MappingKind::general;
|
||||
f.quadratureFactory->configure_centrifugal(
|
||||
integrator, quadrature::QuadratureRole::discretization, representative_density_element,
|
||||
representative_velocity_element, representative_transformation, position_order, utils::DOMAINS::STELLAR,
|
||||
@@ -560,7 +581,7 @@ TEST_CASE(
|
||||
for (int i = 0; i < velocity_dofs_count; ++i) {
|
||||
const mfem::IntegrationPoint &node = velocity_nodes.IntPoint(i);
|
||||
transformation->SetIntPoint(&node);
|
||||
f.mapping->GetPhysicalPoint(*transformation, node, x_physical);
|
||||
mapping_evaluator.GetPhysicalPoint(*transformation, node, x_physical);
|
||||
|
||||
for (int d = 0; d < dim; ++d) {
|
||||
position_test_dofs(i + d * velocity_dofs_count) = x_physical(d);
|
||||
@@ -581,14 +602,14 @@ TEST_CASE(
|
||||
const mfem::IntegrationPoint &integration_point = reference_rule.IntPoint(q);
|
||||
transformation->SetIntPoint(&integration_point);
|
||||
|
||||
const double signed_map_determinant = f.mapping->ComputeDetJ(*transformation, integration_point);
|
||||
const mapping::VolumeQuadratureContext context =
|
||||
f.mapping->GetQuadratureContext(*transformation, integration_point);
|
||||
mapping_evaluator.GetQuadratureContext(*transformation, integration_point);
|
||||
const double signed_map_determinant = context.detJ;
|
||||
|
||||
local_minimum_map_determinant = std::min(local_minimum_map_determinant, signed_map_determinant);
|
||||
local_maximum_map_determinant = std::max(local_maximum_map_determinant, signed_map_determinant);
|
||||
|
||||
f.mapping->GetPhysicalPoint(*transformation, integration_point, x_physical);
|
||||
mapping_evaluator.GetPhysicalPoint(*transformation, integration_point, x_physical);
|
||||
velocity_element->CalcShape(integration_point, velocity_shape);
|
||||
|
||||
position_test_value = 0.0;
|
||||
@@ -661,13 +682,13 @@ TEST_CASE(
|
||||
CHECK_THAT(relative_position_error, Catch::Matchers::WithinAbs(0.0, position_tolerance));
|
||||
}
|
||||
|
||||
f.mapping->ResetDisplacement();
|
||||
*f.displacement = 0.0;
|
||||
}
|
||||
|
||||
TEST_CASE(
|
||||
"Centrifugal Virial Position Representation Is Consistent At The "
|
||||
"Registered Order",
|
||||
tags::integration &tags::solver &tags::integrator &tags::centrifugal
|
||||
tags::rotation_integrator_integration
|
||||
) {
|
||||
constexpr int dim = 3;
|
||||
constexpr double concentration = 4.0;
|
||||
@@ -728,7 +749,10 @@ TEST_CASE(
|
||||
|
||||
mfem::VectorFunctionCoefficient displacement_coefficient(dim, rotation_displacement);
|
||||
displacement.ProjectCoefficient(displacement_coefficient);
|
||||
f.mapping->SetDisplacement(displacement);
|
||||
*f.displacement = displacement;
|
||||
mapping::GridFunctionMappingEvaluator mapping_evaluator(
|
||||
*f.domainMapperStateless, *f.displacement, *f.compactificationCoordinate
|
||||
);
|
||||
|
||||
mfem::Vector omega(dim);
|
||||
omega = 0.0;
|
||||
@@ -761,7 +785,7 @@ TEST_CASE(
|
||||
for (int i = 0; i < velocity_dofs_count; ++i) {
|
||||
const mfem::IntegrationPoint &node = velocity_nodes.IntPoint(i);
|
||||
transformation->SetIntPoint(&node);
|
||||
f.mapping->GetPhysicalPoint(*transformation, node, x_physical);
|
||||
mapping_evaluator.GetPhysicalPoint(*transformation, node, x_physical);
|
||||
|
||||
for (int d = 0; d < dim; ++d) {
|
||||
position_test_dofs(i + d * velocity_dofs_count) = x_physical(d);
|
||||
@@ -780,13 +804,13 @@ TEST_CASE(
|
||||
const mfem::IntegrationPoint &integration_point = reference_rule.IntPoint(q);
|
||||
transformation->SetIntPoint(&integration_point);
|
||||
|
||||
const double signed_map_determinant = f.mapping->ComputeDetJ(*transformation, integration_point);
|
||||
const mapping::VolumeQuadratureContext context =
|
||||
f.mapping->GetQuadratureContext(*transformation, integration_point);
|
||||
mapping_evaluator.GetQuadratureContext(*transformation, integration_point);
|
||||
const double signed_map_determinant = context.detJ;
|
||||
|
||||
local_minimum_determinant = std::min(local_minimum_determinant, signed_map_determinant);
|
||||
|
||||
f.mapping->GetPhysicalPoint(*transformation, integration_point, x_physical);
|
||||
mapping_evaluator.GetPhysicalPoint(*transformation, integration_point, x_physical);
|
||||
velocity_element->CalcShape(integration_point, velocity_shape);
|
||||
|
||||
position_test_value = 0.0;
|
||||
@@ -833,7 +857,7 @@ TEST_CASE(
|
||||
minimum_determinants[rotation_index][order_index] = global_minimum_determinant;
|
||||
}
|
||||
|
||||
f.mapping->ResetDisplacement();
|
||||
*f.displacement = 0.0;
|
||||
}
|
||||
|
||||
for (std::size_t rotation_index = 0; rotation_index < rotation_fractions.size(); ++rotation_index) {
|
||||
@@ -853,7 +877,7 @@ TEST_CASE(
|
||||
|
||||
TEST_CASE(
|
||||
"Centrifugal Virial Position Representation Converges Under H Refinement",
|
||||
tags::integration &tags::solver &tags::integrator &tags::convergence &tags::h_refinement &tags::centrifugal
|
||||
tags::rotation_integrator_convergence
|
||||
) {
|
||||
constexpr int dim = 3;
|
||||
constexpr double concentration = 4.0;
|
||||
@@ -916,7 +940,10 @@ TEST_CASE(
|
||||
|
||||
mfem::VectorFunctionCoefficient displacement_coefficient(dim, rotation_displacement);
|
||||
displacement.ProjectCoefficient(displacement_coefficient);
|
||||
f.mapping->SetDisplacement(displacement);
|
||||
*f.displacement = displacement;
|
||||
mapping::GridFunctionMappingEvaluator mapping_evaluator(
|
||||
*f.domainMapperStateless, *f.displacement, *f.compactificationCoordinate
|
||||
);
|
||||
|
||||
mfem::Vector omega(dim);
|
||||
omega = 0.0;
|
||||
@@ -949,7 +976,7 @@ TEST_CASE(
|
||||
for (int i = 0; i < velocity_dofs_count; ++i) {
|
||||
const mfem::IntegrationPoint &node = velocity_nodes.IntPoint(i);
|
||||
transformation->SetIntPoint(&node);
|
||||
f.mapping->GetPhysicalPoint(*transformation, node, x_physical);
|
||||
mapping_evaluator.GetPhysicalPoint(*transformation, node, x_physical);
|
||||
|
||||
for (int d = 0; d < dim; ++d) {
|
||||
position_test_dofs(i + d * velocity_dofs_count) = x_physical(d);
|
||||
@@ -968,13 +995,13 @@ TEST_CASE(
|
||||
const mfem::IntegrationPoint &integration_point = reference_rule.IntPoint(q);
|
||||
transformation->SetIntPoint(&integration_point);
|
||||
|
||||
const double signed_map_determinant = f.mapping->ComputeDetJ(*transformation, integration_point);
|
||||
const mapping::VolumeQuadratureContext context =
|
||||
f.mapping->GetQuadratureContext(*transformation, integration_point);
|
||||
mapping_evaluator.GetQuadratureContext(*transformation, integration_point);
|
||||
const double signed_map_determinant = context.detJ;
|
||||
|
||||
local_minimum_determinant = std::min(local_minimum_determinant, signed_map_determinant);
|
||||
|
||||
f.mapping->GetPhysicalPoint(*transformation, integration_point, x_physical);
|
||||
mapping_evaluator.GetPhysicalPoint(*transformation, integration_point, x_physical);
|
||||
velocity_element->CalcShape(integration_point, velocity_shape);
|
||||
|
||||
position_test_value = 0.0;
|
||||
@@ -1021,7 +1048,7 @@ TEST_CASE(
|
||||
minimum_determinants[rotation_index][refinement_index] = global_minimum_determinant;
|
||||
}
|
||||
|
||||
f.mapping->ResetDisplacement();
|
||||
*f.displacement = 0.0;
|
||||
}
|
||||
|
||||
for (std::size_t rotation_index = 0; rotation_index < rotation_fractions.size(); ++rotation_index) {
|
||||
|
||||
Reference in New Issue
Block a user