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
RODIER Quentin
Méso-NH code
Commits
446caecc
Commit
446caecc
authored
9 months ago
by
RODIER Quentin
Browse files
Options
Downloads
Patches
Plain Diff
Quentin 05/06/2024: add kernels for turb_hor_sv_corr
parent
4601a56a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/PHYEX/turb/mode_turb_hor.f90
+1
-1
1 addition, 1 deletion
src/PHYEX/turb/mode_turb_hor.f90
src/PHYEX/turb/mode_turb_hor_sv_corr.f90
+33
-27
33 additions, 27 deletions
src/PHYEX/turb/mode_turb_hor_sv_corr.f90
src/Rules.LXnvhpc2202.mk
+1
-1
1 addition, 1 deletion
src/Rules.LXnvhpc2202.mk
with
35 additions
and
29 deletions
src/PHYEX/turb/mode_turb_hor.f90
+
1
−
1
View file @
446caecc
...
...
@@ -370,7 +370,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS
CALL
TURB_HOR_SV_CORR
(
D
,
CST
,
CSTURB
,
TLES
,
&
KSV
,
KSV_LGBEG
,
KSV_LGEND
,
&
KRR
,
KRRL
,
KRRI
,
OOCEAN
,
OCOMPUTE_SRC
,
OBLOWSNOW
,
&
ONOMIXLG
,
O2D
,
&
ONOMIXLG
,
O2D
,
OFLAT
,
&
PDXX
,
PDYY
,
PDZZ
,
PDZX
,
PDZY
,
PRSNOW
,
&
PLM
,
PLEPS
,
PTKEM
,
PTHVREF
,
&
PTHLM
,
PRM
,
&
...
...
This diff is collapsed.
Click to expand it.
src/PHYEX/turb/mode_turb_hor_sv_corr.f90
+
33
−
27
View file @
446caecc
...
...
@@ -7,7 +7,7 @@ IMPLICIT NONE
CONTAINS
SUBROUTINE
TURB_HOR_SV_CORR
(
D
,
CST
,
CSTURB
,
TLES
,
KSV
,
KSV_LGBEG
,
KSV_LGEND
,&
KRR
,
KRRL
,
KRRI
,
OOCEAN
,
OCOMPUTE_SRC
,
OBLOWSNOW
,
&
ONOMIXLG
,
O2D
,
&
ONOMIXLG
,
O2D
,
OFLAT
,
&
PDXX
,
PDYY
,
PDZZ
,
PDZX
,
PDZY
,
PRSNOW
,
&
PLM
,
PLEPS
,
PTKEM
,
PTHVREF
,
&
PTHLM
,
PRM
,
&
...
...
@@ -16,7 +16,7 @@ CONTAINS
! ################################################################
!
!
!!**** *TURB_HO
T
_SV_CORR* computes subgrid Sv2 and SvThv terms
!!**** *TURB_HO
R
_SV_CORR* computes subgrid Sv2 and SvThv terms
!!
!! PURPOSE
!! -------
...
...
@@ -59,7 +59,9 @@ USE MODI_GRADIENT_M
USE
MODI_GRADIENT_U
USE
MODI_GRADIENT_V
USE
MODI_GRADIENT_W
USE
MODI_SHUMAN
USE
MODE_GRADIENT_M_PHY
,
ONLY
:
GX_M_M_PHY
,
GY_M_M_PHY
USE
MODI_SHUMAN
USE
MODE_SHUMAN_PHY
,
ONLY
:
MZF_PHY
USE
MODI_LES_MEAN_SUBGRID
USE
MODE_EMOIST
,
ONLY
:
EMOIST
USE
MODE_ETHETA
,
ONLY
:
ETHETA
...
...
@@ -82,36 +84,37 @@ INTEGER, INTENT(IN) :: KRRL ! number of liquid var.
INTEGER
,
INTENT
(
IN
)
::
KRRI
! number of ice var.
INTEGER
,
INTENT
(
IN
)
::
KSV
,
KSV_LGBEG
,
KSV_LGEND
! number of sv var.
LOGICAL
,
INTENT
(
IN
)
::
OOCEAN
! switch for Ocean model version
LOGICAL
,
INTENT
(
IN
)
::
OFLAT
! Logical for zero ororography
LOGICAL
,
INTENT
(
IN
)
::
OCOMPUTE_SRC
! flag to define dimensions of SIGS and SRCT variables
LOGICAL
,
INTENT
(
IN
)
::
OBLOWSNOW
! switch to activate pronostic blowing snow
LOGICAL
,
INTENT
(
IN
)
::
ONOMIXLG
! to use turbulence for lagrangian variables (modd_conf)
LOGICAL
,
INTENT
(
IN
)
::
O2D
! Logical for 2D model version (modd_conf)
REAL
,
INTENT
(
IN
)
::
PRSNOW
! Ratio for diffusion coeff. scalar (blowing snow)
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PDXX
,
PDYY
,
PDZZ
,
PDZX
,
PDZY
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PDXX
,
PDYY
,
PDZZ
,
PDZX
,
PDZY
! Metric coefficients
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PLM
! mixing length
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PLEPS
! dissipative length
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PTKEM
! tke
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PTHVREF
! reference Thv
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PTHLM
! potential temperature at t-Delta t
REAL
,
DIMENSION
(
:,:,:,:
),
INTENT
(
IN
)
::
PRM
! Mixing ratios at t-Delta t
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PLOCPEXNM
! Lv(T)/Cp/Exnref at time t-1
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PATHETA
! coefficients between
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PAMOIST
! s and Thetal and Rnp
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PSRCM
! normalized
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PLM
! mixing length
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PLEPS
! dissipative length
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PTKEM
! tke
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PTHVREF
! reference Thv
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PTHLM
! potential temperature at t-Delta t
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
,
KRR
),
INTENT
(
IN
)
::
PRM
! Mixing ratios at t-Delta t
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PLOCPEXNM
! Lv(T)/Cp/Exnref at time t-1
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PATHETA
! coefficients between
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PAMOIST
! s and Thetal and Rnp
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PSRCM
! normalized
! 2nd-order flux s'r'c/2Sigma_s2 at t-1 multiplied by Lambda_3
REAL
,
DIMENSION
(
:,:,:
),
INTENT
(
IN
)
::
PWM
! w at t-1
REAL
,
DIMENSION
(
:,:,:,:
),
INTENT
(
IN
)
::
PSVM
! scalar var. at t-1
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
),
INTENT
(
IN
)
::
PWM
! w at t-1
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
,
KSV
),
INTENT
(
IN
)
::
PSVM
! scalar var. at t-1
!
!
!
!* 0.2 declaration of local variables
!
REAL
,
DIMENSION
(
SIZE
(
PSVM
,
1
),
SIZE
(
PSVM
,
2
),
SIZE
(
PSVM
,
3
)
)
&
REAL
,
DIMENSION
(
D
%
NIT
,
D
%
NJT
,
D
%
NKT
)
&
::
ZFLX
,
ZA
!
INTEGER
::
JSV
! loop counter
INTEGER
::
IKU
INTEGER
::
IKU
,
IIT
,
IJT
,
IKT
,
JI
,
JJ
,
JK
!
REAL
::
ZTIME1
,
ZTIME2
!
...
...
@@ -123,6 +126,9 @@ REAL :: ZCSV !constant for the scalar flux
! ---------------------------------------------------------------------------
!
IKU
=
SIZE
(
PTKEM
,
3
)
IIT
=
D
%
NIT
IJT
=
D
%
NJT
IKT
=
D
%
NKT
CALL
SECOND_MNH
(
ZTIME1
)
!
IF
(
OBLOWSNOW
)
THEN
...
...
@@ -141,11 +147,11 @@ DO JSV=1,KSV
IF
(
TLES
%
LLES_CALL
)
THEN
IF
(
.NOT.
O2D
)
THEN
ZFLX
(:,:,:)
=
ZCSV
/
ZCSVD
*
PLM
(:,:,:)
*
PLEPS
(:,:,:)
*
&
(
GX_M_M
(
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
**
2
&
+
GY_M_M
(
PSVM
(:,:,:,
JSV
),
PDYY
,
PDZZ
,
PDZY
)
**
2
)
(
GX_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
**
2
&
+
GY_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDYY
,
PDZZ
,
PDZY
)
**
2
)
ELSE
ZFLX
(:,:,:)
=
ZCSV
/
ZCSVD
*
PLM
(:,:,:)
*
PLEPS
(:,:,:)
*
&
GX_M_M
(
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
**
2
GX_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
**
2
END
IF
CALL
LES_MEAN_SUBGRID
(
-2.
*
ZCSVD
*
SQRT
(
PTKEM
)
*
ZFLX
/
PLEPS
,
&
TLES
%
X_LES_SUBGRID_DISS_Sv2
(:,:,:,
JSV
),
.TRUE.
)
...
...
@@ -158,12 +164,12 @@ DO JSV=1,KSV
CALL
ETHETA
(
D
,
CST
,
KRR
,
KRRI
,
PTHLM
,
PRM
,
PLOCPEXNM
,
PATHETA
,
PSRCM
,
OOCEAN
,
OCOMPUTE_SRC
,
ZA
)
IF
(
.NOT.
O2D
)
THEN
ZFLX
(:,:,:)
=
PLM
(:,:,:)
*
PLEPS
(:,:,:)
&
*
(
GX_M_M
(
PTHLM
,
PDXX
,
PDZZ
,
PDZX
)
*
GX_M_M
(
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
&
+
GY_M_M
(
PTHLM
,
PDYY
,
PDZZ
,
PDZY
)
*
GY_M_M
(
PSVM
(:,:,:,
JSV
),
PDYY
,
PDZZ
,
PDZY
)
&
*
(
GX_M_M
(
OFLAT
,
PTHLM
,
PDXX
,
PDZZ
,
PDZX
)
*
GX_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
&
+
GY_M_M
(
OFLAT
,
PTHLM
,
PDYY
,
PDZZ
,
PDZY
)
*
GY_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDYY
,
PDZZ
,
PDZY
)
&
)
*
(
CSTURB
%
XCSHF
+
ZCSV
)
/
(
2.
*
ZCTSVD
)
ELSE
ZFLX
(:,:,:)
=
PLM
(:,:,:)
*
PLEPS
(:,:,:)
&
*
GX_M_M
(
PTHLM
,
PDXX
,
PDZZ
,
PDZX
)
*
GX_M_M
(
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
&
*
GX_M_M
(
OFLAT
,
PTHLM
,
PDXX
,
PDZZ
,
PDZX
)
*
GX_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
&
*
(
CSTURB
%
XCSHF
+
ZCSV
)
/
(
2.
*
ZCTSVD
)
END
IF
CALL
LES_MEAN_SUBGRID
(
ZA
*
ZFLX
,
TLES
%
X_LES_SUBGRID_SvThv
(:,:,:,
JSV
)
,
.TRUE.
)
...
...
@@ -173,12 +179,12 @@ DO JSV=1,KSV
CALL
EMOIST
(
D
,
CST
,
KRR
,
KRRI
,
PTHLM
,
PRM
,
PLOCPEXNM
,
PAMOIST
,
PSRCM
,
OOCEAN
,
ZA
)
IF
(
.NOT.
O2D
)
THEN
ZFLX
(:,:,:)
=
PLM
(:,:,:)
*
PLEPS
(:,:,:)
&
*
(
GX_M_M
(
PRM
(:,:,:,
1
),
PDXX
,
PDZZ
,
PDZX
)
*
GX_M_M
(
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
&
+
GY_M_M
(
PRM
(:,:,:,
1
),
PDYY
,
PDZZ
,
PDZY
)
*
GY_M_M
(
PSVM
(:,:,:,
JSV
),
PDYY
,
PDZZ
,
PDZY
)
&
*
(
GX_M_M
(
OFLAT
,
PRM
(:,:,:,
1
),
PDXX
,
PDZZ
,
PDZX
)
*
GX_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
&
+
GY_M_M
(
OFLAT
,
PRM
(:,:,:,
1
),
PDYY
,
PDZZ
,
PDZY
)
*
GY_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDYY
,
PDZZ
,
PDZY
)
&
)
*
(
CSTURB
%
XCHF
+
ZCSV
)
/
(
2.
*
ZCQSVD
)
ELSE
ZFLX
(:,:,:)
=
PLM
(:,:,:)
*
PLEPS
(:,:,:)
&
*
GX_M_M
(
PRM
(:,:,:,
1
),
PDXX
,
PDZZ
,
PDZX
)
*
GX_M_M
(
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
&
*
GX_M_M
(
OFLAT
,
PRM
(:,:,:,
1
),
PDXX
,
PDZZ
,
PDZX
)
*
GX_M_M
(
OFLAT
,
PSVM
(:,:,:,
JSV
),
PDXX
,
PDZZ
,
PDZX
)
&
*
(
CSTURB
%
XCHF
+
ZCSV
)
/
(
2.
*
ZCQSVD
)
END
IF
CALL
LES_MEAN_SUBGRID
(
ZA
*
ZFLX
,
TLES
%
X_LES_SUBGRID_SvThv
(:,:,:,
JSV
)
,
.TRUE.
)
...
...
This diff is collapsed.
Click to expand it.
src/Rules.LXnvhpc2202.mk
+
1
−
1
View file @
446caecc
...
...
@@ -340,6 +340,6 @@ PHYEX_OPTDEFAULT = --addMPPDB_CHECKS --addStack MESONH --stopScopes toto --mathF
PHYEX_LIST
=
$(
notdir
$(
shell find PHYEX/micro PHYEX/turb
-follow
-type
f
-name
"*.f*"
-not
-name
"minpack.f90"
|
sed
-e
's/\(.*\)\(\.\).*/\1.D/g'
))
$(PHYEX_LIST)
:
PYFT = pyft_tool.py $(PHYEX_OPTDEFAULT)
PHYEX_SHUMAN
=
mode_tke_eps_sources.D mode_turb_ver_thermo_flux.D mode_turb_ver_thermo_corr.D mode_turb_ver_dyn_flux.D mode_turb_hor_splt.D mode_turb_ver_sv_corr.D mode_turb_ver_sv_flux.D mode_turb_hor_thermo_flux.D mode_turb_hor_thermo_corr.D mode_turb_hor_uv.D
PHYEX_SHUMAN
=
mode_tke_eps_sources.D mode_turb_ver_thermo_flux.D mode_turb_ver_thermo_corr.D mode_turb_ver_dyn_flux.D mode_turb_hor_splt.D mode_turb_ver_sv_corr.D mode_turb_ver_sv_flux.D mode_turb_hor_thermo_flux.D mode_turb_hor_thermo_corr.D mode_turb_hor_uv.D
mode_turb_hor_sv_corr.D
$(PHYEX_SHUMAN)
:
PYFT = pyft_tool.py --shumanFUNCtoCALL --expandAllArraysConcurrent $(PHYEX_OPTDEFAULT)
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