Skip to content

Added in more OBC options #760

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
adcroft merged 11 commits into from
May 4, 2018
Merged

Added in more OBC options #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
49a8a48
Start of oblique tweaks.
kshedstrom Apr 27, 2018
8ca33b0
Fix allocate bug on road to time-filtering OBLIQUE.
kshedstrom Apr 27, 2018
d6bf3e1
Added OBC_COMPUTED_VORTICITY option.
kshedstrom May 1, 2018
17c4ffa
Added OBC_COMPUTED_STRAIN option.
kshedstrom May 1, 2018
9ca0b15
ensure that new_sponges logical is set properly
MJHarrison-GFDL May 2, 2018
9685975
cleanup
MJHarrison-GFDL May 2, 2018
75b6ee0
Fix indexing?
kshedstrom May 2, 2018
e1b2dd4
Merge branch 'dev/esmg' into user/mjh/fix_sponge
kshedstrom May 2, 2018
85ea88e
Better fix to array-bounds trouble
kshedstrom May 2, 2018
8eba1c9
Fix MATT's trailing space.
kshedstrom May 2, 2018
7d1a50c
Adding "specified" option to vorticity and strain.
kshedstrom May 3, 2018
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
28 changes: 28 additions & 0 deletions src/core/MOM_CoriolisAdv.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,20 @@ subroutine CorAdCalc(u, v, h, uh, vh, CAu, CAv, OBC, AD, G, GV, CS)
if (OBC%freeslip_vorticity) then ; do I=OBC%segment(n)%HI%IsdB,OBC%segment(n)%HI%IedB
dudy(I,J) = 0.
enddo ; endif
if (OBC%computed_vorticity) then ; do I=OBC%segment(n)%HI%IsdB,OBC%segment(n)%HI%IedB
if (OBC%segment(n)%direction == OBC_DIRECTION_N) then
dudy(I,J) = 2.0*(OBC%segment(n)%tangential_vel(I,J,k) - u(I,j,k))*G%dxCu(I,j)
else ! (OBC%segment(n)%direction == OBC_DIRECTION_S)
dudy(I,J) = 2.0*(u(I,j+1,k) - OBC%segment(n)%tangential_vel(I,J,k))*G%dxCu(I,j+1)
endif
enddo ; endif
if (OBC%specified_vorticity) then ; do I=OBC%segment(n)%HI%IsdB,OBC%segment(n)%HI%IedB
if (OBC%segment(n)%direction == OBC_DIRECTION_N) then
dudy(I,J) = OBC%segment(n)%tangential_grad(I,J,k)*G%dxCu(I,j)*G%dyBu(I,J)
else ! (OBC%segment(n)%direction == OBC_DIRECTION_S)
dudy(I,J) = OBC%segment(n)%tangential_grad(I,J,k)*G%dxCu(I,j+1)*G%dyBu(I,J)
endif
enddo ; endif

! Project thicknesses across OBC points with a no-gradient condition.
do i = max(Isq-1,OBC%segment(n)%HI%isd), min(Ieq+2,OBC%segment(n)%HI%ied)
Expand All @@ -316,6 +330,20 @@ subroutine CorAdCalc(u, v, h, uh, vh, CAu, CAv, OBC, AD, G, GV, CS)
if (OBC%freeslip_vorticity) then ; do J=OBC%segment(n)%HI%JsdB,OBC%segment(n)%HI%JedB
dvdx(I,J) = 0.
enddo ; endif
if (OBC%specified_vorticity) then ; do J=OBC%segment(n)%HI%JsdB,OBC%segment(n)%HI%JedB
if (OBC%segment(n)%direction == OBC_DIRECTION_E) then
dvdx(I,J) = 2.0*(OBC%segment(n)%tangential_vel(I,J,k) - v(i,J,k))*G%dyCv(i,J)
else ! (OBC%segment(n)%direction == OBC_DIRECTION_W)
dvdx(I,J) = 2.0*(v(i+1,J,k) - OBC%segment(n)%tangential_vel(I,J,k))*G%dyCv(i+1,J)
endif
enddo ; endif
if (OBC%specified_vorticity) then ; do J=OBC%segment(n)%HI%JsdB,OBC%segment(n)%HI%JedB
if (OBC%segment(n)%direction == OBC_DIRECTION_E) then
dvdx(I,J) = OBC%segment(n)%tangential_grad(I,J,k)*G%dyCv(i,J)*G%dxBu(I,J)
else ! (OBC%segment(n)%direction == OBC_DIRECTION_W)
dvdx(I,J) = OBC%segment(n)%tangential_grad(I,J,k)*G%dyCv(i+1,J)*G%dxBu(I,J)
endif
enddo ; endif

! Project thicknesses across OBC points with a no-gradient condition.
do j = max(Jsq-1,OBC%segment(n)%HI%jsd), min(Jeq+2,OBC%segment(n)%HI%jed)
Expand Down
Loading