From 84aba17ddfa8d3e0f6048562e8292169e40343ab Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 8 Dec 2015 17:38:45 +0000 Subject: [PATCH] mld2p4-2: examples/fileread/mld_cexample_1lev.f90 examples/fileread/mld_cexample_ml.f90 examples/fileread/mld_dexample_1lev.f90 examples/fileread/mld_dexample_ml.f90 examples/fileread/mld_sexample_1lev.f90 examples/fileread/mld_sexample_ml.f90 examples/fileread/mld_zexample_1lev.f90 examples/fileread/mld_zexample_ml.f90 tests/fileread/cf_sample.f90 tests/fileread/df_sample.f90 tests/fileread/sf_sample.f90 tests/fileread/zf_sample.f90 New MATDIST interface. --- examples/fileread/mld_cexample_1lev.f90 | 2 +- examples/fileread/mld_cexample_ml.f90 | 2 +- examples/fileread/mld_dexample_1lev.f90 | 2 +- examples/fileread/mld_dexample_ml.f90 | 2 +- examples/fileread/mld_sexample_1lev.f90 | 2 +- examples/fileread/mld_sexample_ml.f90 | 2 +- examples/fileread/mld_zexample_1lev.f90 | 2 +- examples/fileread/mld_zexample_ml.f90 | 2 +- tests/fileread/cf_sample.f90 | 6 +++--- tests/fileread/df_sample.f90 | 6 +++--- tests/fileread/sf_sample.f90 | 6 +++--- tests/fileread/zf_sample.f90 | 6 +++--- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/fileread/mld_cexample_1lev.f90 b/examples/fileread/mld_cexample_1lev.f90 index 1bedde27..b74a2c28 100644 --- a/examples/fileread/mld_cexample_1lev.f90 +++ b/examples/fileread/mld_cexample_1lev.f90 @@ -186,7 +186,7 @@ program mld_cexample_ml call psb_barrier(ictxt) if (iam == psb_root_) write(*,'("Partition type: block")') call psb_matdist(aux_A, A, ictxt, & - & desc_A,b_glob,b,info, parts=part_block) + & desc_A,info,b_glob=b_glob,b=b, parts=part_block) t2 = psb_wtime() - t1 diff --git a/examples/fileread/mld_cexample_ml.f90 b/examples/fileread/mld_cexample_ml.f90 index 80f76962..2b93419b 100644 --- a/examples/fileread/mld_cexample_ml.f90 +++ b/examples/fileread/mld_cexample_ml.f90 @@ -190,7 +190,7 @@ program mld_cexample_ml call psb_barrier(ictxt) if (iam == psb_root_) write(*,'("Partition type: block")') call psb_matdist(aux_A, A, ictxt, & - & desc_A,b_glob,b,info, parts=part_block) + & desc_A,info,b_glob=b_glob,b=b, parts=part_block) t2 = psb_wtime() - t1 diff --git a/examples/fileread/mld_dexample_1lev.f90 b/examples/fileread/mld_dexample_1lev.f90 index 4d2b9bfd..711c53a2 100644 --- a/examples/fileread/mld_dexample_1lev.f90 +++ b/examples/fileread/mld_dexample_1lev.f90 @@ -185,7 +185,7 @@ program mld_dexample_ml call psb_barrier(ictxt) if (iam == psb_root_) write(*,'("Partition type: block")') call psb_matdist(aux_A, A, ictxt, & - & desc_A,b_glob,b,info, parts=part_block) + & desc_A,info,b_glob=b_glob,b=b, parts=part_block) t2 = psb_wtime() - t1 diff --git a/examples/fileread/mld_dexample_ml.f90 b/examples/fileread/mld_dexample_ml.f90 index fee07a74..19c206ca 100644 --- a/examples/fileread/mld_dexample_ml.f90 +++ b/examples/fileread/mld_dexample_ml.f90 @@ -189,7 +189,7 @@ program mld_dexample_ml call psb_barrier(ictxt) if (iam == psb_root_) write(*,'("Partition type: block")') call psb_matdist(aux_A, A, ictxt, & - & desc_A,b_glob,b,info, parts=part_block) + & desc_A,info,b_glob=b_glob,b=b, parts=part_block) t2 = psb_wtime() - t1 diff --git a/examples/fileread/mld_sexample_1lev.f90 b/examples/fileread/mld_sexample_1lev.f90 index 93d5c556..1dd5800a 100644 --- a/examples/fileread/mld_sexample_1lev.f90 +++ b/examples/fileread/mld_sexample_1lev.f90 @@ -186,7 +186,7 @@ program mld_sexample_ml call psb_barrier(ictxt) if (iam == psb_root_) write(*,'("Partition type: block")') call psb_matdist(aux_A, A, ictxt, & - & desc_A,b_glob,b,info, parts=part_block) + & desc_A,info,b_glob=b_glob,b=b, parts=part_block) t2 = psb_wtime() - t1 diff --git a/examples/fileread/mld_sexample_ml.f90 b/examples/fileread/mld_sexample_ml.f90 index eb17a335..38d3c736 100644 --- a/examples/fileread/mld_sexample_ml.f90 +++ b/examples/fileread/mld_sexample_ml.f90 @@ -190,7 +190,7 @@ program mld_sexample_ml call psb_barrier(ictxt) if (iam == psb_root_) write(*,'("Partition type: block")') call psb_matdist(aux_A, A, ictxt, & - & desc_A,b_glob,b,info, parts=part_block) + & desc_A,info,b_glob=b_glob,b=b, parts=part_block) t2 = psb_wtime() - t1 diff --git a/examples/fileread/mld_zexample_1lev.f90 b/examples/fileread/mld_zexample_1lev.f90 index 4a6140da..580aa64f 100644 --- a/examples/fileread/mld_zexample_1lev.f90 +++ b/examples/fileread/mld_zexample_1lev.f90 @@ -185,7 +185,7 @@ program mld_zexample_ml call psb_barrier(ictxt) if (iam == psb_root_) write(*,'("Partition type: block")') call psb_matdist(aux_A, A, ictxt, & - & desc_A,b_glob,b,info, parts=part_block) + & desc_A,info,b_glob=b_glob,b=b, parts=part_block) t2 = psb_wtime() - t1 diff --git a/examples/fileread/mld_zexample_ml.f90 b/examples/fileread/mld_zexample_ml.f90 index 8027722b..6c8198e6 100644 --- a/examples/fileread/mld_zexample_ml.f90 +++ b/examples/fileread/mld_zexample_ml.f90 @@ -189,7 +189,7 @@ program mld_zexample_ml call psb_barrier(ictxt) if (iam == psb_root_) write(*,'("Partition type: block")') call psb_matdist(aux_A, A, ictxt, & - & desc_A,b_glob,b,info, parts=part_block) + & desc_A,info,b_glob=b_glob,b=b, parts=part_block) t2 = psb_wtime() - t1 diff --git a/tests/fileread/cf_sample.f90 b/tests/fileread/cf_sample.f90 index 1f48362e..26cd7adf 100644 --- a/tests/fileread/cf_sample.f90 +++ b/tests/fileread/cf_sample.f90 @@ -212,7 +212,7 @@ program cf_sample ivg(i) = ipv(1) enddo call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,v=ivg) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,v=ivg) else if (ipart == 2) then if (iam == psb_root_) then write(psb_out_unit,'("Partition type: graph")') @@ -224,11 +224,11 @@ program cf_sample call distr_mtpart(psb_root_,ictxt) call getv_mtpart(ivg) call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,v=ivg) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,v=ivg) else if (iam == psb_root_) write(psb_out_unit,'("Partition type: block")') call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,parts=part_block) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,parts=part_block) end if call psb_geall(x_col,desc_a,info) diff --git a/tests/fileread/df_sample.f90 b/tests/fileread/df_sample.f90 index ef11ae07..47a4bdc5 100644 --- a/tests/fileread/df_sample.f90 +++ b/tests/fileread/df_sample.f90 @@ -213,7 +213,7 @@ program df_sample ivg(i) = ipv(1) enddo call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,v=ivg) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,v=ivg) else if (ipart == 2) then if (iam == psb_root_) then write(psb_out_unit,'("Partition type: graph")') @@ -225,11 +225,11 @@ program df_sample call distr_mtpart(psb_root_,ictxt) call getv_mtpart(ivg) call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,v=ivg) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,v=ivg) else if (iam == psb_root_) write(psb_out_unit,'("Partition type: block")') call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,parts=part_block) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,parts=part_block) end if call psb_geall(x_col,desc_a,info) diff --git a/tests/fileread/sf_sample.f90 b/tests/fileread/sf_sample.f90 index 109367a2..eea679c7 100644 --- a/tests/fileread/sf_sample.f90 +++ b/tests/fileread/sf_sample.f90 @@ -212,7 +212,7 @@ program sf_sample ivg(i) = ipv(1) enddo call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,v=ivg) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,v=ivg) else if (ipart == 2) then if (iam == psb_root_) then write(psb_out_unit,'("Partition type: graph")') @@ -224,11 +224,11 @@ program sf_sample call distr_mtpart(psb_root_,ictxt) call getv_mtpart(ivg) call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,v=ivg) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,v=ivg) else if (iam == psb_root_) write(psb_out_unit,'("Partition type: block")') call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,parts=part_block) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,parts=part_block) end if call psb_geall(x_col,desc_a,info) diff --git a/tests/fileread/zf_sample.f90 b/tests/fileread/zf_sample.f90 index 2b382eab..1775e877 100644 --- a/tests/fileread/zf_sample.f90 +++ b/tests/fileread/zf_sample.f90 @@ -212,7 +212,7 @@ program zf_sample ivg(i) = ipv(1) enddo call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,v=ivg) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,v=ivg) else if (ipart == 2) then if (iam == psb_root_) then write(psb_out_unit,'("Partition type: graph")') @@ -224,11 +224,11 @@ program zf_sample call distr_mtpart(psb_root_,ictxt) call getv_mtpart(ivg) call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,v=ivg) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,v=ivg) else if (iam == psb_root_) write(psb_out_unit,'("Partition type: block")') call psb_matdist(aux_a, a, ictxt, & - & desc_a,b_col_glob,b_col,info,fmt=afmt,parts=part_block) + & desc_a,info,b_glob=b_col_glob,b=b_col,fmt=afmt,parts=part_block) end if call psb_geall(x_col,desc_a,info)