Modified command line options

[seamulator.git] / src / sea.cpp

diff --git a/src/sea.cpp b/src/sea.cpp
index 85191d4fd7680fc5708dc25bd7da23ca53ee2767..597e0a1be73d460a38b4542107be9ea85e568f2b 100644 (file)
--- a/src/sea.cpp
+++ b/src/sea.cpp
@@ -6,13 +6,13 @@
 
 #include "watersurface.h"
 
 
 #include "watersurface.h"
 

-const double Sea::PHILLIPS_CONSTANT{0.0000001};

 const double Sea::GRAVITATIONAL_CONSTANT{9.8};
 
 const double Sea::GRAVITATIONAL_CONSTANT{9.8};
 

-Sea::Sea(WaterSurfacePtr surface) :
+Sea::Sea(WaterSurfacePtr surface, double windSpeed, double magicConstant) :

   m_surface{surface},
   m_windDirection{1, 0},
   m_surface{surface},
   m_windDirection{1, 0},

-  m_windSpeed{10},
+  m_windSpeed{windSpeed},
+  m_magicConstant{magicConstant},

   m_randomGenerator{m_randomDevice()},
   m_normalDistribution{0.0, 1.0}
 {
   m_randomGenerator{m_randomDevice()},
   m_normalDistribution{0.0, 1.0}
 {


@@ -89,7 +89,7 @@ double Sea::phillipsSpectrum(double k_x, double k_y) const
   const double cosineFactor = pow((k_x / k) * m_windDirection[0] +
                                  (k_y / k) * m_windDirection[1], 2);
 
   const double cosineFactor = pow((k_x / k) * m_windDirection[0] +
                                  (k_y / k) * m_windDirection[1], 2);
 

-  return PHILLIPS_CONSTANT * exp(-1 / pow(k * L, 2)) / pow(k, 4) *
+  return m_magicConstant * exp(-1 / pow(k * L, 2)) / pow(k, 4) *

     cosineFactor;
 }
 
     cosineFactor;
 }