Remove avg_window option: always use print_freq

1 files changed, 4 insertions, 20 deletions

diff --git a/src/main.c b/src/main.c
index d7aa8fd..cc1ad32 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,7 +28,6 @@ typedef struct nstrophy_parameters {
   double delta;
   double L;
   unsigned int print_freq;
-  unsigned int avg_window;
   int seed;
   unsigned int starting_time;
   unsigned int driving;
@@ -44,7 +43,7 @@ int print_params(nstrophy_parameters parameters, char* initfile_str, FILE* file)
 // read command line arguments
 int read_args(int argc, const char* argv[], char** params, unsigned int* command, unsigned int* nthreads, char** savefile_str);
 int read_params(char* param_str, nstrophy_parameters* parameters, char** initfile_str);
-int set_parameter(char* lhs, char* rhs, nstrophy_parameters* parameters, bool* setN1, bool* setN2, bool* setavg_window, char** initfile_str);
+int set_parameter(char* lhs, char* rhs, nstrophy_parameters* parameters, bool* setN1, bool* setN2, char** initfile_str);
 
 // set driving force
 _Complex double* set_driving(nstrophy_parameters parameters);
@@ -149,7 +148,7 @@ int main (
   else if(command==COMMAND_EEA){
     // register signal handler to handle aborts
     signal(SIGINT, sig_handler);
-    eea(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.irreversible, parameters.print_freq, parameters.avg_window, parameters.starting_time, nthreads, savefile, (char*)argv[0], param_str, savefile_str);
+    eea(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.irreversible, parameters.print_freq, parameters.starting_time, nthreads, savefile, (char*)argv[0], param_str, savefile_str);
   }
   else if(command==COMMAND_QUIET){
     quiet(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.irreversible, nthreads, savefile);
@@ -323,8 +322,6 @@ int read_params(
   // whether N was set explicitly
   bool setN1=false;
   bool setN2=false;
-  // whether avg_window was set explicitly
-  bool setavg_window=false;
   // whether lhs (false is rhs)
   bool lhs=true;
 
@@ -365,7 +362,7 @@ int read_params(
 	break;
       case ';':
 	//set parameter
-	ret=set_parameter(buffer_lhs, buffer_rhs, parameters, &setN1, &setN2, &setavg_window, initfile_str);
+	ret=set_parameter(buffer_lhs, buffer_rhs, parameters, &setN1, &setN2, initfile_str);
 	if(ret<0){
 	  return ret;
 	}
@@ -392,7 +389,7 @@ int read_params(
 
     // set last param
     if (*param_str!='\0'){
-      ret=set_parameter(buffer_lhs, buffer_rhs, parameters, &setN1, &setN2, &setavg_window, initfile_str);
+      ret=set_parameter(buffer_lhs, buffer_rhs, parameters, &setN1, &setN2, initfile_str);
       if(ret<0){
 	return ret;
       }
@@ -410,10 +407,6 @@ int read_params(
   if (!setN2){
     parameters->N2=smallest_pow2(3*(parameters->K2));
   }
-  // if avg_window is not set explicitly, set it to print_freq
-  if (!setavg_window){
-    parameters->avg_window=parameters->print_freq;
-  }
 
   return(0);
 }
@@ -426,7 +419,6 @@ int set_parameter(
   nstrophy_parameters* parameters,
   bool* setN1,
   bool* setN2,
-  bool* setavg_window,
   char** initfile_str
 ){
   int ret;
@@ -533,14 +525,6 @@ int set_parameter(
       return(-1);
     }
   }
-  else if (strcmp(lhs,"avg_window")==0){
-    ret=sscanf(rhs,"%u",&(parameters->avg_window));
-    if(ret!=1){
-      fprintf(stderr, "error: parameter 'avg_window' should be an integer\n       got '%s'\n",rhs);
-      return(-1);
-    }
-    *setavg_window=true;
-  }
   else if (strcmp(lhs,"random_seed")==0){
     ret=sscanf(rhs,"%d",&(parameters->seed));
     if(ret!=1){