adjusted sequence of parameters so they are displayed in correct order

MathiasBojack · Dec 6, 2019 · eacbafb · eacbafb
1 parent 7ca4326
commit eacbafb
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 37 deletions.
diff --git a/Applications/Utils/FileConverter/GocadTSurfaceReader.cpp b/Applications/Utils/FileConverter/GocadTSurfaceReader.cpp
@@ -36,30 +36,29 @@ int main(int argc, char* argv[])
             "(http://www.opengeosys.org)",
         ' ', GitInfoLib::GitInfo::ogs_version);
 
-    TCLAP::ValueArg<std::string> input_arg(
-        "i", "input-file", "Gocad triangular surfaces file (*.ts)", true, "",
-        "filename.ts");
-    cmd.add(input_arg);
-
-    TCLAP::ValueArg<std::string> output_arg(
-        "o", "output-dir", "output directory", true, "",
-        "output dir");
-    cmd.add(output_arg);
-
     TCLAP::SwitchArg write_binary_arg(
         "b", "write-binary",
         "if set, OGS-Meshes will be written in binary format");
     cmd.add(write_binary_arg);
 
+    TCLAP::SwitchArg export_surfaces_arg(
+        "s", "surfaces-only",
+        "if set, only TSurf datasets will be parsed from the input file");
+    cmd.add(export_surfaces_arg);
+
     TCLAP::SwitchArg export_lines_arg(
         "l", "lines-only",
         "if set, only PLine datasets will be parsed from the input file");
     cmd.add(export_lines_arg);
 
-    TCLAP::SwitchArg export_surfaces_arg(
-        "s", "surfaces-only",
-        "if set, only TSurf datasets will be parsed from the input file");
-    cmd.add(export_surfaces_arg);
+    TCLAP::ValueArg<std::string> output_arg(
+        "o", "output-dir", "output directory", true, "", "output dir");
+    cmd.add(output_arg);
+
+    TCLAP::ValueArg<std::string> input_arg(
+        "i", "input-file", "Gocad triangular surfaces file (*.ts)", true, "",
+        "filename.ts");
+    cmd.add(input_arg);
 
     cmd.parse(argc, argv);
 

diff --git a/Applications/Utils/FileConverter/Mesh2Raster.cpp b/Applications/Utils/FileConverter/Mesh2Raster.cpp
@@ -37,18 +37,17 @@ int main(int argc, char* argv[])
             "Copyright (c) 2012-2019, OpenGeoSys Community "
             "(http://www.opengeosys.org)",
         ' ', GitInfoLib::GitInfo::ogs_version);
-    TCLAP::ValueArg<std::string> input_arg("i", "input-file",
-                                           "Mesh input file (*.vtu, *.msh)",
-                                           true, "", "string");
-    cmd.add(input_arg);
-    TCLAP::ValueArg<std::string> output_arg(
-        "o", "output-file", "Raster output file (*.asc)", true, "", "string");
-    cmd.add(output_arg);
     TCLAP::ValueArg<double> cell_arg("c", "cellsize",
                                      "edge length of raster cells in result",
                                      false, 1, "real");
     cmd.add(cell_arg);
-
+    TCLAP::ValueArg<std::string> output_arg(
+        "o", "output-file", "Raster output file (*.asc)", true, "", "string");
+    cmd.add(output_arg);
+    TCLAP::ValueArg<std::string> input_arg("i", "input-file",
+                                           "Mesh input file (*.vtu, *.msh)",
+                                           true, "", "string");
+    cmd.add(input_arg);
     cmd.parse(argc, argv);
 
     INFO("Rasterising mesh...");

diff --git a/Applications/Utils/FileConverter/TecPlotTools.cpp b/Applications/Utils/FileConverter/TecPlotTools.cpp
@@ -418,14 +418,18 @@ int main(int argc, char* argv[])
             "Copyright (c) 2012-2019, OpenGeoSys Community "
             "(http://www.opengeosys.org)",
         ' ', GitInfoLib::GitInfo::ogs_version);
-    TCLAP::ValueArg<std::string> input_arg("i", "input-file", "TecPlot input file", true, "", "string");
-    cmd.add(input_arg);
-    TCLAP::ValueArg<std::string> output_arg("o", "output-file", "output mesh file", false, "", "string");
-    cmd.add(output_arg);
-    TCLAP::SwitchArg split_arg("s", "split", "split time steps into seperate files");
+    TCLAP::SwitchArg split_arg("s", "split",
+        "split time steps into seperate files");
     cmd.add(split_arg);
-    TCLAP::SwitchArg convert_arg("c", "convert", "convert TecPlot data into OGS meshes");
+    TCLAP::SwitchArg convert_arg("c", "convert",
+        "convert TecPlot data into OGS meshes");
     cmd.add(convert_arg);
+    TCLAP::ValueArg<std::string> output_arg(
+        "o", "output-file", "output mesh file", false, "", "string");
+    cmd.add(output_arg);
+    TCLAP::ValueArg<std::string> input_arg(
+        "i", "input-file", "TecPlot input file", true, "", "string");
+    cmd.add(input_arg);
     cmd.parse(argc, argv);
 
     if (!input_arg.isSet())

diff --git a/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp b/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
@@ -34,19 +34,19 @@ int main(int argc, char* argv[])
             "Copyright (c) 2012-2019, OpenGeoSys Community "
             "(http://www.opengeosys.org)",
         ' ', GitInfoLib::GitInfo::ogs_version);
-    TCLAP::ValueArg<std::string> input1_arg(
-        "", "file1", "First DEM-raster file", true, "", "file1.asc");
-    cmd.add(input1_arg);
-    TCLAP::ValueArg<std::string> input2_arg(
-        "", "file2", "Second DEM-raster file", true, "", "file2.asc");
-    cmd.add(input2_arg);
+    TCLAP::ValueArg<std::size_t> number_arg(
+        "n", "number", "number of rasters to be calculated", false, 1, "int");
+    cmd.add(number_arg);
     TCLAP::ValueArg<std::string> output_arg("o", "output-file",
                                             "Raster output file (*.asc)", true,
                                             "", "output.asc");
     cmd.add(output_arg);
-    TCLAP::ValueArg<std::size_t> number_arg(
-        "n", "number", "number of rasters to be calculated", false, 1, "int");
-    cmd.add(number_arg);
+    TCLAP::ValueArg<std::string> input2_arg(
+        "", "file2", "Second DEM-raster file", true, "", "file2.asc");
+    cmd.add(input2_arg);
+    TCLAP::ValueArg<std::string> input1_arg(
+        "", "file1", "First DEM-raster file", true, "", "file1.asc");
+    cmd.add(input1_arg);
 
     cmd.parse(argc, argv);