Skip to content

Commit 3dff7c4

Browse files
committed
modify: add new lines between inline assignments
1 parent 7054d66 commit 3dff7c4

2 files changed

Lines changed: 50 additions & 22 deletions

File tree

src/specialmatrices/stdlib_specialmatrices_sym_tridiagonal.fypp

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,12 @@ submodule (stdlib_specialmatrices) sym_tridiagonal_matrices
156156
end if
157157

158158
! Deal with optional arguments.
159-
alpha_ = 1.0_${k1}$ ; if (present(alpha)) alpha_ = alpha
160-
beta_ = 0.0_${k1}$ ; if (present(beta)) beta_ = beta
161-
op_ = "N" ; if (present(op)) op_ = op
159+
alpha_ = 1.0_${k1}$
160+
if (present(alpha)) alpha_ = alpha
161+
beta_ = 0.0_${k1}$
162+
if (present(beta)) beta_ = beta
163+
op_ = "N"
164+
if (present(op)) op_ = op
162165
if (op_ == "H") op_ = "C"
163166

164167
#:if t1.startswith('real')
@@ -167,11 +170,14 @@ submodule (stdlib_specialmatrices) sym_tridiagonal_matrices
167170
#:endif
168171

169172
! Prepare Lapack arguments.
170-
n = A%n ; ldx = n ; ldy = n ;
173+
n = A%n
174+
ldx = n
175+
ldy = n
171176
nrhs = #{if rank==1}# 1 #{else}# size(x, dim=2, kind=ilp) #{endif}#
172177

173178
! Pointer trick.
174-
xmat(1:n, 1:nrhs) => x ; ymat(1:n, 1:nrhs) => y
179+
xmat(1:n, 1:nrhs) => x
180+
ymat(1:n, 1:nrhs) => y
175181
#:if t1.startswith('complex')
176182
call glagtm(op_, n, nrhs, alpha_, A%du, A%dv, A%du, xmat, ldx, beta_, ymat, ldy)
177183
#:else
@@ -207,13 +213,15 @@ submodule (stdlib_specialmatrices) sym_tridiagonal_matrices
207213
#:else
208214
allocate(B(n,n), source=zero_${k1}$)
209215
#:endif
210-
B(1,1) = A%dv(1) ; B(1,2) = A%du(1)
216+
B(1,1) = A%dv(1)
217+
B(1,2) = A%du(1)
211218
do concurrent (i = 2: n - 1)
212219
B(i, i - 1) = A%du(i - 1)
213220
B(i, i) = A%dv(i)
214221
B(i, i + 1) = A%du(i)
215222
enddo
216-
B(n , n -1) = A%du(n - 1); B(n, n) = A%dv(n)
223+
B(n , n -1) = A%du(n - 1)
224+
B(n, n) = A%dv(n)
217225
end associate
218226
end function
219227
#:endfor
@@ -246,15 +254,17 @@ submodule (stdlib_specialmatrices) sym_tridiagonal_matrices
246254
type(sym_tridiagonal_${s1}$_type), intent(in) :: A
247255
type(sym_tridiagonal_${s1}$_type) :: B
248256
B = sym_tridiagonal(A%du, A%dv)
249-
B%du = alpha*B%du; B%dv = alpha*B%dv;
257+
B%du = alpha*B%du
258+
B%dv = alpha*B%dv
250259
end function
251260

252261
pure module function scalar_multiplication_bis_sym_tridiagonal_${s1}$(A, alpha) result(B)
253262
type(sym_tridiagonal_${s1}$_type), intent(in) :: A
254263
${t1}$, intent(in) :: alpha
255264
type(sym_tridiagonal_${s1}$_type) :: B
256265
B = sym_tridiagonal(A%du, A%dv)
257-
B%du = alpha*B%du; B%dv = alpha*B%dv;
266+
B%du = alpha*B%du
267+
B%dv = alpha*B%dv
258268
end function
259269
#:endfor
260270

@@ -264,15 +274,17 @@ submodule (stdlib_specialmatrices) sym_tridiagonal_matrices
264274
type(sym_tridiagonal_${s1}$_type), intent(in) :: B
265275
type(sym_tridiagonal_${s1}$_type) :: C
266276
C = sym_tridiagonal(A%du, A%dv)
267-
C%du = C%du + B%du; C%dv = C%dv + B%dv
277+
C%du = C%du + B%du
278+
C%dv = C%dv + B%dv
268279
end function
269280

270281
pure module function matrix_sub_sym_tridiagonal_${s1}$(A, B) result(C)
271282
type(sym_tridiagonal_${s1}$_type), intent(in) :: A
272283
type(sym_tridiagonal_${s1}$_type), intent(in) :: B
273284
type(sym_tridiagonal_${s1}$_type) :: C
274285
C = sym_tridiagonal(A%du, A%dv)
275-
C%du = C%du - B%du; C%dv = C%dv - B%dv
286+
C%du = C%du - B%du
287+
C%dv = C%dv - B%dv
276288
end function
277289
#:endfor
278290

src/specialmatrices/stdlib_specialmatrices_tridiagonal.fypp

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,12 @@ submodule (stdlib_specialmatrices) tridiagonal_matrices
164164
end if
165165

166166
! Deal with optional arguments.
167-
alpha_ = 1.0_${k1}$ ; if (present(alpha)) alpha_ = alpha
168-
beta_ = 0.0_${k1}$ ; if (present(beta)) beta_ = beta
169-
op_ = "N" ; if (present(op)) op_ = op
167+
alpha_ = 1.0_${k1}$
168+
if (present(alpha)) alpha_ = alpha
169+
beta_ = 0.0_${k1}$
170+
if (present(beta)) beta_ = beta
171+
op_ = "N"
172+
if (present(op)) op_ = op
170173
if (op_ == "H") op_ = "C"
171174

172175
#:if t1.startswith('real')
@@ -175,11 +178,14 @@ submodule (stdlib_specialmatrices) tridiagonal_matrices
175178
#:endif
176179

177180
! Prepare Lapack arguments.
178-
n = A%n ; ldx = n ; ldy = n ;
181+
n = A%n
182+
ldx = n
183+
ldy = n
179184
nrhs = #{if rank==1}# 1 #{else}# size(x, dim=2, kind=ilp) #{endif}#
180185

181186
! Pointer trick.
182-
xmat(1:n, 1:nrhs) => x ; ymat(1:n, 1:nrhs) => y
187+
xmat(1:n, 1:nrhs) => x
188+
ymat(1:n, 1:nrhs) => y
183189
#:if t1.startswith('complex')
184190
call glagtm(op_, n, nrhs, alpha_, A%dl, A%dv, A%du, xmat, ldx, beta_, ymat, ldy)
185191
#:else
@@ -216,13 +222,15 @@ submodule (stdlib_specialmatrices) tridiagonal_matrices
216222
#:else
217223
allocate(B(n, n), source=zero_${k1}$)
218224
#:endif
219-
B(1, 1) = A%dv(1) ; B(1, 2) = A%du(1)
225+
B(1, 1) = A%dv(1)
226+
B(1, 2) = A%du(1)
220227
do concurrent (i=2:n-1)
221228
B(i, i-1) = A%dl(i-1)
222229
B(i, i) = A%dv(i)
223230
B(i, i+1) = A%du(i)
224231
enddo
225-
B(n, n-1) = A%dl(n-1) ; B(n, n) = A%dv(n)
232+
B(n, n-1) = A%dl(n-1)
233+
B(n, n) = A%dv(n)
226234
end associate
227235
end function
228236
#:endfor
@@ -255,15 +263,19 @@ submodule (stdlib_specialmatrices) tridiagonal_matrices
255263
type(tridiagonal_${s1}$_type), intent(in) :: A
256264
type(tridiagonal_${s1}$_type) :: B
257265
B = tridiagonal(A%dl, A%dv, A%du)
258-
B%dl = alpha*B%dl; B%dv = alpha*B%dv; B%du = alpha*B%du
266+
B%dl = alpha*B%dl
267+
B%dv = alpha*B%dv
268+
B%du = alpha*B%du
259269
end function
260270

261271
pure module function scalar_multiplication_bis_tridiagonal_${s1}$(A, alpha) result(B)
262272
type(tridiagonal_${s1}$_type), intent(in) :: A
263273
${t1}$, intent(in) :: alpha
264274
type(tridiagonal_${s1}$_type) :: B
265275
B = tridiagonal(A%dl, A%dv, A%du)
266-
B%dl = alpha*B%dl; B%dv = alpha*B%dv; B%du = alpha*B%du
276+
B%dl = alpha*B%dl
277+
B%dv = alpha*B%dv
278+
B%du = alpha*B%du
267279
end function
268280
#:endfor
269281

@@ -273,15 +285,19 @@ submodule (stdlib_specialmatrices) tridiagonal_matrices
273285
type(tridiagonal_${s1}$_type), intent(in) :: B
274286
type(tridiagonal_${s1}$_type) :: C
275287
C = tridiagonal(A%dl, A%dv, A%du)
276-
C%dl = C%dl + B%dl; C%dv = C%dv + B%dv; C%du = C%du + B%du
288+
C%dl = C%dl + B%dl
289+
C%dv = C%dv + B%dv
290+
C%du = C%du + B%du
277291
end function
278292

279293
pure module function matrix_sub_tridiagonal_${s1}$(A, B) result(C)
280294
type(tridiagonal_${s1}$_type), intent(in) :: A
281295
type(tridiagonal_${s1}$_type), intent(in) :: B
282296
type(tridiagonal_${s1}$_type) :: C
283297
C = tridiagonal(A%dl, A%dv, A%du)
284-
C%dl = C%dl - B%dl; C%dv = C%dv - B%dv; C%du = C%du - B%du
298+
C%dl = C%dl - B%dl
299+
C%dv = C%dv - B%dv
300+
C%du = C%du - B%du
285301
end function
286302
#:endfor
287303

0 commit comments

Comments
 (0)