Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sfx
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
sfx
Commits
938bf014
Commit
938bf014
authored
1 year ago
by
Evgeny Mortikov
Browse files
Options
Downloads
Patches
Plain Diff
minor code update: removing zeta from output parameters in neutral case
parent
1de9b15a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
srcF/sfx_esm.f90
+4
-4
4 additions, 4 deletions
srcF/sfx_esm.f90
srcF/sfx_log.f90
+4
-6
4 additions, 6 deletions
srcF/sfx_log.f90
with
8 additions
and
10 deletions
srcF/sfx_esm.f90
+
4
−
4
View file @
938bf014
...
...
@@ -212,8 +212,9 @@ contains
else
if
(
Rib
>
-0.001
)
then
! --- nearly neutral [-0.001, 0] block
call
get_psi_neutral
(
psi_m
,
psi_h
,
zeta
,
h0_m
,
h0_t
,
B
)
call
get_psi_neutral
(
psi_m
,
psi_h
,
h0_m
,
h0_t
,
B
)
zeta
=
0.0
phi_m
=
1.0
phi_h
=
1.0
/
Pr_t_0_inv
else
...
...
@@ -268,19 +269,18 @@ contains
! universal functions
! --------------------------------------------------------------------------------
subroutine
get_psi_neutral
(
psi_m
,
psi_h
,
zeta
,
h0_m
,
h0_t
,
B
)
subroutine
get_psi_neutral
(
psi_m
,
psi_h
,
h0_m
,
h0_t
,
B
)
!> @brief universal functions (momentum) & (heat): neutral case
! ----------------------------------------------------------------------------
real
,
intent
(
out
)
::
psi_m
,
psi_h
!> universal functions
real
,
intent
(
out
)
::
zeta
!> = z/L
real
,
intent
(
in
)
::
h0_m
,
h0_t
!> = z/z0_m, z/z0_h
real
,
intent
(
in
)
::
B
!> = log(z0_m / z0_h)
! ----------------------------------------------------------------------------
zeta
=
0.0
psi_m
=
log
(
h0_m
)
psi_h
=
log
(
h0_t
)
/
Pr_t_0_inv
!*: this looks redundant z0_t = z0_m in case |B| ~ 0
if
(
abs
(
B
)
<
1.0e-10
)
psi_h
=
psi_m
/
Pr_t_0_inv
end
subroutine
...
...
This diff is collapsed.
Click to expand it.
srcF/sfx_log.f90
+
4
−
6
View file @
938bf014
...
...
@@ -99,7 +99,6 @@ contains
real
u_dyn0
!> dynamic velocity in neutral conditions [m/s]
real
Re
!> roughness Reynolds number = u_dyn0 * z0_m / nu [n/d]
real
zeta
!> = z/L [n/d]
real
Rib
!> bulk Richardson number
real
psi_m
,
psi_h
!> universal functions (momentum) & (heat) [n/d]
...
...
@@ -172,7 +171,7 @@ contains
! --- 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
,
h0_m
,
h0_t
,
B
)
! ----------------------------------------------------------------------------
phi_m
=
1.0
...
...
@@ -187,7 +186,7 @@ contains
Pr_t_inv
=
phi_m
/
phi_h
! --- setting output
sfx
=
sfxDataType
(
zeta
=
zeta
,
Rib
=
Rib
,
&
sfx
=
sfxDataType
(
zeta
=
0.0
,
Rib
=
Rib
,
&
Re
=
Re
,
B
=
B
,
z0_m
=
z0_m
,
z0_t
=
z0_t
,
&
Rib_conv_lim
=
0.0
,
&
Cm
=
Cm
,
Ct
=
Ct
,
Km
=
Km
,
Pr_t_inv
=
Pr_t_inv
)
...
...
@@ -197,19 +196,18 @@ contains
! universal functions
! --------------------------------------------------------------------------------
subroutine
get_psi_neutral
(
psi_m
,
psi_h
,
zeta
,
h0_m
,
h0_t
,
B
)
subroutine
get_psi_neutral
(
psi_m
,
psi_h
,
h0_m
,
h0_t
,
B
)
!> @brief universal functions (momentum) & (heat): neutral case
! ----------------------------------------------------------------------------
real
,
intent
(
out
)
::
psi_m
,
psi_h
!> universal functions
real
,
intent
(
out
)
::
zeta
!> = z/L
real
,
intent
(
in
)
::
h0_m
,
h0_t
!> = z/z0_m, z/z0_h
real
,
intent
(
in
)
::
B
!> = log(z0_m / z0_h)
! ----------------------------------------------------------------------------
zeta
=
0.0
psi_m
=
log
(
h0_m
)
psi_h
=
log
(
h0_t
)
/
Pr_t_0_inv
!*: this looks redundant z0_t = z0_m in case |B| ~ 0
if
(
abs
(
B
)
<
1.0e-10
)
psi_h
=
psi_m
/
Pr_t_0_inv
end
subroutine
...
...
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