Removed "options" from solver selection

Now the solver name fully determines the solver (and options)
to be used. For example, now one must specify "h48h0k4" as the
name of the solver.

This PR also fixes a couple of things in tools.

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/001_derive_h48/derive_h48.c b/tools/001_derive_h48/derive_h48.c
index ba282ff..c5f28c8 100644
--- a/tools/001_derive_h48/derive_h48.c
+++ b/tools/001_derive_h48/derive_h48.c
@@ -11,25 +11,25 @@ edit the base value in the source code and recompile.
 
 #include "../tool.h"
 
-char *opts_large, *opts_small, *filename_large, *filename_small;
+char *solver_large, *solver_small, *filename_large, *filename_small;
 
 void run(void) {
-        derivedata_run(opts_large, opts_small, filename_large, filename_small);
+        derivedata_run(solver_large, solver_small, filename_large, filename_small);
 }
 
 int main(int argc, char **argv) {
         if (argc < 5) {
                 fprintf(stderr,
                     "Error: not enough arguments. Required:\n"
-                    "1. Options for large table\n"
-                    "2. Options for derived table\n"
+                    "1. Solver name for large table\n"
+                    "2. Solver name for derived table\n"
                     "3. Filename containing large table\n"
                     "4. Filename for saving derived table\n");
                 return 1;
         }
 
-        opts_large = argv[1];
-        opts_small = argv[2];
+        solver_large = argv[1];
+        solver_small = argv[2];
         filename_large = argv[3];
         filename_small = argv[4];