Skip to content
Snippets Groups Projects
Commit 563f198b authored by Evgeny Mortikov's avatar Evgeny Mortikov
Browse files

minor code update

parent bbfcd5f7
No related branches found
No related tags found
No related merge requests found
...@@ -17,6 +17,7 @@ module sfx_data ...@@ -17,6 +17,7 @@ module sfx_data
! public interface ! public interface
! -------------------------------------------------------------------------------- ! --------------------------------------------------------------------------------
public :: push_sfx_data
! -------------------------------------------------------------------------------- ! --------------------------------------------------------------------------------
! -------------------------------------------------------------------------------- ! --------------------------------------------------------------------------------
...@@ -79,4 +80,30 @@ module sfx_data ...@@ -79,4 +80,30 @@ module sfx_data
end type end type
! -------------------------------------------------------------------------------- ! --------------------------------------------------------------------------------
contains
! --------------------------------------------------------------------------------
subroutine push_sfx_data(sfx, sfx_cell, idx)
!> @brief helper subroutine for copying data in sfxDataVecType
! ----------------------------------------------------------------------------
type (sfxDataVecType), intent(inout) :: sfx
type (sfxDataType), intent(in) :: sfx_cell
integer, intent(in) :: idx
! ----------------------------------------------------------------------------
sfx%zeta(idx) = sfx_cell%zeta
sfx%Rib(idx) = sfx_cell%Rib
sfx%Re(idx) = sfx_cell%Re
sfx%B(idx) = sfx_cell%B
sfx%z0_m(idx) = sfx_cell%z0_m
sfx%z0_t(idx) = sfx_cell%z0_t
sfx%Rib_conv_lim(idx) = sfx_cell%Rib_conv_lim
sfx%Cm(idx) = sfx_cell%Cm
sfx%Ct(idx) = sfx_cell%Ct
sfx%Km(idx) = sfx_cell%Km
sfx%Pr_t_inv(idx) = sfx_cell%Pr_t_inv
end subroutine push_sfx_data
! --------------------------------------------------------------------------------
end module sfx_data end module sfx_data
\ No newline at end of file
...@@ -69,30 +69,6 @@ contains ...@@ -69,30 +69,6 @@ contains
end subroutine get_surface_fluxes_vec end subroutine get_surface_fluxes_vec
! -------------------------------------------------------------------------------- ! --------------------------------------------------------------------------------
! --------------------------------------------------------------------------------
subroutine push_sfx_data(sfx, sfx_cell, idx)
!> @brief helper subroutine for copying data in sfxDataVecType
! ----------------------------------------------------------------------------
type (sfxDataVecType), intent(inout) :: sfx
type (sfxDataType), intent(in) :: sfx_cell
integer, intent(in) :: idx
! ----------------------------------------------------------------------------
sfx%zeta(idx) = sfx_cell%zeta
sfx%Rib(idx) = sfx_cell%Rib
sfx%Re(idx) = sfx_cell%Re
sfx%B(idx) = sfx_cell%B
sfx%z0_m(idx) = sfx_cell%z0_m
sfx%z0_t(idx) = sfx_cell%z0_t
sfx%Rib_conv_lim(idx) = sfx_cell%Rib_conv_lim
sfx%Cm(idx) = sfx_cell%Cm
sfx%Ct(idx) = sfx_cell%Ct
sfx%Km(idx) = sfx_cell%Km
sfx%Pr_t_inv(idx) = sfx_cell%Pr_t_inv
end subroutine push_sfx_data
! --------------------------------------------------------------------------------
! -------------------------------------------------------------------------------- ! --------------------------------------------------------------------------------
subroutine get_surface_fluxes(sfx, meteo, numerics) subroutine get_surface_fluxes(sfx, meteo, numerics)
!> @brief surface flux calculation for single cell !> @brief surface flux calculation for single cell
...@@ -263,6 +239,7 @@ contains ...@@ -263,6 +239,7 @@ contains
phi_m = (1.0 - alpha_m * zeta)**(-0.25) phi_m = (1.0 - alpha_m * zeta)**(-0.25)
phi_h = 1.0 / (Pr_t_0_inv * sqrt(1.0 - alpha_h_fix * zeta)) phi_h = 1.0 / (Pr_t_0_inv * sqrt(1.0 - alpha_h_fix * zeta))
end if end if
! ----------------------------------------------------------------------------
! --- define transfer coeff. (momentum) & (heat) ! --- define transfer coeff. (momentum) & (heat)
Cm = kappa / psi_m Cm = kappa / psi_m
......
...@@ -65,30 +65,6 @@ contains ...@@ -65,30 +65,6 @@ contains
end subroutine get_surface_fluxes_vec end subroutine get_surface_fluxes_vec
! -------------------------------------------------------------------------------- ! --------------------------------------------------------------------------------
! --------------------------------------------------------------------------------
subroutine push_sfx_data(sfx, sfx_cell, idx)
!> @brief helper subroutine for copying data in sfxDataVecType
! ----------------------------------------------------------------------------
type (sfxDataVecType), intent(inout) :: sfx
type (sfxDataType), intent(in) :: sfx_cell
integer, intent(in) :: idx
! ----------------------------------------------------------------------------
sfx%zeta(idx) = sfx_cell%zeta
sfx%Rib(idx) = sfx_cell%Rib
sfx%Re(idx) = sfx_cell%Re
sfx%B(idx) = sfx_cell%B
sfx%z0_m(idx) = sfx_cell%z0_m
sfx%z0_t(idx) = sfx_cell%z0_t
sfx%Rib_conv_lim(idx) = sfx_cell%Rib_conv_lim
sfx%Cm(idx) = sfx_cell%Cm
sfx%Ct(idx) = sfx_cell%Ct
sfx%Km(idx) = sfx_cell%Km
sfx%Pr_t_inv(idx) = sfx_cell%Pr_t_inv
end subroutine push_sfx_data
! --------------------------------------------------------------------------------
! -------------------------------------------------------------------------------- ! --------------------------------------------------------------------------------
subroutine get_surface_fluxes(sfx, meteo, numerics) subroutine get_surface_fluxes(sfx, meteo, numerics)
!> @brief surface flux calculation for single cell !> @brief surface flux calculation for single cell
...@@ -212,6 +188,7 @@ contains ...@@ -212,6 +188,7 @@ contains
! --- get the fluxes ! --- get the fluxes
! ---------------------------------------------------------------------------- ! ----------------------------------------------------------------------------
call get_psi_neutral(psi_m, psi_h, zeta, h0_m, h0_t, B) call get_psi_neutral(psi_m, psi_h, zeta, h0_m, h0_t, B)
! ----------------------------------------------------------------------------
phi_m = 1.0 phi_m = 1.0
phi_h = 1.0 / Pr_t_0_inv phi_h = 1.0 / Pr_t_0_inv
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment