From 96eb6077a52a8d9655c47e9c94803eed2a56797b Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 27 Aug 2010 15:16:01 +0000 Subject: [PATCH] psblas3: base/serial/f03/psb_c_csc_impl.f03 base/serial/f03/psb_c_csr_impl.f03 base/serial/f03/psb_d_csc_impl.f03 base/serial/f03/psb_d_csr_impl.f03 base/serial/f03/psb_s_csc_impl.f03 base/serial/f03/psb_s_csr_impl.f03 base/serial/f03/psb_z_csc_impl.f03 base/serial/f03/psb_z_csr_impl.f03 Fixed steps for CP_TO/CP_FROM/MV_TO/MV_FROM --- base/serial/f03/psb_c_csc_impl.f03 | 8 ++++---- base/serial/f03/psb_c_csr_impl.f03 | 8 ++++---- base/serial/f03/psb_d_csc_impl.f03 | 8 ++++---- base/serial/f03/psb_d_csr_impl.f03 | 10 +++++----- base/serial/f03/psb_s_csc_impl.f03 | 8 ++++---- base/serial/f03/psb_s_csr_impl.f03 | 8 ++++---- base/serial/f03/psb_z_csc_impl.f03 | 8 ++++---- base/serial/f03/psb_z_csr_impl.f03 | 8 ++++---- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/base/serial/f03/psb_c_csc_impl.f03 b/base/serial/f03/psb_c_csc_impl.f03 index 8394af00..b7f85a91 100644 --- a/base/serial/f03/psb_c_csc_impl.f03 +++ b/base/serial/f03/psb_c_csc_impl.f03 @@ -2474,7 +2474,7 @@ subroutine psb_c_mv_csc_to_fmt(a,b,info) call a%free() class default - call tmp%mv_from_fmt(a,info) + call a%mv_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2514,7 +2514,7 @@ subroutine psb_c_cp_csc_to_fmt(a,b,info) b%val = a%val class default - call tmp%cp_from_fmt(a,info) + call a%cp_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2554,7 +2554,7 @@ subroutine psb_c_mv_csc_from_fmt(a,b,info) call b%free() class default - call tmp%mv_from_fmt(b,info) + call b%mv_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select @@ -2594,7 +2594,7 @@ subroutine psb_c_cp_csc_from_fmt(a,b,info) a%val = b%val class default - call tmp%cp_from_fmt(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select end subroutine psb_c_cp_csc_from_fmt diff --git a/base/serial/f03/psb_c_csr_impl.f03 b/base/serial/f03/psb_c_csr_impl.f03 index f9b487ad..9cdab8b8 100644 --- a/base/serial/f03/psb_c_csr_impl.f03 +++ b/base/serial/f03/psb_c_csr_impl.f03 @@ -2609,7 +2609,7 @@ subroutine psb_c_mv_csr_to_fmt(a,b,info) call a%free() class default - call tmp%mv_from_fmt(a,info) + call a%mv_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2648,7 +2648,7 @@ subroutine psb_c_cp_csr_to_fmt(a,b,info) b%val = a%val class default - call tmp%cp_from_fmt(a,info) + call a%cp_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2687,7 +2687,7 @@ subroutine psb_c_mv_csr_from_fmt(a,b,info) call b%free() class default - call tmp%mv_from_fmt(b,info) + call b%mv_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select @@ -2726,7 +2726,7 @@ subroutine psb_c_cp_csr_from_fmt(a,b,info) a%val = b%val class default - call tmp%cp_from_fmt(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select end subroutine psb_c_cp_csr_from_fmt diff --git a/base/serial/f03/psb_d_csc_impl.f03 b/base/serial/f03/psb_d_csc_impl.f03 index 2a2b9123..10ad2841 100644 --- a/base/serial/f03/psb_d_csc_impl.f03 +++ b/base/serial/f03/psb_d_csc_impl.f03 @@ -2347,7 +2347,7 @@ subroutine psb_d_mv_csc_to_fmt(a,b,info) call a%free() class default - call tmp%mv_from_fmt(a,info) + call a%mv_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2387,7 +2387,7 @@ subroutine psb_d_cp_csc_to_fmt(a,b,info) b%val = a%val class default - call tmp%cp_from_fmt(a,info) + call a%cp_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2427,7 +2427,7 @@ subroutine psb_d_mv_csc_from_fmt(a,b,info) call b%free() class default - call tmp%mv_from_fmt(b,info) + call b%mv_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select @@ -2467,7 +2467,7 @@ subroutine psb_d_cp_csc_from_fmt(a,b,info) a%val = b%val class default - call tmp%cp_from_fmt(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select end subroutine psb_d_cp_csc_from_fmt diff --git a/base/serial/f03/psb_d_csr_impl.f03 b/base/serial/f03/psb_d_csr_impl.f03 index 5b426edb..29d2cf02 100644 --- a/base/serial/f03/psb_d_csr_impl.f03 +++ b/base/serial/f03/psb_d_csr_impl.f03 @@ -2445,7 +2445,7 @@ subroutine psb_d_cp_csr_from_coo(a,b,info) info = psb_success_ ! This is to have fix_coo called behind the scenes - call tmp%cp_from_coo(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end subroutine psb_d_cp_csr_from_coo @@ -2658,7 +2658,7 @@ subroutine psb_d_mv_csr_to_fmt(a,b,info) call a%free() class default - call tmp%mv_from_fmt(a,info) + call a%mv_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2698,7 +2698,7 @@ subroutine psb_d_cp_csr_to_fmt(a,b,info) call psb_safe_cpy( a%val, b%val , info) class default - call tmp%cp_from_fmt(a,info) + call a%cp_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2737,7 +2737,7 @@ subroutine psb_d_mv_csr_from_fmt(a,b,info) call b%free() class default - call tmp%mv_from_fmt(b,info) + call b%mv_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select @@ -2777,7 +2777,7 @@ subroutine psb_d_cp_csr_from_fmt(a,b,info) call psb_safe_cpy( b%val, a%val , info) class default - call tmp%cp_from_fmt(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select end subroutine psb_d_cp_csr_from_fmt diff --git a/base/serial/f03/psb_s_csc_impl.f03 b/base/serial/f03/psb_s_csc_impl.f03 index 1522d0e1..4048a8d7 100644 --- a/base/serial/f03/psb_s_csc_impl.f03 +++ b/base/serial/f03/psb_s_csc_impl.f03 @@ -2112,7 +2112,7 @@ subroutine psb_s_mv_csc_to_fmt(a,b,info) call a%free() class default - call tmp%mv_from_fmt(a,info) + call a%mv_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2152,7 +2152,7 @@ subroutine psb_s_cp_csc_to_fmt(a,b,info) b%val = a%val class default - call tmp%cp_from_fmt(a,info) + call a%cp_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2192,7 +2192,7 @@ subroutine psb_s_mv_csc_from_fmt(a,b,info) call b%free() class default - call tmp%mv_from_fmt(b,info) + call b%mv_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select @@ -2232,7 +2232,7 @@ subroutine psb_s_cp_csc_from_fmt(a,b,info) a%val = b%val class default - call tmp%cp_from_fmt(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select end subroutine psb_s_cp_csc_from_fmt diff --git a/base/serial/f03/psb_s_csr_impl.f03 b/base/serial/f03/psb_s_csr_impl.f03 index a51420e4..2d6161f9 100644 --- a/base/serial/f03/psb_s_csr_impl.f03 +++ b/base/serial/f03/psb_s_csr_impl.f03 @@ -2417,7 +2417,7 @@ subroutine psb_s_mv_csr_to_fmt(a,b,info) call a%free() class default - call tmp%mv_from_fmt(a,info) + call a%mv_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2456,7 +2456,7 @@ subroutine psb_s_cp_csr_to_fmt(a,b,info) b%val = a%val class default - call tmp%cp_from_fmt(a,info) + call a%cp_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2495,7 +2495,7 @@ subroutine psb_s_mv_csr_from_fmt(a,b,info) call b%free() class default - call tmp%mv_from_fmt(b,info) + call b%mv_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select @@ -2534,7 +2534,7 @@ subroutine psb_s_cp_csr_from_fmt(a,b,info) a%val = b%val class default - call tmp%cp_from_fmt(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select end subroutine psb_s_cp_csr_from_fmt diff --git a/base/serial/f03/psb_z_csc_impl.f03 b/base/serial/f03/psb_z_csc_impl.f03 index 8ebe8d34..beb1b229 100644 --- a/base/serial/f03/psb_z_csc_impl.f03 +++ b/base/serial/f03/psb_z_csc_impl.f03 @@ -2475,7 +2475,7 @@ subroutine psb_z_mv_csc_to_fmt(a,b,info) call a%free() class default - call tmp%mv_from_fmt(a,info) + call a%mv_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2515,7 +2515,7 @@ subroutine psb_z_cp_csc_to_fmt(a,b,info) b%val = a%val class default - call tmp%cp_from_fmt(a,info) + call a%cp_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2555,7 +2555,7 @@ subroutine psb_z_mv_csc_from_fmt(a,b,info) call b%free() class default - call tmp%mv_from_fmt(b,info) + call b%mv_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select @@ -2595,7 +2595,7 @@ subroutine psb_z_cp_csc_from_fmt(a,b,info) a%val = b%val class default - call tmp%cp_from_fmt(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select end subroutine psb_z_cp_csc_from_fmt diff --git a/base/serial/f03/psb_z_csr_impl.f03 b/base/serial/f03/psb_z_csr_impl.f03 index 5e6afc49..2d4df322 100644 --- a/base/serial/f03/psb_z_csr_impl.f03 +++ b/base/serial/f03/psb_z_csr_impl.f03 @@ -2609,7 +2609,7 @@ subroutine psb_z_mv_csr_to_fmt(a,b,info) call a%free() class default - call tmp%mv_from_fmt(a,info) + call a%mv_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2648,7 +2648,7 @@ subroutine psb_z_cp_csr_to_fmt(a,b,info) b%val = a%val class default - call tmp%cp_from_fmt(a,info) + call a%cp_to_coo(tmp,info) if (info == psb_success_) call b%mv_from_coo(tmp,info) end select @@ -2687,7 +2687,7 @@ subroutine psb_z_mv_csr_from_fmt(a,b,info) call b%free() class default - call tmp%mv_from_fmt(b,info) + call b%mv_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select @@ -2726,7 +2726,7 @@ subroutine psb_z_cp_csr_from_fmt(a,b,info) a%val = b%val class default - call tmp%cp_from_fmt(b,info) + call b%cp_to_coo(tmp,info) if (info == psb_success_) call a%mv_from_coo(tmp,info) end select end subroutine psb_z_cp_csr_from_fmt