Skip to content

Commit 7212400

Browse files
authored
Update MOM_diabatic_driver.F90
remove conflict with dev/emc
1 parent 7de295c commit 7212400

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/parameterizations/vertical/MOM_diabatic_driver.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ module MOM_diabatic_driver
176176
integer :: id_Kd_heat = -1, id_Kd_salt = -1, id_Kd_interface = -1, id_Kd_ePBL = -1
177177
integer :: id_Tdif = -1, id_Tadv = -1, id_Sdif = -1, id_Sadv = -1
178178
integer :: id_MLD_003 = -1, id_MLD_0125 = -1, id_MLD_user = -1, id_mlotstsq = -1
179-
integer :: id_subMLN2 = -1, id_brine_lay = -1, id_sppt_wts = -1, id_t_rp1=-1,id_t_rp2=-1
179+
integer :: id_subMLN2 = -1, id_sppt_wts = -1, id_t_rp1=-1,id_t_rp2=-1
180180

181181
! diagnostic for fields prior to applying diapycnal physics
182182
integer :: id_u_predia = -1, id_v_predia = -1, id_h_predia = -1

0 commit comments

Comments
 (0)