Skip to content

Commit 42b38e3

Browse files
zer011bzer011b
committed
Fix TMz and TEz dumpers invocation
1 parent 394c2f4 commit 42b38e3

4 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎Source/Scheme/Scheme3D.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,32 +2442,32 @@ Scheme3D::performNSteps (time_step startStep, time_step numberTimeSteps, int dum
24422442
BMPDumper<GridCoordinate3D> dumperEx;
24432443
DATDumper<GridCoordinate3D> dumperDATEx;
24442444
dumperDATEx.init (t, CURRENT, processId, "3D-in-time-Ex");
2445-
dumperDATEx.dumpGrid (Ex, GridCoordinate3D (0), GridCoordinate3D (0));
2445+
dumperDATEx.dumpGrid (Ex, GridCoordinate3D (0), Ex.getSize ());
24462446

24472447
BMPDumper<GridCoordinate3D> dumperEy;
24482448
DATDumper<GridCoordinate3D> dumperDATEy;
24492449
dumperDATEy.init (t, CURRENT, processId, "3D-in-time-Ey");
2450-
dumperDATEy.dumpGrid (Ey, GridCoordinate3D (0), GridCoordinate3D (0));
2450+
dumperDATEy.dumpGrid (Ey, GridCoordinate3D (0), Ey.getSize ());
24512451

24522452
BMPDumper<GridCoordinate3D> dumperEz;
24532453
DATDumper<GridCoordinate3D> dumperDATEz;
24542454
dumperDATEz.init (t, CURRENT, processId, "3D-in-time-Ez");
2455-
dumperDATEz.dumpGrid (Ez, GridCoordinate3D (0), GridCoordinate3D (0));
2455+
dumperDATEz.dumpGrid (Ez, GridCoordinate3D (0), Ez.getSize ());
24562456

24572457
BMPDumper<GridCoordinate3D> dumperHx;
24582458
DATDumper<GridCoordinate3D> dumperDATHx;
24592459
dumperDATHx.init (t, CURRENT, processId, "3D-in-time-Hx");
2460-
dumperDATHx.dumpGrid (Hx, GridCoordinate3D (0), GridCoordinate3D (0));
2460+
dumperDATHx.dumpGrid (Hx, GridCoordinate3D (0), Hx.getSize ());
24612461

24622462
BMPDumper<GridCoordinate3D> dumperHy;
24632463
DATDumper<GridCoordinate3D> dumperDATHy;
24642464
dumperDATHy.init (t, CURRENT, processId, "3D-in-time-Hy");
2465-
dumperDATHy.dumpGrid (Hy, GridCoordinate3D (0), GridCoordinate3D (0));
2465+
dumperDATHy.dumpGrid (Hy, GridCoordinate3D (0), Hy.getSize ());
24662466

24672467
BMPDumper<GridCoordinate3D> dumperHz;
24682468
DATDumper<GridCoordinate3D> dumperDATHz;
24692469
dumperDATHz.init (t, CURRENT, processId, "3D-in-time-Hz");
2470-
dumperDATHz.dumpGrid (Hz, GridCoordinate3D (0), GridCoordinate3D (0));
2470+
dumperDATHz.dumpGrid (Hz, GridCoordinate3D (0), Hz.getSize ());
24712471
//
24722472
// BMPDumper<GridCoordinate3D> dumperHx;
24732473
// dumperHx.init (t, CURRENT, processId, "2D-TMz-in-time-Hx");
@@ -2673,32 +2673,32 @@ Scheme3D::performNSteps (time_step startStep, time_step numberTimeSteps, int dum
26732673
BMPDumper<GridCoordinate3D> dumperEx;
26742674
DATDumper<GridCoordinate3D> dumperDATEx;
26752675
dumperDATEx.init (stepLimit, CURRENT, processId, "3D-in-time-Ex");
2676-
dumperDATEx.dumpGrid (Ex, GridCoordinate3D (0), GridCoordinate3D (0));
2676+
dumperDATEx.dumpGrid (Ex, GridCoordinate3D (0), Ex.getSize ());
26772677

26782678
BMPDumper<GridCoordinate3D> dumperEy;
26792679
DATDumper<GridCoordinate3D> dumperDATEy;
26802680
dumperDATEy.init (stepLimit, CURRENT, processId, "3D-in-time-Ey");
2681-
dumperDATEy.dumpGrid (Ey, GridCoordinate3D (0), GridCoordinate3D (0));
2681+
dumperDATEy.dumpGrid (Ey, GridCoordinate3D (0), Ey.getSize ());
26822682

26832683
BMPDumper<GridCoordinate3D> dumperEz;
26842684
DATDumper<GridCoordinate3D> dumperDATEz;
26852685
dumperDATEz.init (stepLimit, CURRENT, processId, "3D-in-time-Ez");
2686-
dumperDATEz.dumpGrid (Ez, GridCoordinate3D (0), GridCoordinate3D (0));
2686+
dumperDATEz.dumpGrid (Ez, GridCoordinate3D (0), Ez.getSize ());
26872687

26882688
BMPDumper<GridCoordinate3D> dumperHx;
26892689
DATDumper<GridCoordinate3D> dumperDATHx;
26902690
dumperDATHx.init (stepLimit, CURRENT, processId, "3D-in-time-Hx");
2691-
dumperDATHx.dumpGrid (Hx, GridCoordinate3D (0), GridCoordinate3D (0));
2691+
dumperDATHx.dumpGrid (Hx, GridCoordinate3D (0), Hx.getSize ());
26922692

26932693
BMPDumper<GridCoordinate3D> dumperHy;
26942694
DATDumper<GridCoordinate3D> dumperDATHy;
26952695
dumperDATHy.init (stepLimit, CURRENT, processId, "3D-in-time-Hy");
2696-
dumperDATHy.dumpGrid (Hy, GridCoordinate3D (0), GridCoordinate3D (0));
2696+
dumperDATHy.dumpGrid (Hy, GridCoordinate3D (0), Hy.getSize ());
26972697

26982698
BMPDumper<GridCoordinate3D> dumperHz;
26992699
DATDumper<GridCoordinate3D> dumperDATHz;
27002700
dumperDATHz.init (stepLimit, CURRENT, processId, "3D-in-time-Hz");
2701-
dumperDATHz.dumpGrid (Hz, GridCoordinate3D (0), GridCoordinate3D (0));
2701+
dumperDATHz.dumpGrid (Hz, GridCoordinate3D (0), Hz.getSize ());
27022702

27032703
// BMPDumper<GridCoordinate1D> dumper;
27042704
// dumper.init (stepLimit, PREVIOUS, processId, "3D-incident-E");

‎Source/Scheme/SchemeTEz.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,15 +1103,15 @@ SchemeTEz::performNSteps (time_step startStep, time_step numberTimeSteps, int du
11031103
{
11041104
BMPDumper<GridCoordinate2D> dumperEx;
11051105
dumperEx.init (t, CURRENT, processId, "2D-TEz-in-time-Ex");
1106-
dumperEx.dumpGrid (Ex);
1106+
dumperEx.dumpGrid (Ex, GridCoordinate2D (0), Ex.getSize ());
11071107

11081108
BMPDumper<GridCoordinate2D> dumperEy;
11091109
dumperEy.init (t, CURRENT, processId, "2D-TEz-in-time-Ey");
1110-
dumperEy.dumpGrid (Ey);
1110+
dumperEy.dumpGrid (Ey, GridCoordinate2D (0), Ey.getSize ());
11111111

11121112
BMPDumper<GridCoordinate2D> dumperHz;
11131113
dumperHz.init (t, CURRENT, processId, "2D-TEz-in-time-Hz");
1114-
dumperHz.dumpGrid (Hz);
1114+
dumperHz.dumpGrid (Hz, GridCoordinate2D (0), Hz.getSize ());
11151115
}
11161116
}
11171117

@@ -1151,15 +1151,15 @@ SchemeTEz::performNSteps (time_step startStep, time_step numberTimeSteps, int du
11511151
{
11521152
BMPDumper<GridCoordinate2D> dumperEx;
11531153
dumperEx.init (stepLimit, CURRENT, processId, "2D-TEz-in-time-Ex");
1154-
dumperEx.dumpGrid (Ex);
1154+
dumperEx.dumpGrid (Ex, GridCoordinate2D (0), Ex.getSize ());
11551155

11561156
BMPDumper<GridCoordinate2D> dumperEy;
11571157
dumperEy.init (stepLimit, CURRENT, processId, "2D-TEz-in-time-Ey");
1158-
dumperEy.dumpGrid (Ey);
1158+
dumperEy.dumpGrid (Ey, GridCoordinate2D (0), Ey.getSize ());
11591159

11601160
BMPDumper<GridCoordinate2D> dumperHz;
11611161
dumperHz.init (stepLimit, CURRENT, processId, "2D-TEz-in-time-Hz");
1162-
dumperHz.dumpGrid (Hz);
1162+
dumperHz.dumpGrid (Hz, GridCoordinate2D (0), Hz.getSize ());
11631163
}
11641164

11651165
#ifdef COMPLEX_FIELD_VALUES
@@ -1355,7 +1355,7 @@ SchemeTEz::performAmplitudeSteps (time_step startStep, int dumpRes)
13551355
{
13561356
BMPDumper<GridCoordinate2D> dumper;
13571357
dumper.init (t, CURRENT, processId, "2D-TEz-amplitude-Hz");
1358-
dumper.dumpGrid (HzAmplitude);
1358+
dumper.dumpGrid (HzAmplitude, GridCoordinate2D (0), HzAmplitude.getSize ());
13591359

13601360
for (int i = 0; i < HzSize.getX (); ++i)
13611361
{
@@ -1503,7 +1503,7 @@ SchemeTEz::initGrids ()
15031503

15041504
BMPDumper<GridCoordinate2D> dumper;
15051505
dumper.init (0, CURRENT, processId, "Eps");
1506-
dumper.dumpGrid (Eps);
1506+
dumper.dumpGrid (Eps, GridCoordinate2D (0), Eps.getSize ());
15071507

15081508
for (int i = 0; i < Mu.getSize ().getX (); ++i)
15091509
{
@@ -1648,19 +1648,19 @@ SchemeTEz::initGrids ()
16481648
{
16491649
BMPDumper<GridCoordinate2D> dumper;
16501650
dumper.init (0, CURRENT, processId, "SigmaX");
1651-
dumper.dumpGrid (SigmaX);
1651+
dumper.dumpGrid (SigmaX, GridCoordinate2D (0), SigmaX.getSize ());
16521652
}
16531653

16541654
{
16551655
BMPDumper<GridCoordinate2D> dumper;
16561656
dumper.init (0, CURRENT, processId, "SigmaY");
1657-
dumper.dumpGrid (SigmaY);
1657+
dumper.dumpGrid (SigmaY, GridCoordinate2D (0), SigmaY.getSize ());
16581658
}
16591659

16601660
{
16611661
BMPDumper<GridCoordinate2D> dumper;
16621662
dumper.init (0, CURRENT, processId, "SigmaZ");
1663-
dumper.dumpGrid (SigmaZ);
1663+
dumper.dumpGrid (SigmaZ, GridCoordinate2D (0), SigmaZ.getSize ());
16641664
}
16651665

16661666
for (int i = 0; i < Ex.getSize ().getX (); ++i)

‎Source/Scheme/SchemeTMz.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,15 +1398,15 @@ SchemeTMz::performNSteps (time_step startStep, time_step numberTimeSteps, int du
13981398
{
13991399
BMPDumper<GridCoordinate2D> dumperEz;
14001400
dumperEz.init (t, CURRENT, processId, "2D-TMz-in-time-Ez");
1401-
dumperEz.dumpGrid (Ez);
1401+
dumperEz.dumpGrid (Ez, GridCoordinate2D (0), Ez.getSize ());
14021402

14031403
BMPDumper<GridCoordinate2D> dumperHx;
14041404
dumperHx.init (t, CURRENT, processId, "2D-TMz-in-time-Hx");
1405-
dumperHx.dumpGrid (Hx);
1405+
dumperHx.dumpGrid (Hx, GridCoordinate2D (0), Hx.getSize ());
14061406

14071407
BMPDumper<GridCoordinate2D> dumperHy;
14081408
dumperHy.init (t, CURRENT, processId, "2D-TMz-in-time-Hy");
1409-
dumperHy.dumpGrid (Hy);
1409+
dumperHy.dumpGrid (Hy, GridCoordinate2D (0), Hy.getSize ());
14101410
}
14111411
}
14121412
}
@@ -1415,15 +1415,15 @@ SchemeTMz::performNSteps (time_step startStep, time_step numberTimeSteps, int du
14151415
{
14161416
BMPDumper<GridCoordinate2D> dumperEz;
14171417
dumperEz.init (stepLimit, CURRENT, processId, "2D-TMz-in-time-Ez");
1418-
dumperEz.dumpGrid (Ez);
1418+
dumperEz.dumpGrid (Ez, GridCoordinate2D (0), Ez.getSize ());
14191419

14201420
BMPDumper<GridCoordinate2D> dumperHx;
14211421
dumperHx.init (stepLimit, CURRENT, processId, "2D-TMz-in-time-Hx");
1422-
dumperHx.dumpGrid (Hx);
1422+
dumperHx.dumpGrid (Hx, GridCoordinate2D (0), Hx.getSize ());
14231423

14241424
BMPDumper<GridCoordinate2D> dumperHy;
14251425
dumperHy.init (stepLimit, CURRENT, processId, "2D-TMz-in-time-Hy");
1426-
dumperHy.dumpGrid (Hy);
1426+
dumperHy.dumpGrid (Hy, GridCoordinate2D (0), Hy.getSize ());
14271427

14281428
// for (int i = 0; i < EzSize.getX (); ++i)
14291429
// {
@@ -1678,7 +1678,7 @@ SchemeTMz::performAmplitudeSteps (time_step startStep, int dumpRes)
16781678
{
16791679
BMPDumper<GridCoordinate2D> dumper;
16801680
dumper.init (t, CURRENT, processId, "2D-TMz-amplitude-Ez");
1681-
dumper.dumpGrid (EzAmplitude);
1681+
dumper.dumpGrid (EzAmplitude, GridCoordinate2D (0), EzAmplitude.getSize ());
16821682

16831683
// FieldValue norm = 0;
16841684
//
@@ -1802,7 +1802,7 @@ SchemeTMz::performSteps (int dumpRes)
18021802
{
18031803
BMPDumper<GridCoordinate2D> dumper;
18041804
dumper.init (totalStep, ALL, processId, "2D-TMz-in-time");
1805-
dumper.dumpGrid (Ez);
1805+
dumper.dumpGrid (Ez, GridCoordinate2D (0), Ez.getSize ());
18061806
}
18071807
#else /* CUDA_ENABLED */
18081808

@@ -1892,7 +1892,7 @@ SchemeTMz::initGrids ()
18921892

18931893
BMPDumper<GridCoordinate2D> dumper;
18941894
dumper.init (0, CURRENT, processId, "Eps");
1895-
dumper.dumpGrid (Eps);
1895+
dumper.dumpGrid (Eps, GridCoordinate2D (0), Eps.getSize ());
18961896

18971897
for (int i = 0; i < OmegaPE.getSize ().getX (); ++i)
18981898
{
@@ -2051,16 +2051,16 @@ SchemeTMz::initGrids ()
20512051
}
20522052

20532053
dumper.init (0, CURRENT, processId, "OmegaPE");
2054-
dumper.dumpGrid (OmegaPE);
2054+
dumper.dumpGrid (OmegaPE, GridCoordinate2D (0), OmegaPE.getSize ());
20552055

20562056
dumper.init (0, CURRENT, processId, "OmegaPM");
2057-
dumper.dumpGrid (OmegaPM);
2057+
dumper.dumpGrid (OmegaPM, GridCoordinate2D (0), OmegaPM.getSize ());
20582058

20592059
dumper.init (0, CURRENT, processId, "GammaE");
2060-
dumper.dumpGrid (GammaE);
2060+
dumper.dumpGrid (GammaE, GridCoordinate2D (0), GammaE.getSize ());
20612061

20622062
dumper.init (0, CURRENT, processId, "GammaM");
2063-
dumper.dumpGrid (GammaM);
2063+
dumper.dumpGrid (GammaM, GridCoordinate2D (0), GammaM.getSize ());
20642064

20652065
for (int i = 0; i < Mu.getSize ().getX (); ++i)
20662066
{
@@ -2205,19 +2205,19 @@ SchemeTMz::initGrids ()
22052205
{
22062206
BMPDumper<GridCoordinate2D> dumper;
22072207
dumper.init (0, CURRENT, processId, "SigmaX");
2208-
dumper.dumpGrid (SigmaX);
2208+
dumper.dumpGrid (SigmaX, GridCoordinate2D (0), SigmaX.getSize ());
22092209
}
22102210

22112211
{
22122212
BMPDumper<GridCoordinate2D> dumper;
22132213
dumper.init (0, CURRENT, processId, "SigmaY");
2214-
dumper.dumpGrid (SigmaY);
2214+
dumper.dumpGrid (SigmaY, GridCoordinate2D (0), SigmaY.getSize ());
22152215
}
22162216

22172217
{
22182218
BMPDumper<GridCoordinate2D> dumper;
22192219
dumper.init (0, CURRENT, processId, "SigmaZ");
2220-
dumper.dumpGrid (SigmaZ);
2220+
dumper.dumpGrid (SigmaZ, GridCoordinate2D (0), SigmaZ.getSize ());
22212221
}
22222222

22232223
for (int i = 0; i < Ez.getSize ().getX (); ++i)

‎Source/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ int main (int argc, char** argv)
143143

144144
FPValue incidentWaveAngle1 = PhysicsConst::Pi / 2; /**< teta */
145145
FPValue incidentWaveAngle2 = 0; /**< phi */
146-
FPValue incidentWaveAngle3 = 0; /**< psi */
146+
FPValue incidentWaveAngle3 = PhysicsConst::Pi / 2; /**< psi */
147147
#endif
148148
#ifdef GRID_3D
149149
GridCoordinate3D overallSize (gridSizeX, gridSizeY, gridSizeZ);
@@ -233,7 +233,7 @@ int main (int argc, char** argv)
233233
ParallelGridCoordinate bufferSize (bufSize);
234234

235235
#ifdef GRID_2D
236-
SchemeTMz scheme (&yeeLayout, overallSize, bufferSize, totalTimeSteps, false, 2 * totalTimeSteps, true, false, incidentWaveAngle2, false);
236+
SchemeTMz scheme (&yeeLayout, overallSize, bufferSize, totalTimeSteps, false, 2 * totalTimeSteps, true, false, incidentWaveAngle2, true);
237237
//SchemeTEz scheme (overallSize, bufferLeft, bufferRight, rank, numProcs, totalTimeSteps, false, 2 * totalTimeSteps, true, GridCoordinate2D (20, 20), true, GridCoordinate2D (30, 30), 0);
238238
#endif
239239
#ifdef GRID_3D

0 commit comments

Comments
 (0)