Modified files to compile with gcc8/scons3.
parent
64113c7030
commit
b2489a052a
|
@ -168,7 +168,8 @@ int cchz_wave(int flag, DataAccessor* intAcc, DataAccessor* ampAcc, DataAccessor
|
||||||
|
|
||||||
cmp[i][j] = conj(dt1) * dt2;
|
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];
|
dt2 = i1[bx-1][j];
|
||||||
|
|
||||||
cmp[bx-1][j] = conj(dt1) * dt2;
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -529,13 +529,13 @@ c PARAMETERS:
|
||||||
c INPUT VARIABLES:
|
c INPUT VARIABLES:
|
||||||
|
|
||||||
integer nmax
|
integer nmax
|
||||||
real*8 p(MAXSIZ)
|
real*8 p(*)
|
||||||
real*8 hc(MAXSIZ)
|
real*8 hc(*)
|
||||||
real*8 hs(MAXSIZ)
|
real*8 hs(*)
|
||||||
real*8 cc(MAXSIZ)
|
real*8 cc(*)
|
||||||
real*8 cs(MAXSIZ)
|
real*8 cs(*)
|
||||||
real*8 sinml(MAXSIZ)
|
real*8 sinml(*)
|
||||||
real*8 cosml(MAXSIZ)
|
real*8 cosml(*)
|
||||||
real*8 re
|
real*8 re
|
||||||
real*8 ang
|
real*8 ang
|
||||||
real*8 haco
|
real*8 haco
|
||||||
|
|
Loading…
Reference in New Issue