print_alpha
This commit is contained in:
		
							
								
								
									
										14
									
								
								src/main.c
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								src/main.c
									
									
									
									
									
								
							@@ -58,6 +58,7 @@ typedef struct nstrophy_parameters {
 | 
			
		||||
  FILE* drivingfile;
 | 
			
		||||
  double lyapunov_reset;
 | 
			
		||||
  double D_epsilon;
 | 
			
		||||
  bool print_alpha;
 | 
			
		||||
} nstrophy_parameters;
 | 
			
		||||
 | 
			
		||||
// usage message
 | 
			
		||||
@@ -277,7 +278,7 @@ int main (
 | 
			
		||||
    // register signal handler to handle aborts
 | 
			
		||||
    signal(SIGINT, sig_handler);
 | 
			
		||||
    signal(SIGTERM, sig_handler);
 | 
			
		||||
    enstrophy(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.final_time, parameters.nu, parameters.delta, parameters.L, parameters.adaptive_tolerance, parameters.adaptive_factor, parameters.max_delta, parameters.adaptive_norm, u0, g, parameters.irreversible, parameters.keep_en_cst, parameters.init_en, parameters.algorithm, parameters.print_freq, parameters.starting_time, nthreads, savefile, utfile, (char*)argv[0], dstring_to_str_noinit(¶m_str), dstring_to_str_noinit(&savefile_str), dstring_to_str_noinit(&utfile_str));
 | 
			
		||||
    enstrophy(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.final_time, parameters.nu, parameters.delta, parameters.L, parameters.adaptive_tolerance, parameters.adaptive_factor, parameters.max_delta, parameters.adaptive_norm, u0, g, parameters.irreversible, parameters.keep_en_cst, parameters.init_en, parameters.algorithm, parameters.print_freq, parameters.starting_time, parameters.print_alpha, nthreads, savefile, utfile, (char*)argv[0], dstring_to_str_noinit(¶m_str), dstring_to_str_noinit(&savefile_str), dstring_to_str_noinit(&utfile_str));
 | 
			
		||||
  }
 | 
			
		||||
  else if(command==COMMAND_QUIET){
 | 
			
		||||
    quiet(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.final_time, parameters.nu, parameters.delta, parameters.L, parameters.adaptive_tolerance, parameters.adaptive_factor, parameters.max_delta, parameters.adaptive_norm, parameters.starting_time, u0, g, parameters.irreversible, parameters.keep_en_cst, parameters.init_en, parameters.algorithm, nthreads, savefile);
 | 
			
		||||
@@ -554,6 +555,8 @@ int set_default_params(
 | 
			
		||||
  parameters->initfile=NULL;
 | 
			
		||||
  parameters->algorithm=ALGORITHM_RK4;
 | 
			
		||||
  parameters->keep_en_cst=false;
 | 
			
		||||
 | 
			
		||||
  parameters->print_alpha=false;
 | 
			
		||||
  
 | 
			
		||||
  return(0);
 | 
			
		||||
}
 | 
			
		||||
@@ -885,6 +888,15 @@ int set_parameter(
 | 
			
		||||
    }
 | 
			
		||||
    parameters->keep_en_cst=(tmp==1);
 | 
			
		||||
  }
 | 
			
		||||
  else if (strcmp(lhs,"print_alpha")==0){
 | 
			
		||||
    int tmp;
 | 
			
		||||
    ret=sscanf(rhs,"%d",&tmp);
 | 
			
		||||
    if(ret!=1 || (tmp!=0 && tmp!=1)){
 | 
			
		||||
      fprintf(stderr, "error: parameter 'print_alpha' should be 0 or 1\n       got '%s'\n",rhs);
 | 
			
		||||
      return(-1);
 | 
			
		||||
    }
 | 
			
		||||
    parameters->print_alpha=(tmp==1);
 | 
			
		||||
  }
 | 
			
		||||
  else{
 | 
			
		||||
    fprintf(stderr, "error: unrecognized parameter '%s'\n",lhs);
 | 
			
		||||
    return(-1);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user