Skip to content

Commit

Permalink
Tiny tweak to Matt's giant merger
Browse files Browse the repository at this point in the history
  • Loading branch information
kshedstrom committed Aug 26, 2019
1 parent 69d8e0f commit 09f2157
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/core/MOM_open_boundary.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4092,8 +4092,8 @@ subroutine adjustSegmentEtaToFitBathymetry(G, GV, US, segment,fld)
type(ocean_grid_type), intent(in) :: G !< The ocean's grid structure
type(verticalGrid_type), intent(in) :: GV !< The ocean's vertical grid structure
type(unit_scale_type), intent(in) :: US !< A dimensional unit scaling type
type(OBC_segment_type), intent(inout) :: segment !< pointer to segment type
integer, intent(in) :: fld
type(OBC_segment_type), intent(inout) :: segment !< pointer to segment type
integer, intent(in) :: fld !< field index to adjust thickness
! Local variables
integer :: i, j, k, is, ie, js, je, nz, contractions, dilations
integer :: n
Expand Down
3 changes: 1 addition & 2 deletions src/tracer/MOM_tracer_advect.F90
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,9 @@ subroutine advect_x(Tr, hprev, uhr, uh_neglect, OBC, domore_u, ntr, Idt, &
real, dimension(SZI_(G),ntr) :: &
slope_x ! The concentration slope per grid point [conc].
real, dimension(SZIB_(G),ntr) :: &
flux_x ! The tracer flux across a boundary [H m2 conc ~> m3 conc or kg conc].
flux_x ! The tracer flux across a boundary [H L2 conc ~> m3 conc or kg conc].
real, dimension(SZI_(G),ntr) :: &
T_tmp ! The copy of the tracer concentration at constant i,k [H m2 conc ~> m3 conc or kg conc].
flux_x ! The tracer flux across a boundary [H L2 conc ~> m3 conc or kg conc].

real :: maxslope ! The maximum concentration slope per grid point
! consistent with monotonicity [conc].
Expand Down

0 comments on commit 09f2157

Please sign in to comment.