@@ -1064,8 +1064,8 @@ subroutine mixedlayer_restrat_Bodner(CS, G, GV, US, h, uhtr, vhtr, tv, forces, d
1064
1064
h_big = 0.5 * ( big_H(i,j) + big_H(i+1 ,j) ) ! H ~> m or kg m-3
1065
1065
grd_b = ( buoy_av(i+1 ,j) - buoy_av(i,j) ) * G% IdxCu(I,j) ! L H-1 T-2 ~> s-2 or m3 kg-1 s-2
1066
1066
r_wpup = 2 . / ( wpup(i,j) + wpup(i+1 ,j) ) ! T2 L-1 H-1 ~> s2 m-2 or m s2 kg-1
1067
- psi_mag = ( ( ( CS% Cr_space(i,j) * grid_dsd ) * ( absf * h_sml ) ) & ! L2 H T-1 ~> m3 s-1 or kg s-1
1068
- * ( ( h_big** 2 ) * grd_b ) ) * r_wpup
1067
+ psi_mag = ( ( ( ( 0.5 * ( CS% Cr_space(i,j) + CS % Cr_space(i +1 ,j))) * grid_dsd ) & ! L2 H T-1 ~> m3 s-1 or kg s-1
1068
+ * ( absf * h_sml ) ) * ( ( h_big** 2 ) * grd_b ) ) * r_wpup
1069
1069
else ! There is no flux on land and no gradient at open boundary points.
1070
1070
psi_mag = 0.0
1071
1071
endif
@@ -1105,8 +1105,8 @@ subroutine mixedlayer_restrat_Bodner(CS, G, GV, US, h, uhtr, vhtr, tv, forces, d
1105
1105
h_big = 0.5 * ( big_H(i,j) + big_H(i,j+1 ) ) ! H ~> m or kg m-3
1106
1106
grd_b = ( buoy_av(i,j+1 ) - buoy_av(i,j) ) * G% IdyCv(I,j) ! L H-1 T-2 ~> s-2 or m3 kg-1 s-2
1107
1107
r_wpup = 2 . / ( wpup(i,j) + wpup(i,j+1 ) ) ! T2 L-1 H-1 ~> s2 m-2 or m s2 kg-1
1108
- psi_mag = ( ( ( CS% Cr_space(i,j) * grid_dsd ) * ( absf * h_sml ) ) & ! L2 H T-1 ~> m3 s-1 or kg s-1
1109
- * ( ( h_big** 2 ) * grd_b ) ) * r_wpup
1108
+ psi_mag = ( ( ( ( 0.5 * ( CS% Cr_space(i,j) + CS % Cr_space(i,j +1 ))) * grid_dsd ) & ! L2 H T-1 ~> m3 s-1 or kg s-1
1109
+ * ( absf * h_sml ) ) * ( ( h_big** 2 ) * grd_b ) ) * r_wpup
1110
1110
else ! There is no flux on land and no gradient at open boundary points.
1111
1111
psi_mag = 0.0
1112
1112
endif
@@ -1670,6 +1670,7 @@ logical function mixedlayer_restrat_init(Time, G, GV, US, param_file, diag, CS,
1670
1670
filename = trim (inputdir) // " /" // trim (filename)
1671
1671
allocate (CS% MLD_Tfilt_space(G% isd:G% ied,G% jsd:G% jed), source= 0.0 )
1672
1672
call MOM_read_data(filename, varname, CS% MLD_Tfilt_space, G% domain, scale= US% s_to_T)
1673
+ call pass_var(CS% MLD_Tfilt_space, G% domain)
1673
1674
endif
1674
1675
allocate (CS% Cr_space(G% isd:G% ied,G% jsd:G% jed), source= CS% Cr)
1675
1676
if (CS% Cr_grid) then
@@ -1681,6 +1682,7 @@ logical function mixedlayer_restrat_init(Time, G, GV, US, param_file, diag, CS,
1681
1682
default= " Cr" )
1682
1683
filename = trim (inputdir) // " /" // trim (filename)
1683
1684
call MOM_read_data(filename, varname, CS% Cr_space, G% domain)
1685
+ call pass_var(CS% Cr_space, G% domain)
1684
1686
endif
1685
1687
call closeParameterBlock(param_file) ! The remaining parameters do not have MLE% prepended
1686
1688
call get_param(param_file, mdl, " MLE_USE_PBL_MLD" , CS% MLE_use_PBL_MLD, &
0 commit comments