Author: Alastair McKinstry Description: avoid using 'as' as variable: now a reserved keyword in python2.6 Last-Updated: 2010-11-03 Forwarded: no Index: spherepack-3.2/Lib/sphere.py =================================================================== --- spherepack-3.2.orig/Lib/sphere.py 2010-11-03 13:52:02.000000000 +0000 +++ spherepack-3.2/Lib/sphere.py 2010-11-03 13:56:51.000000000 +0000 @@ -776,7 +776,7 @@ wsha, lsha = gridComp.shai(nlat, nlon) - as, bs = gridComp.sha(nlat, nlon, nt, lsha, wsha, sf) + aas, bbs = gridComp.sha(nlat, nlon, nt, lsha, wsha, sf) wsha, lsha = gridComp.shai(nlat, nlon) @@ -786,7 +786,7 @@ wvhs, lvhs = gridComp.vhsi(nlat, nlon) - u, v = gridComp.isfvp(nlat, nlon, nt, as, bs, av, bv, lvhs, wvhs) + u, v = gridComp.isfvp(nlat, nlon, nt, aas, bbs, av, bv, lvhs, wvhs) u, v = mathtogeo(reverseLatitude, standardShape, inverseOrder, u, v) @@ -1812,13 +1812,13 @@ return sf - def isfvp(self, nlat, nlon, nt, as, bs, av, bv, lvhsec, wvhsec): + def isfvp(self, nlat, nlon, nt, aas, bbs, av, bv, lvhsec, wvhsec): #----------------------------------------------------------------------------- # # purpose: computes a vector function with a given stream function and # velocity potential on a equally spaced grid # - # usage: u, v = x.isfvp(nlat, nlon, nt, as, bs, av, bv, wvhsec, lvhsec) + # usage: u, v = x.isfvp(nlat, nlon, nt, aas, bbs, av, bv, wvhsec, lvhsec) # #----------------------------------------------------------------------------- @@ -1849,8 +1849,8 @@ work = numpy.zeros((lwork,),'f') v, w, ierror = spherepack.isfvpec(nlat, nlon, isym, idv, jdv, - numpy.transpose(as), - numpy.transpose(bs), + numpy.transpose(aas), + numpy.transpose(bbs), numpy.transpose(av), numpy.transpose(bv), wvhsec, work) @@ -3167,13 +3167,13 @@ return sf - def isfvp(self, nlat, nlon, nt, as, bs, av, bv, lvhsgc, wvhsgc): + def isfvp(self, nlat, nlon, nt, aas, bbs, av, bv, lvhsgc, wvhsgc): #----------------------------------------------------------------------------- # # purpose: computes a vector function with a given stream function and # velocity potential on a gaussian grid # - # usage: u, v = g.isfvp(nlat, nlon, nt, as, bs, av, bv, wvhsgc, lvhsgc) + # usage: u, v = g.isfvp(nlat, nlon, nt, aas, bbs, av, bv, wvhsgc, lvhsgc) # #----------------------------------------------------------------------------- @@ -3199,8 +3199,8 @@ work = numpy.zeros((lwork,),'f') v, w, ierror = spherepack.isfvpgc(nlat, nlon, isym, idv, jdv, - numpy.transpose(as), - numpy.transpose(bs), + numpy.transpose(aas), + numpy.transpose(bbs), numpy.transpose(av), numpy.transpose(bv), wvhsgc, work) @@ -4513,13 +4513,13 @@ return sf - def isfvp(self, nlat, nlon, nt, as, bs, av, bv, lvhses, wvhses): + def isfvp(self, nlat, nlon, nt, aas, bbs, av, bv, lvhses, wvhses): #----------------------------------------------------------------------------- # # purpose: computes a vector function with a given stream function and # velocity potential on a equally spaced grid # - # usage: u, v = x.isfvp(nlat, nlon, nt, as, bs, av, bv, wvhses, lvhses) + # usage: u, v = x.isfvp(nlat, nlon, nt, aas, bbs, av, bv, wvhses, lvhses) # #----------------------------------------------------------------------------- @@ -4542,8 +4542,8 @@ work = numpy.zeros((lwork,),'f') v, w, ierror = spherepack.isfvpes(nlat, nlon, isym, idv, jdv, - numpy.transpose(as), - numpy.transpose(bis), + numpy.transpose(aas), + numpy.transpose(bbs), numpy.transpose(av), numpy.transpose(bv), wvhses, work) @@ -5878,13 +5878,13 @@ return sf - def isfvp(self, nlat, nlon, nt, as, bs, av, bv, lvhsgs, wvhsgs): + def isfvp(self, nlat, nlon, nt, aas, bbs, av, bv, lvhsgs, wvhsgs): #----------------------------------------------------------------------------- # # purpose: computes a vector function with a given stream function and # velocity potential on a gaussian grid # - # usage: u, v, ierror = g.isfvp(nlat, nlon, nt, as, bs, av, bv, wvhsgs, lvhsgs) + # usage: u, v, ierror = g.isfvp(nlat, nlon, nt, aas, bbs, av, bv, wvhsgs, lvhsgs) # #----------------------------------------------------------------------------- @@ -5910,8 +5910,8 @@ work = numpy.zeros((lwork,),'f') v, w, ierror = spherepack.isfvpgs(nlat, nlon, isym, idv, jdv, - numpy.transpose(as), - numpy.transpose(bs), + numpy.transpose(aas), + numpy.transpose(bbs), numpy.transpose(av), numpy.transpose(bv), wvhsgs, work) Index: spherepack-3.2/Src/spherepack.pyf =================================================================== --- spherepack-3.2.orig/Src/spherepack.pyf 2010-11-04 09:11:22.000000000 +0000 +++ spherepack-3.2/Src/spherepack.pyf 2010-11-04 09:13:36.000000000 +0000 @@ -2735,10 +2735,10 @@ ! end - subroutine isfvpec(nlat,nlon,isym,nt,v,w,idv,jdv,as,bs,av,bv,mdb,ndb,wvhsec,lvhsec,work,lwork,ierror) + subroutine isfvpec(nlat,nlon,isym,nt,v,w,idv,jdv,aas,bbs,av,bv,mdb,ndb,wvhsec,lvhsec,work,lwork,ierror) ! ************************************************************************** ! - ! given the scalar spherical harmonic coefficients as,bs precomputed + ! given the scalar spherical harmonic coefficients aas,bbs precomputed ! by shaec for the scalar stream function sf and av,bv precomputed by ! shaec for the scalar velocity potenital vp, subroutine isfvpec computes ! the vector field (v,w) corresponding to sf and vp. w is the east @@ -2790,7 +2790,7 @@ ! jdv the second dimension of the arrays v,w as it appears in ! the program that calls isfvpec. ! - ! as,bs two or three dimensional arrays (see input parameter nt) + ! aas,bbs two or three dimensional arrays (see input parameter nt) ! that contain the spherical harmonic coefficients of ! the scalar field sf as computed by subroutine shaec. ! @@ -2798,10 +2798,10 @@ ! that contain the spherical harmonic coefficients of ! the scalar field vp as computed by subroutine shaec. ! - ! mdb the first dimension of the arrays as,bs,av,bv as it + ! mdb the first dimension of the arrays aas,bbs,av,bv as it ! appears in the program that calls isfvpec. ! - ! ndb the second dimension of the arrays as,bs,av,bv as it + ! ndb the second dimension of the arrays aas,bbs,av,bv as it ! appears in the program that calls isfvpec. ! ! wvhsec an array which must be initialized by subroutine vhseci. @@ -2821,7 +2821,7 @@ !v,w two or three dimensional arrays (see input parameter nt) ! that contains the vector field corresponding to the stream ! function sf and velocity potential vp whose coefficients, - ! as,bs (for sf) and av,bv (for vp), were precomputed by + ! aas,bbs (for sf) and av,bv (for vp), were precomputed by ! subroutine shaec. ! colatitude point ! @@ -2852,18 +2852,18 @@ real, intent(out)::v(idv, jdv, nt) real, intent(out)::w(idv, jdv, nt) real, intent(temporary):: work(lwork) - real as(mdb, ndb, nt) - real bs(mdb, ndb, nt) + real aas(mdb, ndb, nt) + real bbs(mdb, ndb, nt) real av(mdb, ndb, nt) real bv(mdb, ndb, nt) real wvhsec(lvhsec) ! end - subroutine isfvpes(nlat,nlon,isym,nt,v,w,idv,jdv,as,bs,av,bv,mdb,ndb,wvhses,lvhses,work,lwork,ierror) + subroutine isfvpes(nlat,nlon,isym,nt,v,w,idv,jdv,aas,bbs,av,bv,mdb,ndb,wvhses,lvhses,work,lwork,ierror) ! ************************************************************************** ! - ! given the scalar spherical harmonic coefficients as,bs precomputed + ! given the scalar spherical harmonic coefficients aas,bbs precomputed ! by shaes for the scalar stream function sf and av,bv precomputed by ! shaes for the scalar velocity potenital vp, subroutine isfvpes computes ! the vector field (v,w) corresponding to sf and vp. w is the east @@ -2913,7 +2913,7 @@ ! jdv the second dimension of the arrays v,w as it appears in ! the program that calls isfvpes. jdv must be at least nlon. ! - ! as,bs two or three dimensional arrays (see input parameter nt) + ! aas,bbs two or three dimensional arrays (see input parameter nt) ! that contain the spherical harmonic coefficients of ! the scalar field sf as computed by subroutine shaes. ! @@ -2921,10 +2921,10 @@ ! that contain the spherical harmonic coefficients of ! the scalar field vp as computed by subroutine shaes. ! - ! mdb the first dimension of the arrays as,bs,av,bv as it + ! mdb the first dimension of the arrays aas,bbs,av,bv as it ! appears in the program that calls isfvpes. ! - ! ndb the second dimension of the arrays as,bs,av,bv as it + ! ndb the second dimension of the arrays aas,bbs,av,bv as it ! appears in the program that calls isfvpes. ! ! wvhses an array which must be initialized by subroutine vhsesi. @@ -2944,7 +2944,7 @@ ! v,w two or three dimensional arrays (see input parameter nt) ! that contains the vector field corresponding to the stream ! function sf and velocity potential vp whose coefficients, - ! as,bs (for sf) and av,bv (for vp), were precomputed by + ! aas,bbs (for sf) and av,bv (for vp), were precomputed by ! subroutine shaes. ! ! ierror = 0 no errors @@ -2974,18 +2974,18 @@ real, intent(out)::v(idv, jdv, nt) real, intent(out)::w(idv, jdv, nt) real, intent(temporary):: work(lwork) - real as(mdb, ndb, nt) - real bs(mdb, ndb, nt) + real aas(mdb, ndb, nt) + real bbs(mdb, ndb, nt) real av(mdb, ndb, nt) real bv(mdb, ndb, nt) real wvhses(lvhses) ! end - subroutine isfvpgc(nlat,nlon,isym,nt,v,w,idv,jdv,as,bs,av,bv,mdb,ndb,wvhsgc,lvhsgc,work,lwork,ierror) + subroutine isfvpgc(nlat,nlon,isym,nt,v,w,idv,jdv,aas,bbs,av,bv,mdb,ndb,wvhsgc,lvhsgc,work,lwork,ierror) ! ************************************************************************** ! - ! given the scalar spherical harmonic coefficients as,bs precomputed + ! given the scalar spherical harmonic coefficients aas,bbs precomputed ! by shagc for the scalar stream function sf and av,bv precomputed by ! shagc for the scalar velocity potenital vp, subroutine isfvpgc computes ! the vector field (v,w) corresponding to sf and vp. w is the east @@ -3030,7 +3030,7 @@ ! jdv the second dimension of the arrays v,w as it appears in ! the program that calls isfvpgc. ! - ! as,bs two or three dimensional arrays (see input parameter nt) + ! aas,bbs two or three dimensional arrays (see input parameter nt) ! that contain the spherical harmonic coefficients of ! the scalar field sf as computed by subroutine shagc. ! @@ -3038,10 +3038,10 @@ ! that contain the spherical harmonic coefficients of ! the scalar field vp as computed by subroutine shagc. ! - ! mdb the first dimension of the arrays as,bs,av,bv as it + ! mdb the first dimension of the arrays aas,bbs,av,bv as it ! appears in the program that calls isfvpgc. ! - ! ndb the second dimension of the arrays as,bs,av,bv as it + ! ndb the second dimension of the arrays aas,bbs,av,bv as it ! appears in the program that calls isfvpgc. ! ! wvhsgc an array which must be initialized by subroutine vhsgci. @@ -3064,7 +3064,7 @@ !v,w two or three dimensional arrays (see input parameter nt) ! that contains the vector field corresponding to the stream ! function sf and velocity potential vp whose coefficients, - ! as,bs (for sf) and av,bv (for vp), were precomputed by + ! aas,bbs (for sf) and av,bv (for vp), were precomputed by ! subroutine shagc. ! ! ierror= 0 no errors @@ -3094,18 +3094,18 @@ real, intent(out)::v(idv, jdv, nt) real, intent(out)::w(idv, jdv, nt) real, intent(temporary):: work(lwork) - real as(mdb, ndb, nt) - real bs(mdb, ndb, nt) + real aas(mdb, ndb, nt) + real bbs(mdb, ndb, nt) real av(mdb, ndb, nt) real bv(mdb, ndb, nt) real wvhsgc(lvhsgc) ! end - subroutine isfvpgs(nlat,nlon,isym,nt,v,w,idv,jdv,as,bs,av,bv,mdb,ndb,wvhsgs,lvhsgs,work,lwork,ierror) + subroutine isfvpgs(nlat,nlon,isym,nt,v,w,idv,jdv,aas,bbs,av,bv,mdb,ndb,wvhsgs,lvhsgs,work,lwork,ierror) ! ************************************************************************** ! - ! given the scalar spherical harmonic coefficients as,bs precomputed + ! given the scalar spherical harmonic coefficients aas,bbs precomputed ! by shags for the scalar stream function sf and av,bv precomputed by ! shags for the scalar velocity potenital vp, subroutine isfvpgs computes ! the vector field (v,w) corresponding to sf and vp. w is the east @@ -3150,7 +3150,7 @@ ! jdv the second dimension of the arrays v,w as it appears in ! the program that calls isfvpgs. ! - ! as,bs two or three dimensional arrays (see input parameter nt) + ! aas,bbs two or three dimensional arrays (see input parameter nt) ! that contain the spherical harmonic coefficients of ! the scalar field sf as computed by subroutine shags. ! @@ -3158,10 +3158,10 @@ ! that contain the spherical harmonic coefficients of ! the scalar field vp as computed by subroutine shags. ! - ! mdb the first dimension of the arrays as,bs,av,bv as it + ! mdb the first dimension of the arrays aas,bbs,av,bv as it ! appears in the program that calls isfvpgs. ! - ! ndb the second dimension of the arrays as,bs,av,bv as it + ! ndb the second dimension of the arrays aas,bbs,av,bv as it ! appears in the program that calls isfvpgs. ! ! wvhsgs an array which must be initialized by subroutine vhsgsi. @@ -3179,7 +3179,7 @@ !v,w two or three dimensional arrays (see input parameter nt) ! that contains the vector field corresponding to the stream ! function sf and velocity potential vp whose coefficients, - ! as,bs (for sf) and av,bv (for vp), were precomputed by + ! aas,bbs (for sf) and av,bv (for vp), were precomputed by ! subroutine shags. ! !ierror = 0 no errors @@ -3209,8 +3209,8 @@ real, intent(out)::v(idv, jdv, nt) real, intent(out)::w(idv, jdv, nt) real, intent(temporary):: work(lwork) - real as(mdb, ndb, nt) - real bs(mdb, ndb, nt) + real aas(mdb, ndb, nt) + real bbs(mdb, ndb, nt) real av(mdb, ndb, nt) real bv(mdb, ndb, nt) real wvhsgs(lvhsgs)