Skip to content

Commit c3a26fc

Browse files
jvdp1jvdp1
committed
solved conflicts
2 parents c1323b5 + 85f7f6d commit c3a26fc

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎src/tests/io/test_savetxt.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ subroutine test_csp(outpath)
8686
character(*), intent(in) :: outpath
8787
complex(sp) :: d(3, 2), e(2, 3)
8888
complex(sp), allocatable :: d2(:, :)
89-
d = cmplx(1, 1)* reshape([1, 2, 3, 4, 5, 6], [3, 2])
89+
d = cmplx(1, 1,kind=sp)* reshape([1, 2, 3, 4, 5, 6], [3, 2])
9090
call savetxt(outpath, d)
9191
call loadtxt(outpath, d2)
9292
call check(all(shape(d2) == [3, 2]))
9393
call check(all(abs(d-d2) < epsilon(1._sp)))
9494

95-
e = cmplx(1, 1)* reshape([1, 2, 3, 4, 5, 6], [2, 3])
95+
e = cmplx(1, 1,kind=sp)* reshape([1, 2, 3, 4, 5, 6], [2, 3])
9696
call savetxt(outpath, e)
9797
call loadtxt(outpath, d2)
9898
call check(all(shape(d2) == [2, 3]))
@@ -103,13 +103,13 @@ subroutine test_cdp(outpath)
103103
character(*), intent(in) :: outpath
104104
complex(dp) :: d(3, 2), e(2, 3)
105105
complex(dp), allocatable :: d2(:, :)
106-
d = cmplx(1._dp, 1._dp)* reshape([1, 2, 3, 4, 5, 6], [3, 2])
106+
d = cmplx(1._dp, 1._dp,kind=dp)* reshape([1, 2, 3, 4, 5, 6], [3, 2])
107107
call savetxt(outpath, d)
108108
call loadtxt(outpath, d2)
109109
call check(all(shape(d2) == [3, 2]))
110110
call check(all(abs(d-d2) < epsilon(1._dp)))
111111

112-
e = cmplx(1, 1)* reshape([1, 2, 3, 4, 5, 6], [2, 3])
112+
e = cmplx(1, 1,kind=dp)* reshape([1, 2, 3, 4, 5, 6], [2, 3])
113113
call savetxt(outpath, e)
114114
call loadtxt(outpath, d2)
115115
call check(all(shape(d2) == [2, 3]))

‎src/tests/linalg/test_linalg.f90

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ subroutine test_eye
7373
msg="sum(rye - diag([(1.0_sp,i=1,6)])) < sptol failed.",warn=warn)
7474

7575
cye = eye(7)
76-
call check(abs(trace(cye) - cmplx(7.0_sp,0.0_sp)) < sptol, &
77-
msg="abs(trace(cye) - cmplx(7.0_sp,0.0_sp)) < sptol failed.",warn=warn)
76+
call check(abs(trace(cye) - cmplx(7.0_sp,0.0_sp,kind=sp)) < sptol, &
77+
msg="abs(trace(cye) - cmplx(7.0_sp,0.0_sp,kind=sp)) < sptol failed.",warn=warn)
7878
end subroutine
7979

8080
subroutine test_diag_rsp
@@ -153,7 +153,7 @@ subroutine test_diag_rqp
153153
subroutine test_diag_csp
154154
integer, parameter :: n = 3
155155
complex(sp) :: a(n,n), b(n,n)
156-
complex(sp), parameter :: i_ = cmplx(0,1)
156+
complex(sp), parameter :: i_ = cmplx(0,1,kind=sp)
157157
integer :: i,j
158158
write(*,*) "test_diag_csp"
159159
a = diag([(i,i=1,n)]) + diag([(i_,i=1,n)])
@@ -170,7 +170,7 @@ subroutine test_diag_csp
170170
subroutine test_diag_cdp
171171
integer, parameter :: n = 3
172172
complex(dp) :: a(n,n)
173-
complex(dp), parameter :: i_ = cmplx(0,1)
173+
complex(dp), parameter :: i_ = cmplx(0,1,kind=dp)
174174
write(*,*) "test_diag_cdp"
175175
a = diag([i_],-2) + diag([i_],2)
176176
call check(a(3,1) == i_ .and. a(1,3) == i_, &
@@ -180,7 +180,7 @@ subroutine test_diag_cdp
180180
subroutine test_diag_cqp
181181
integer, parameter :: n = 3
182182
complex(qp) :: a(n,n)
183-
complex(qp), parameter :: i_ = cmplx(0,1)
183+
complex(qp), parameter :: i_ = cmplx(0,1,kind=qp)
184184
write(*,*) "test_diag_cqp"
185185
a = diag([i_,i_],-1) + diag([i_,i_],1)
186186
call check(all(diag(a,-1) == i_) .and. all(diag(a,1) == i_), &
@@ -331,7 +331,7 @@ subroutine test_trace_csp
331331
integer, parameter :: n = 5
332332
real(sp) :: re(n,n), im(n,n)
333333
complex(sp) :: a(n,n), b(n,n)
334-
complex(sp), parameter :: i_ = cmplx(0,1)
334+
complex(sp), parameter :: i_ = cmplx(0,1,kind=sp)
335335
write(*,*) "test_trace_csp"
336336

337337
call random_number(re)
@@ -350,12 +350,12 @@ subroutine test_trace_csp
350350
subroutine test_trace_cdp
351351
integer, parameter :: n = 3
352352
complex(dp) :: a(n,n), ans
353-
complex(dp), parameter :: i_ = cmplx(0,1)
353+
complex(dp), parameter :: i_ = cmplx(0,1,kind=dp)
354354
integer :: j
355355
write(*,*) "test_trace_cdp"
356356

357357
a = reshape([(j + (n**2 - (j-1))*i_,j=1,n**2)],[n,n])
358-
ans = cmplx(15,15) !(1 + 5 + 9) + (9 + 5 + 1)i
358+
ans = cmplx(15,15,kind=dp) !(1 + 5 + 9) + (9 + 5 + 1)i
359359

360360
call check(abs(trace(a) - ans) < dptol, &
361361
msg="abs(trace(a) - ans) < dptol failed.",warn=warn)
@@ -364,7 +364,7 @@ subroutine test_trace_cdp
364364
subroutine test_trace_cqp
365365
integer, parameter :: n = 3
366366
complex(qp) :: a(n,n)
367-
complex(qp), parameter :: i_ = cmplx(0,1)
367+
complex(qp), parameter :: i_ = cmplx(0,1,kind=qp)
368368
write(*,*) "test_trace_cqp"
369369
a = 3*eye(n) + 4*eye(n)*i_ ! pythagorean triple
370370
call check(abs(trace(a)) - 3*5.0_qp < qptol, &

‎src/tests/optval/test_optval.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function foo_csp(x) result(z)
100100
subroutine test_optval_cdp
101101
complex(dp) :: z1
102102
print *, "test_optval_cdp"
103-
z1 = cmplx(1.0_dp, 2.0_dp)
103+
z1 = cmplx(1.0_dp, 2.0_dp,kind=dp)
104104
call check(foo_cdp(z1) == z1)
105105
call check(foo_cdp() == z1)
106106
end subroutine test_optval_cdp

‎src/tests/stats/test_cov.f90

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ program test_cov
1414
2._dp, 4._dp, 6._dp, 8._dp,&
1515
9._dp, 10._dp, 11._dp, 12._dp], [4, 3])
1616

17-
complex(dp) :: cd1(5) = [ cmplx(0.57706_dp, 0.00000_dp),&
18-
cmplx(0.00000_dp, 1.44065_dp),&
19-
cmplx(1.26401_dp, 0.00000_dp),&
20-
cmplx(0.00000_dp, 0.88833_dp),&
21-
cmplx(1.14352_dp, 0.00000_dp)]
22-
complex(dp) :: ds(2,3) = reshape([ cmplx(1._dp, 0._dp),&
23-
cmplx(0._dp, 2._dp),&
24-
cmplx(3._dp, 0._dp),&
25-
cmplx(0._dp, 4._dp),&
26-
cmplx(5._dp, 0._dp),&
27-
cmplx(0._dp, 6._dp)], [2, 3])
17+
complex(dp) :: cd1(5) = [ cmplx(0.57706_dp, 0.00000_dp,kind=dp),&
18+
cmplx(0.00000_dp, 1.44065_dp,kind=dp),&
19+
cmplx(1.26401_dp, 0.00000_dp,kind=dp),&
20+
cmplx(0.00000_dp, 0.88833_dp,kind=dp),&
21+
cmplx(1.14352_dp, 0.00000_dp,kind=dp)]
22+
complex(dp) :: ds(2,3) = reshape([ cmplx(1._dp, 0._dp,kind=dp),&
23+
cmplx(0._dp, 2._dp,kind=dp),&
24+
cmplx(3._dp, 0._dp,kind=dp),&
25+
cmplx(0._dp, 4._dp,kind=dp),&
26+
cmplx(5._dp, 0._dp,kind=dp),&
27+
cmplx(0._dp, 6._dp,kind=dp)], [2, 3])
2828

2929

3030
call test_sp(real(d1, sp), real(d, sp))

‎src/tests/stats/test_mean.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ program test_mean
4444
!csp
4545

4646
call loadtxt("array3.dat", d)
47-
cs = cmplx(1._sp, 1._sp)*d
47+
cs = cmplx(1._sp, 1._sp,kind=sp)*d
4848

4949
call check( abs(mean(cs) - sum(cs)/real(size(cs), sp)) < sptol)
5050
call check( sum( abs( mean(cs,1) - sum(cs,1)/real(size(cs,1), sp) )) < sptol)
@@ -53,7 +53,7 @@ program test_mean
5353
!cdp
5454

5555
call loadtxt("array3.dat", d)
56-
cd = cmplx(1._dp, 1._dp)*d
56+
cd = cmplx(1._dp, 1._dp,kind=dp)*d
5757

5858
call check( abs(mean(cd) - sum(cd)/real(size(cd), dp)) < dptol)
5959
call check( sum( abs( mean(cd,1) - sum(cd,1)/real(size(cd,1), dp) )) < dptol)
@@ -102,7 +102,7 @@ program test_mean
102102
cd3(:,:,1)=d;
103103
cd3(:,:,2)=d*1.5;
104104
cd3(:,:,3)=d*4;
105-
cd3 = cmplx(1._sp, 1._sp)*cd3
105+
cd3 = cmplx(1._sp, 1._sp,kind=sp)*cd3
106106

107107
call check( abs(mean(cd3) - sum(cd3)/real(size(cd3), dp)) < dptol)
108108
call check( sum( abs( mean(cd3,1) - sum(cd3,1)/real(size(cd3,1), dp) )) < dptol)

‎src/tests/stats/test_var.f90

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ program test_var
3030
cmplx(1.26401_sp, 0.00000_sp),&
3131
cmplx(0.00000_sp, 0.88833_sp),&
3232
cmplx(1.14352_sp, 0.00000_sp)]
33-
complex(dp) :: cd1(5) = [ cmplx(0.57706_dp, 0.00000_dp),&
34-
cmplx(0.00000_dp, 1.44065_dp),&
35-
cmplx(1.26401_dp, 0.00000_dp),&
36-
cmplx(0.00000_dp, 0.88833_dp),&
37-
cmplx(1.14352_dp, 0.00000_dp)]
33+
complex(dp) :: cd1(5) = [ cmplx(0.57706_dp, 0.00000_dp,kind=dp),&
34+
cmplx(0.00000_dp, 1.44065_dp,kind=dp),&
35+
cmplx(1.26401_dp, 0.00000_dp,kind=dp),&
36+
cmplx(0.00000_dp, 0.88833_dp,kind=dp),&
37+
cmplx(1.14352_dp, 0.00000_dp,kind=dp)]
3838
complex(sp) :: cs(5,3)
3939
complex(dp) :: cd(5,3)
4040

‎src/tests/stats/test_varn.f90

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ program test_varn
2323
9._dp, 10._dp, 11._dp, 12._dp], [4, 3])
2424

2525

26-
complex(dp) :: cd1(5) = [ cmplx(0.57706_dp, 0.00000_dp),&
27-
cmplx(0.00000_dp, 1.44065_dp),&
28-
cmplx(1.26401_dp, 0.00000_dp),&
29-
cmplx(0.00000_dp, 0.88833_dp),&
30-
cmplx(1.14352_dp, 0.00000_dp)]
26+
complex(dp) :: cd1(5) = [ cmplx(0.57706_dp, 0.00000_dp,kind=dp),&
27+
cmplx(0.00000_dp, 1.44065_dp,kind=dp),&
28+
cmplx(1.26401_dp, 0.00000_dp,kind=dp),&
29+
cmplx(0.00000_dp, 0.88833_dp,kind=dp),&
30+
cmplx(1.14352_dp, 0.00000_dp,kind=dp)]
3131
complex(dp) :: cd(5,3)
3232

3333

0 commit comments

Comments
 (0)