diff options
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -41,9 +41,8 @@ _Complex double* set_driving(unsigned int driving, nstrophy_parameters parameter _Complex double* set_init(unsigned int init, nstrophy_parameters parameters); #define COMMAND_UK 1 -#define COMMAND_ALPHA 2 +#define COMMAND_EEA 2 #define COMMAND_QUIET 3 -#define COMMAND_ENERGY 4 #define DRIVING_ZERO 1 #define DRIVING_TEST 2 @@ -93,10 +92,7 @@ int main ( 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); } - else if (command==COMMAND_ENERGY){ - energy(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.print_freq, nthreads); - } - else if(command==COMMAND_ALPHA){ + 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); } else if(command==COMMAND_QUIET){ @@ -251,15 +247,12 @@ int read_args( if(strcmp(argv[i], "uk")==0){ *command=COMMAND_UK; } - else if(strcmp(argv[i], "alpha")==0){ - *command=COMMAND_ALPHA; + else if(strcmp(argv[i], "energy")==0){ + *command=COMMAND_EEA; } else if(strcmp(argv[i], "quiet")==0){ *command=COMMAND_QUIET; } - else if(strcmp(argv[i], "energy")==0){ - *command=COMMAND_ENERGY; - } else{ fprintf(stderr, "error: unrecognized command: '%s'\n",argv[i]); return(-1); |