Merge pull request #4661 from markscheel/TransformToDistortedFrame

sxs-collaboration · Jan 31, 2023 · d18b58e · d18b58e
2 parents 8296901 + 0822b69
commit d18b58e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/PointwiseFunctions/GeneralRelativity/Transform.cpp b/src/PointwiseFunctions/GeneralRelativity/Transform.cpp
@@ -346,11 +346,11 @@ auto first_index_to_different_frame(
       ->Scalar<DTYPE(data)>;
 GENERATE_INSTANTIATIONS(INSTANTIATE, (1, 2, 3),
                         (Frame::BlockLogical, Frame::ElementLogical,
-                         Frame::Grid),
+                         Frame::Grid, Frame::Distorted),
                         (Frame::Inertial), (double, DataVector))
 GENERATE_INSTANTIATIONS(INSTANTIATE, (1, 2, 3), (Frame::Inertial),
                         (Frame::BlockLogical, Frame::ElementLogical,
-                         Frame::Grid),
+                         Frame::Grid, Frame::Distorted),
                         (double, DataVector))
 #undef INSTANTIATE
 
@@ -377,12 +377,12 @@ GENERATE_INSTANTIATIONS(INSTANTIATE, (1, 2, 3), (Frame::Inertial),
 
 GENERATE_INSTANTIATIONS(INSTANTIATE, (1, 2, 3),
                         (Frame::BlockLogical, Frame::ElementLogical,
-                         Frame::Grid),
+                         Frame::Grid, Frame::Distorted),
                         (Frame::Inertial), (double, DataVector),
                         (I, i, iJ, ii, II, ijj))
 GENERATE_INSTANTIATIONS(INSTANTIATE, (1, 2, 3), (Frame::Inertial),
                         (Frame::BlockLogical, Frame::ElementLogical,
-                         Frame::Grid),
+                         Frame::Grid, Frame::Distorted),
                         (double, DataVector), (I, i, iJ, ii, II, ijj))
 
 #undef INSTANTIATE
@@ -414,7 +414,7 @@ GENERATE_INSTANTIATIONS(INSTANTIATE, (1, 2, 3), (Frame::Inertial),
       ->tnsr::ijj<DataVector, DIM(data), DESTFRAME(data)>;
 GENERATE_INSTANTIATIONS(INSTANTIATE, (1, 2, 3),
                         (Frame::BlockLogical, Frame::ElementLogical),
-                        (Frame::Grid))
+                        (Frame::Grid, Frame::Distorted))
 
 #undef DIM
 #undef SRCFRAME

diff --git a/tests/Unit/PointwiseFunctions/GeneralRelativity/Test_Transform.cpp b/tests/Unit/PointwiseFunctions/GeneralRelativity/Test_Transform.cpp
@@ -119,10 +119,25 @@ SPECTRE_TEST_CASE("Unit.PointwiseFunctions.GeneralRelativity.Transform",
   test_transform_to_different_frame<1, Frame::Grid, Frame::Inertial>(dv);
   test_transform_to_different_frame<2, Frame::Grid, Frame::Inertial>(dv);
   test_transform_to_different_frame<3, Frame::Grid, Frame::Inertial>(dv);
+  test_transform_to_different_frame<1, Frame::Inertial, Frame::Distorted>(
+      double{});
+  test_transform_to_different_frame<2, Frame::Inertial, Frame::Distorted>(
+      double{});
+  test_transform_to_different_frame<3, Frame::Inertial, Frame::Distorted>(
+      double{});
+  test_transform_to_different_frame<1, Frame::Inertial, Frame::Distorted>(dv);
+  test_transform_to_different_frame<2, Frame::Inertial, Frame::Distorted>(dv);
+  test_transform_to_different_frame<3, Frame::Inertial, Frame::Distorted>(dv);
   test_transform_first_index_to_different_frame<1, Frame::ElementLogical,
                                                 Frame::Grid>(dv);
   test_transform_first_index_to_different_frame<2, Frame::ElementLogical,
                                                 Frame::Grid>(dv);
   test_transform_first_index_to_different_frame<3, Frame::ElementLogical,
                                                 Frame::Grid>(dv);
+  test_transform_first_index_to_different_frame<1, Frame::ElementLogical,
+                                                Frame::Distorted>(dv);
+  test_transform_first_index_to_different_frame<2, Frame::ElementLogical,
+                                                Frame::Distorted>(dv);
+  test_transform_first_index_to_different_frame<3, Frame::ElementLogical,
+                                                Frame::Distorted>(dv);
 }