Skip to content
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

+Add support for tidal variations in open boundary condition data #1191

Merged
merged 32 commits into from
Oct 7, 2020
+665 −187
Merged

+Add support for tidal variations in open boundary condition data #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
34d221c
Merge working tides version with latest dev/gfdl
andrew-c-ross Jul 29, 2020
a26a386
Should be uppercase
andrew-c-ross Jul 29, 2020
1539071
Add tide prefix to nodal ref date
andrew-c-ross Jul 29, 2020
ad95be5
Merge branch 'dev/gfdl' into tidal_boundary
andrew-c-ross Jul 31, 2020
4c0f583
Merge branch 'dev/gfdl' into tidal_boundary
andrew-c-ross Aug 13, 2020
726f70b
Revert to always allocating 1. Fixes failing tests
andrew-c-ross Aug 13, 2020
418d5cc
Add missing update of SSH when there is no ramp
andrew-c-ross Aug 18, 2020
7b2dcd9
Support setting tides by value=
andrew-c-ross Aug 18, 2020
656c535
Remove unused bt_vel
andrew-c-ross Aug 18, 2020
e3db1b8
Include tides in rotation. Currently fails custom rotation tests.
andrew-c-ross Aug 19, 2020
aa648c7
Rename OBC_N_TIDE_CONSTITUENTS to have tide prefix first
andrew-c-ross Aug 19, 2020
217df96
Fix bug: nest tidal calculation within loop
andrew-c-ross Aug 24, 2020
7bfc146
Should default to prev behavior of not using phase correction
andrew-c-ross Aug 25, 2020
ff13dc2
Merge branch 'dev/gfdl' into tidal_boundary
andrew-c-ross Aug 25, 2020
6e6f7b4
Improve compatibility with code style guide
andrew-c-ross Aug 25, 2020
c7f42c8
Improve code style
andrew-c-ross Aug 25, 2020
3780b5c
Note minor differences in formula
andrew-c-ross Aug 27, 2020
e4f6624
Merge branch 'dev/gfdl' into tidal_boundary
andrew-c-ross Aug 27, 2020
31f40a5
Fix typos
andrew-c-ross Aug 27, 2020
0804b04
Merge branch 'dev/gfdl' into tidal_boundary
andrew-c-ross Aug 28, 2020
bbb6736
Correct documentation
andrew-c-ross Aug 28, 2020
3efb4b2
Merge branch 'dev/gfdl' into tidal_boundary
andrew-c-ross Aug 28, 2020
90c5625
Fix bug when equilibrium phase correction was not used and nodal refe…
andrew-c-ross Aug 31, 2020
aff69f2
Fix assorted typos and spaces
andrew-c-ross Aug 31, 2020
2ffaa30
Use time_type for reference times
andrew-c-ross Sep 10, 2020
3ea831b
Move longitudes to own type
andrew-c-ross Sep 10, 2020
b3ac797
Document some units
andrew-c-ross Sep 10, 2020
4314a57
Merge branch 'dev/gfdl' into tidal_boundary
Hallberg-NOAA Sep 18, 2020
6ce763d
Merge branch 'dev/gfdl' into tidal_boundary
Hallberg-NOAA Sep 21, 2020
a326e03
Merge branch 'dev/gfdl' into tidal_boundary
Hallberg-NOAA Sep 28, 2020
913830b
Open boundary forcing will also use TIDE_*_FREQ parameters if they ar…
andrew-c-ross Oct 2, 2020
a7d64b3
Merge branch 'dev/gfdl' into tidal_boundary
marshallward Oct 7, 2020
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
2 changes: 1 addition & 1 deletion src/core/MOM_boundary_update.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ subroutine update_OBC_data(OBC, G, GV, US, tv, h, CS, Time)
call shelfwave_set_OBC_data(OBC, CS%shelfwave_OBC_CSp, G, h, Time)
if (CS%use_dyed_channel) &
call dyed_channel_update_flow(OBC, CS%dyed_channel_OBC_CSp, G, Time)
if (OBC%needs_IO_for_data) &
if (OBC%needs_IO_for_data .or. OBC%add_tide_constituents) &
call update_OBC_segment_data(G, GV, US, OBC, tv, h, Time)

end subroutine update_OBC_data
Expand Down
Loading