@@ -31,14 +31,16 @@ subroutine test_46(error_cnt)
31
31
integer (IK) :: ival
32
32
real (RK) :: rval
33
33
real :: r32val
34
+ real ,dimension (:),allocatable :: r32vec
34
35
logical (LK) :: lval
35
36
character (kind= CK,len= :),allocatable :: cval
36
37
character (kind= CK,len= 1 ),dimension (:),allocatable :: cvec
37
38
character (kind= CK,len= :),dimension (:),allocatable :: cvec2
38
39
integer (IK),dimension (:),allocatable :: ilen
39
40
40
- character (kind= CK,len= 1 ),dimension (1 ) :: cvec_default = [CK_' 1' ]
41
- integer (IK),dimension (1 ) :: ilen_default = [1 ]
41
+ character (kind= CK,len= 1 ),dimension (1 ),parameter :: cvec_default = [CK_' 1' ]
42
+ integer (IK),dimension (1 ),parameter :: ilen_default = [1 ]
43
+ real ,dimension (1 ),parameter :: r32vec_default = [99.0 ]
42
44
43
45
write (error_unit,' (A)' ) ' '
44
46
write (error_unit,' (A)' ) ' ================================='
@@ -65,7 +67,13 @@ subroutine test_46(error_cnt)
65
67
66
68
call json% get(p, CK_' not_there' , r32val, found, default= 99.0 ) ! real32
67
69
if (json% failed() .or. found .or. r32val-99.0 > 0.0 ) then
68
- write (error_unit,' (A)' ) ' Error using json_get_real_by_path default'
70
+ write (error_unit,' (A)' ) ' Error using json_get_real32_by_path default'
71
+ error_cnt = error_cnt + 1
72
+ end if
73
+
74
+ call json% get(p, CK_' not_there' , r32vec, found, default= r32vec_default) ! real32 vec
75
+ if (json% failed() .or. found .or. any (r32vec- r32vec_default>.0 )) then
76
+ write (error_unit,' (A)' ) ' Error using json_get_real32_by_path default'
69
77
error_cnt = error_cnt + 1
70
78
end if
71
79
@@ -88,17 +96,17 @@ subroutine test_46(error_cnt)
88
96
end if
89
97
90
98
call json% get(p, CK_' not_there' , cvec, found, default= cvec_default)
91
- if (json% failed() .or. found .or. all (cvec /= cvec_default)) then
99
+ if (json% failed() .or. found .or. any (cvec /= cvec_default)) then
92
100
write (error_unit,' (A)' ) ' Error using json_get_string_vec_by_path default'
93
101
error_cnt = error_cnt + 1
94
102
end if
95
103
call json% get(p, CK_' not_there' , cvec2, ilen, found, default= cvec_default)
96
- if (json% failed() .or. found .or. all (cvec2 /= cvec_default) .or. all (ilen/= 1_IK )) then
104
+ if (json% failed() .or. found .or. any (cvec2 /= cvec_default) .or. any (ilen/= 1_IK )) then
97
105
write (error_unit,' (A)' ) ' Error using json_get_alloc_string_vec_by_path default'
98
106
error_cnt = error_cnt + 1
99
107
end if
100
108
call json% get(p, CK_' not_there' , cvec2, ilen, found, default= cvec_default, default_ilen= ilen_default)
101
- if (json% failed() .or. found .or. all (cvec2 /= cvec_default) .or. all (ilen/= 1_IK )) then
109
+ if (json% failed() .or. found .or. any (cvec2 /= cvec_default) .or. any (ilen/= 1_IK )) then
102
110
write (error_unit,' (A)' ) ' Error using json_get_alloc_string_vec_by_path default'
103
111
error_cnt = error_cnt + 1
104
112
end if
@@ -129,17 +137,17 @@ subroutine test_46(error_cnt)
129
137
end if
130
138
131
139
call json% get(p, ' not_there' , cvec, found, default= [CK_' 1' ])
132
- if (json% failed() .or. found .or. all (cvec /= [CK_' 1' ])) then
140
+ if (json% failed() .or. found .or. any (cvec /= [CK_' 1' ])) then
133
141
write (error_unit,' (A)' ) ' Error using json_get_string_vec_by_path default'
134
142
error_cnt = error_cnt + 1
135
143
end if
136
144
call json% get(p, ' not_there' , cvec2, ilen, found, default= cvec_default)
137
- if (json% failed() .or. found .or. all (cvec2 /= cvec_default) .or. all (ilen/= 1_IK )) then
145
+ if (json% failed() .or. found .or. any (cvec2 /= cvec_default) .or. any (ilen/= 1_IK )) then
138
146
write (error_unit,' (A)' ) ' Error using json_get_alloc_string_vec_by_path default'
139
147
error_cnt = error_cnt + 1
140
148
end if
141
149
call json% get(p, ' not_there' , cvec2, ilen, found, default= cvec_default, default_ilen= ilen_default)
142
- if (json% failed() .or. found .or. all (cvec2 /= cvec_default) .or. all (ilen/= 1_IK )) then
150
+ if (json% failed() .or. found .or. any (cvec2 /= cvec_default) .or. any (ilen/= 1_IK )) then
143
151
write (error_unit,' (A)' ) ' Error using json_get_alloc_string_vec_by_path default'
144
152
error_cnt = error_cnt + 1
145
153
end if
@@ -186,17 +194,17 @@ subroutine test_46(error_cnt)
186
194
end if
187
195
188
196
call json_f% get(CK_' not_there' , cvec, found, default= cvec_default)
189
- if (json% failed() .or. found .or. all (cvec /= cvec_default)) then
197
+ if (json% failed() .or. found .or. any (cvec /= cvec_default)) then
190
198
write (error_unit,' (A)' ) ' Error using json_get_string_vec_by_path default'
191
199
error_cnt = error_cnt + 1
192
200
end if
193
201
call json_f% get(CK_' not_there' , cvec2, ilen, found, default= cvec_default)
194
- if (json% failed() .or. found .or. all (cvec2 /= cvec_default) .or. all (ilen/= 1_IK )) then
202
+ if (json% failed() .or. found .or. any (cvec2 /= cvec_default) .or. any (ilen/= 1_IK )) then
195
203
write (error_unit,' (A)' ) ' Error using json_get_alloc_string_vec_by_path default'
196
204
error_cnt = error_cnt + 1
197
205
end if
198
206
call json_f% get(CK_' not_there' , cvec2, ilen, found, default= cvec_default, default_ilen= ilen_default)
199
- if (json% failed() .or. found .or. all (cvec2 /= cvec_default) .or. all (ilen/= 1_IK )) then
207
+ if (json% failed() .or. found .or. any (cvec2 /= cvec_default) .or. any (ilen/= 1_IK )) then
200
208
write (error_unit,' (A)' ) ' Error using json_get_alloc_string_vec_by_path default'
201
209
error_cnt = error_cnt + 1
202
210
end if
@@ -227,17 +235,17 @@ subroutine test_46(error_cnt)
227
235
end if
228
236
229
237
call json_f% get(' not_there' , cvec, found, default= cvec_default)
230
- if (json% failed() .or. found .or. all (cvec /= cvec_default)) then
238
+ if (json% failed() .or. found .or. any (cvec /= cvec_default)) then
231
239
write (error_unit,' (A)' ) ' Error using json_get_string_vec_by_path default'
232
240
error_cnt = error_cnt + 1
233
241
end if
234
242
call json_f% get(' not_there' , cvec2, ilen, found, default= cvec_default)
235
- if (json% failed() .or. found .or. all (cvec2 /= cvec_default) .or. all (ilen/= 1_IK )) then
243
+ if (json% failed() .or. found .or. any (cvec2 /= cvec_default) .or. any (ilen/= 1_IK )) then
236
244
write (error_unit,' (A)' ) ' Error using json_get_alloc_string_vec_by_path default'
237
245
error_cnt = error_cnt + 1
238
246
end if
239
247
call json_f% get(' not_there' , cvec2, ilen, found, default= cvec_default, default_ilen= ilen_default)
240
- if (json% failed() .or. found .or. all (cvec2 /= cvec_default) .or. all (ilen/= 1_IK )) then
248
+ if (json% failed() .or. found .or. any (cvec2 /= cvec_default) .or. any (ilen/= 1_IK )) then
241
249
write (error_unit,' (A)' ) ' Error using json_get_alloc_string_vec_by_path default'
242
250
error_cnt = error_cnt + 1
243
251
end if
0 commit comments