Use 'enstrophy' instead of energy, and print enstrophy*alpha

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main.c b/src/main.c
index 4ad182e..f2118a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -155,10 +155,10 @@ 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.irreversible, parameters.algorithm, parameters.print_freq, parameters.starting_time, nthreads, savefile);
   }
-  else if(command==COMMAND_EEA){
+  else if(command==COMMAND_ENSTROPHY){
     // 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.algorithm, parameters.print_freq, parameters.starting_time, nthreads, savefile, (char*)argv[0], param_str, savefile_str);
+    enstrophy(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.nsteps, parameters.nu, parameters.delta, parameters.L, u0, g, parameters.irreversible, parameters.algorithm, 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, parameters.starting_time, u0, g, parameters.irreversible, parameters.algorithm, nthreads, savefile);
@@ -322,8 +322,8 @@ int read_args(
       if(strcmp(argv[i], "uk")==0){
 	*command=COMMAND_UK;
       }
-      else if(strcmp(argv[i], "energy")==0){
-	*command=COMMAND_EEA;
+      else if(strcmp(argv[i], "enstrophy")==0){
+	*command=COMMAND_ENSTROPHY;
       }
       else if(strcmp(argv[i], "quiet")==0){
 	*command=COMMAND_QUIET;