1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
|
Author: Alastair McKinstry <mckinstry@debian.org>
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)
|
