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
428e4c2d
Commit
428e4c2d
authored
3 years ago
by
WAUTELET Philippe
Browse files
Options
Downloads
Patches
Plain Diff
Philippe 17/01/2022: OpenACC: move Print_msg calls outside of kernels regions
parent
c297b792
No related branches found
No related tags found
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/MNH/advec_weno_k_2_aux.f90
+21
-21
21 additions, 21 deletions
src/MNH/advec_weno_k_2_aux.f90
src/MNH/advec_weno_k_3_aux.f90
+117
-29
117 additions, 29 deletions
src/MNH/advec_weno_k_3_aux.f90
with
138 additions
and
50 deletions
src/MNH/advec_weno_k_2_aux.f90
+
21
−
21
View file @
428e4c2d
!MNH_LIC Copyright 2013-20
19
CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 2013-20
22
CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!MNH_LIC for details. version 1.
...
@@ -351,7 +351,11 @@ IF (PRESENT(TPHALO2)) THEN
...
@@ -351,7 +351,11 @@ IF (PRESENT(TPHALO2)) THEN
TEAST
=>
TPHALO2
%
EAST
TEAST
=>
TPHALO2
%
EAST
END
IF
END
IF
#endif
#endif
!
#ifdef MNH_OPENACC
IF
(
HLBCX
(
1
)
==
'CYCL'
)
call
Print_msg
(
NVERB_WARNING
,
'GEN'
,
'ADVEC_WENO_K_2_UX'
,
'OpenACC: CYCL not yet tested'
)
#endif
!$acc kernels
!$acc kernels
PR
(:,:,:)
=
0.0
PR
(:,:,:)
=
0.0
!
!
...
@@ -375,10 +379,6 @@ SELECT CASE ( HLBCX(1) ) ! X direction LBC type: (1) for left side
...
@@ -375,10 +379,6 @@ SELECT CASE ( HLBCX(1) ) ! X direction LBC type: (1) for left side
!* 1.1 CYCLIC CASE IN THE X DIRECTION:
!* 1.1 CYCLIC CASE IN THE X DIRECTION:
!
!
CASE
(
'CYCL'
)
! In that case one must have HLBCX(1) == HLBCX(2)
CASE
(
'CYCL'
)
! In that case one must have HLBCX(1) == HLBCX(2)
#ifdef MNH_OPENACC
call
Print_msg
(
NVERB_WARNING
,
'GEN'
,
'ADVEC_WENO_K_2_UX'
,
'OpenACC: CYCL not yet tested'
)
#endif
!
IW
=
IIB
IW
=
IIB
IE
=
IIE
IE
=
IIE
!
!
...
@@ -734,7 +734,11 @@ IF (PRESENT(TPHALO2)) THEN
...
@@ -734,7 +734,11 @@ IF (PRESENT(TPHALO2)) THEN
TEAST
=>
TPHALO2
%
EAST
TEAST
=>
TPHALO2
%
EAST
END
IF
END
IF
#endif
#endif
!
#ifdef MNH_OPENACC
IF
(
HLBCX
(
1
)
==
'CYCL'
)
call
Print_msg
(
NVERB_WARNING
,
'GEN'
,
'ADVEC_WENO_K_2_MX'
,
'OpenACC: CYCL not yet tested'
)
#endif
!$acc kernels
!$acc kernels
PR
(:,:,:)
=
0.0
PR
(:,:,:)
=
0.0
!
!
...
@@ -758,10 +762,6 @@ SELECT CASE ( HLBCX(1) ) ! X direction LBC type: (1) for left side
...
@@ -758,10 +762,6 @@ SELECT CASE ( HLBCX(1) ) ! X direction LBC type: (1) for left side
!* 1.1 CYCLIC CASE IN THE X DIRECTION:
!* 1.1 CYCLIC CASE IN THE X DIRECTION:
!
!
CASE
(
'CYCL'
)
! In that case one must have HLBCX(1) == HLBCX(2)
CASE
(
'CYCL'
)
! In that case one must have HLBCX(1) == HLBCX(2)
#ifdef MNH_OPENACC
call
Print_msg
(
NVERB_WARNING
,
'GEN'
,
'ADVEC_WENO_K_2_MX'
,
'OpenACC: CYCL not yet tested'
)
#endif
!
IW
=
IIB
IW
=
IIB
IE
=
IIE
IE
=
IIE
!
!
...
@@ -1119,7 +1119,11 @@ IF (PRESENT(TPHALO2)) THEN
...
@@ -1119,7 +1119,11 @@ IF (PRESENT(TPHALO2)) THEN
TSOUTH
=>
TPHALO2
%
SOUTH
TSOUTH
=>
TPHALO2
%
SOUTH
END
IF
END
IF
#endif
#endif
!
#ifdef MNH_OPENACC
IF
(
HLBCY
(
1
)
==
'CYCL'
)
call
Print_msg
(
NVERB_WARNING
,
'GEN'
,
'ADVEC_WENO_K_2_MY'
,
'OpenACC: CYCL not yet tested'
)
#endif
!$acc kernels
!$acc kernels
PR
(:,:,:)
=
0.0
PR
(:,:,:)
=
0.0
!
!
...
@@ -1143,10 +1147,6 @@ SELECT CASE ( HLBCY(1) ) !
...
@@ -1143,10 +1147,6 @@ SELECT CASE ( HLBCY(1) ) !
!* 1.1 CYCLIC CASE IN THE Y DIRECTION:
!* 1.1 CYCLIC CASE IN THE Y DIRECTION:
!
!
CASE
(
'CYCL'
)
! In that case one must have HLBCY(1) == HLBCY(2)
CASE
(
'CYCL'
)
! In that case one must have HLBCY(1) == HLBCY(2)
#ifdef MNH_OPENACC
call
Print_msg
(
NVERB_WARNING
,
'GEN'
,
'ADVEC_WENO_K_2_MY'
,
'OpenACC: CYCL not yet tested'
)
#endif
!
IS
=
IJB
IS
=
IJB
IN
=
IJE
IN
=
IJE
!
!
...
@@ -1498,7 +1498,11 @@ IF (PRESENT(TPHALO2)) THEN
...
@@ -1498,7 +1498,11 @@ IF (PRESENT(TPHALO2)) THEN
TSOUTH
=>
TPHALO2
%
SOUTH
TSOUTH
=>
TPHALO2
%
SOUTH
END
IF
END
IF
#endif
#endif
!
#ifdef MNH_OPENACC
IF
(
HLBCY
(
1
)
==
'CYCL'
)
call
Print_msg
(
NVERB_WARNING
,
'GEN'
,
'ADVEC_WENO_K_2_VY'
,
'OpenACC: CYCL not yet tested'
)
#endif
!$acc kernels
!$acc kernels
PR
(:,:,:)
=
0.0
PR
(:,:,:)
=
0.0
!
!
...
@@ -1522,10 +1526,6 @@ SELECT CASE ( HLBCY(1) ) ! Y direction LBC type: (1) for left side
...
@@ -1522,10 +1526,6 @@ SELECT CASE ( HLBCY(1) ) ! Y direction LBC type: (1) for left side
!* 1.1 CYCLIC CASE IN THE Y DIRECTION:
!* 1.1 CYCLIC CASE IN THE Y DIRECTION:
!
!
CASE
(
'CYCL'
)
! In that case one must have HLBCX(1) == HLBCX(2)
CASE
(
'CYCL'
)
! In that case one must have HLBCX(1) == HLBCX(2)
#ifdef MNH_OPENACC
call
Print_msg
(
NVERB_WARNING
,
'GEN'
,
'ADVEC_WENO_K_2_VY'
,
'OpenACC: CYCL not yet tested'
)
#endif
!
IS
=
IJB
IS
=
IJB
IN
=
IJE
IN
=
IJE
!
!
...
...
This diff is collapsed.
Click to expand it.
src/MNH/advec_weno_k_3_aux.f90
+
117
−
29
View file @
428e4c2d
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