Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
knelli2 committed Feb 7, 2025
1 parent 80d5253 commit 129cf0f
Showing 1 changed file with 9 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,9 @@ TimeDependentMapOptions<IsCylindrical>::distorted_to_inertial_map(
: RotScaleTrans{};

if (block_has_shape_map) {
// The skew map is only applied within the envelope, which is also where we
// apply the rigid RotScaleTrans map, so use `use_rigid_map` as a sentinel
// for where we put the skew map (if we have one).
if (rot_scale_trans_map_.has_value() and
(use_rigid_map and skew_map_.has_value())) {
return std::make_unique<detail::di_map<Skew, RotScaleTrans>>(
Expand Down Expand Up @@ -601,6 +604,9 @@ TimeDependentMapOptions<IsCylindrical>::grid_to_inertial_map(
&gsl::at(gsl::at(shape_maps_, index), include_distorted_map.value());
}
ASSERT(shape->has_value(), "Shape map was requested but not built.");
// The skew map is only applied within the envelope, which is also where we
// apply the rigid RotScaleTrans map, so use `use_rigid_map` as a sentinel
// for where we put the skew map (if we have one).
if (rot_scale_trans_map_.has_value() and
(use_rigid_map and skew_map_.has_value())) {
return std::make_unique<detail::gi_map<Shape, Skew, RotScaleTrans>>(
Expand All @@ -615,6 +621,9 @@ TimeDependentMapOptions<IsCylindrical>::grid_to_inertial_map(
return std::make_unique<detail::gi_map<Shape>>(shape->value());
}
} else {
// The skew map is only applied within the envelope, which is also where we
// apply the rigid RotScaleTrans map, so use `use_rigid_map` as a sentinel
// for where we put the skew map (if we have one).
if (rot_scale_trans_map_.has_value() and
(use_rigid_map and skew_map_.has_value())) {
return std::make_unique<detail::gi_map<Skew, RotScaleTrans>>(
Expand Down

0 comments on commit 129cf0f

Please sign in to comment.