diff --git a/srcF/sfx_sheba_noniterative.f90 b/srcF/sfx_sheba_noniterative.f90 index bde96f6cf831e1088c599f8979636159cec1d112..a2dbcbcb616f5b695623b8db5603b3262424cfec 100644 --- a/srcF/sfx_sheba_noniterative.f90 +++ b/srcF/sfx_sheba_noniterative.f90 @@ -298,7 +298,7 @@ contains !deltaS=S_salt-S_mean !Ri_sn = (g * sigma_r * deltaS * h) / U**2 - Ri_sn=0.0 + !Ri_sn=0.0 ! --- get the fluxes ! ---------------------------------------------------------------------------- @@ -308,11 +308,11 @@ contains ! --- restrict bulk Ri value ! *: note that this value is written to output ! Rib = min(Rib, Rib_max) - do i = 1, numerics%maxiters_convection - if (surface_type == surface_snow) then + !do i = 1, numerics%maxiters_convection + !if (surface_type == surface_snow) then !write(*,*) 'RIsnow', Rib, Ri_sn - Rib=Rib+Ri_sn - endif + ! Rib=Rib+Ri_sn + !endif call get_zeta(zeta, Rib, h, z0_m, z0_t) @@ -326,18 +326,18 @@ contains Tdyn = kappa * dT * Pr_t_0_inv / (log(h / z0_t) - (psi_h - psi0_h)) - call get_sigma(sigma_r, sigma_w, rho_air, rho_s) - call get_w_snow(w_snow, sigma_w, g, d_s, nu_air) - call get_h_salt(h_salt, Udyn) - call get_S_salt(S_salt, Udyn, u_thsnow, g, h_salt) - call get_S_mean(S_mean, S_salt, h_salt, h, w_snow, Udyn) + ! call get_sigma(sigma_r, sigma_w, rho_air, rho_s) + ! call get_w_snow(w_snow, sigma_w, g, d_s, nu_air) + ! call get_h_salt(h_salt, Udyn) + ! call get_S_salt(S_salt, Udyn, u_thsnow, g, h_salt) + ! call get_S_mean(S_mean, S_salt, h_salt, h, w_snow, Udyn) - deltaS=S_salt-S_mean + ! deltaS=S_salt-S_mean - Ri_sn = (g * sigma_r * deltaS * h) / U**2 + ! Ri_sn = (g * sigma_r * deltaS * h) / U**2 - end do - write(*,*) 'sfx_snow', Ri_sn, Rib, Udyn, surface_type + !end do + !write(*,*) 'sfx_snow', Ri_sn, Rib, Udyn, surface_type else if (Rib < Rib_conv_lim) then ! --- strong instability block @@ -386,15 +386,15 @@ contains Pr_t_inv = phi_m / phi_h ! --- setting output - !sfx = sfxDataType(zeta = zeta, Rib = Rib, & - ! Re = Re, B = B, z0_m = z0_m, z0_t = z0_t, & - ! Rib_conv_lim = Rib_conv_lim, & - ! Cm = Cm, Ct = Ct, Km = Km, Pr_t_inv = Pr_t_inv) - sfx = sfxDataType(zeta = zeta, Rib = Rib, & - Re = Ri_sn, B = B, z0_m = z0_m, z0_t = z0_t, & - Rib_conv_lim = S_mean, & - Cm = Cm, Ct = Ct, Km = S_salt, Pr_t_inv = Udyn) + Re = Re, B = B, z0_m = z0_m, z0_t = z0_t, & + Rib_conv_lim = Rib_conv_lim, & + Cm = Cm, Ct = Ct, Km = Km, Pr_t_inv = Pr_t_inv) + + !sfx = sfxDataType(zeta = zeta, Rib = Rib, & + ! Re = Ri_sn, B = B, z0_m = z0_m, z0_t = z0_t, & + ! Rib_conv_lim = S_mean, & + ! Cm = Cm, Ct = Ct, Km = S_salt, Pr_t_inv = Udyn) end subroutine get_surface_fluxes ! --------------------------------------------------------------------------------