diff --git a/src/Domain/Creators/BinaryCompactObject.cpp b/src/Domain/Creators/BinaryCompactObject.cpp index 36e4f335a8f54..bff72d22af793 100644 --- a/src/Domain/Creators/BinaryCompactObject.cpp +++ b/src/Domain/Creators/BinaryCompactObject.cpp @@ -357,11 +357,11 @@ Domain<3> BinaryCompactObject::create_domain() const { Maps maps{}; // ObjectA/B is on the right/left, respectively. - const Translation translation_A{ + const Affine3D translation_A{ Affine{-1.0, 1.0, -1.0 + x_coord_a_, 1.0 + x_coord_a_}, Affine{-1.0, 1.0, -1.0 + y_offset_, 1.0 + y_offset_}, Affine{-1.0, 1.0, -1.0 + z_offset_, 1.0 + z_offset_}}; - const Translation translation_B{ + const Affine3D translation_B{ Affine{-1.0, 1.0, -1.0 + x_coord_b_, 1.0 + x_coord_b_}, Affine{-1.0, 1.0, -1.0 + y_offset_, 1.0 + y_offset_}, Affine{-1.0, 1.0, -1.0 + z_offset_, 1.0 + z_offset_}}; diff --git a/src/Domain/Creators/BinaryCompactObject.hpp b/src/Domain/Creators/BinaryCompactObject.hpp index bbb872aaae769..9468df7851b0c 100644 --- a/src/Domain/Creators/BinaryCompactObject.hpp +++ b/src/Domain/Creators/BinaryCompactObject.hpp @@ -151,7 +151,9 @@ class BinaryCompactObject : public DomainCreator<3> { using Affine = CoordinateMaps::Affine; using Affine3D = CoordinateMaps::ProductOf3Maps; using Identity2D = CoordinateMaps::Identity<2>; - using Translation = CoordinateMaps::ProductOf3Maps; + // The Translation type is no longer needed, but it is kept here for backwards + // compatibility with old domains. + using Translation = CoordinateMaps::ProductOf2Maps; using Equiangular = CoordinateMaps::Equiangular; using Equiangular3D = CoordinateMaps::ProductOf3Maps; @@ -175,6 +177,12 @@ class BinaryCompactObject : public DomainCreator<3> { CoordinateMaps::Wedge<3>>, domain::CoordinateMap, Translation>, + domain::CoordinateMap, + domain::CoordinateMap, + domain::CoordinateMap, Affine3D>, bco::TimeDependentMapOptions::maps_list>>; /// Options for an excision region in the domain diff --git a/src/PointwiseFunctions/AnalyticData/Xcts/Binary.hpp b/src/PointwiseFunctions/AnalyticData/Xcts/Binary.hpp index 4170501a19e16..b2d4f5143387f 100644 --- a/src/PointwiseFunctions/AnalyticData/Xcts/Binary.hpp +++ b/src/PointwiseFunctions/AnalyticData/Xcts/Binary.hpp @@ -473,7 +473,7 @@ class Binary : public elliptic::analytic_data::Background, inv_jacobian, tmpl::list /*meta*/) const { std::array, 2> x_isolated{{x, x}}; - std::array, 2> coords_isolated{ + const std::array, 2> coords_isolated{ {{{xcoords_[0], y_offset_, z_offset_}}, {{xcoords_[1], y_offset_, z_offset_}}}}; std::array euclidean_distance{}; diff --git a/tests/Unit/Domain/Test_Domain.cpp b/tests/Unit/Domain/Test_Domain.cpp index 8b61ec0460b19..3da4bb8457956 100644 --- a/tests/Unit/Domain/Test_Domain.cpp +++ b/tests/Unit/Domain/Test_Domain.cpp @@ -1145,8 +1145,8 @@ Domain<3> create_serialized_domain() { const double x_coord_a = object_A.x_coord; const double x_coord_b = object_B.x_coord; - const double y_offset = 0.1; - const double z_offset = 0.2; + const double y_offset = 0.; + const double z_offset = 0.; const double envelope_radius = 100.0; const double outer_radius = 300.0; const double inner_sphericity_A = 1.0;