changed

Author: srinjoy933

src/specialmatrices/stdlib_specialmatrices_tridiagonal.fypp

@@ -36,31 +36,8 @@ submodule (stdlib_specialmatrices) tridiagonal_matrices
         !! Matrix dimension.
         type(tridiagonal_${s1}$_type) :: A
         !! Corresponding tridiagonal matrix.
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 42054c9d7c11c427d6628bba5c236f0bf2fcdc97
-        ! Internal variables.
-        type(linalg_state_type) :: err0
-
-        ! Description of the matrix.
-        A%n = n
-        if (n <= 0) then
-            err0 = linalg_state_type(this, LINALG_VALUE_ERROR, "Matrix size needs to be positive, n = ", n, ".")
-            call linalg_error_handling(err0)
-        endif
-        ! Matrix elements.
-        allocate( A%dl(n-1), source = dl )
-        allocate( A%dv(n), source= dv )
-        allocate( A%du(n-1), source = du )
-<<<<<<< HEAD
-=======
-        call build_tridiagonal(dl, dv, du, n, A)
->>>>>>> 72698fd78241550f6d359b58ef08499d9c1ed030
-=======
+        
         call build_tridiagonal(dl, dv, du, n, A)
->>>>>>> 42054c9d7c11c427d6628bba5c236f0bf2fcdc97
     end function
 
     module function initialize_tridiagonal_impure_${s1}$(dl, dv, du, err) result(A)
@@ -243,10 +220,6 @@ submodule (stdlib_specialmatrices) tridiagonal_matrices
         #:else
         allocate(B(n, n), source=zero_${k1}$)
         #:endif
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 42054c9d7c11c427d6628bba5c236f0bf2fcdc97
 
         if (n == 1) then
             B(1, 1) = A%dv(1)
@@ -261,24 +234,8 @@ submodule (stdlib_specialmatrices) tridiagonal_matrices
             B(n, n-1) = A%dl(n-1)
             B(n, n) = A%dv(n)
         end if
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 42054c9d7c11c427d6628bba5c236f0bf2fcdc97
-        B(1, 1) = A%dv(1)
-        B(1, 2) = A%du(1)
-        do concurrent (i=2:n-1)
-            B(i, i-1) = A%dl(i-1)
-            B(i, i) = A%dv(i)
-            B(i, i+1) = A%du(i)
-        enddo
-        B(n, n-1) = A%dl(n-1)
-        B(n, n) = A%dv(n)
-<<<<<<< HEAD
->>>>>>> 72698fd78241550f6d359b58ef08499d9c1ed030
-=======
->>>>>>> 42054c9d7c11c427d6628bba5c236f0bf2fcdc97
         end associate
+
     end function
     #:endfor
 

test/linalg/test_linalg_specialmatrices.fypp

@@ -113,7 +113,7 @@ contains
                 "spmv(fail): y = alpha*A*x + beta*y, alpha: "//to_string(alpha)//", beta: "//to_string(beta))
             if (allocated(error)) return
 
-            ! Test y = alpha * A.T @ x beta * y for random values of alpha and beta
+            ! Test y = alpha * A.T @ x + beta * y for random values of alpha and beta
             y1 = 0.0_wp
             call random_number(alpha)
             call random_number(beta)
@@ -446,41 +446,10 @@ contains
             ! Scalar multiplication test
             C = 3.0_wp * A
             call check(error, all_close(dense(C), 3.0_wp * dense(A)), .true.)
-    subroutine test_sym_tridiagonal_arithmetic(error)
-        !> Error handling
-        type(error_type), allocatable, intent(out) :: error
-        #:for k1, t1, s1 in (KINDS_TYPES)
-        block
-            integer, parameter :: wp = ${k1}$
-            type(sym_tridiagonal_${s1}$_type) :: A, B, C
-            ${t1}$, allocatable :: dv(:), du(:)
-
-            dv = [1.0_wp, 5.0_wp, 9.0_wp, 13.0_wp]
-            du = [2.0_wp, 6.0_wp, 10.0_wp]
-            A = sym_tridiagonal(du, dv)
-
-            dv = [3.0_wp, 7.0_wp, 11.0_wp, 14.0_wp]
-            du = [4.0_wp, 8.0_wp, 12.0_wp]
-            B = sym_tridiagonal(du, dv)
-
-            C = A + B
-            call check(error, all_close(dense(C), dense(A) + dense(B)), .true., &
-                "Symmetric tridiagonal operator + failed")
-            if (allocated(error)) return
-
-            C = A - B
-            call check(error, all_close(dense(C), dense(A) - dense(B)), .true., &
-                "Symmetric tridiagonal operator - failed")
-            if (allocated(error)) return
-
-            C = 5.0_wp * A
-            call check(error, all_close(dense(C), 5.0_wp * dense(A)), .true., &
-                "Symmetric tridiagonal operator * failed")
             if (allocated(error)) return
         end block
         #:endfor
     end subroutine
-end module
 
 end module