Skip to content

Commit b4c4f28

Browse files
committed
Resolve conflict with NOAA-GFDL/MOM6#1088
- 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.
1 parent 71d1c73 commit b4c4f28

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

src/core/MOM_open_boundary.F90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4935,7 +4935,6 @@ subroutine rotate_OBC_config(OBC_in, G_in, OBC, G, turns)
49354935

49364936
! Scalar and logical transfer
49374937
OBC%number_of_segments = OBC_in%number_of_segments
4938-
OBC%g_Earth = OBC_in%g_Earth
49394938
OBC%ke = OBC_in%ke
49404939
OBC%user_BCs_set_globally = OBC_in%user_BCs_set_globally
49414940

0 commit comments

Comments
 (0)