Modified command line options

[seamulator.git] / src / seamulator.cpp

diff --git a/src/seamulator.cpp b/src/seamulator.cpp
index 98e92df2b793be60836328152be73591ce6f9e62..ffbf5860b1526bcae31901972ad04f16ae91b84d 100644 (file)
--- a/src/seamulator.cpp
+++ b/src/seamulator.cpp
@@ -29,28 +29,17 @@ struct Settings {
   double amplitudeFactor;
 };
 
   double amplitudeFactor;
 };
 

-namespace po = boost::program_options;
-

 void glDisplayFunc();
 void glReshapeFunc(int width, int height);
 void glMouseFunc(int button, int state, int x, int y);
 void glMotionFunc(int x, int y);
 void glDisplayFunc();
 void glReshapeFunc(int width, int height);
 void glMouseFunc(int button, int state, int x, int y);
 void glMotionFunc(int x, int y);

-Settings parseArguments(int argc, char** argv, po::options_description desc);
+Settings parseArguments(int argc, char** argv);
+
+namespace po = boost::program_options;

 
 int main(int argc, char** argv)
 {
 
 int main(int argc, char** argv)
 {

-  po::options_description desc("Available options");
-  desc.add_options()
-    ("help,h", "produce help message")
-    ("windspeed,w", po::value<double>()->default_value(10),
-     "wind speed given in m/s")
-    ("size,s", po::value<std::string>()->default_value("small"),
-     "lattice size (small/large)")
-    ("amplitude,a", po::value<double>()->default_value(1),
-     "amplitude multiplicator")
-    ;
-
-  Settings settings = parseArguments(argc, argv, desc);
+  Settings settings = parseArguments(argc, argv);

 
   std::srand(std::time(0));
   surface = std::make_shared<WaterSurface>(settings.latticeSize,
 
   std::srand(std::time(0));
   surface = std::make_shared<WaterSurface>(settings.latticeSize,


@@ -79,8 +68,19 @@ int main(int argc, char** argv)
   return 0;
 }
 
   return 0;
 }
 

-Settings parseArguments(int argc, char** argv, po::options_description desc)
+Settings parseArguments(int argc, char** argv)

 {
 {

+  po::options_description desc("Available options");
+  desc.add_options()
+    ("help,h", "show this help")
+    ("windspeed,w", po::value<double>()->default_value(10),
+     "wind speed (m/s)")
+    ("size,s", po::value<char>()->default_value('s'),
+     "lattice size (s|l)")
+    ("amplitude,a", po::value<double>()->default_value(1),
+     "amplitude multiplicator")
+    ;
+

   po::variables_map vm;
   po::store(po::parse_command_line(argc, argv, desc), vm);
   po::notify(vm);
   po::variables_map vm;
   po::store(po::parse_command_line(argc, argv, desc), vm);
   po::notify(vm);


@@ -94,7 +94,7 @@ Settings parseArguments(int argc, char** argv, po::options_description desc)
 
   settings.windSpeed = vm["windspeed"].as<double>();
 
 
   settings.windSpeed = vm["windspeed"].as<double>();
 

-  if (vm["size"].as<std::string>() == "large") {
+  if (vm["size"].as<char>() == 'l') {

     settings.latticeSize = 256;
     settings.latticeExtend = 20;
     settings.amplitudeFactor = vm["amplitude"].as<double>() * 0.00000004;
     settings.latticeSize = 256;
     settings.latticeExtend = 20;
     settings.amplitudeFactor = vm["amplitude"].as<double>() * 0.00000004;