New parameter: starting_time
This commit is contained in:
13
src/main.c
13
src/main.c
@@ -24,6 +24,7 @@ typedef struct nstrophy_parameters {
|
||||
double L;
|
||||
unsigned int print_freq;
|
||||
int seed;
|
||||
unsigned int starting_time;
|
||||
} nstrophy_parameters;
|
||||
|
||||
// usage message
|
||||
@@ -119,10 +120,10 @@ int main (
|
||||
|
||||
// run command
|
||||
if (command==COMMAND_UK){
|
||||
uk(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.print_freq, nthreads, savefile);
|
||||
uk(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.print_freq, parameters.starting_time, nthreads, savefile);
|
||||
}
|
||||
else if(command==COMMAND_EEA){
|
||||
eea(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.print_freq, nthreads, savefile);
|
||||
eea(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.print_freq, parameters.starting_time, nthreads, savefile);
|
||||
}
|
||||
else if(command==COMMAND_QUIET){
|
||||
quiet(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, nthreads, savefile);
|
||||
@@ -345,6 +346,7 @@ int read_params(
|
||||
parameters->L=2*M_PI;
|
||||
parameters->nsteps=10000000;
|
||||
parameters->print_freq=1000;
|
||||
parameters->starting_time=0;
|
||||
parameters->seed=17;
|
||||
|
||||
if (param_str!=NULL){
|
||||
@@ -516,6 +518,13 @@ int set_parameter(
|
||||
return(-1);
|
||||
}
|
||||
}
|
||||
else if (strcmp(lhs,"starting_time")==0){
|
||||
ret=sscanf(rhs,"%u",&(parameters->starting_time));
|
||||
if(ret!=1){
|
||||
fprintf(stderr, "error: parameter 'starting_time' should be an unsigned integer\n got '%s'\n",rhs);
|
||||
return(-1);
|
||||
}
|
||||
}
|
||||
else{
|
||||
fprintf(stderr, "error: unrecognized parameter '%s'\n",lhs);
|
||||
return(-1);
|
||||
|
||||
Reference in New Issue
Block a user