Skip to content

Commit

Permalink
bug fixing:
Browse files Browse the repository at this point in the history
(1) add missing halo in MOM_full_convection.F90
(2) remove wrong logic "not" in MOM.F90 at line 2669
  • Loading branch information
jiandewang committed Jul 11, 2020
1 parent 4fccd95 commit cbcf3ec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/MOM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2666,7 +2666,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
call register_obsolete_diagnostics(param_file, CS%diag)

if (use_frazil) then
if (.not.query_initialized(CS%tv%frazil,"frazil",restart_CSp)) then
if (query_initialized(CS%tv%frazil,"frazil",restart_CSp)) then
! Test whether the dimensional rescaling has changed for heat content.
if ((US%kg_m3_to_R_restart*US%m_to_Z_restart*US%J_kg_to_Q_restart /= 0.0) .and. &
((US%J_kg_to_Q*US%kg_m3_to_R*US%m_to_Z) /= &
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_full_convection.F90
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ subroutine smoothed_dRdT_dRdS(h, tv, Kddt, dR_dT, dR_dS, G, GV, US, j, p_surf, h
else
do i=is,ie ; pres(i) = 0.0 ; enddo
endif
EOSdom(:) = EOS_domain(G%HI)
EOSdom(:) = EOS_domain(G%HI, halo)
call calculate_density_derivs(T_f(:,1), S_f(:,1), pres, dR_dT(:,1), dR_dS(:,1), tv%eqn_of_state, EOSdom)
do i=is,ie ; pres(i) = pres(i) + h(i,j,1)*(GV%H_to_RZ*GV%g_Earth) ; enddo
do K=2,nz
Expand Down

0 comments on commit cbcf3ec

Please sign in to comment.