Added readvec.m and modified amgmvio to copy in files

seq_linear_solvers/amg/tools/amgmvio

@@ -12,25 +12,33 @@
 #
 # Usage:  amgmvio <prefix1> <prefix2>
 #
-# Result: mv <prefix1>.in.problem  <prefix2>.in.problem
-#         mv <prefix1>.in.solver   <prefix2>.in.solver
-#         mv <prefix1>.out* <prefix2>.out*
+# Result: cp <prefix1>.in.problem  <prefix2>.in.problem
+#         cp <prefix1>.in.solver   <prefix2>.in.solver
+#         mv <prefix1>.out*        <prefix2>.out*
 #
 #=============================================================================
 
 if [ "$2" != "" ]; then
 
-for i in $1.in.problem $1.in.solver $1.out*
+for i in $1.in.problem $1.in.solver
 do
   EXT=`echo $i $1 | awk '{print substr($1,length($2)+1)}'`
   cp $i $2${EXT}
 done
 
+for i in $1.out*
+do
+  EXT=`echo $i $1 | awk '{print substr($1,length($2)+1)}'`
+  mv $i $2${EXT}
+done
+
+
 else
 
   echo 'usage:  amgmvio <prefix1> <prefix2>'
-  echo 'result: mv <prefix1>.in*  <prefix2>.in*'
-  echo '        mv <prefix1>.out* <prefix2>.out*'
+  echo 'result: cp <prefix1>.in.problem  <prefix2>.in.problem'
+  echo '        cp <prefix1>.in.solver   <prefix2>.in.solver'
+  echo '        mv <prefix1>.out*        <prefix2>.out*'
 
 fi
 

seq_linear_solvers/amg/tools/build

@@ -64,7 +64,7 @@ then
      $AMG_MKDIR $AMG_BIN
    fi
 
-   UTILITIES="amgstrip amgmvio convert_icf3d readysmp.m"
+   UTILITIES="amgstrip amgmvio convert_icf3d readysmp.m readvec.m"
 
    for i in $UTILITIES
    do

seq_linear_solvers/amg/tools/rcs_files

@@ -1,4 +1,5 @@
 Makefile
+amgmvio
 amgstrip
 build
 convert_icf3d.c
@@ -8,6 +9,7 @@ matrix.c
 matrix.h
 read.c
 readysmp.m
+readvec.m
 vector.c
 vector.h
 write.c

seq_linear_solvers/amg/tools/readvec.m

@@ -0,0 +1,20 @@
+function [v] = readvec(filename)
+%-----------------------------------------------------------------------------
+% [v] = readvec('filename'):
+%   Reads from file 'filename' a vector v.
+%
+%   Format:
+%   First line is 'nv' the number of rows in matrix.  Integer.
+%   Next 'nv' lines are the vector coefficients.
+%
+%-----------------------------------------------------------------------------
+
+fid=fopen(filename,'r');
+
+% read junk line
+junk = fscanf(fid,'%d',2);
+
+nv = fscanf(fid,'%d',1); % number of variables (nv)
+[v, count] = fscanf(fid,'%d ',nv);
+fclose(fid);
+

seq_ls/amg/tools/amgmvio

@@ -12,25 +12,33 @@
 #
 # Usage:  amgmvio <prefix1> <prefix2>
 #
-# Result: mv <prefix1>.in.problem  <prefix2>.in.problem
-#         mv <prefix1>.in.solver   <prefix2>.in.solver
-#         mv <prefix1>.out* <prefix2>.out*
+# Result: cp <prefix1>.in.problem  <prefix2>.in.problem
+#         cp <prefix1>.in.solver   <prefix2>.in.solver
+#         mv <prefix1>.out*        <prefix2>.out*
 #
 #=============================================================================
 
 if [ "$2" != "" ]; then
 
-for i in $1.in.problem $1.in.solver $1.out*
+for i in $1.in.problem $1.in.solver
 do
   EXT=`echo $i $1 | awk '{print substr($1,length($2)+1)}'`
   cp $i $2${EXT}
 done
 
+for i in $1.out*
+do
+  EXT=`echo $i $1 | awk '{print substr($1,length($2)+1)}'`
+  mv $i $2${EXT}
+done
+
+
 else
 
   echo 'usage:  amgmvio <prefix1> <prefix2>'
-  echo 'result: mv <prefix1>.in*  <prefix2>.in*'
-  echo '        mv <prefix1>.out* <prefix2>.out*'
+  echo 'result: cp <prefix1>.in.problem  <prefix2>.in.problem'
+  echo '        cp <prefix1>.in.solver   <prefix2>.in.solver'
+  echo '        mv <prefix1>.out*        <prefix2>.out*'
 
 fi
 

seq_ls/amg/tools/build

@@ -64,7 +64,7 @@ then
      $AMG_MKDIR $AMG_BIN
    fi
 
-   UTILITIES="amgstrip amgmvio convert_icf3d readysmp.m"
+   UTILITIES="amgstrip amgmvio convert_icf3d readysmp.m readvec.m"
 
    for i in $UTILITIES
    do

seq_ls/amg/tools/rcs_files

@@ -1,4 +1,5 @@
 Makefile
+amgmvio
 amgstrip
 build
 convert_icf3d.c
@@ -8,6 +9,7 @@ matrix.c
 matrix.h
 read.c
 readysmp.m
+readvec.m
 vector.c
 vector.h
 write.c

seq_ls/amg/tools/readvec.m

@@ -0,0 +1,20 @@
+function [v] = readvec(filename)
+%-----------------------------------------------------------------------------
+% [v] = readvec('filename'):
+%   Reads from file 'filename' a vector v.
+%
+%   Format:
+%   First line is 'nv' the number of rows in matrix.  Integer.
+%   Next 'nv' lines are the vector coefficients.
+%
+%-----------------------------------------------------------------------------
+
+fid=fopen(filename,'r');
+
+% read junk line
+junk = fscanf(fid,'%d',2);
+
+nv = fscanf(fid,'%d',1); % number of variables (nv)
+[v, count] = fscanf(fid,'%d ',nv);
+fclose(fid);
+