Skip to content

Commit

Permalink
Merge pull request #48 from gustavo-marques/fix_cvmix_convection
Browse files Browse the repository at this point in the history
Fixes a bug and renames diag. fields in MOM_cvmix_conv
  • Loading branch information
gustavo-marques authored Apr 18, 2018
2 parents 869d32f + caf1d1e commit 5f19507
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/parameterizations/vertical/MOM_cvmix_conv.F90
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ logical function cvmix_conv_init(Time, G, GV, param_file, diag, CS)

! Register diagnostics
CS%diag => diag
CS%id_N2 = register_diag_field('ocean_model', 'conv_N2', diag%axesTi, Time, &
CS%id_N2 = register_diag_field('ocean_model', 'N2_conv', diag%axesTi, Time, &
'Square of Brunt-Vaisala frequency used by MOM_cvmix_conv module', '1/s2')
CS%id_kd_conv = register_diag_field('ocean_model', 'conv_kd', diag%axesTi, Time, &
CS%id_kd_conv = register_diag_field('ocean_model', 'kd_conv', diag%axesTi, Time, &
'Additional diffusivity added by MOM_cvmix_conv module', 'm2/s')
CS%id_kv_conv = register_diag_field('ocean_model', 'conv_kv', diag%axesTi, Time, &
CS%id_kv_conv = register_diag_field('ocean_model', 'kv_conv', diag%axesTi, Time, &
'Additional viscosity added by MOM_cvmix_conv module', 'm2/s')

call cvmix_init_conv(convect_diff=CS%kd_conv_const, &
Expand Down Expand Up @@ -224,7 +224,7 @@ subroutine calculate_cvmix_conv(h, tv, G, GV, CS, hbl)
OBL_ind=kOBL)

! Do not apply mixing due to convection within the boundary layer
do k=1,NINT(hbl(i,j))
do k=1,kOBL
CS%kv_conv(i,j,k) = 0.0
CS%kd_conv(i,j,k) = 0.0
enddo
Expand Down

0 comments on commit 5f19507

Please sign in to comment.