KJ135
/
ISCE_INSAR
mirror of http://172.16.0.12:5000/WBJY/ISCE_INSAR.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from isce/scons3_gcc8 

Modified files to compile with gcc8/scons3.
LT1AB
Eric M Gurrola 2019-02-07 13:10:47 -08:00 committed by GitHub Enterprise
parent 64113c7030 b2489a052a
commit 4ff5cb1437
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/mroipac/correlation/src/cchz_wave.cpp
View File

@ -168,7 +168,8 @@ int cchz_wave(int flag, DataAccessor* intAcc, DataAccessor* ampAcc, DataAccessor
cmp[i][j] = conj(dt1) * dt2;
i1[i][j] = abs(dt1) + 1i * abs(dt2);
// i1[i][j] = std::abs(dt1) + 1i * std::abs(dt2);
i1[i][j] = std::complex<float>(std::abs(dt1), std::abs(dt2));
}
}
}
@ -190,7 +191,7 @@ int cchz_wave(int flag, DataAccessor* intAcc, DataAccessor* ampAcc, DataAccessor
dt2 = i1[bx-1][j];
cmp[bx-1][j] = conj(dt1) * dt2;
i1[bx-1][j] = abs(dt1) + 1i * abs(dt2);
i1[bx-1][j] = std::complex<float>(std::abs(dt1), std::abs(dt2));
}
}

14
contrib/demUtils/correct_geoid_i2_srtm/src/correct_geoid_i2_srtm.f
View File

@ -529,13 +529,13 @@ c PARAMETERS:
c INPUT VARIABLES:
integer nmax
real*8 p(MAXSIZ)
real*8 hc(MAXSIZ)
real*8 hs(MAXSIZ)
real*8 cc(MAXSIZ)
real*8 cs(MAXSIZ)
real*8 sinml(MAXSIZ)
real*8 cosml(MAXSIZ)
real*8 p(*)
real*8 hc(*)
real*8 hs(*)
real*8 cc(*)
real*8 cs(*)
real*8 sinml(*)
real*8 cosml(*)
real*8 re
real*8 ang
real*8 haco