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
357
358
359
360
361
362
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Use eccodes instead of grib_api
Last-Updated: 2016-12-07
Forwarded: no
Index: flextra-5.0/makefile.ecmwf
===================================================================
--- flextra-5.0.orig/makefile.ecmwf
+++ flextra-5.0/makefile.ecmwf
@@ -4,10 +4,8 @@ INCF = incl*
#
INCPATH = /usr/include
-LIBPATH1 = /usr/lib
-LIBPATH2 = /usr/lib
FFLAGS = $(FCFLAGS) -fPIC -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
-LFLAGS = $(FFLAGS) $(LDFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm
+LFLAGS = $(FFLAGS) $(LDFLAGS) -leccodes_f90 -leccodes -lm
#
OBJECTS = caldate.o openoutput.o \
Index: flextra-5.0/makefile.gfs
===================================================================
--- flextra-5.0.orig/makefile.gfs
+++ flextra-5.0/makefile.gfs
@@ -5,10 +5,8 @@ INCF = incl*
FC = gfortran
INCPATH = /usr/include
-LIBPATH1 = /usr/lib
-LIBPATH2 = /usr/lib
FFLAGS = $(FCFLAGS) -fPIC -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
-LFLAGS = $(FFLAGS) $(LDFLAGS) -L$(LIBPATH1) -L$(LIBPATH2) -lgrib_api_f77 -lgrib_api -lm
+LFLAGS = $(FFLAGS) $(LDFLAGS) -leccodes_f90 -leccodes -lm
#
OBJECTS = caldate.o openoutput.o \
Index: flextra-5.0/gridcheck_gfs.f
===================================================================
--- flextra-5.0.orig/gridcheck_gfs.f
+++ flextra-5.0/gridcheck_gfs.f
@@ -51,9 +51,10 @@
* *
***********************************************************************
*
+ use grib_api
include 'includepar'
include 'includecom'
- include 'grib_api_f77.h'
+* include 'grib_api_f77.h'
@@ -101,11 +102,11 @@ C coordinate parameters
* OPENING OF DATA FILE (GRIB CODE)
*
ifile=5
-5 iret=grib_open_file(ifile,path(3)(1:len(3))//
- >trim(wfname(ifn)),'r')
- call grib_check(iret)
+5 call grib_open_file(ifile,path(3)(1:len(3))//
+ >trim(wfname(ifn)),'r', iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
! turn on support for multi fields messages */
- call grib_check(grib_multi_support_on())
+ call grib_multi_support_on()
!HSO 5 call pbopen(lunit,path(3)(1:len(3))//wfname(ifn),'r',ierr)
! if(ierr.lt.0) goto 999
!HSO fin
@@ -116,10 +117,10 @@ C coordinate parameters
*
* GET NEXT FIELDS
*
- iret = grib_new_from_file(ifile,igrib)
+ call grib_new_from_file(ifile,igrib, iret)
if (igrib .eq. -1 ) then
if (iret .ne. -1) then
- call grib_check(iret)
+ call grib_check(iret,'flextra','grtibcheck_gfs.f')
goto 999 ! ERROR DETECTED
endif
goto 30 ! EOF DETECTED
@@ -140,12 +141,14 @@ c endif
! first see if we read GRIB1 or GRIB2
- call grib_check(grib_get_int( igrib,
- >'editionNumber',gribVer))
+ call grib_get_int( igrib,
+ > 'editionNumber',gribVer, iret)
+ call grib_check(iret,'flextra','grtibcheck_gfs.f')
! get the size and data of the values array
- call grib_check(grib_get_size(igrib,'values',isize))
- call grib_check(grib_get_real8_array(igrib,'values',zsecn4,isize))
+ call grib_get_size(igrib,'values',isize, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_real8_array(igrib,'values',zsecn4,isize)
do i=1,isize
zsec4(i)=zsecn4(i)
enddo
@@ -153,24 +156,31 @@ c endif
if (gribVer.eq.1) then ! GRIB Edition 1
! read the grib1 identifiers
- call grib_check(grib_get_int( igrib,
- >'indicatorOfParameter',isec1(6)))
- call grib_check(grib_get_int( igrib,
- >'indicatorOfTypeOfLevel',isec1(7)))
- call grib_check(grib_get_int( igrib,
- >'level',isec1(8)))
+ call grib_get_int( igrib,
+ > 'indicatorOfParameter',isec1(6),iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_int( igrib,
+ > 'indicatorOfTypeOfLevel',isec1(7), iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_int( igrib,
+ > 'level',isec1(8), iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
else ! GRIB Edition 2
! read the grib2 identifiers
- call grib_check(grib_get_int( igrib,
- >'parameterCategory',parCat))
- call grib_check(grib_get_int( igrib,
- >'parameterNumber',parNum))
- call grib_check(grib_get_int( igrib,
- >'typeOfFirstFixedSurface',typSurf))
- call grib_check(grib_get_int( igrib,
- >'scaledValueOfFirstFixedSurface',valSurf))
+ call grib_get_int( igrib,
+ > 'parameterCategory',parCat, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_int( igrib,
+ > 'parameterNumber',parNum, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_int( igrib,
+ > 'typeOfFirstFixedSurface',typSurf, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_int( igrib,
+ > 'scaledValueOfFirstFixedSurface',valSurf, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
! convert to grib1 identifiers
isec1(6)=-1
@@ -196,18 +206,24 @@ c endif
! get the required fields from section 2
! store compatible to gribex input
- call grib_check(grib_get_int( igrib,
- >'numberOfPointsAlongAParallel',isec2(2)))
- call grib_check(grib_get_int( igrib,
- >'numberOfPointsAlongAMeridian',isec2(3)))
- call grib_check(grib_get_real8(igrib,
- >'latitudeOfFirstGridPointInDegrees',yaux2in))
- call grib_check(grib_get_real8(igrib,
- >'longitudeOfFirstGridPointInDegrees',xaux1in))
- call grib_check(grib_get_real8(igrib,
- >'latitudeOfLastGridPointInDegrees',yaux1in))
- call grib_check(grib_get_real8(igrib,
- >'longitudeOfLastGridPointInDegrees',xaux2in))
+ call grib_get_int( igrib,
+ > 'numberOfPointsAlongAParallel',isec2(2), iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_int( igrib,
+ >'numberOfPointsAlongAMeridian',isec2(3), iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_real8(igrib,
+ >'latitudeOfFirstGridPointInDegrees',yaux2in, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_real8(igrib,
+ >'longitudeOfFirstGridPointInDegrees',xaux1in, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_real8(igrib,
+ > 'latitudeOfLastGridPointInDegrees',yaux1in, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
+ call grib_get_real8(igrib,
+ > 'longitudeOfLastGridPointInDegrees',xaux2in, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
xaux1=xaux1in
xaux2=xaux2in
yaux1=yaux1in
@@ -305,7 +321,8 @@ C map scale
endif
if (igrib.ne.-1) then
- call grib_check(grib_release(igrib))
+ call grib_release(igrib, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
endif
goto 10 !! READ NEXT LEVEL OR PARAMETER
@@ -315,7 +332,8 @@ C map scale
*
* CLOSING OF INPUT DATA FILE
*
- call grib_check(grib_close_file(ifile))
+ call grib_close_file(ifile, iret)
+ call grib_check(iret,'flextra','gribcheck_gfs.f')
nuvz=iumax
nwz =iumax
Index: flextra-5.0/readwind_gfs.f
===================================================================
--- flextra-5.0.orig/readwind_gfs.f
+++ flextra-5.0/readwind_gfs.f
@@ -33,10 +33,9 @@
* ps surface pressure *
* *
***********************************************************************
-
+ use grib_api
include 'includepar'
include 'includecom'
- include 'grib_api_f77.h'
integer ii,indj,i,j,k,n,ifield,iumax
integer ix,jy,induvz,indwz,numpt,numpu,numpv,numpw,numprh
@@ -79,11 +78,12 @@ C coordinate parameters
!HSO
! print*,'reading winds from ',path(3)(1:len(3))
! >//trim(wfname(indj)),'|'
-5 iret=grib_open_file(ifile,path(3)(1:len(3))
- >//trim(wfname(indj)),'r')
- call grib_check(iret)
+!5 iret=grib_open_file(ifile,path(3)(1:len(3))
+5 call grib_open_file(ifile,path(3)(1:len(3))
+ >//trim(wfname(indj)),'r',iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
! turn on support for multi fields messages
- call grib_check(grib_multi_support_on())
+ call grib_multi_support_on()
numpt=0
@@ -97,22 +97,22 @@ C coordinate parameters
* GET NEXT FIELDS
*
- iret=grib_new_from_file(ifile,igrib)
+ call grib_new_from_file(ifile,igrib,iret)
if (igrib .eq. -1 ) then
if (iret .ne. -1) then
- call grib_check(iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
goto 888 ! ERROR DETECTED
endif
goto 50 ! EOF DETECTED
endif
! first see if we read GRIB1 or GRIB2
- call grib_check(grib_get_int( igrib,
- >'editionNumber',gribVer))
-
+ call grib_get_int( igrib,
+ >'editionNumber',gribVer, iret)
+ call grib_check(iret, 'flextra', 'readwind_gfs.f')
! get the size and data of the values array
- call grib_check(grib_get_size(igrib,'values',isize))
- call grib_check(grib_get_real8_array(igrib,'values',zsecn4,isize))
+ call grib_get_size(igrib,'values',isize)
+ call grib_get_real8_array(igrib,'values',zsecn4,isize)
do i=1,isize
zsec4(i)=zsecn4(i)
enddo
@@ -120,24 +120,33 @@ C coordinate parameters
if (gribVer.eq.1) then ! GRIB Edition 1
! read the grib1 identifiers
- call grib_check(grib_get_int( igrib,
- >'indicatorOfParameter',isec1(6)))
- call grib_check(grib_get_int( igrib,
- >'indicatorOfTypeOfLevel',isec1(7)))
- call grib_check(grib_get_int( igrib,
- >'level',isec1(8)))
+ call grib_get_int( igrib,
+ > 'indicatorOfParameter',isec1(6), iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+ call grib_get_int( igrib,
+ >'indicatorOfTypeOfLevel',isec1(7), iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+ call grib_get_int( igrib,
+ > 'level',isec1(8), iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+
else ! GRIB Edition 2
! read the grib2 identifiers
- call grib_check(grib_get_int( igrib,
- >'parameterCategory',parCat))
- call grib_check(grib_get_int( igrib,
- >'parameterNumber',parNum))
- call grib_check(grib_get_int( igrib,
- >'typeOfFirstFixedSurface',typSurf))
- call grib_check(grib_get_int( igrib,
- >'scaledValueOfFirstFixedSurface',valSurf))
+ call grib_get_int( igrib,
+ >'parameterCategory',parCat, iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+ call grib_get_int( igrib,
+ >'parameterNumber',parNum, iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+ call grib_get_int( igrib,
+ > 'typeOfFirstFixedSurface',typSurf, iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+ call grib_get_int( igrib,
+ > 'scaledValueOfFirstFixedSurface',valSurf, iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+
! convert to grib1 identifiers
isec1(6)=-1
@@ -244,14 +253,18 @@ c if (ierr.ne.0) goto 10 ! ERROR
! get the required fields from section 2
! store compatible to gribex input
- call grib_check(grib_get_int( igrib,
- >'numberOfPointsAlongAParallel',isec2(2)))
- call grib_check(grib_get_int( igrib,
- >'numberOfPointsAlongAMeridian',isec2(3)))
- call grib_check(grib_get_real8(igrib,
- >'longitudeOfFirstGridPointInDegrees',xauxin))
- call grib_check(grib_get_real8(igrib,
- >'latitudeOfLastGridPointInDegrees',yauxin))
+ call grib_get_int( igrib,
+ >'numberOfPointsAlongAParallel',isec2(2), iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+ call grib_get_int( igrib,
+ >'numberOfPointsAlongAMeridian',isec2(3), iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+ call grib_get_real8(igrib,
+ >'longitudeOfFirstGridPointInDegrees',xauxin, iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
+ call grib_get_real8(igrib,
+ >'latitudeOfLastGridPointInDegrees',yauxin, iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
xaux=xauxin
yaux=yauxin
@@ -381,7 +394,8 @@ c if (ierr.ne.0) goto 10 ! ERROR
if((isec1(6).eq.33).and.(isec1(7).eq.100)) iumax=iumax+1
if (igrib.ne.-1) then
- call grib_check(grib_release(igrib))
+ call grib_release(igrib, iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
endif
goto 10 !! READ NEXT LEVEL OR PARAMETER
@@ -390,7 +404,8 @@ c if (ierr.ne.0) goto 10 ! ERROR
*
* CLOSING OF INPUT DATA FILE
*
- call grib_check(grib_close_file(ifile))
+ call grib_close_file(ifile, iret)
+ call grib_check(iret,'flextra','readwind_gfs.f')
|
