Skip to content

Commit ea3ef44

Browse files
committed
Minor fix in wavefront resizing
1 parent 9f06b8f commit ea3ef44

1 file changed

Lines changed: 19 additions & 9 deletions

File tree

cpp/src/core/srradstr.cpp

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4703,7 +4703,7 @@ void srTSRWRadStructAccessData::ResizeCoreXZ(SRWLRadMesh& oldMesh, float* pOldRa
47034703

47044704
//long long PerX_New = neNew << 1;
47054705
//long long PerX_New = newMesh.ne << 1;
4706-
long long PerX = newMesh.ne << 1;
4706+
long long PerX = ((long long)newMesh.ne << 1);
47074707
//long long PerZ_New = PerX_New*nxNew;
47084708
long long PerZ_New = PerX*nxNew;
47094709
long long izPerZ_New, ixPerX_New_p_Two_ie;
@@ -4712,8 +4712,11 @@ void srTSRWRadStructAccessData::ResizeCoreXZ(SRWLRadMesh& oldMesh, float* pOldRa
47124712
//long long PerZ_Old = PerX_Old*oldMesh.nx;
47134713
long long PerZ_Old = PerX*oldMesh.nx;
47144714

4715-
bool UseLowOrderInterp_PolCompX, UseLowOrderInterp_PolCompZ;
4716-
bool FieldShouldBeZeroedDueToX, FieldShouldBeZeroedDueToZ; //, FieldShouldBeZeroed;
4715+
//bool UseLowOrderInterp_PolCompX, UseLowOrderInterp_PolCompZ;
4716+
//bool FieldShouldBeZeroedDueToX, FieldShouldBeZeroedDueToZ; //, FieldShouldBeZeroed;
4717+
//OC19052026: added formal initialization
4718+
bool UseLowOrderInterp_PolCompX=false, UseLowOrderInterp_PolCompZ=false;
4719+
bool FieldShouldBeZeroedDueToX=false, FieldShouldBeZeroedDueToZ=false;
47174720

47184721
float *pEX0_New = 0, *pEZ0_New = 0;
47194722
if(TreatPolCompX) pEX0_New = pNewRadX;
@@ -4778,7 +4781,7 @@ void srTSRWRadStructAccessData::ResizeCoreXZ(SRWLRadMesh& oldMesh, float* pOldRa
47784781
xAbs = xStartNew + ix*xStepNew;
47794782

47804783
FieldShouldBeZeroedDueToX = false;
4781-
//OC17102021: removed if(WfrEdgeCorrShouldBeDone) because interpolation shoudl not be performed outside of the old function definition range
4784+
//OC17102021: removed if(WfrEdgeCorrShouldBeDone) because interpolation should not be performed outside of the old function definition range
47824785
//if(WfrEdgeCorrShouldBeDone)
47834786
//{
47844787
if((xAbs < xWfrMin - xTol) || (xAbs > xWfrMax + xTol)) FieldShouldBeZeroedDueToX = true;
@@ -4810,10 +4813,12 @@ void srTSRWRadStructAccessData::ResizeCoreXZ(SRWLRadMesh& oldMesh, float* pOldRa
48104813

48114814
ixcOld_mi_ixStOld = ixcOld - ixStOld;
48124815

4813-
UseLowOrderInterp_PolCompX = false; UseLowOrderInterp_PolCompZ = false; //OC14102025 (to avoid warning)
4816+
//UseLowOrderInterp_PolCompX = false; UseLowOrderInterp_PolCompZ = false; //OC14102025 (to avoid warning)
4817+
//OC19052026: commented-out the above and rolled-back to previous version, following bug report by HG (manifested on linux)
48144818
if((izStOld != izStOldPrev) || (ixStOld != ixStOldPrev))
48154819
{
4816-
//UseLowOrderInterp_PolCompX = false; UseLowOrderInterp_PolCompZ = false;
4820+
UseLowOrderInterp_PolCompX = false; UseLowOrderInterp_PolCompZ = false;
4821+
//OC19052026: uncommented the above and rolled-back to previous version, following bug report by HG (manifested on linux)
48174822

48184823
long long TotOffsetOld = izStOld*PerZ_Old + ixStOld*PerX + two_ie;
48194824
//long long TotOffsetOld = izStOld*PerZ_Old + ixStOld*PerX_Old + two_ie;
@@ -5330,7 +5335,9 @@ void srTSRWRadStructAccessData::AddElFieldDataWithInterpXZ(srTSRWRadStructAccess
53305335
long long PerZ_Add = PerX*nxAdd;
53315336
long long two_ie;
53325337

5333-
bool UseLowOrderInterp_PolCompX, UseLowOrderInterp_PolCompZ;
5338+
//bool UseLowOrderInterp_PolCompX, UseLowOrderInterp_PolCompZ;
5339+
//OC19052026: added formal initialization
5340+
bool UseLowOrderInterp_PolCompX=false, UseLowOrderInterp_PolCompZ=false;
53345341
//bool FieldShouldBeZeroedDueToX, FieldShouldBeZeroedDueToZ;
53355342

53365343
float *pEX0 = 0, *pEZ0 = 0;
@@ -5454,10 +5461,13 @@ void srTSRWRadStructAccessData::AddElFieldDataWithInterpXZ(srTSRWRadStructAccess
54545461
phase += constRxE*x_mi_xc*x_mi_xc;
54555462
}
54565463

5457-
UseLowOrderInterp_PolCompX = false; UseLowOrderInterp_PolCompZ = false;
5464+
//UseLowOrderInterp_PolCompX = false; UseLowOrderInterp_PolCompZ = false;
5465+
//OC19052026: commented-out the above and rolled-back to previous version, following bug report by HG (manifested on linux)
54585466
if((izStAdd != izStAddPrev) || (ixStAdd != ixStAddPrev))
54595467
{
5460-
//UseLowOrderInterp_PolCompX = false; UseLowOrderInterp_PolCompZ = false;
5468+
UseLowOrderInterp_PolCompX = false; UseLowOrderInterp_PolCompZ = false;
5469+
//OC19052026: uncommented the above and rolled-back to previous version, following bug report by HG (manifested on linux)
5470+
54615471
long long TotOffsetAdd = izStAdd*PerZ_Add + ixStAdd*PerX + two_ie;
54625472

54635473
if(TreatPolCompX)

0 commit comments

Comments
 (0)