Skip to content

Commit

Permalink
Standardize names in BCO time dep options
Browse files Browse the repository at this point in the history
  • Loading branch information
@knelli2
knelli2 committed Jun 24, 2024
1 parent beac80b commit 8581c61
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 39 deletions.
74 changes: 39 additions & 35 deletions src/Domain/Creators/TimeDependentOptions/BinaryCompactObject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,21 @@ template <bool IsCylindrical>
TimeDependentMapOptions<IsCylindrical>::TimeDependentMapOptions(
double initial_time,
std::optional<ExpansionMapOptions> expansion_map_options,
std::optional<RotationMapOptions> rotation_options,
std::optional<RotationMapOptions> rotation_map_options,
std::optional<TranslationMapOptions> translation_map_options,
std::optional<ShapeMapOptions<domain::ObjectLabel::A>> shape_options_A,
std::optional<ShapeMapOptions<domain::ObjectLabel::B>> shape_options_B,
const Options::Context& context)
: initial_time_(initial_time),
expansion_map_options_(expansion_map_options),
rotation_options_(rotation_options),
translation_options_(translation_map_options),
rotation_map_options_(rotation_map_options),
translation_map_options_(translation_map_options),
shape_options_A_(shape_options_A),
shape_options_B_(shape_options_B) {
if (not(expansion_map_options_.has_value() or rotation_options_.has_value() or
translation_options_.has_value() or shape_options_A_.has_value() or
shape_options_B_.has_value())) {
if (not(expansion_map_options_.has_value() or
rotation_map_options_.has_value() or
translation_map_options_.has_value() or
shape_options_A_.has_value() or shape_options_B_.has_value())) {
PARSE_ERROR(context,
"Time dependent map options were specified, but all options "
"were 'None'. If you don't want time dependent maps, specify "
Expand Down Expand Up @@ -123,37 +124,40 @@ TimeDependentMapOptions<IsCylindrical>::create_functions_of_time(
// (omega) to determine map parameters. In theory we could determine
// each initial angle from the input axis-angle representation, but
// we don't need to.
if (rotation_options_.has_value()) {
if (rotation_map_options_.has_value()) {
result[rotation_name] = std::make_unique<
FunctionsOfTime::QuaternionFunctionOfTime<3>>(
initial_time_,
std::array<DataVector, 1>{DataVector{1.0, 0.0, 0.0, 0.0}},
std::array<DataVector, 4>{
{{3, 0.0},
{gsl::at(rotation_options_.value().initial_angular_velocity, 0),
gsl::at(rotation_options_.value().initial_angular_velocity, 1),
gsl::at(rotation_options_.value().initial_angular_velocity, 2)},
{gsl::at(rotation_map_options_.value().initial_angular_velocity,
0),
gsl::at(rotation_map_options_.value().initial_angular_velocity,
1),
gsl::at(rotation_map_options_.value().initial_angular_velocity,
2)},
{3, 0.0},
{3, 0.0}}},
expiration_times.at(rotation_name));
}

// TranslationMap FunctionOfTime
if (translation_options_.has_value()) {
result[translation_name] =
std::make_unique<FunctionsOfTime::PiecewisePolynomial<2>>(
initial_time_,
std::array<DataVector, 3>{
{{gsl::at(translation_options_.value().initial_values, 0)[0],
gsl::at(translation_options_.value().initial_values, 0)[1],
gsl::at(translation_options_.value().initial_values, 0)[2]},
{gsl::at(translation_options_.value().initial_values, 1)[0],
gsl::at(translation_options_.value().initial_values, 1)[1],
gsl::at(translation_options_.value().initial_values, 1)[2]},
{gsl::at(translation_options_.value().initial_values, 2)[0],
gsl::at(translation_options_.value().initial_values, 2)[1],
gsl::at(translation_options_.value().initial_values, 2)[2]}}},
expiration_times.at(translation_name));
if (translation_map_options_.has_value()) {
result[translation_name] = std::make_unique<
FunctionsOfTime::PiecewisePolynomial<2>>(
initial_time_,
std::array<DataVector, 3>{
{{gsl::at(translation_map_options_.value().initial_values, 0)[0],
gsl::at(translation_map_options_.value().initial_values, 0)[1],
gsl::at(translation_map_options_.value().initial_values, 0)[2]},
{gsl::at(translation_map_options_.value().initial_values, 1)[0],
gsl::at(translation_map_options_.value().initial_values, 1)[1],
gsl::at(translation_map_options_.value().initial_values, 1)[2]},
{gsl::at(translation_map_options_.value().initial_values, 2)[0],
gsl::at(translation_map_options_.value().initial_values, 2)[1],
gsl::at(translation_map_options_.value().initial_values, 2)[2]}}},
expiration_times.at(translation_name));
}

// Size and Shape FunctionOfTime for objects A and B
Expand Down Expand Up @@ -205,28 +209,28 @@ void TimeDependentMapOptions<IsCylindrical>::build_maps(
const std::optional<std::array<double, IsCylindrical ? 2 : 3>>&
object_B_radii,
const double envelope_radius, const double domain_outer_radius) {
if (expansion_map_options_.has_value() or rotation_options_.has_value() or
translation_options_.has_value()) {
if (expansion_map_options_.has_value() or rotation_map_options_.has_value() or
translation_map_options_.has_value()) {
rot_scale_trans_map_ = std::make_pair(
RotScaleTrans{
expansion_map_options_.has_value()
? std::make_pair(expansion_name, expansion_outer_boundary_name)
: std::optional<std::pair<std::string, std::string>>{},
rotation_options_.has_value() ? rotation_name
: std::optional<std::string>{},
translation_options_.has_value() ? translation_name
: std::optional<std::string>{},
rotation_map_options_.has_value() ? rotation_name
: std::optional<std::string>{},
translation_map_options_.has_value() ? translation_name
: std::optional<std::string>{},
envelope_radius, domain_outer_radius,
domain::CoordinateMaps::TimeDependent::RotScaleTrans<
3>::BlockRegion::Inner},
RotScaleTrans{
expansion_map_options_.has_value()
? std::make_pair(expansion_name, expansion_outer_boundary_name)
: std::optional<std::pair<std::string, std::string>>{},
rotation_options_.has_value() ? rotation_name
: std::optional<std::string>{},
translation_options_.has_value() ? translation_name
: std::optional<std::string>{},
rotation_map_options_.has_value() ? rotation_name
: std::optional<std::string>{},
translation_map_options_.has_value() ? translation_name
: std::optional<std::string>{},
envelope_radius, domain_outer_radius,
domain::CoordinateMaps::TimeDependent::RotScaleTrans<
3>::BlockRegion::Transition});
Expand Down
8 changes: 4 additions & 4 deletions src/Domain/Creators/TimeDependentOptions/BinaryCompactObject.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ struct TimeDependentMapOptions {
TimeDependentMapOptions(
double initial_time,
std::optional<ExpansionMapOptions> expansion_map_options,
std::optional<RotationMapOptions> rotation_options,
std::optional<TranslationMapOptions> translation_options,
std::optional<RotationMapOptions> rotation_map_options,
std::optional<TranslationMapOptions> translation_map_options,
std::optional<ShapeMapOptions<domain::ObjectLabel::A>> shape_options_A,
std::optional<ShapeMapOptions<domain::ObjectLabel::B>> shape_options_B,
const Options::Context& context = {});
Expand Down Expand Up @@ -368,8 +368,8 @@ struct TimeDependentMapOptions {

double initial_time_{std::numeric_limits<double>::signaling_NaN()};
std::optional<ExpansionMapOptions> expansion_map_options_{};
std::optional<RotationMapOptions> rotation_options_{};
std::optional<TranslationMapOptions> translation_options_{};
std::optional<RotationMapOptions> rotation_map_options_{};
std::optional<TranslationMapOptions> translation_map_options_{};
std::optional<ShapeMapOptions<domain::ObjectLabel::A>> shape_options_A_{};
std::optional<ShapeMapOptions<domain::ObjectLabel::B>> shape_options_B_{};
std::array<std::optional<double>, 2> inner_radii_{};
Expand Down

0 comments on commit 8581c61

Please sign in to comment.