From caf1d1efc6672d40c0d6a389075fc5b785a71045 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Wed, 18 Apr 2018 09:20:00 -0600 Subject: [PATCH] Fixes bug and renames variables --- src/parameterizations/vertical/MOM_cvmix_conv.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/parameterizations/vertical/MOM_cvmix_conv.F90 b/src/parameterizations/vertical/MOM_cvmix_conv.F90 index 55e7d55d6e..2be06ee14b 100644 --- a/src/parameterizations/vertical/MOM_cvmix_conv.F90 +++ b/src/parameterizations/vertical/MOM_cvmix_conv.F90 @@ -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, & @@ -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