Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Méso-NH code
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Méso-NH
Méso-NH code
Commits
738b9ff9
Commit
738b9ff9
authored
2 years ago
by
RODIER Quentin
Browse files
Options
Downloads
Patches
Plain Diff
Quentin 20/06/2022: bugfix for PTR and PDISS outputs diags for MesoNH was never filled
parent
3a66131b
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/common/turb/modi_turb.F90
+5
-3
5 additions, 3 deletions
src/common/turb/modi_turb.F90
src/common/turb/turb.F90
+9
-7
9 additions, 7 deletions
src/common/turb/turb.F90
src/mesonh/ext/phys_paramn.f90
+7
-0
7 additions, 0 deletions
src/mesonh/ext/phys_paramn.f90
with
21 additions
and
10 deletions
src/common/turb/modi_turb.F90
+
5
−
3
View file @
738b9ff9
...
...
@@ -24,7 +24,7 @@ INTERFACE
&
TBUDGETS
,
KBUDGETS
,
&
&
PEDR
,
PLEM
,
PRTKEMS
,
PTPMF
,
&
&
PDRUS_TURB
,
PDRVS_TURB
,
&
&
PDRTHLS_TURB
,
PDRRTS_TURB
,
PDRSVS_TURB
)
&
PDRTHLS_TURB
,
PDRRTS_TURB
,
PDRSVS_TURB
,
PTR
,
PDISS
)
!
USE
MODD_BUDGET
,
ONLY
:
TBUDGETDATA
USE
MODD_IO
,
ONLY
:
TFILEDATA
...
...
@@ -137,8 +137,10 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PLENGTHH
TYPE
(
TBUDGETDATA
),
DIMENSION
(
KBUDGETS
),
INTENT
(
INOUT
)
::
TBUDGETS
INTEGER
,
INTENT
(
IN
)
::
KBUDGETS
!
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PEDR
! EDR
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PLEM
! Mixing length
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PEDR
! EDR
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PLEM
! Mixing length
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PTR
! Transport prod. of TKE
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PDISS
! Dissipation of TKE
!
!-------------------------------------------------------------------------------
!
...
...
This diff is collapsed.
Click to expand it.
src/common/turb/turb.F90
+
9
−
7
View file @
738b9ff9
...
...
@@ -22,7 +22,7 @@
&
TBUDGETS
,
KBUDGETS
,
&
&
PEDR
,
PLEM
,
PRTKEMS
,
PTPMF
,
&
&
PDRUS_TURB
,
PDRVS_TURB
,
&
&
PDRTHLS_TURB
,
PDRRTS_TURB
,
PDRSVS_TURB
)
&
PDRTHLS_TURB
,
PDRRTS_TURB
,
PDRSVS_TURB
,
PTR
,
PDISS
)
! #################################################################
!
!
...
...
@@ -393,6 +393,8 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PLENGTHM, PLENGTHH
!
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PEDR
! EDR
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PLEM
! Mixing length
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PTR
! Transport prod. of TKE
REAL
,
DIMENSION
(:,:,:),
INTENT
(
OUT
),
OPTIONAL
::
PDISS
! Dissipation of TKE
!
!
!-------------------------------------------------------------------------------
...
...
@@ -1044,13 +1046,13 @@ ELSE
ZRTKEMS
=
0.
END
IF
!
CALL
TKE_EPS_SOURCES
(
KKA
,
KKU
,
KKL
,
KMI
,
PTKET
,
ZLM
,
ZLEPS
,
PDP
,
ZTRH
,
&
&
PRHODJ
,
PDZZ
,
PDXX
,
PDYY
,
PDZX
,
PDZY
,
PZZ
,
&
&
PTSTEP
,
PIMPL
,
ZEXPL
,
&
&
HTURBLEN
,
HTURBDIM
,
&
&
TPFILE
,
OTURB_DIAG
,
&
CALL
TKE_EPS_SOURCES
(
KKA
,
KKU
,
KKL
,
KMI
,
PTKET
,
ZLM
,
ZLEPS
,
PDP
,
ZTRH
,
&
&
PRHODJ
,
PDZZ
,
PDXX
,
PDYY
,
PDZX
,
PDZY
,
PZZ
,
&
&
PTSTEP
,
PIMPL
,
ZEXPL
,
&
&
HTURBLEN
,
HTURBDIM
,
&
&
TPFILE
,
OTURB_DIAG
,
&
&
PTP
,
PRTKES
,
PRTHLS
,
ZCOEF_DISS
,
PTDIFF
,
PTDISS
,
ZRTKEMS
,&
&
TBUDGETS
,
KBUDGETS
,
PEDR
=
PEDR
)
&
TBUDGETS
,
KBUDGETS
,
PEDR
=
PEDR
,
PTR
=
PTR
,
PDISS
=
PDISS
)
IF
(
LBUDGET_TH
)
THEN
IF
(
KRRI
>=
1
.AND.
KRRL
>=
1
)
THEN
CALL
BUDGET_STORE_END
(
TBUDGETS
(
NBUDGET_TH
),
'DISSH'
,
PRTHLS
+
ZLVOCPEXNM
*
PRRS
(:,:,:,
2
)
&
...
...
This diff is collapsed.
Click to expand it.
src/mesonh/ext/phys_paramn.f90
+
7
−
0
View file @
738b9ff9
...
...
@@ -454,6 +454,7 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZIZOCE(:) ! Solar flux penetrating in ocean
REAL
,
DIMENSION
(:),
ALLOCATABLE
::
ZPROSOL1
(:),
ZPROSOL2
(:)
! Funtions for penetrating solar flux
!
REAL
,
DIMENSION
(:,:,:),
ALLOCATABLE
::
ZLENGTHM
,
ZLENGTHH
,
ZMFMOIST
!LHARAT turb option from AROME
REAL
,
DIMENSION
(:,:,:),
ALLOCATABLE
::
ZTDIFF
,
ZTDISS
!
!-----------------------------------------------------------------------------
...
...
@@ -1481,6 +1482,9 @@ IF(ALLOCATED(XSVW_FLUX)) THEN
ELSE
ALLOCATE
(
XSVW_FLUX
(
SIZE
(
XSVT
,
1
),
SIZE
(
XSVT
,
2
),
SIZE
(
XSVT
,
3
),
SIZE
(
XSVT
,
4
)))
END
IF
!
ALLOCATE
(
ZTDIFF
(
IIU
,
IJU
,
IKU
))
ALLOCATE
(
ZTDISS
(
IIU
,
IJU
,
IKU
))
!
CALL
TURB
(
1
,
IKU
,
1
,
IMI
,
NRR
,
NRRL
,
NRRI
,
CLBCX
,
CLBCY
,
1
,
NMODEL_CLOUD
,
&
LTURB_FLX
,
LTURB_DIAG
,
LSUBG_COND
,
LRMC01
,
LOCEAN
,
&
...
...
@@ -1499,6 +1503,9 @@ END IF
XTHW_FLUX
,
XRCW_FLUX
,
XSVW_FLUX
,
XDYP
,
XTHP
,
XTR
,
XDISS
,
&
TBUDGETS
,
KBUDGETS
=
SIZE
(
TBUDGETS
),
PLEM
=
XLEM
,
PRTKEMS
=
XRTKEMS
)
!
DEALLOCATE
(
ZTDIFF
)
DEALLOCATE
(
ZTDISS
)
!
IF
(
LRMC01
)
THEN
CALL
ADD2DFIELD_ll
(
TZFIELDS_ll
,
XSBL_DEPTH
,
'PHYS_PARAM_n::XSBL_DEPTH'
)
CALL
UPDATE_HALO_ll
(
TZFIELDS_ll
,
IINFO_ll
)
...
...
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