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
7ec137d5
Commit
7ec137d5
authored
1 year ago
by
VIE Benoît
Committed by
RODIER Quentin
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
add namelist switch LTURB_PRECIP
parent
9689d295
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
src/common/turb/modd_turbn.F90
+5
-1
5 additions, 1 deletion
src/common/turb/modd_turbn.F90
src/common/turb/turb.F90
+7
-5
7 additions, 5 deletions
src/common/turb/turb.F90
with
12 additions
and
6 deletions
src/common/turb/modd_turbn.F90
+
5
−
1
View file @
7ec137d5
...
@@ -122,6 +122,7 @@ REAL :: XCEI_MAX !< maximum threshold for the instability index C
...
@@ -122,6 +122,7 @@ REAL :: XCEI_MAX !< maximum threshold for the instability index C
!(beginning of the saturation of the amplification)
!(beginning of the saturation of the amplification)
REAL
,
DIMENSION
(:,:,:),
POINTER
::
XCEI
!< Cloud Entrainment instability index to emphasize localy
REAL
,
DIMENSION
(:,:,:),
POINTER
::
XCEI
!< Cloud Entrainment instability index to emphasize localy
! turbulent fluxes
! turbulent fluxes
LOGICAL
::
LTURB_PRECIP
! switch to apply turbulence to precipitating hydrometeor mixing ratios
!
!
END
TYPE
TURB_t
END
TYPE
TURB_t
...
@@ -180,6 +181,7 @@ REAL, POINTER :: XCOEF_AMPL_SAT=>NULL()
...
@@ -180,6 +181,7 @@ REAL, POINTER :: XCOEF_AMPL_SAT=>NULL()
REAL
,
POINTER
::
XCEI_MIN
=>
NULL
()
REAL
,
POINTER
::
XCEI_MIN
=>
NULL
()
REAL
,
POINTER
::
XCEI_MAX
=>
NULL
()
REAL
,
POINTER
::
XCEI_MAX
=>
NULL
()
REAL
,
DIMENSION
(:,:,:),
POINTER
::
XCEI
=>
NULL
()
REAL
,
DIMENSION
(:,:,:),
POINTER
::
XCEI
=>
NULL
()
LOGICAL
,
POINTER
::
LTURB_PRECIP
=>
NULL
()
!
!
NAMELIST
/
NAM_TURBn
/
XIMPL
,
CTURBLEN
,
CTURBDIM
,
LTURB_FLX
,
LTURB_DIAG
,
&
NAMELIST
/
NAM_TURBn
/
XIMPL
,
CTURBLEN
,
CTURBDIM
,
LTURB_FLX
,
LTURB_DIAG
,
&
LSIG_CONV
,
LRMC01
,
CTOM
,&
LSIG_CONV
,
LRMC01
,
CTOM
,&
...
@@ -188,7 +190,7 @@ NAMELIST/NAM_TURBn/XIMPL,CTURBLEN,CTURBDIM,LTURB_FLX,LTURB_DIAG, &
...
@@ -188,7 +190,7 @@ NAMELIST/NAM_TURBn/XIMPL,CTURBLEN,CTURBDIM,LTURB_FLX,LTURB_DIAG, &
XALTHGRAD
,
XCLDTHOLD
,
XLINI
,
LHARAT
,
&
XALTHGRAD
,
XCLDTHOLD
,
XLINI
,
LHARAT
,
&
LPROJQITURB
,
LSMOOTH_PRANDTL
,
XMINSIGS
,
NTURBSPLIT
,
&
LPROJQITURB
,
LSMOOTH_PRANDTL
,
XMINSIGS
,
NTURBSPLIT
,
&
LCLOUDMODIFLM
,
CTURBLEN_CLOUD
,
&
LCLOUDMODIFLM
,
CTURBLEN_CLOUD
,
&
XCOEF_AMPL_SAT
,
XCEI_MIN
,
XCEI_MAX
XCOEF_AMPL_SAT
,
XCEI_MIN
,
XCEI_MAX
,
LTURB_PRECIP
!
!
!-------------------------------------------------------------------------------
!-------------------------------------------------------------------------------
!
!
...
@@ -276,6 +278,7 @@ XCOEF_AMPL_SAT=>TURB_MODEL(KTO)%XCOEF_AMPL_SAT
...
@@ -276,6 +278,7 @@ XCOEF_AMPL_SAT=>TURB_MODEL(KTO)%XCOEF_AMPL_SAT
XCEI_MIN
=>
TURB_MODEL
(
KTO
)
%
XCEI_MIN
XCEI_MIN
=>
TURB_MODEL
(
KTO
)
%
XCEI_MIN
XCEI_MAX
=>
TURB_MODEL
(
KTO
)
%
XCEI_MAX
XCEI_MAX
=>
TURB_MODEL
(
KTO
)
%
XCEI_MAX
XCEI
=>
TURB_MODEL
(
KTO
)
%
XCEI
XCEI
=>
TURB_MODEL
(
KTO
)
%
XCEI
LTURB_PRECIP
=>
TURB_MODEL
(
KTO
)
%
LTURB_PRECIP
!
!
ENDIF
ENDIF
!
!
...
@@ -386,6 +389,7 @@ IF(LLDEFAULTVAL) THEN
...
@@ -386,6 +389,7 @@ IF(LLDEFAULTVAL) THEN
XCOEF_AMPL_SAT
=
5.
XCOEF_AMPL_SAT
=
5.
XCEI_MIN
=
0.001E-06
XCEI_MIN
=
0.001E-06
XCEI_MAX
=
0.01E-06
XCEI_MAX
=
0.01E-06
LTURB_PRECIP
=
.FALSE.
!
!
IF
(
HPROGRAM
==
'AROME'
)
THEN
IF
(
HPROGRAM
==
'AROME'
)
THEN
XTKEMIN
=
1.E-6
XTKEMIN
=
1.E-6
...
...
This diff is collapsed.
Click to expand it.
src/common/turb/turb.F90
+
7
−
5
View file @
7ec137d5
...
@@ -1346,11 +1346,13 @@ IF ( KRRL >= 1 ) THEN
...
@@ -1346,11 +1346,13 @@ IF ( KRRL >= 1 ) THEN
END
IF
!
END
IF
!
!
!
PRSVS
(:,:,:)
=
ZWORKS
(:,:,
1
:
KSV
)
PRSVS
(:,:,:)
=
ZWORKS
(:,:,
1
:
KSV
)
IF
(
KRR
.GE.
3
)
PRRS
(:,:,
3
)
=
ZWORKS
(:,:,
KSV
+3
)
IF
(
TURBN
%
LTURB_PRECIP
)
THEN
IF
(
KRR
.GE.
5
)
PRRS
(:,:,
5
)
=
ZWORKS
(:,:,
KSV
+5
)
IF
(
KRR
.GE.
3
)
PRRS
(:,:,
3
)
=
ZWORKS
(:,:,
KSV
+3
)
IF
(
KRR
.GE.
6
)
PRRS
(:,:,
6
)
=
ZWORKS
(:,:,
KSV
+6
)
IF
(
KRR
.GE.
5
)
PRRS
(:,:,
5
)
=
ZWORKS
(:,:,
KSV
+5
)
IF
(
KRR
.GE.
7
)
PRRS
(:,:,
7
)
=
ZWORKS
(:,:,
KSV
+7
)
IF
(
KRR
.GE.
6
)
PRRS
(:,:,
6
)
=
ZWORKS
(:,:,
KSV
+6
)
IF
(
OFLYER
)
PWSV
(:,:,:)
=
ZWORKWSV
(:,:,
1
:
KSV
)
IF
(
KRR
.GE.
7
)
PRRS
(:,:,
7
)
=
ZWORKS
(:,:,
KSV
+7
)
END
IF
IF
(
OFLYER
)
PWSV
(:,:,:)
=
ZWORKWSV
(:,:,
1
:
KSV
)
!
!
! Remove non-physical negative values (unnecessary in a perfect world) + corresponding budgets
! Remove non-physical negative values (unnecessary in a perfect world) + corresponding budgets
CALL
SOURCES_NEG_CORRECT_PHY
(
D
,
KSV
,
HCLOUD
,
HELEC
,
'NETUR'
,
KRR
,
PTSTEP
,
PPABST
,
PTHLT
,
PRT
,
PRTHLS
,
PRRS
,
PRSVS
)
CALL
SOURCES_NEG_CORRECT_PHY
(
D
,
KSV
,
HCLOUD
,
HELEC
,
'NETUR'
,
KRR
,
PTSTEP
,
PPABST
,
PTHLT
,
PRT
,
PRTHLS
,
PRRS
,
PRSVS
)
...
...
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