@@ -202,7 +202,7 @@ contains
202
202
case(1)
203
203
do i = 1, size(res, 2)
204
204
do j = 1, size(res, 1)
205
- mask_ = merge(.true., .false., mask(:, i) .and. mask(:, j) )
205
+ mask_ = mask(:, i) .and. mask(:, j)
206
206
centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),&
207
207
#:if t1[0] == 'r'
208
208
0._${k1}$,&
@@ -227,7 +227,7 @@ contains
227
227
case(2)
228
228
do i = 1, size(res, 2)
229
229
do j = 1, size(res, 1)
230
- mask_ = merge(.true., .false., mask(i, :) .and. mask(j, :) )
230
+ mask_ = mask(i, :) .and. mask(j, :)
231
231
centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),&
232
232
#:if t1[0] == 'r'
233
233
0._${k1}$,&
@@ -274,11 +274,9 @@ contains
274
274
case(1)
275
275
do i = 1, size(res, 2)
276
276
do j = 1, size(res, 1)
277
- mask_ = merge(.true., .false., mask(:, i) .and. mask(:, j))
278
- centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),&
279
- 0._dp, mask_)
280
- centerj_ = merge( x(:, j) - mean(x(:, j), mask = mask_),&
281
- 0._dp, mask_)
277
+ mask_ = mask(:, i) .and. mask(:, j)
278
+ centeri_ = merge( x(:, i) - mean(x(:, i), mask = mask_),0._dp, mask_)
279
+ centerj_ = merge( x(:, j) - mean(x(:, j), mask = mask_),0._dp, mask_)
282
280
283
281
res(j, i) = dot_product( centerj_, centeri_)&
284
282
/sqrt(dot_product( centeri_, centeri_)*&
@@ -289,11 +287,9 @@ contains
289
287
case(2)
290
288
do i = 1, size(res, 2)
291
289
do j = 1, size(res, 1)
292
- mask_ = merge(.true., .false., mask(i, :) .and. mask(j, :))
293
- centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),&
294
- 0._dp, mask_)
295
- centerj_ = merge( x(j, :) - mean(x(j, :), mask = mask_),&
296
- 0._dp, mask_)
290
+ mask_ = mask(i, :) .and. mask(j, :)
291
+ centeri_ = merge( x(i, :) - mean(x(i, :), mask = mask_),0._dp, mask_)
292
+ centerj_ = merge( x(j, :) - mean(x(j, :), mask = mask_),0._dp, mask_)
297
293
298
294
res(j, i) = dot_product( centeri_, centerj_)&
299
295
/sqrt(dot_product( centeri_, centeri_)*&
0 commit comments