Fixed them all

[seamulator.git] / sea.h

diff --git a/sea.h b/sea.h
index 20f5d638d33479fd21d5b8daf0626e591d9926ac..798b92d138eb68f7a9719f6461ad369af8616cf7 100644 (file)
--- a/sea.h
+++ b/sea.h
@@ -8,7 +8,6 @@
 
 #include "seafwd.h"
 
-#include "complexpair.h"
 #include "watersurfacefwd.h"
 
 class Sea
@@ -30,14 +29,13 @@ class Sea
   std::random_device m_randomDevice;
   std::mt19937 m_randomGenerator;
   std::normal_distribution<> m_normalDistribution;
-  std::vector<ComplexPair> m_fourierAmplitudes;
+  std::vector<std::complex<double>> m_fourierAmplitudes;
   fftw_complex *m_fftwIn, *m_fftwOut;
   fftw_plan m_fftwPlan;
   std::chrono::time_point<std::chrono::system_clock> m_startTime;
 
   double phillipsSpectrum(double k_x, double k_y) const;
-  ComplexPair generateFourierAmplitude(double k_x, double k_y);
-  ComplexPair& fourierAmplitudeAt(int n, int m);
+  std::complex<double>& fourierAmplitudeAt(int n, int m);
   void generateFourierAmplitudes();
   double spatialFrequencyForIndex(int n) const;
   double getRuntime() const;