Skip to content

Commit

Permalink
Update MOM_diabatic_driver.F90
Browse files Browse the repository at this point in the history
remove conflict with dev/emc
  • Loading branch information
pjpegion authored Dec 2, 2020
1 parent 7de295c commit 7212400
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_diabatic_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ module MOM_diabatic_driver
integer :: id_Kd_heat = -1, id_Kd_salt = -1, id_Kd_interface = -1, id_Kd_ePBL = -1
integer :: id_Tdif = -1, id_Tadv = -1, id_Sdif = -1, id_Sadv = -1
integer :: id_MLD_003 = -1, id_MLD_0125 = -1, id_MLD_user = -1, id_mlotstsq = -1
integer :: id_subMLN2 = -1, id_brine_lay = -1, id_sppt_wts = -1, id_t_rp1=-1,id_t_rp2=-1
integer :: id_subMLN2 = -1, id_sppt_wts = -1, id_t_rp1=-1,id_t_rp2=-1

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

0 comments on commit 7212400

Please sign in to comment.