From c6c609d6ac1b2b7f32dbe6548a1954fa996175a5 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 26 Mar 2014 17:51:30 +0000 Subject: [PATCH] mld2p4-2: configure.ac 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 mm_array_read interface: fix fileread samples. --- configure.ac | 4 ---- 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 | 2 +- tests/fileread/df_sample.f90 | 2 +- tests/fileread/sf_sample.f90 | 2 +- tests/fileread/zf_sample.f90 | 2 +- 13 files changed, 12 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 0f415975..1bfe61bd 100755 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,5 @@ dnl $Id$ -dnl -dnl Michele Martone's proposal for a transition towards the GNU build system for the PSBLAS library -dnl - dnl Process this file with autoconf to produce a configure script. dnl dnl usage : aclocal -I config/ && autoconf && ./configure && make diff --git a/examples/fileread/mld_cexample_1lev.f90 b/examples/fileread/mld_cexample_1lev.f90 index 09cd7528..6ffc7220 100644 --- a/examples/fileread/mld_cexample_1lev.f90 +++ b/examples/fileread/mld_cexample_1lev.f90 @@ -131,7 +131,7 @@ program mld_cexample_ml call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/examples/fileread/mld_cexample_ml.f90 b/examples/fileread/mld_cexample_ml.f90 index 80ab327c..762a517e 100644 --- a/examples/fileread/mld_cexample_ml.f90 +++ b/examples/fileread/mld_cexample_ml.f90 @@ -135,7 +135,7 @@ program mld_cexample_ml call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/examples/fileread/mld_dexample_1lev.f90 b/examples/fileread/mld_dexample_1lev.f90 index cad2d6bc..a91fff6f 100644 --- a/examples/fileread/mld_dexample_1lev.f90 +++ b/examples/fileread/mld_dexample_1lev.f90 @@ -130,7 +130,7 @@ program mld_dexample_ml call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/examples/fileread/mld_dexample_ml.f90 b/examples/fileread/mld_dexample_ml.f90 index eee3ec7d..b81a2945 100644 --- a/examples/fileread/mld_dexample_ml.f90 +++ b/examples/fileread/mld_dexample_ml.f90 @@ -134,7 +134,7 @@ program mld_dexample_ml call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/examples/fileread/mld_sexample_1lev.f90 b/examples/fileread/mld_sexample_1lev.f90 index 16695617..f5df1a83 100644 --- a/examples/fileread/mld_sexample_1lev.f90 +++ b/examples/fileread/mld_sexample_1lev.f90 @@ -131,7 +131,7 @@ program mld_sexample_ml call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/examples/fileread/mld_sexample_ml.f90 b/examples/fileread/mld_sexample_ml.f90 index 61bbdcfe..6c45de1e 100644 --- a/examples/fileread/mld_sexample_ml.f90 +++ b/examples/fileread/mld_sexample_ml.f90 @@ -135,7 +135,7 @@ program mld_sexample_ml call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/examples/fileread/mld_zexample_1lev.f90 b/examples/fileread/mld_zexample_1lev.f90 index c46f7718..d4a74056 100644 --- a/examples/fileread/mld_zexample_1lev.f90 +++ b/examples/fileread/mld_zexample_1lev.f90 @@ -130,7 +130,7 @@ program mld_zexample_ml call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/examples/fileread/mld_zexample_ml.f90 b/examples/fileread/mld_zexample_ml.f90 index 23deec41..13a22adc 100644 --- a/examples/fileread/mld_zexample_ml.f90 +++ b/examples/fileread/mld_zexample_ml.f90 @@ -134,7 +134,7 @@ program mld_zexample_ml call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/tests/fileread/cf_sample.f90 b/tests/fileread/cf_sample.f90 index 8d69ab68..116bc630 100644 --- a/tests/fileread/cf_sample.f90 +++ b/tests/fileread/cf_sample.f90 @@ -150,7 +150,7 @@ program cf_sample call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/tests/fileread/df_sample.f90 b/tests/fileread/df_sample.f90 index 98b85cae..4322bd45 100644 --- a/tests/fileread/df_sample.f90 +++ b/tests/fileread/df_sample.f90 @@ -150,7 +150,7 @@ program df_sample call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/tests/fileread/sf_sample.f90 b/tests/fileread/sf_sample.f90 index 4edeba7b..1687179a 100644 --- a/tests/fileread/sf_sample.f90 +++ b/tests/fileread/sf_sample.f90 @@ -150,7 +150,7 @@ program sf_sample call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if diff --git a/tests/fileread/zf_sample.f90 b/tests/fileread/zf_sample.f90 index 9848cb70..2908058d 100644 --- a/tests/fileread/zf_sample.f90 +++ b/tests/fileread/zf_sample.f90 @@ -150,7 +150,7 @@ program zf_sample call mm_mat_read(aux_a,info,iunit=iunit,filename=mtrx_file) if (info == psb_success_) then if (rhs_file /= 'NONE') then - call mm_vet_read(aux_b,info,iunit=iunit,filename=rhs_file) + call mm_array_read(aux_b,info,iunit=iunit,filename=rhs_file) end if end if