Points above water get wave kin at surface

Author: AlexWKinley

source/Waves.cpp

@@ -151,18 +151,6 @@ WaveGrid::getWaveKin(const vec3& pos,
 	if (zeta) {
 		*zeta = wave_elev;
 	}
-	if (pos.z() > wave_elev) {
-		if (vel) {
-			*vel = vec::Zero();
-		}
-		if (acc) {
-			*acc = vec::Zero();
-		}
-		if (pdyn) {
-			*pdyn = 0;
-		}
-		return;
-	}
 
 	real stretched_z = 0.0;
 	const real bottom = seafloor.getDepth(vec2(pos.x(), pos.y()));
@@ -171,6 +159,14 @@ WaveGrid::getWaveKin(const vec3& pos,
 	const real avgDepth = seafloor.getAverageDepth();
 
 	stretched_z = (-avgDepth * (pos.z() - bottom)) / actual_depth + avgDepth;
+
+	// If the point is above the water surface, return the values at the water
+	// surface. This is important for situations where a point is out of the
+	// water but the object itself may have significant submergence (sideway
+	// floating line, top node of buoy, etc)
+	if (stretched_z > 0.0) {
+		stretched_z = 0.0;
+	}
 	// LOGMSG << "WaveGrid::getWaveKin - stretched_z = " << stretched_z << endl;
 
 	auto iz = interp_factor(pz, stretched_z, fz);

source/Waves/SpectrumKin.cpp

@@ -57,25 +57,22 @@ SpectrumKin::getWaveKin(vec3 pos,
 	    amplitudes * (omegas * t - kValues * distances + phases).sin();
 	const Eigen::ArrayX<real> cos_waves =
 	    amplitudes * (omegas * t - kValues * distances + phases).cos();
-	const real surface_height = sin_waves.sum();
 
-	if (pos.z() > surface_height) {
-		if (zeta) {
-			*zeta = surface_height;
-		}
-		if (vel) {
-			*vel = vec3::Zero();
-		}
-		if (acc) {
-			*acc = vec3::Zero();
-		}
-		return;
-	}
+	const real surface_height = sin_waves.sum();
 	const real bottom = actualDepth;
 	const real actual_depth = surface_height - bottom;
 
-	const real stretched_z =
+	real stretched_z =
 	    (-avgDepth * (pos.z() - bottom)) / actual_depth + avgDepth;
+
+	// If the point is above the water surface, return the values at the water
+	// surface. This is important for situations where a point is out of the
+	// water but the object itself may have significant submergence (sideway
+	// floating line, top node of buoy, etc)
+	if (stretched_z > 0.0) {
+		stretched_z = 0.0;
+	}
+
 	if (zeta) {
 		*zeta = surface_height;
 	}