Skip to content

Commit 679a065

Browse files
bcaddybcaddy
committed
Fix bad rebase
1 parent 0654285 commit 679a065

2 files changed

Lines changed: 15 additions & 83 deletions

File tree

‎src/reconstruction/reconstruction_internals.h‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -858,20 +858,25 @@ auto __device__ __host__ __inline__ PPM_Interfaces(hydro_utilities::Primitive co
858858

859859
reconstruction::PPM_Single_Variable(cell_im2.density, cell_im1.density, cell_i.density, cell_ip1.density,
860860
cell_ip2.density, interface_L_iph.density, interface_R_imh.density);
861-
reconstruction::PPM_Single_Variable(cell_im2.velocity.x, cell_im1.velocity.x, cell_i.velocity.x, cell_ip1.velocity.x,
862-
cell_ip2.velocity.x, interface_L_iph.velocity.x, interface_R_imh.velocity.x);
863-
reconstruction::PPM_Single_Variable(cell_im2.velocity.y, cell_im1.velocity.y, cell_i.velocity.y, cell_ip1.velocity.y,
864-
cell_ip2.velocity.y, interface_L_iph.velocity.y, interface_R_imh.velocity.y);
865-
reconstruction::PPM_Single_Variable(cell_im2.velocity.z, cell_im1.velocity.z, cell_i.velocity.z, cell_ip1.velocity.z,
866-
cell_ip2.velocity.z, interface_L_iph.velocity.z, interface_R_imh.velocity.z);
861+
reconstruction::PPM_Single_Variable(cell_im2.velocity.x(), cell_im1.velocity.x(), cell_i.velocity.x(),
862+
cell_ip1.velocity.x(), cell_ip2.velocity.x(), interface_L_iph.velocity.x(),
863+
interface_R_imh.velocity.x());
864+
reconstruction::PPM_Single_Variable(cell_im2.velocity.y(), cell_im1.velocity.y(), cell_i.velocity.y(),
865+
cell_ip1.velocity.y(), cell_ip2.velocity.y(), interface_L_iph.velocity.y(),
866+
interface_R_imh.velocity.y());
867+
reconstruction::PPM_Single_Variable(cell_im2.velocity.z(), cell_im1.velocity.z(), cell_i.velocity.z(),
868+
cell_ip1.velocity.z(), cell_ip2.velocity.z(), interface_L_iph.velocity.z(),
869+
interface_R_imh.velocity.z());
867870
reconstruction::PPM_Single_Variable(cell_im2.pressure, cell_im1.pressure, cell_i.pressure, cell_ip1.pressure,
868871
cell_ip2.pressure, interface_L_iph.pressure, interface_R_imh.pressure);
869872

870873
#ifdef MHD
871-
reconstruction::PPM_Single_Variable(cell_im2.magnetic.y, cell_im1.magnetic.y, cell_i.magnetic.y, cell_ip1.magnetic.y,
872-
cell_ip2.magnetic.y, interface_L_iph.magnetic.y, interface_R_imh.magnetic.y);
873-
reconstruction::PPM_Single_Variable(cell_im2.magnetic.z, cell_im1.magnetic.z, cell_i.magnetic.z, cell_ip1.magnetic.z,
874-
cell_ip2.magnetic.z, interface_L_iph.magnetic.z, interface_R_imh.magnetic.z);
874+
reconstruction::PPM_Single_Variable(cell_im2.magnetic.y(), cell_im1.magnetic.y(), cell_i.magnetic.y(),
875+
cell_ip1.magnetic.y(), cell_ip2.magnetic.y(), interface_L_iph.magnetic.y(),
876+
interface_R_imh.magnetic.y());
877+
reconstruction::PPM_Single_Variable(cell_im2.magnetic.z(), cell_im1.magnetic.z(), cell_i.magnetic.z(),
878+
cell_ip1.magnetic.z(), cell_ip2.magnetic.z(), interface_L_iph.magnetic.z(),
879+
interface_R_imh.magnetic.z());
875880
#endif // MHD
876881

877882
#ifdef DE

‎src/reconstruction/reconstruction_internals_tests.cu‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -447,37 +447,6 @@ TEST(tALLReconstructionVanLeerSlopeCharacteristic, CorrectInputExpectCorrectOutp
447447
testing_utilities::Check_Results(fiducial_data.a4, test_data.a4, "a4");
448448
}
449449

450-
TEST(tHYDROReconstructionMonotizeParabolicInterface, CorrectInputExpectCorrectOutput)
451-
{
452-
// Input Data
453-
454-
hydro_utilities::Primitive const cell_i{1.4708046701, {9.5021020181, 3.7123503442, 4.6476103466}, 3.7096802847};
455-
hydro_utilities::Primitive const cell_im1{3.9547588941, {3.1552319951, 3.0209247624, 9.5841013261}, 2.2945188332};
456-
hydro_utilities::Primitive const cell_ip1{5.1973323534, {6.9132613767, 1.8397298636, 5.341960387}, 9.093498542};
457-
hydro_utilities::Primitive interface_L_iph{6.7787324804, {9.5389820358, 9.8522754567, 7.8305142852}, 2.450533435};
458-
hydro_utilities::Primitive interface_R_imh{4.8015193892, {5.9124263972, 8.7513040382, 8.3659359773}, 1.339777121};
459-
460-
// Get test data
461-
reconstruction::Monotonize_Parabolic_Interface(cell_i, cell_im1, cell_ip1, interface_L_iph, interface_R_imh);
462-
463-
// Check results
464-
hydro_utilities::Primitive const fiducial_interface_L{
465-
1.4708046700999999, {9.5021020181000004, 3.7123503441999999, 4.6476103465999996}, 3.7096802847000001};
466-
hydro_utilities::Primitive const fiducial_interface_R{
467-
1.4708046700999999, {9.428341982700001, 3.7123503441999999, 4.6476103465999996}, 3.7096802847000001};
468-
testing_utilities::Check_Results(fiducial_interface_L.density, interface_L_iph.density, "density");
469-
testing_utilities::Check_Results(fiducial_interface_L.velocity.x(), interface_L_iph.velocity.x(), "velocity.x()");
470-
testing_utilities::Check_Results(fiducial_interface_L.velocity.y(), interface_L_iph.velocity.y(), "velocity.y()");
471-
testing_utilities::Check_Results(fiducial_interface_L.velocity.z(), interface_L_iph.velocity.z(), "velocity.z()");
472-
testing_utilities::Check_Results(fiducial_interface_L.pressure, interface_L_iph.pressure, "pressure");
473-
474-
testing_utilities::Check_Results(fiducial_interface_R.density, interface_R_imh.density, "density");
475-
testing_utilities::Check_Results(fiducial_interface_R.velocity.x(), interface_R_imh.velocity.x(), "velocity.x()");
476-
testing_utilities::Check_Results(fiducial_interface_R.velocity.y(), interface_R_imh.velocity.y(), "velocity.y()");
477-
testing_utilities::Check_Results(fiducial_interface_R.velocity.z(), interface_R_imh.velocity.z(), "velocity.z()");
478-
testing_utilities::Check_Results(fiducial_interface_R.pressure, interface_R_imh.pressure, "pressure");
479-
}
480-
481450
TEST(tALLReconstructionCalcInterfaceLinear, CorrectInputExpectCorrectOutput)
482451
{
483452
// Setup input data
@@ -513,48 +482,6 @@ TEST(tALLReconstructionCalcInterfaceLinear, CorrectInputExpectCorrectOutput)
513482
#endif // MHD
514483
}
515484

516-
TEST(tALLReconstructionCalcInterfaceParabolic, CorrectInputExpectCorrectOutput)
517-
{
518-
// Setup input data
519-
#ifdef MHD
520-
hydro_utilities::Primitive cell_i{1, {2, 3, 4}, 5, {6, 7, 8}};
521-
hydro_utilities::Primitive cell_im1{6, {7, 8, 9}, 10, {11, 12, 13}};
522-
hydro_utilities::Primitive slopes_i{14, {15, 16, 17}, 18, {19, 20, 21}};
523-
hydro_utilities::Primitive slopes_im1{22, {23, 24, 25}, 26, {27, 28, 29}};
524-
#else // MHD
525-
hydro_utilities::Primitive cell_i{1, {2, 3, 4}, 5};
526-
hydro_utilities::Primitive cell_im1{6, {7, 8, 9}, 10};
527-
hydro_utilities::Primitive slopes_i{14, {15, 16, 17}, 18};
528-
hydro_utilities::Primitive slopes_im1{22, {23, 24, 25}, 26};
529-
#endif // MHD
530-
531-
// Get test data
532-
auto test_data = reconstruction::Calc_Interface_Parabolic(cell_i, cell_im1, slopes_i, slopes_im1);
533-
534-
// Check results
535-
#ifdef MHD
536-
hydro_utilities::Primitive const fiducial_data{4.833333333333333,
537-
{5.833333333333333, 6.833333333333333, 7.833333333333333},
538-
8.8333333333333339,
539-
{0.0, 10.833333333333334, 11.833333333333334}};
540-
testing_utilities::Check_Results(fiducial_data.density, test_data.density, "density");
541-
testing_utilities::Check_Results(fiducial_data.velocity.x(), test_data.velocity.x(), "velocity.x()");
542-
testing_utilities::Check_Results(fiducial_data.velocity.y(), test_data.velocity.y(), "velocity.y()");
543-
testing_utilities::Check_Results(fiducial_data.velocity.z(), test_data.velocity.z(), "velocity.z()");
544-
testing_utilities::Check_Results(fiducial_data.pressure, test_data.pressure, "pressure");
545-
testing_utilities::Check_Results(fiducial_data.magnetic.y(), test_data.magnetic.y(), "magnetic.y()");
546-
testing_utilities::Check_Results(fiducial_data.magnetic.z(), test_data.magnetic.z(), "magnetic.z()");
547-
#else // MHD
548-
hydro_utilities::Primitive const fiducial_data{
549-
4.833333333333333, {5.833333333333333, 6.833333333333333, 7.833333333333333}, 8.8333333333333339};
550-
testing_utilities::Check_Results(fiducial_data.density, test_data.density, "density");
551-
testing_utilities::Check_Results(fiducial_data.velocity.x(), test_data.velocity.x(), "velocity.x()");
552-
testing_utilities::Check_Results(fiducial_data.velocity.y(), test_data.velocity.y(), "velocity.y()");
553-
testing_utilities::Check_Results(fiducial_data.velocity.z(), test_data.velocity.z(), "velocity.z()");
554-
testing_utilities::Check_Results(fiducial_data.pressure, test_data.pressure, "pressure");
555-
#endif // MHD
556-
}
557-
558485
TEST(tALLReconstructionPPMSingleVariable, CorrectInputExpectCorrectOutput)
559486
{
560487
// Set up PRNG to use

0 commit comments

Comments
 (0)