Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
ocean-mixing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
inmcm-mirror
ocean-mixing
Commits
08166054
Commit
08166054
authored
7 months ago
by
Evgeny Mortikov
Browse files
Options
Downloads
Patches
Plain Diff
adding generic subroutines def. in closure modules
parent
42fa7fef
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
obl_k_epsilon.f90
+2
-2
2 additions, 2 deletions
obl_k_epsilon.f90
obl_main.f90
+16
-9
16 additions, 9 deletions
obl_main.f90
obl_pph.f90
+4
-4
4 additions, 4 deletions
obl_pph.f90
obl_pph_dyn.f90
+2
-2
2 additions, 2 deletions
obl_pph_dyn.f90
with
24 additions
and
17 deletions
obl_k_epsilon.f90
+
2
−
2
View file @
08166054
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
obl_main.f90
+
16
−
9
View file @
08166054
...
...
@@ -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
! ----------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
obl_pph.f90
+
4
−
4
View file @
08166054
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
obl_pph_dyn.f90
+
2
−
2
View file @
08166054
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment