Skip to content

Commit

Permalink
Merge branch 'dev/isomip_tmp' of https://github.com/gustavo-marques/MOM6
Browse files Browse the repository at this point in the history
 into gustavo-marques-dev/isomip_tmp
  • Loading branch information
adcroft committed Oct 21, 2016
2 parents a5ea1d0 + c211584 commit 87e47d9
Show file tree
Hide file tree
Showing 6 changed files with 602 additions and 287 deletions.
1 change: 0 additions & 1 deletion src/core/MOM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2904,7 +2904,6 @@ subroutine calculate_surface_state(state, u, v, h, ssh, G, GV, CS, p_atm)
iscB = G%iscB ; iecB = G%iecB; jscB = G%jscB ; jecB = G%jecB
isdB = G%isdB ; iedB = G%iedB; jsdB = G%jsdB ; jedB = G%jedB

!write(*,*)'iscB,iecB,jscB,jecB', iscB,iecB,jscB,jecB
state%sea_lev => ssh

if (present(p_atm)) then ; if (ASSOCIATED(p_atm)) then
Expand Down
Loading

0 comments on commit 87e47d9

Please sign in to comment.