Skip to content

Fixing wrong calculation of C-grid velocities in Peninsula example Field #1768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erikvansebille merged 5 commits into from
Nov 25, 2024
Merged

Fixing wrong calculation of C-grid velocities in Peninsula example Field #1768

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb32273
Fixing bug where velocities in Peninsula on C-grid were calculated wr…
erikvansebille Nov 21, 2024
771cf99
Merge branch 'master' into fixing_peninsula_Cgrid_velocities
erikvansebille Nov 25, 2024
65aa695
Small clean-up of peninsula code
erikvansebille Nov 25, 2024
5f1e014
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 25, 2024
2cd9850
Increasing error tolerances by facter 1e3 (since values of P have als…
erikvansebille Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions docs/examples/example_peninsula.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,23 @@
x, y = np.meshgrid(La, Wa, sparse=True, indexing="xy")
P = (u0 * R**2 * y / ((x - x0) ** 2 + y**2) - u0 * y) / 1e3

# Set land points to zero
landpoints = P >= 0.0
P[landpoints] = 0.0

if grid_type == "A":
U = u0 - u0 * R**2 * ((x - x0) ** 2 - y**2) / (((x - x0) ** 2 + y**2) ** 2)
V = -2 * u0 * R**2 * ((x - x0) * y) / (((x - x0) ** 2 + y**2) ** 2)
U[landpoints] = 0.0
V[landpoints] = 0.0
elif grid_type == "C":
U = np.zeros(P.shape)
V = np.zeros(P.shape)
V[:, 1:] = P[:, 1:] - P[:, :-1]
U[1:, :] = -(P[1:, :] - P[:-1, :])
V[:, 1:] = (P[:, 1:] - P[:, :-1]) / (La[1] - La[0]) * 1e3
U[1:, :] = -(P[1:, :] - P[:-1, :]) / (Wa[1] - Wa[0]) * 1e3

Check warning on line 75 in docs/examples/example_peninsula.py

View check run for this annotation

Codecov / codecov/patch

docs/examples/example_peninsula.py#L74-L75 

Added lines #L74 - L75 were not covered by tests
else:
raise RuntimeError(f"Grid_type {grid_type} is not a valid option")

# Set land points to NaN
landpoints = P >= 0.0
P[landpoints] = np.nan
U[landpoints] = np.nan
V[landpoints] = np.nan

# Convert from m to lat/lon for spherical meshes
lon = La / 1852.0 / 60.0 if mesh == "spherical" else La
lat = Wa / 1852.0 / 60.0 if mesh == "spherical" else Wa
Expand Down
Loading