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 #84 from rtburns-jpl/argcount 

Bugfixes for gcc/gfortran 9
LT1AB
piyushrpt 2020-03-13 22:27:19 -07:00 committed by GitHub
parent ef9bfddfc2 9bee1a326b
commit d6e22a762f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/mroipac/looks/bindings/looksmodule.cpp
View File

@ -250,7 +250,7 @@ int takeLookscpx(DataAccessor *IAIn, DataAccessor* IAout, int ld, int la)
for(int j = 0; j < nfull; j++) for(int j = 0; j < nfull; j++)
{ {
bdbl[j] += ain[j]; bdbl[j] += complex<double>(ain[j].real(), ain[j].imag());
} }
} }

2
contrib/mdx/src/SConscript
View File

@ -35,7 +35,7 @@ import os
Import('envmdx') Import('envmdx')
envmdx.Append( CCFLAGS=['-DSUN','-DIO64','-I'+envmdx['MOTIFINCPATH'],'-I'+envmdx['X11INCPATH']] ) envmdx.Append( CCFLAGS=['-DSUN','-DIO64','-I'+envmdx['MOTIFINCPATH'],'-I'+envmdx['X11INCPATH']] )
envmdx.PrependUnique( LIBPATH=[envmdx['MOTIFLIBPATH'],envmdx['X11LIBPATH']] ) envmdx.PrependUnique( LIBPATH=[envmdx['MOTIFLIBPATH'],envmdx['X11LIBPATH']] )
envmdx.Append( FORTRANFLAGS=['-DSUN','-DIO64','-DGFORTRAN'] ) envmdx.Append( FORTRANFLAGS=['-DSUN','-DIO64'] )
listFiles = ['graphx_mdx.c','rdf_reader_subs.f','mdx_subs.F'] listFiles = ['graphx_mdx.c','rdf_reader_subs.f','mdx_subs.F']
build = envmdx['PRJ_LIB_DIR'] build = envmdx['PRJ_LIB_DIR']

8
contrib/mdx/src/mdx_main.F
View File

@ -74,12 +74,6 @@ c*****************************************************************
integer i_arg integer i_arg
integer i_inarg integer i_inarg
integer iargc
#ifdef GFORTRAN
c external iargc
#else
external iargc
#endif
integer rdflen integer rdflen
external rdflen external rdflen
@ -110,7 +104,7 @@ c external iargc
equivalence(b_data,r_data) equivalence(b_data,r_data)
a_cmd = '-V' a_cmd = '-V'
i_inarg = iargc() i_inarg = command_argument_count()
if (i_inarg .eq. 0) then if (i_inarg .eq. 0) then
write(6,*) ' ' write(6,*) ' '
write(6,'(1x,a,a18,a)' ) ' << mdx Version ',version_mdx(), ' >> ' write(6,'(1x,a,a18,a)' ) ' << mdx Version ',version_mdx(), ' >> '