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
563f198b
Commit
563f198b
authored
1 year ago
by
Evgeny Mortikov
Browse files
Options
Downloads
Patches
Plain Diff
minor code update
parent
bbfcd5f7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
srcF/sfx_data.f90
+27
-0
27 additions, 0 deletions
srcF/sfx_data.f90
srcF/sfx_esm.f90
+1
-24
1 addition, 24 deletions
srcF/sfx_esm.f90
srcF/sfx_log.f90
+1
-24
1 addition, 24 deletions
srcF/sfx_log.f90
with
29 additions
and
48 deletions
srcF/sfx_data.f90
+
27
−
0
View file @
563f198b
...
...
@@ -17,6 +17,7 @@ module sfx_data
! public interface
! --------------------------------------------------------------------------------
public
::
push_sfx_data
! --------------------------------------------------------------------------------
! --------------------------------------------------------------------------------
...
...
@@ -79,4 +80,30 @@ module sfx_data
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
\ No newline at end of file
This diff is collapsed.
Click to expand it.
srcF/sfx_esm.f90
+
1
−
24
View file @
563f198b
...
...
@@ -69,30 +69,6 @@ contains
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
)
!> @brief surface flux calculation for single cell
...
...
@@ -263,6 +239,7 @@ contains
phi_m
=
(
1.0
-
alpha_m
*
zeta
)
**
(
-0.25
)
phi_h
=
1.0
/
(
Pr_t_0_inv
*
sqrt
(
1.0
-
alpha_h_fix
*
zeta
))
end
if
! ----------------------------------------------------------------------------
! --- define transfer coeff. (momentum) & (heat)
Cm
=
kappa
/
psi_m
...
...
This diff is collapsed.
Click to expand it.
srcF/sfx_log.f90
+
1
−
24
View file @
563f198b
...
...
@@ -65,30 +65,6 @@ contains
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
)
!> @brief surface flux calculation for single cell
...
...
@@ -212,6 +188,7 @@ contains
! --- get the fluxes
! ----------------------------------------------------------------------------
call
get_psi_neutral
(
psi_m
,
psi_h
,
zeta
,
h0_m
,
h0_t
,
B
)
! ----------------------------------------------------------------------------
phi_m
=
1.0
phi_h
=
1.0
/
Pr_t_0_inv
...
...
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