summaryrefslogtreecommitdiff
path: root/src/ocean
diff options
context:
space:
mode:
authorjjesswan <jessica_wan@brown.edu>2024-05-06 02:22:37 -0400
committerjjesswan <jessica_wan@brown.edu>2024-05-06 02:22:37 -0400
commit7a6ceadedc20f58b7be76654eb8357e3ca0b026d (patch)
treeef4b93cdb8f92c358c3d4715f6eebd5a2827427b /src/ocean
parent2ba27898535e01298ef8f0d0b9ffd4e69ce13458 (diff)
saving
Diffstat (limited to 'src/ocean')
-rw-r--r--src/ocean/ocean_alt.cpp2
-rw-r--r--src/ocean/ocean_alt.h7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ocean/ocean_alt.cpp b/src/ocean/ocean_alt.cpp
index 9ba0042..8f46f1b 100644
--- a/src/ocean/ocean_alt.cpp
+++ b/src/ocean/ocean_alt.cpp
@@ -317,6 +317,8 @@ std::vector<Eigen::Vector3f> ocean_alt::get_vertices()
vertices.push_back(Eigen::Vector3f(horiz_pos[0] + disp[0], height, horiz_pos[1] + disp[1]));
m_normals[i] = norm.normalized();//Eigen::Vector3f(-slope[0], 1.0, -slope[1]).normalized();
//std::cout << "normal: " << m_normals[i] << std::endl
+ m_foam_constants.wavelengths[i] = 2.f *M_PI * m_slopes[i].dot(m_slopes[i]) / Lx;
+ //std::cout << m_foam_constants.wavelengths[i] << std::endl;
diff --git a/src/ocean/ocean_alt.h b/src/ocean/ocean_alt.h
index dc9bb33..41c99ba 100644
--- a/src/ocean/ocean_alt.h
+++ b/src/ocean/ocean_alt.h
@@ -78,11 +78,10 @@ private:
const double Lx = 512.0;
const double Lz = 512.0;
- const int num_rows = 32;
- const int num_cols = 32;
-
+ const int num_rows = 64;
+ const int num_cols = 64;
const int N = num_rows*num_cols; // total number of grid points
- const double lambda = 0.3; // how much displacement matters
+ const double lambda = 0.4; // how much displacement matters
const double spacing = 35.0; // spacing between grid points
const double A = 100; // numeric constant for the Phillips spectrum