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

adding generic subroutines def. in closure modules

parent 42fa7fef
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,7 @@ module obl_k_epsilon
contains
! --------------------------------------------------------------------------------
subroutine define_k_epsilon_stability_functions(param, bc, grid)
subroutine define_stability_functions(param, bc, grid)
!< @brief advance stability functions: N**2, S**2, Ri-gradient
! ----------------------------------------------------------------------------
use obl_state
......@@ -44,7 +44,7 @@ module obl_k_epsilon
end subroutine
! --------------------------------------------------------------------------------
subroutine advance_k_epsilon(param, bc, grid, dt)
subroutine advance_turbulence_closure(param, bc, grid, dt)
!< @brief advance turbulence closure
! ----------------------------------------------------------------------------
use obl_state
......
......@@ -21,9 +21,16 @@ program obl_main
use obl_scm
use obl_diag
use obl_bc
use obl_pph
use obl_pph_dyn
use obl_k_epsilon
use obl_pph, only: pphParamType, &
define_stability_functions_pph => define_stability_functions, &
advance_turbulence_closure_pph => advance_turbulence_closure
use obl_pph_dyn, only: pphDynParamType, &
define_stability_functions_pph_dyn => define_stability_functions, &
advance_turbulence_closure_pph_dyn => advance_turbulence_closure
use obl_k_epsilon, only: kepsilonParamType, &
define_stability_functions_k_epsilon => define_stability_functions, &
advance_turbulence_closure_k_epsilon => advance_turbulence_closure, &
TKE_init, EPS_init, TKE_bc, EPS_bc
use obl_io_plt
use io
use io_metadata
......@@ -364,14 +371,14 @@ program obl_main
!< advance turbulence closure
! ----------------------------------------------------------------------------
if (closure_mode.eq.1) then
call define_pph_stability_functions(param_pph, bc, grid)
call advance_pph(param_pph, bc, grid, dt)
call define_stability_functions_pph(param_pph, bc, grid)
call advance_turbulence_closure_pph(param_pph, bc, grid, dt)
else if (closure_mode.eq.2) then
call define_pph_dyn_stability_functions(param_pph_dyn, bc, grid)
call advance_pph_dyn(param_pph_dyn, bc, grid, dt)
call define_stability_functions_pph_dyn(param_pph_dyn, bc, grid)
call advance_turbulence_closure_pph_dyn(param_pph_dyn, bc, grid, dt)
else if (closure_mode.eq.4) then
call define_k_epsilon_stability_functions(param_k_epsilon, bc, grid)
call advance_k_epsilon(param_k_epsilon, bc, grid, dt)
call define_stability_functions_k_epsilon(param_k_epsilon, bc, grid)
call advance_turbulence_closure_k_epsilon(param_k_epsilon, bc, grid, dt)
endif
! ----------------------------------------------------------------------------
......
......@@ -12,8 +12,8 @@ module obl_pph
! public interface
! --------------------------------------------------------------------------------
public :: advance_pph
public :: define_pph_stability_functions
public :: advance_turbulence_closure
public :: define_stability_functions
public :: get_eddy_viscosity, get_eddy_diffusivity
public :: get_eddy_viscosity_vec, get_eddy_diffusivity_vec
! --------------------------------------------------------------------------------
......@@ -31,7 +31,7 @@ module obl_pph
contains
! --------------------------------------------------------------------------------
subroutine define_pph_stability_functions(param, bc, grid)
subroutine define_stability_functions(param, bc, grid)
!< @brief advance stability functions: N**2, S**2, Ri-gradient
! ----------------------------------------------------------------------------
use obl_state
......@@ -48,7 +48,7 @@ module obl_pph
end subroutine
! --------------------------------------------------------------------------------
subroutine advance_pph(param, bc, grid, dt)
subroutine advance_turbulence_closure(param, bc, grid, dt)
!< @brief advance turbulence closure
! ----------------------------------------------------------------------------
use obl_state
......
......@@ -23,7 +23,7 @@ module obl_pph_dyn
contains
! --------------------------------------------------------------------------------
subroutine define_pph_dyn_stability_functions(param, bc, grid)
subroutine define_stability_functions(param, bc, grid)
!< @brief advance stability functions: N**2, S**2, Ri-gradient
! ----------------------------------------------------------------------------
use obl_state
......@@ -40,7 +40,7 @@ module obl_pph_dyn
end subroutine
! --------------------------------------------------------------------------------
subroutine advance_pph_dyn(param, bc, grid, dt)
subroutine advance_turbulence_closure(param, bc, grid, dt)
!< @brief advance turbulence closure
! ----------------------------------------------------------------------------
use obl_state
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment