Rename read_u/write_u to read_vec/write_vec

4 files changed, 35 insertions, 35 deletions

diff --git a/src/init.c b/src/init.c
index e4b6065..cce97d2 100644
--- a/src/init.c
+++ b/src/init.c
@@ -89,7 +89,7 @@ int init_file_txt (
   int K2,
   FILE* initfile
 ){
-  read_u(u0, K1, K2, initfile);
+  read_vec(u0, K1, K2, initfile);
   return 0;
 }
 // binary input
@@ -99,6 +99,6 @@ int init_file_bin (
   int K2,
   FILE* initfile
 ){
-  read_u_bin(u0, K1, K2, initfile);
+  read_vec_bin(u0, K1, K2, initfile);
   return 0;
 }
diff --git a/src/io.c b/src/io.c
index de52972..e8afbb1 100644
--- a/src/io.c
+++ b/src/io.c
@@ -4,8 +4,8 @@
 #include "io.h"
 #include "navier-stokes.h"
 
-// write final entry to file
-int write_u(_Complex double* u, int K1, int K2, FILE* file){
+// write complex vector indexed by k1,k2 to file
+int write_vec(_Complex double* vec, int K1, int K2, FILE* file){
   int kx,ky;
 
   // do nothing if there is no file
@@ -15,15 +15,27 @@ int write_u(_Complex double* u, int K1, int K2, FILE* file){
 
   for(kx=0;kx<=K1;kx++){
     for (ky=-K2;ky<=K2;ky++){
-      fprintf(file,"% 3d % 3d % .15e % .15e\n",kx,ky,__real__ u[klookup_sym(kx,ky,K2)],__imag__ u[klookup_sym(kx,ky,K2)]);
+      fprintf(file,"% 3d % 3d % .15e % .15e\n",kx,ky,__real__ vec[klookup_sym(kx,ky,K2)],__imag__ vec[klookup_sym(kx,ky,K2)]);
     }
   }
 
   return 0;
 }
 
-// read u from file
-int read_u(_Complex double* u, int K1, int K2, FILE* file){
+// write complex vector indexed by k1,k2 to file in binary format
+int write_vec_bin(_Complex double* vec, int K1, int K2, FILE* file){
+  // do nothing if there is no file
+  if(file==NULL){
+    return 0;
+  }
+
+  fwrite(vec, sizeof(_Complex double), (K1+1)*(2*K2+1), file);
+
+  return 0;
+}
+
+// read complex vector indexed by k1,k2 from file
+int read_vec(_Complex double* out, int K1, int K2, FILE* file){
   int kx,ky;
   double r,i;
   char* line;
@@ -37,7 +49,7 @@ int read_u(_Complex double* u, int K1, int K2, FILE* file){
 
   // error if there is no file (this should not happen)
   if (file==NULL){
-    fprintf(stderr,"error reading u from file (this is a bug!)\n");
+    fprintf(stderr,"error reading input from file (this is a bug, contact Ian at ian.jauslin@rutgers.edu!)\n");
     return -1;
   }
 
@@ -74,8 +86,8 @@ int read_u(_Complex double* u, int K1, int K2, FILE* file){
 	    fprintf(stderr, "warning: reading line %d: kx should be >=0, skipping\n", counter);
 	  }
 	  else{
-	    // set u
-	    u[klookup_sym(kx, ky, K2)]=r+i*I;
+	    // set output
+	    out[klookup_sym(kx, ky, K2)]=r+i*I;
 	  }
 	}
       }
@@ -115,20 +127,8 @@ int read_u(_Complex double* u, int K1, int K2, FILE* file){
   return 0;
 }
 
-// write final entry to file in binary format
-int write_u_bin(_Complex double* u, int K1, int K2, FILE* file){
-  // do nothing if there is no file
-  if(file==NULL){
-    return 0;
-  }
-
-  fwrite(u, sizeof(_Complex double), (K1+1)*(2*K2+1), file);
-
-  return 0;
-}
-
-// read u from file in binary format
-int read_u_bin(_Complex double* u, int K1, int K2, FILE* file){
+// read complex vector indexed by k1,k2 from file in binary format
+int read_vec_bin(_Complex double* out, int K1, int K2, FILE* file){
   char c;
   int ret;
 
@@ -164,7 +164,7 @@ int read_u_bin(_Complex double* u, int K1, int K2, FILE* file){
     }
   }
 
-  fread(u, sizeof(_Complex double), (K1+1)*(2*K2+1), file);
+  fread(out, sizeof(_Complex double), (K1+1)*(2*K2+1), file);
 
   return 0;
 }
diff --git a/src/io.h b/src/io.h
index bbf20ae..99fd84d 100644
--- a/src/io.h
+++ b/src/io.h
@@ -3,13 +3,13 @@
 
 #include <stdio.h>
 
-// write u to file
-int write_u(_Complex double* u, int K1, int K2, FILE* file);
-int write_u_bin(_Complex double* u, int K1, int K2, FILE* file);
+// write complex vector indexed by k1,k2 to file
+int write_vec(_Complex double* u, int K1, int K2, FILE* file);
+int write_vec_bin(_Complex double* u, int K1, int K2, FILE* file);
 
-// read u from file
-int read_u(_Complex double* u, int K1, int K2, FILE* file);
-int read_u_bin(_Complex double* u, int K1, int K2, FILE* file);
+// read complex vector indexed by k1,k2 from file
+int read_vec(_Complex double* u, int K1, int K2, FILE* file);
+int read_vec_bin(_Complex double* u, int K1, int K2, FILE* file);
 
 // remove an entry from params string (inplace)
 int remove_entry(char* param_str, char* entry);
diff --git a/src/navier-stokes.c b/src/navier-stokes.c
index 110ba07..a344ae4 100644
--- a/src/navier-stokes.c
+++ b/src/navier-stokes.c
@@ -71,7 +71,7 @@ int uk(
   }
 
   // save final entry to savefile
-  write_u_bin(u, K1, K2, savefile);
+  write_vec_bin(u, K1, K2, savefile);
 
   ns_free_tmps(u, tmp1, tmp2, tmp3, fft1, fft2, ifft);
   return(0);
@@ -188,9 +188,9 @@ int eea(
 
   // save final entry to savefile
   if(savefile==stderr || savefile==stdout){
-    write_u(u, K1, K2, savefile);
+    write_vec(u, K1, K2, savefile);
   } else {
-    write_u_bin(u, K1, K2, savefile);
+    write_vec_bin(u, K1, K2, savefile);
   }
 
   ns_free_tmps(u, tmp1, tmp2, tmp3, fft1, fft2, ifft);
@@ -233,7 +233,7 @@ int quiet(
   }
 
   // save final entry to savefile
-  write_u(u, K1, K2, savefile);
+  write_vec(u, K1, K2, savefile);
 
   ns_free_tmps(u, tmp1, tmp2, tmp3, fft1, fft2, ifft);
   return(0);