Skip to content

Commit

Permalink
Remove unused variables.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pkestene
pkestene committed Aug 27, 2024
1 parent 29097e2 commit 3b5d6a9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 52 deletions.
29 changes: 7 additions & 22 deletions src/muscl/MHDRunFunctors2D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1066,13 +1066,11 @@ class ComputeFluxAndUpdateAlongDirFunctor2D_MHD : public MHDBaseFunctor2D
//!
//! \param[in] Udata_in is conservative variables at t_n
//! \param[in] Udata_out is conservative variables at t_{n+1}
//! \param[in] Qdata is necessary to recompute limited slopes
//! \param[in] Qdata2 is primitive variables array at t_{n+1/2}
//!
ComputeFluxAndUpdateAlongDirFunctor2D_MHD(HydroParams params,
DataArray2d Udata_in,
DataArray2d Udata_out,
DataArray2d Qdata,
DataArray2d Qdata2,
DataArray2d Slopes_x,
DataArray2d Slopes_y,
Expand All @@ -1082,7 +1080,6 @@ class ComputeFluxAndUpdateAlongDirFunctor2D_MHD : public MHDBaseFunctor2D
: MHDBaseFunctor2D(params)
, Udata_in(Udata_in)
, Udata_out(Udata_out)
, Qdata(Qdata)
, Qdata2(Qdata2)
, Slopes_x(Slopes_x)
, Slopes_y(Slopes_y)
Expand All @@ -1095,7 +1092,6 @@ class ComputeFluxAndUpdateAlongDirFunctor2D_MHD : public MHDBaseFunctor2D
apply(HydroParams params,
DataArray2d Udata_in,
DataArray2d Udata_out,
DataArray2d Qdata,
DataArray2d Qdata2,
DataArray2d Slopes_x,
DataArray2d Slopes_y,
Expand All @@ -1104,7 +1100,7 @@ class ComputeFluxAndUpdateAlongDirFunctor2D_MHD : public MHDBaseFunctor2D
real_t dtdy)
{
ComputeFluxAndUpdateAlongDirFunctor2D_MHD<dir> functor(
params, Udata_in, Udata_out, Qdata, Qdata2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);
params, Udata_in, Udata_out, Qdata2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);
Kokkos::parallel_for(
"ComputeFluxAndUpdateAlongDirFunctor2D_MHD",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
Expand All @@ -1131,19 +1127,12 @@ class ComputeFluxAndUpdateAlongDirFunctor2D_MHD : public MHDBaseFunctor2D
i >= ghostWidth and i < isize - ghostWidth + 1)
// clang-format on
{
MHDState dq, dqN;

// cell-centered primitive variables in current cell, and left and right neighbor along dir
MHDState q;
get_state(Qdata, i, j, q);

// cell-centered primitive variables in neighbor cell
MHDState qN;
get_state(Qdata, i - delta_i, j - delta_j, qN);

// left and right reconstructed state (input for Riemann solver)
MHDState qR, qL;

// slopes in left and right cells
MHDState dq, dqN;

//
// Right state at left interface (current cell)
//
Expand Down Expand Up @@ -1286,7 +1275,7 @@ class ComputeFluxAndUpdateAlongDirFunctor2D_MHD : public MHDBaseFunctor2D
} // operator ()

DataArray2d Udata_in, Udata_out;
DataArray2d Qdata, Qdata2;
DataArray2d Qdata2;
DataArray2d Slopes_x, Slopes_y;
DataArray2d sFaceMag;
real_t dtdx, dtdy;
Expand All @@ -1306,13 +1295,11 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor2D : public MHDBaseFunctor2D
//!
//! \param[in] Udata_in is conservative variables at t_n
//! \param[in] Udata_out is conservative variables at t_{n+1}
//! \param[in] Qdata is necessary to recompute limited slopes
//! \param[in] Qdata2 is primitive variables array at t_{n+1/2}
//!
ReconstructEdgeComputeEmfAndUpdateFunctor2D(HydroParams params,
DataArray2d Udata_in,
DataArray2d Udata_out,
DataArray2d Qdata,
DataArray2d Qdata2,
DataArray2d Slopes_x,
DataArray2d Slopes_y,
Expand All @@ -1322,7 +1309,6 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor2D : public MHDBaseFunctor2D
: MHDBaseFunctor2D(params)
, Udata_in(Udata_in)
, Udata_out(Udata_out)
, Qdata(Qdata)
, Qdata2(Qdata2)
, Slopes_x(Slopes_x)
, Slopes_y(Slopes_y)
Expand All @@ -1335,7 +1321,6 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor2D : public MHDBaseFunctor2D
apply(HydroParams params,
DataArray2d Udata_in,
DataArray2d Udata_out,
DataArray2d Qdata,
DataArray2d Qdata2,
DataArray2d Slopes_x,
DataArray2d Slopes_y,
Expand All @@ -1344,7 +1329,7 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor2D : public MHDBaseFunctor2D
real_t dtdy)
{
ReconstructEdgeComputeEmfAndUpdateFunctor2D functor(
params, Udata_in, Udata_out, Qdata, Qdata2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);
params, Udata_in, Udata_out, Qdata2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);
Kokkos::parallel_for(
"ReconstructEdgeComputeEmfAndUpdateFunctor2D",
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
Expand Down Expand Up @@ -1522,7 +1507,7 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor2D : public MHDBaseFunctor2D
} // operator ()

DataArray2d Udata_in, Udata_out;
DataArray2d Qdata, Qdata2;
DataArray2d Qdata2;
DataArray2d Slopes_x, Slopes_y;
DataArray2d sFaceMag;
real_t dtdx, dtdy;
Expand Down
26 changes: 5 additions & 21 deletions src/muscl/MHDRunFunctors3D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1037,13 +1037,11 @@ class ComputeFluxAndUpdateAlongDirFunctor3D_MHD : public MHDBaseFunctor3D
//!
//! \param[in] Udata_in is conservative variables at t_n
//! \param[in] Udata_out is conservative variables at t_{n+1}
//! \param[in] Qdata is necessary to recompute limited slopes
//! \param[in] Qdata2 is primitive variables array at t_{n+1/2}
//!
ComputeFluxAndUpdateAlongDirFunctor3D_MHD(HydroParams params,
DataArray3d Udata_in,
DataArray3d Udata_out,
DataArray3d Qdata,
DataArray3d Qdata2,
DataArray3d Slopes_x,
DataArray3d Slopes_y,
Expand All @@ -1055,7 +1053,6 @@ class ComputeFluxAndUpdateAlongDirFunctor3D_MHD : public MHDBaseFunctor3D
: MHDBaseFunctor3D(params)
, Udata_in(Udata_in)
, Udata_out(Udata_out)
, Qdata(Qdata)
, Qdata2(Qdata2)
, Slopes_x(Slopes_x)
, Slopes_y(Slopes_y)
Expand All @@ -1070,7 +1067,6 @@ class ComputeFluxAndUpdateAlongDirFunctor3D_MHD : public MHDBaseFunctor3D
apply(HydroParams params,
DataArray3d Udata_in,
DataArray3d Udata_out,
DataArray3d Qdata,
DataArray3d Qdata2,
DataArray3d Slopes_x,
DataArray3d Slopes_y,
Expand All @@ -1083,7 +1079,6 @@ class ComputeFluxAndUpdateAlongDirFunctor3D_MHD : public MHDBaseFunctor3D
ComputeFluxAndUpdateAlongDirFunctor3D_MHD<dir> functor(params,
Udata_in,
Udata_out,
Qdata,
Qdata2,
Slopes_x,
Slopes_y,
Expand Down Expand Up @@ -1121,19 +1116,13 @@ class ComputeFluxAndUpdateAlongDirFunctor3D_MHD : public MHDBaseFunctor3D
i >= ghostWidth and i < isize - ghostWidth + 1)
// clang-format on
{
MHDState dq, dqN;

// cell-centered primitive variables in current cell, and left and right neighbor along dir
MHDState q;
get_state(Qdata, i, j, k, q);

// cell-centered primitive variables in neighbor cell
MHDState qN;
get_state(Qdata, i - delta_i, j - delta_j, k - delta_k, qN);

// left and right reconstructed state (input for Riemann solver)
MHDState qR, qL;

// slopes in left and right cells
MHDState dq, dqN;

//
// Right state at left interface (current cell)
//
Expand Down Expand Up @@ -1326,7 +1315,7 @@ class ComputeFluxAndUpdateAlongDirFunctor3D_MHD : public MHDBaseFunctor3D
} // operator ()

DataArray3d Udata_in, Udata_out;
DataArray3d Qdata, Qdata2;
DataArray3d Qdata2;
DataArray3d Slopes_x, Slopes_y, Slopes_z;
DataArray3d sFaceMag;
real_t dtdx, dtdy, dtdz;
Expand All @@ -1347,13 +1336,11 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor3D : public MHDBaseFunctor3D
//!
//! \param[in] Udata_in is conservative variables at t_n
//! \param[in] Udata_out is conservative variables at t_{n+1}
//! \param[in] Qdata is necessary to recompute limited slopes
//! \param[in] Qdata2 is primitive variables array at t_{n+1/2}
//!
ReconstructEdgeComputeEmfAndUpdateFunctor3D(HydroParams params,
DataArray3d Udata_in,
DataArray3d Udata_out,
DataArray3d Qdata,
DataArray3d Qdata2,
DataArray3d Slopes_x,
DataArray3d Slopes_y,
Expand All @@ -1365,7 +1352,6 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor3D : public MHDBaseFunctor3D
: MHDBaseFunctor3D(params)
, Udata_in(Udata_in)
, Udata_out(Udata_out)
, Qdata(Qdata)
, Qdata2(Qdata2)
, Slopes_x(Slopes_x)
, Slopes_y(Slopes_y)
Expand All @@ -1380,7 +1366,6 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor3D : public MHDBaseFunctor3D
apply(HydroParams params,
DataArray3d Udata_in,
DataArray3d Udata_out,
DataArray3d Qdata,
DataArray3d Qdata2,
DataArray3d Slopes_x,
DataArray3d Slopes_y,
Expand All @@ -1393,7 +1378,6 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor3D : public MHDBaseFunctor3D
ReconstructEdgeComputeEmfAndUpdateFunctor3D functor(params,
Udata_in,
Udata_out,
Qdata,
Qdata2,
Slopes_x,
Slopes_y,
Expand Down Expand Up @@ -1897,7 +1881,7 @@ class ReconstructEdgeComputeEmfAndUpdateFunctor3D : public MHDBaseFunctor3D
} // operator ()

DataArray3d Udata_in, Udata_out;
DataArray3d Qdata, Qdata2;
DataArray3d Qdata2;
DataArray3d Slopes_x, Slopes_y, Slopes_z;
DataArray3d sFaceMag;
real_t dtdx, dtdy, dtdz;
Expand Down
18 changes: 9 additions & 9 deletions src/muscl/SolverMHDMuscl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,13 +438,13 @@ SolverMHDMuscl<2>::godunov_unsplit_impl(DataArray data_in, DataArray data_out, r

// update at t_{n+1} with hydro flux (across all faces)
ComputeFluxAndUpdateAlongDirFunctor2D_MHD<DIR_X>::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);

ComputeFluxAndUpdateAlongDirFunctor2D_MHD<DIR_Y>::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);

ReconstructEdgeComputeEmfAndUpdateFunctor2D::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, sFaceMag, dtdx, dtdy);
}

timers[TIMER_NUM_SCHEME]->stop();
Expand Down Expand Up @@ -538,23 +538,23 @@ SolverMHDMuscl<3>::godunov_unsplit_impl(DataArray data_in, DataArray data_out, r

// update hydro variables at t_{n+1}
ComputeFluxAndUpdateAlongDirFunctor3D_MHD<DIR_X>::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);

ComputeFluxAndUpdateAlongDirFunctor3D_MHD<DIR_Y>::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);

ComputeFluxAndUpdateAlongDirFunctor3D_MHD<DIR_Z>::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);

// update magnetic field at t_{n+1}
ReconstructEdgeComputeEmfAndUpdateFunctor3D<DIR_X>::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);

ReconstructEdgeComputeEmfAndUpdateFunctor3D<DIR_Y>::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);

ReconstructEdgeComputeEmfAndUpdateFunctor3D<DIR_Z>::apply(
params, data_in, data_out, Q, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);
params, data_in, data_out, Q2, Slopes_x, Slopes_y, Slopes_z, sFaceMag, dtdx, dtdy, dtdz);
}
timers[TIMER_NUM_SCHEME]->stop();

Expand Down

0 comments on commit 3b5d6a9

Please sign in to comment.