Skip to content

Commit 58e8b04

Browse files
pkestenepkestene
committed
Use new parameter hancock_predictor_enabled.
1 parent cf4b823 commit 58e8b04

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎src/muscl/HydroRunFunctors2D.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -499,15 +499,15 @@ class ComputeAndStoreFluxesFunctor2D : public HydroBaseFunctor2D
499499
* \param[in] Qdata primitive variables (at cell center)
500500
* \param[out] FluxData_x flux coming from the left neighbor along X
501501
* \param[out] FluxData_y flux coming from the left neighbor along Y
502-
* \param[in] gravity_params static gravity parameters
502+
* \param[in] gravity static gravity parameters
503503
* \param[in] gravity_field gravity vector field
504504
*/
505505
ComputeAndStoreFluxesFunctor2D(HydroParams params,
506506
DataArray2d Qdata,
507507
DataArray2d FluxData_x,
508508
DataArray2d FluxData_y,
509509
real_t dt,
510-
GravityParams gravity_params,
510+
GravityParams gravity,
511511
VectorField2d gravity_field)
512512
: HydroBaseFunctor2D(params)
513513
, Qdata(Qdata)
@@ -516,7 +516,7 @@ class ComputeAndStoreFluxesFunctor2D : public HydroBaseFunctor2D
516516
, dt(dt)
517517
, dtdx(dt / params.dx)
518518
, dtdy(dt / params.dy)
519-
, gravity_params(gravity_params)
519+
, gravity(gravity)
520520
, gravity_field(gravity_field){};
521521

522522
// static method which does it all: create and execute functor
@@ -526,11 +526,11 @@ class ComputeAndStoreFluxesFunctor2D : public HydroBaseFunctor2D
526526
DataArray2d FluxData_x,
527527
DataArray2d FluxData_y,
528528
real_t dt,
529-
GravityParams gravity_params,
529+
GravityParams gravity,
530530
VectorField2d gravity_field)
531531
{
532532
ComputeAndStoreFluxesFunctor2D functor(
533-
params, Qdata, FluxData_x, FluxData_y, dt, gravity_params, gravity_field);
533+
params, Qdata, FluxData_x, FluxData_y, dt, gravity, gravity_field);
534534
Kokkos::parallel_for(
535535
"ComputeAndStoreFluxesFunctor2D",
536536
Kokkos::MDRangePolicy<Kokkos::Rank<2>>({ 0, 0 }, { params.isize, params.jsize }),
@@ -653,7 +653,7 @@ class ComputeAndStoreFluxesFunctor2D : public HydroBaseFunctor2D
653653
trace_unsplit_2d_along_dir(
654654
qLocNeighbor, dqX_neighbor, dqY_neighbor, dtdx, dtdy, FACE_XMAX, qleft);
655655

656-
if (gravity_params.enabled)
656+
if (gravity.enabled and gravity.hancock_predictor_enabled)
657657
{
658658
// we need to modify input to flux computation with
659659
// gravity predictor (half time step)
@@ -727,7 +727,7 @@ class ComputeAndStoreFluxesFunctor2D : public HydroBaseFunctor2D
727727
trace_unsplit_2d_along_dir(
728728
qLocNeighbor, dqX_neighbor, dqY_neighbor, dtdx, dtdy, FACE_YMAX, qleft);
729729

730-
if (gravity_params.enabled)
730+
if (gravity.enabled and gravity.hancock_predictor_enabled)
731731
{
732732
// we need to modify input to flux computation with
733733
// gravity predictor (half time step)
@@ -761,7 +761,7 @@ class ComputeAndStoreFluxesFunctor2D : public HydroBaseFunctor2D
761761
DataArray2d FluxData_x;
762762
DataArray2d FluxData_y;
763763
real_t dt, dtdx, dtdy;
764-
GravityParams gravity_params;
764+
GravityParams gravity;
765765
VectorField2d gravity_field;
766766

767767

@@ -1143,7 +1143,7 @@ class ComputeTraceAndFluxes_Functor2D : public HydroBaseFunctor2D
11431143
// left interface : right state
11441144
trace_unsplit_2d_along_dir(qLoc, dqX, dqY, dtdx, dtdy, FACE_XMIN, qright);
11451145

1146-
if (gravity.enabled)
1146+
if (gravity.enabled and gravity.hancock_predictor_enabled)
11471147
{
11481148
// we need to modify input to flux computation with
11491149
// gravity predictor (half time step)
@@ -1172,7 +1172,7 @@ class ComputeTraceAndFluxes_Functor2D : public HydroBaseFunctor2D
11721172
trace_unsplit_2d_along_dir(
11731173
qLocNeighbor, dqX_neighbor, dqY_neighbor, dtdx, dtdy, FACE_XMAX, qleft);
11741174

1175-
if (gravity.enabled)
1175+
if (gravity.enabled and gravity.hancock_predictor_enabled)
11761176
{
11771177
// we need to modify input to flux computation with
11781178
// gravity predictor (half time step)
@@ -1198,7 +1198,7 @@ class ComputeTraceAndFluxes_Functor2D : public HydroBaseFunctor2D
11981198
// left interface : right state
11991199
trace_unsplit_2d_along_dir(qLoc, dqX, dqY, dtdx, dtdy, FACE_YMIN, qright);
12001200

1201-
if (gravity.enabled)
1201+
if (gravity.enabled and gravity.hancock_predictor_enabled)
12021202
{
12031203
// we need to modify input to flux computation with
12041204
// gravity predictor (half time step)
@@ -1227,7 +1227,7 @@ class ComputeTraceAndFluxes_Functor2D : public HydroBaseFunctor2D
12271227
trace_unsplit_2d_along_dir(
12281228
qLocNeighbor, dqX_neighbor, dqY_neighbor, dtdx, dtdy, FACE_YMAX, qleft);
12291229

1230-
if (gravity.enabled)
1230+
if (gravity.enabled and gravity.hancock_predictor_enabled)
12311231
{
12321232
// we need to modify input to flux computation with
12331233
// gravity predictor (half time step)
@@ -1417,7 +1417,7 @@ class ComputeAllFluxesAndUpdateFunctor2D : public HydroBaseFunctor2D
14171417
trace_unsplit_2d_along_dir(
14181418
qLocNeighbor, dqX_neighbor, dqY_neighbor, dtdx, dtdy, FACE_XMAX, qleft);
14191419

1420-
if (gravity.enabled)
1420+
if (gravity.enabled and gravity.hancock_predictor_enabled)
14211421
{
14221422
// we need to modify input to flux computation with
14231423
// gravity predictor (half time step)
@@ -1501,7 +1501,7 @@ class ComputeAllFluxesAndUpdateFunctor2D : public HydroBaseFunctor2D
15011501
trace_unsplit_2d_along_dir(
15021502
qLocNeighbor, dqX_neighbor, dqY_neighbor, dtdx, dtdy, FACE_YMAX, qleft);
15031503

1504-
if (gravity.enabled)
1504+
if (gravity.enabled and gravity.hancock_predictor_enabled)
15051505
{
15061506
// we need to modify input to flux computation with
15071507
// gravity predictor (half time step)

‎src/muscl/HydroRunFunctors3D.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ class ComputeAndStoreFluxesFunctor3D : public HydroBaseFunctor3D
486486
trace_unsplit_3d_along_dir(
487487
qLocNeighbor, dqX_neighbor, dqY_neighbor, dqZ_neighbor, dtdx, dtdy, dtdz, FACE_XMAX, qleft);
488488

489-
if (gravity.enabled)
489+
if (gravity.enabled and gravity.hancock_predictor_enabled)
490490
{
491491
// we need to modify input to flux computation with
492492
// gravity predictor (half time step)
@@ -579,7 +579,7 @@ class ComputeAndStoreFluxesFunctor3D : public HydroBaseFunctor3D
579579
trace_unsplit_3d_along_dir(
580580
qLocNeighbor, dqX_neighbor, dqY_neighbor, dqZ_neighbor, dtdx, dtdy, dtdz, FACE_YMAX, qleft);
581581

582-
if (gravity.enabled)
582+
if (gravity.enabled and gravity.hancock_predictor_enabled)
583583
{
584584
// we need to modify input to flux computation with
585585
// gravity predictor (half time step)
@@ -674,7 +674,7 @@ class ComputeAndStoreFluxesFunctor3D : public HydroBaseFunctor3D
674674
trace_unsplit_3d_along_dir(
675675
qLocNeighbor, dqX_neighbor, dqY_neighbor, dqZ_neighbor, dtdx, dtdy, dtdz, FACE_ZMAX, qleft);
676676

677-
if (gravity.enabled)
677+
if (gravity.enabled and gravity.hancock_predictor_enabled)
678678
{
679679
// we need to modify input to flux computation with
680680
// gravity predictor (half time step)
@@ -1200,7 +1200,7 @@ class ComputeTraceAndFluxes_Functor3D : public HydroBaseFunctor3D
12001200
// left interface : right state
12011201
trace_unsplit_3d_along_dir(qLoc, dqX, dqY, dqZ, dtdx, dtdy, dtdz, FACE_XMIN, qright);
12021202

1203-
if (gravity.enabled)
1203+
if (gravity.enabled and gravity.hancock_predictor_enabled)
12041204
{
12051205
// we need to modify input to flux computation with
12061206
// gravity predictor (half time step)
@@ -1246,7 +1246,7 @@ class ComputeTraceAndFluxes_Functor3D : public HydroBaseFunctor3D
12461246
FACE_XMAX,
12471247
qleft);
12481248

1249-
if (gravity.enabled)
1249+
if (gravity.enabled and gravity.hancock_predictor_enabled)
12501250
{
12511251
// we need to modify input to flux computation with
12521252
// gravity predictor (half time step)
@@ -1274,7 +1274,7 @@ class ComputeTraceAndFluxes_Functor3D : public HydroBaseFunctor3D
12741274
// left interface : right state
12751275
trace_unsplit_3d_along_dir(qLoc, dqX, dqY, dqZ, dtdx, dtdy, dtdz, FACE_YMIN, qright);
12761276

1277-
if (gravity.enabled)
1277+
if (gravity.enabled and gravity.hancock_predictor_enabled)
12781278
{
12791279
// we need to modify input to flux computation with
12801280
// gravity predictor (half time step)
@@ -1320,7 +1320,7 @@ class ComputeTraceAndFluxes_Functor3D : public HydroBaseFunctor3D
13201320
FACE_YMAX,
13211321
qleft);
13221322

1323-
if (gravity.enabled)
1323+
if (gravity.enabled and gravity.hancock_predictor_enabled)
13241324
{
13251325
// we need to modify input to flux computation with
13261326
// gravity predictor (half time step)
@@ -1386,7 +1386,7 @@ class ComputeTraceAndFluxes_Functor3D : public HydroBaseFunctor3D
13861386
FACE_ZMAX,
13871387
qleft);
13881388

1389-
if (gravity.enabled)
1389+
if (gravity.enabled and gravity.hancock_predictor_enabled)
13901390
{
13911391
// we need to modify input to flux computation with
13921392
// gravity predictor (half time step)
@@ -1629,7 +1629,7 @@ class ComputeAllFluxesAndUpdateFunctor3D : public HydroBaseFunctor3D
16291629
trace_unsplit_3d_along_dir(
16301630
qLocNeighbor, dqX_neighbor, dqY_neighbor, dqZ_neighbor, dtdx, dtdy, dtdz, FACE_XMAX, qleft);
16311631

1632-
if (gravity.enabled)
1632+
if (gravity.enabled and gravity.hancock_predictor_enabled)
16331633
{
16341634
// we need to modify input to flux computation with
16351635
// gravity predictor (half time step)
@@ -1736,7 +1736,7 @@ class ComputeAllFluxesAndUpdateFunctor3D : public HydroBaseFunctor3D
17361736
trace_unsplit_3d_along_dir(
17371737
qLocNeighbor, dqX_neighbor, dqY_neighbor, dqZ_neighbor, dtdx, dtdy, dtdz, FACE_YMAX, qleft);
17381738

1739-
if (gravity.enabled)
1739+
if (gravity.enabled and gravity.hancock_predictor_enabled)
17401740
{
17411741
// we need to modify input to flux computation with
17421742
// gravity predictor (half time step)
@@ -1845,7 +1845,7 @@ class ComputeAllFluxesAndUpdateFunctor3D : public HydroBaseFunctor3D
18451845
trace_unsplit_3d_along_dir(
18461846
qLocNeighbor, dqX_neighbor, dqY_neighbor, dqZ_neighbor, dtdx, dtdy, dtdz, FACE_ZMAX, qleft);
18471847

1848-
if (gravity.enabled)
1848+
if (gravity.enabled and gravity.hancock_predictor_enabled)
18491849
{
18501850
// we need to modify input to flux computation with
18511851
// gravity predictor (half time step)

0 commit comments

Comments
 (0)