From 233835de10df1d44607eda88430c7542f837ef52 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sat, 26 Sep 2009 14:45:23 +0000 Subject: [PATCH] psblas3: base/serial/f03/psb_c_csr_impl.f03 base/serial/f03/psb_d_csr_impl.f03 base/serial/f03/psb_s_csr_impl.f03 base/serial/f03/psb_z_csr_impl.f03 Changed cp_from/mv_from implementation. Still a lot to be done! --- base/serial/f03/psb_c_csr_impl.f03 | 5 ++++- base/serial/f03/psb_d_csr_impl.f03 | 5 ++++- base/serial/f03/psb_s_csr_impl.f03 | 5 ++++- base/serial/f03/psb_z_csr_impl.f03 | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/base/serial/f03/psb_c_csr_impl.f03 b/base/serial/f03/psb_c_csr_impl.f03 index 69714b9b..f72c1b78 100644 --- a/base/serial/f03/psb_c_csr_impl.f03 +++ b/base/serial/f03/psb_c_csr_impl.f03 @@ -2119,7 +2119,10 @@ subroutine c_cp_csr_to_fmt_impl(a,b,info) call a%cp_to_coo(b,info) type is (psb_c_csr_sparse_mat) - b = a + call b%psb_c_base_sparse_mat%cp_from(a%psb_c_base_sparse_mat) + b%irp = a%irp + b%ja = a%ja + b%val = a%val class default call tmp%cp_from_fmt(a,info) diff --git a/base/serial/f03/psb_d_csr_impl.f03 b/base/serial/f03/psb_d_csr_impl.f03 index e627c7c6..5aa25576 100644 --- a/base/serial/f03/psb_d_csr_impl.f03 +++ b/base/serial/f03/psb_d_csr_impl.f03 @@ -1927,7 +1927,10 @@ subroutine d_cp_csr_to_fmt_impl(a,b,info) call a%cp_to_coo(b,info) type is (psb_d_csr_sparse_mat) - b = a + call b%psb_d_base_sparse_mat%cp_from(a%psb_d_base_sparse_mat) + b%irp = a%irp + b%ja = a%ja + b%val = a%val class default call tmp%cp_from_fmt(a,info) diff --git a/base/serial/f03/psb_s_csr_impl.f03 b/base/serial/f03/psb_s_csr_impl.f03 index a30b1f3f..586a4118 100644 --- a/base/serial/f03/psb_s_csr_impl.f03 +++ b/base/serial/f03/psb_s_csr_impl.f03 @@ -1938,7 +1938,10 @@ subroutine s_cp_csr_to_fmt_impl(a,b,info) call a%cp_to_coo(b,info) type is (psb_s_csr_sparse_mat) - b = a + call b%psb_s_base_sparse_mat%cp_from(a%psb_s_base_sparse_mat) + b%irp = a%irp + b%ja = a%ja + b%val = a%val class default call tmp%cp_from_fmt(a,info) diff --git a/base/serial/f03/psb_z_csr_impl.f03 b/base/serial/f03/psb_z_csr_impl.f03 index aaf82b0d..e026bbdd 100644 --- a/base/serial/f03/psb_z_csr_impl.f03 +++ b/base/serial/f03/psb_z_csr_impl.f03 @@ -2119,7 +2119,10 @@ subroutine z_cp_csr_to_fmt_impl(a,b,info) call a%cp_to_coo(b,info) type is (psb_z_csr_sparse_mat) - b = a + call b%psb_z_base_sparse_mat%cp_from(a%psb_z_base_sparse_mat) + b%irp = a%irp + b%ja = a%ja + b%val = a%val class default call tmp%cp_from_fmt(a,info)