projects/guix·blob python-team · refs

329 lines · 11.8 KiB

1Fix multi-line string formatting in fortran test programs (reported upstream).
2
3diff --git a/samples/appendfield.f b/samples/appendfield.f
4index 42c4b6b..58257f7 100644
5--- a/samples/appendfield.f
6+++ b/samples/appendfield.f
7@@ -22,8 +22,8 @@ c
8 inarray(i) = i
9 enddo
10
11- swfid = swopen("SwathFile_created_with_hadeos_sample_file_writer_o
12- 1f_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
13+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
14+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
15 swid = swattach(swfid, "Swath1")
16
17
18diff --git a/samples/definefields.f b/samples/definefields.f
19index 89859e4..f3b3497 100644
20--- a/samples/definefields.f
21+++ b/samples/definefields.f
22@@ -24,8 +24,8 @@ c DFACC_RDWR accesscode in the open statement. The SWopen
23 c routine returns the swath fileid, swfid, which is used to
24 c identify the file in subsequent routines.
25
26- swfid = swopen("SwathFile_created_with_hadeos_sample_file_writer
27- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
28+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
29+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
30
31
32 c
33diff --git a/samples/definegdflds.f b/samples/definegdflds.f
34index 177422e..1b7fcf6 100644
35--- a/samples/definegdflds.f
36+++ b/samples/definegdflds.f
37@@ -21,8 +21,8 @@
38 fillval1=-7.0
39 fillval2=-9999.0
40
41- gdfid = gdopen("GridFile_created_with_hadeos_sample_file_writer_
42- 1of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
43+ gdfid = gdopen("GridFile_created_with_hadeos_sample_file_write"//
44+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
45
46
47 gdid1 = gdattach(gdfid, "UTMGrid")
48diff --git a/samples/definelevels.f b/samples/definelevels.f
49index 2496d5f..64b2842 100644
50--- a/samples/definelevels.f
51+++ b/samples/definelevels.f
52@@ -32,8 +32,8 @@ c DFACC_RDWR access code in the open statement. The ptopen
53 c routine returns the point fileid, ptfid, which is used to
54 c identify the file in subsequent routines.
55
56- ptfid = ptopen("PointFile_created_with_hadeos_sample_file_writer
57- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
58+ ptfid = ptopen("PointFile_created_with_hadeos_sample_file_write"//
59+ 1 "r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
60
61
62 c
63diff --git a/samples/inquiregrid.f b/samples/inquiregrid.f
64index 8110461..8ce71e4 100644
65--- a/samples/inquiregrid.f
66+++ b/samples/inquiregrid.f
67@@ -18,8 +18,8 @@
68
69
70
71- gdfid = gdopen('GridFile_created_with_hadeos_sample_file_writer_
72- 1of_HDFEOS2_version_219_or_higher_release.hdf', DFACC_READ)
73+ gdfid = gdopen("GridFile_created_with_hadeos_sample_file_write"//
74+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
75
76
77 if (gdfid .ne. -1) then
78diff --git a/samples/inquireswath.f b/samples/inquireswath.f
79index 899ee59..78c292b 100644
80--- a/samples/inquireswath.f
81+++ b/samples/inquireswath.f
82@@ -24,8 +24,8 @@ c
83 c Open the Swath File for read only access
84 c
85
86- swfid = swopen("SwathFile_created_with_hadeos_sample_file_writer
87- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
88+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
89+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
90
91
92 if (swfid .NE. -1) then
93diff --git a/samples/readdimscalegrid.f b/samples/readdimscalegrid.f
94index fed5540..a0bb48a 100644
95--- a/samples/readdimscalegrid.f
96+++ b/samples/readdimscalegrid.f
97@@ -34,8 +34,8 @@
98 ! * id, gdfid, which is used to identify the file in subsequent routines.
99 ! */
100
101- gdfid = gdopen("GridFile_created_with_hadeos_sample_file_writer_
102- 1of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
103+ gdfid = gdopen("GridFile_created_with_hadeos_sample_file_write"//
104+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
105
106 ! /*
107 ! * If the grid file cannot be found, gdopen will return -1 for the file
108diff --git a/samples/readdimscaleswath.f b/samples/readdimscaleswath.f
109index 97b6264..1b61624 100644
110--- a/samples/readdimscaleswath.f
111+++ b/samples/readdimscaleswath.f
112@@ -33,8 +33,8 @@
113 ! * id, swfid, which is used to identify the file in subsequent routines.
114 ! */
115
116- swfid = swopen("SwathFile_created_with_hadeos_sample_file_writer
117- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
118+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
119+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
120
121 ! /*
122 ! * If the swath file cannot be found, swopen will return -1 for the file
123diff --git a/samples/readfields.f b/samples/readfields.f
124index 873b30a..29d42f0 100644
125--- a/samples/readfields.f
126+++ b/samples/readfields.f
127@@ -21,8 +21,8 @@ c
128 c Open the HDF swath file, "SwathFile.hdf"
129 c
130
131- swfid = swopen("SwathFile_created_with_hadeos_sample_file_writer
132- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
133+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
134+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
135
136
137 if (swfid .NE. -1) then
138diff --git a/samples/readgdflds.f b/samples/readgdflds.f
139index e5fe85f..ff2bd86 100644
140--- a/samples/readgdflds.f
141+++ b/samples/readgdflds.f
142@@ -9,8 +9,8 @@
143 integer DFNT_FLOAT32
144 parameter (DFNT_FLOAT32=5)
145
146- gdfid = gdopen("GridFile_created_with_hadeos_sample_file_writer_
147- 1of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
148+ gdfid = gdopen("GridFile_created_with_hadeos_sample_file_write"//
149+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
150
151 if (gdfid .ne. -1) then
152
153diff --git a/samples/readlevels.f b/samples/readlevels.f
154index a7fd033..f349398 100644
155--- a/samples/readlevels.f
156+++ b/samples/readlevels.f
157@@ -36,8 +36,8 @@ c
158 c Open the HDF swath file, "PointFile.hdf".
159 c
160
161- ptfid = ptopen("PointFile_created_with_hadeos_sample_file_writer
162- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
163+ ptfid = ptopen("PointFile_created_with_hadeos_sample_file_write"//
164+ + "r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
165
166 c
167 c Read Simple Point
168@@ -47,6 +47,8 @@ c
169 status = ptlevinfo(ptid, 0, fldlist, fldtype, fldorder)
170 n = ptnrecs(ptid, 0)
171
172+ write(*,*) n
173+
174 do 5 i=1,n
175 recs(i) = i - 1
176 5 continue
177diff --git a/samples/setupgrid.f b/samples/setupgrid.f
178index be5408c..cf4bd04 100644
179--- a/samples/setupgrid.f
180+++ b/samples/setupgrid.f
181@@ -34,8 +34,8 @@ c code in the open statement. The GDopen routine returns the grid
182 c file id, gdfid, which is used to identify the file in subsequent
183 c routines in the library.
184 c
185- gdfid = gdopen('GridFile_created_with_hadeos_sample_file_writer_of
186- 1_HDFEOS2_version_219_or_higher_release.hdf',DFACC_CREATE)
187+ gdfid = gdopen('GridFile_created_with_hadeos_sample_file_writer_"//
188+ 1"of_HDFEOS2_version_219_or_higher_release.hdf',DFACC_CREATE)
189
190 c
191 c Create UTM Grid
192diff --git a/samples/setupswath.f b/samples/setupswath.f
193index d0289d6..fbaa0bb 100644
194--- a/samples/setupswath.f
195+++ b/samples/setupswath.f
196@@ -22,8 +22,8 @@ c code in the open statement. The SWopen routine returns the swath
197 c file id, swfid, which is used to identify the file in subsequent
198 c routines in the library.
199 c
200- swfid = swopen('SwathFile_created_with_hadeos_sample_file_writer_o
201- 1f_HDFEOS2_version_219_or_higher_release.hdf',DFACC_CREATE)
202+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
203+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf",DFACC_CREATE)
204
205 c
206 c The first of these, SWcreate, creates the swath, "Swath1", within the
207diff --git a/samples/subsetgrid.f b/samples/subsetgrid.f
208index c57e541..087e5b1 100644
209--- a/samples/subsetgrid.f
210+++ b/samples/subsetgrid.f
211@@ -22,8 +22,8 @@ c
212 c Open the HDF grid file, "GridFile.hdf"
213 c
214
215- gdfid = gdopen("GridFile_created_with_hadeos_sample_file_writer_
216- 1of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
217+ gdfid = gdopen("GridFile_created_with_hadeos_sample_file_write"//
218+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
219
220 if (gdfid .NE. -1) then
221
222diff --git a/samples/subsetpoint.f b/samples/subsetpoint.f
223index 9e72c5f..2e76d7d 100644
224--- a/samples/subsetpoint.f
225+++ b/samples/subsetpoint.f
226@@ -21,8 +21,8 @@ c
227 c Open the HDF point file, "PointFile.hdf"
228 c
229
230- ptfid = ptopen("PointFile_created_with_hadeos_sample_file_writer
231- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
232+ ptfid = ptopen("PointFile_created_with_hadeos_sample_file_write"//
233+ 1 "r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
234
235 if (ptfid .NE. -1) then
236
237diff --git a/samples/subsetswath.f b/samples/subsetswath.f
238index dcee609..9af8a46 100644
239--- a/samples/subsetswath.f
240+++ b/samples/subsetswath.f
241@@ -28,8 +28,8 @@ c
242 c Open the HDF swath file, "SwathFile.hdf"
243 c
244
245- swfid = swopen("SwathFile_created_with_hadeos_sample_file_writer
246- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
247+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
248+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_READ)
249
250 if (swfid .NE. -1) then
251
252diff --git a/samples/writedimscalegrid.f b/samples/writedimscalegrid.f
253index 09688d8..42013fe 100644
254--- a/samples/writedimscalegrid.f
255+++ b/samples/writedimscalegrid.f
256@@ -29,8 +29,8 @@
257 ! * id, gdfid, which is used to identify the file in subsequent routines.
258 ! */
259
260- gdfid = gdopen("GridFile_created_with_hadeos_sample_file_writer_
261- 1of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
262+ gdfid = gdopen("GridFile_created_with_hadeos_sample_file_write"//
263+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
264
265 ! /*
266 ! * If the grid file cannot be found, gdopen will return -1 for the file
267diff --git a/samples/writedimscaleswath.f b/samples/writedimscaleswath.f
268index 1151671..1a911a6 100644
269--- a/samples/writedimscaleswath.f
270+++ b/samples/writedimscaleswath.f
271@@ -31,8 +31,8 @@
272 ! * id, swfid, which is used to identify the file in subsequent routines.
273 ! */
274
275- swfid = swopen("SwathFile_created_with_hadeos_sample_file_write
276- 1r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
277+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
278+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
279
280 ! /*
281 ! * If the swath file cannot be found, swopen will return -1 for the file
282diff --git a/samples/writefields.f b/samples/writefields.f
283index a743661..862b96c 100644
284--- a/samples/writefields.f
285+++ b/samples/writefields.f
286@@ -31,8 +31,8 @@ c
287 c Open the HDF swath file, "SwathFile.hdf"
288 c
289
290- swfid = swopen("SwathFile_created_with_hadeos_sample_file_writer
291- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
292+ swfid = swopen("SwathFile_created_with_hadeos_sample_file_write"//
293+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
294
295
296 if (swfid .NE. -1) then
297diff --git a/samples/writegdflds.f b/samples/writegdflds.f
298index d1540b3..81aef75 100644
299--- a/samples/writegdflds.f
300+++ b/samples/writegdflds.f
301@@ -23,8 +23,8 @@
302 enddo
303
304
305- gdfid = gdopen("GridFile_created_with_hadeos_sample_file_writer_
306- 1of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
307+ gdfid = gdopen("GridFile_created_with_hadeos_sample_file_write"//
308+ 1"r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
309
310 if (gdfid .ne. -1) then
311
312diff --git a/samples/writelevels.f b/samples/writelevels.f
313index 88e7780..cb40c9e 100644
314--- a/samples/writelevels.f
315+++ b/samples/writelevels.f
316@@ -32,8 +32,8 @@ c
317 c Open the HDF point file, "PointFile.hdf".
318 c
319
320- ptfid = ptopen("PointFile_created_with_hadeos_sample_file_writer
321- 1_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
322+ ptfid = ptopen("PointFile_created_with_hadeos_sample_file_write"//
323+ + "r_of_HDFEOS2_version_219_or_higher_release.hdf", DFACC_RDWR)
324
325
326 c
327--
3282.10.0
329