Skip to content

Commit

Permalink
Resolve conflict with NOAA-GFDL/MOM6#1088
Browse files Browse the repository at this point in the history
- This branch/PR had been setup to precede NOAA-GFDL/MOM6#1088
  to minimize changes to MOM6-examples but @Hallberg-NOAA jumped
  the gun and merged the PRs out of order.
- This commit resolves the conflict and MOM6-examples needs to
  be fixed.
  • Loading branch information
adcroft committed Apr 16, 2020
1 parent 71d1c73 commit b4c4f28
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/core/MOM_open_boundary.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4935,7 +4935,6 @@ subroutine rotate_OBC_config(OBC_in, G_in, OBC, G, turns)

! Scalar and logical transfer
OBC%number_of_segments = OBC_in%number_of_segments
OBC%g_Earth = OBC_in%g_Earth
OBC%ke = OBC_in%ke
OBC%user_BCs_set_globally = OBC_in%user_BCs_set_globally

Expand Down

0 comments on commit b4c4f28

Please sign in to comment.