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
4bb00b40
Commit
4bb00b40
authored
5 years ago
by
WAUTELET Philippe
Browse files
Options
Downloads
Patches
Plain Diff
Philippe 12/04/2019: replace ABORT and STOP calls by Print_msg
parent
688213e6
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/LIB/SURCOUCHE/src/mode_toolsz_ll.f90
+4
-5
4 additions, 5 deletions
src/LIB/SURCOUCHE/src/mode_toolsz_ll.f90
src/MNH/compute_updraft_hrio.f90
+10
-5
10 additions, 5 deletions
src/MNH/compute_updraft_hrio.f90
with
14 additions
and
10 deletions
src/LIB/SURCOUCHE/src/mode_toolsz_ll.f90
+
4
−
5
View file @
4bb00b40
...
@@ -339,11 +339,10 @@
...
@@ -339,11 +339,10 @@
END
IF
END
IF
IF
(
(
(
1
+
TPROC
(
IP
)
%
NXEND
-
TPROC
(
IP
)
%
NXOR
)
==
0
)
&
IF
(
(
(
1
+
TPROC
(
IP
)
%
NXEND
-
TPROC
(
IP
)
%
NXOR
)
==
0
)
&
.OR.
(
(
1
+
TPROC
(
IP
)
%
NYEND
-
TPROC
(
IP
)
%
NYOR
)
==
0
)
)
THEN
.OR.
(
(
1
+
TPROC
(
IP
)
%
NYEND
-
TPROC
(
IP
)
%
NYOR
)
==
0
)
)
THEN
PRINT
*
,
"/!\ SPLITZ: some proc have 0 size local domaine , to much processors used for domaine size "
,
&
write
(
yval1
,
'( I10 )'
)
1
+
TPROC
(
IP
)
%
NXEND
-
TPROC
(
IP
)
%
NXOR
" IP="
,
IP
,
&
write
(
yval2
,
'( I10 )'
)
1
+
TPROC
(
IP
)
%
NYEND
-
TPROC
(
IP
)
%
NYOR
" DIMX="
,
1
+
TPROC
(
IP
)
%
NXEND
-
TPROC
(
IP
)
%
NXOR
,
&
call
Print_msg
(
NVERB_FATAL
,
'GEN'
,
'SPLITZ'
,
'zero-size local-domain dimensions: DIMX='
//
&
" DIMY="
,
1
+
TPROC
(
IP
)
%
NYEND
-
TPROC
(
IP
)
%
NYOR
trim
(
yval1
)//
', DIMY='
//
trim
(
yval2
)//
'. Too many processes for this domain size.'
)
CALL
ABORT
()
END
IF
END
IF
!
!
!* 3. shift from physical to extended domain
!* 3. shift from physical to extended domain
...
...
This diff is collapsed.
Click to expand it.
src/MNH/compute_updraft_hrio.f90
+
10
−
5
View file @
4bb00b40
!MNH_LIC Copyright 1994-201
4
CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 1994-201
9
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.
!-----------------------------------------------------------------
! ######spl
! ######spl
MODULE
MODI_COMPUTE_UPDRAFT_HRIO
MODULE
MODI_COMPUTE_UPDRAFT_HRIO
! ###########################
! ###########################
...
@@ -135,6 +136,7 @@ END MODULE MODI_COMPUTE_UPDRAFT_HRIO! ######spl
...
@@ -135,6 +136,7 @@ END MODULE MODI_COMPUTE_UPDRAFT_HRIO! ######spl
!! S. Riette Jan 2012: support for both order of vertical levels
!! S. Riette Jan 2012: support for both order of vertical levels
!! V.Masson, C.Lac : 02/2011 : SV_UP initialized by a non-zero value
!! V.Masson, C.Lac : 02/2011 : SV_UP initialized by a non-zero value
!! Q.Rodier 01/2019 : support RM17 mixing length
!! Q.Rodier 01/2019 : support RM17 mixing length
! P. Wautelet 12/04/2019: replace ABORT and STOP calls by Print_msg
!! --------------------------------------------------------------------------
!! --------------------------------------------------------------------------
!
!
!* 0. DECLARATIONS
!* 0. DECLARATIONS
...
@@ -150,6 +152,8 @@ USE MODD_GRID_n, ONLY : XDXHAT, XDYHAT
...
@@ -150,6 +152,8 @@ USE MODD_GRID_n, ONLY : XDXHAT, XDYHAT
USE
MODD_BLANK
USE
MODD_BLANK
USE
MODD_TURB_n
,
ONLY
:
CTURBLEN
USE
MODD_TURB_n
,
ONLY
:
CTURBLEN
use
mode_msg
!USE MODI_COMPUTE_ENTR_DETR
!USE MODI_COMPUTE_ENTR_DETR
USE
MODI_TH_R_FROM_THL_RT_1D
USE
MODI_TH_R_FROM_THL_RT_1D
USE
MODI_SHUMAN_MF
USE
MODI_SHUMAN_MF
...
@@ -394,7 +398,7 @@ PSV_DO(:,:,:)=0.
...
@@ -394,7 +398,7 @@ PSV_DO(:,:,:)=0.
PTHL_UP
(:,
KKB
)
=
ZTHLM_F
(:,
KKB
)
+
MAX
(
0.
,
MIN
(
ZTMAX
,(
PSFTH
(:)/
SQRT
(
ZTKEM_F
(:,
KKB
)))
*
XALP_PERT
))
PTHL_UP
(:,
KKB
)
=
ZTHLM_F
(:,
KKB
)
+
MAX
(
0.
,
MIN
(
ZTMAX
,(
PSFTH
(:)/
SQRT
(
ZTKEM_F
(:,
KKB
)))
*
XALP_PERT
))
PRT_UP
(:,
KKB
)
=
ZRTM_F
(:,
KKB
)
+
MAX
(
0.
,
MIN
(
ZRMAX
,(
PSFRV
(:)/
SQRT
(
ZTKEM_F
(:,
KKB
)))
*
XALP_PERT
))
PRT_UP
(:,
KKB
)
=
ZRTM_F
(:,
KKB
)
+
MAX
(
0.
,
MIN
(
ZRMAX
,(
PSFRV
(:)/
SQRT
(
ZTKEM_F
(:,
KKB
)))
*
XALP_PERT
))
!------------------------
!------------------------
print
*
,
OENTR_DETR
!
print*,OENTR_DETR
!------------------------
!------------------------
IF
(
OENTR_DETR
)
THEN
IF
(
OENTR_DETR
)
THEN
ZTHM_F
(:,:)
=
MZM_MF
(
KKA
,
KKU
,
KKL
,
PTHM
(:,:))
ZTHM_F
(:,:)
=
MZM_MF
(
KKA
,
KKU
,
KKL
,
PTHM
(:,:))
...
@@ -767,7 +771,8 @@ DO JK=KKB,KKE-KKL,KKL
...
@@ -767,7 +771,8 @@ DO JK=KKB,KKE-KKL,KKL
! on cherche savoir s'il y a des vitesses verticales non dfinies
! on cherche savoir s'il y a des vitesses verticales non dfinies
! je n'utilise que ZW_UP2 pour pouvoir avoir une valeur si ZW_UP
! je n'utilise que ZW_UP2 pour pouvoir avoir une valeur si ZW_UP
! n'est pas dfini
! n'est pas dfini
IF
(
maxval
(
ZW_UP2
(:,
JK
+
KKL
))
.NE.
maxval
(
ZW_UP2
(:,
JK
+
KKL
)))
STOP
'probleme ici'
IF
(
maxval
(
ZW_UP2
(:,
JK
+
KKL
))
.NE.
maxval
(
ZW_UP2
(:,
JK
+
KKL
)))
&
call
Print_msg
(
NVERB_FATAL
,
'GEN'
,
'COMPUTE_UPDRAFT_HRIO'
,
'maxval(ZW_UP2(:,JK+KKL)) /= maxval(ZW_UP2(:,JK+KKL))'
)
! si on est dans la zone grise la dfinition du flux de masse change
! si on est dans la zone grise la dfinition du flux de masse change
! donc celle de alpha aussi
! donc celle de alpha aussi
WHERE
(
GTEST
)
WHERE
(
GTEST
)
...
@@ -858,6 +863,6 @@ ENDDO ! boucle JK
...
@@ -858,6 +863,6 @@ ENDDO ! boucle JK
GWORK1
(:)
=
(
GTESTLCL
(:)
.AND.
(
PDEPTH
(:)
>
ZDEPTH_MAX1
)
)
GWORK1
(:)
=
(
GTESTLCL
(:)
.AND.
(
PDEPTH
(:)
>
ZDEPTH_MAX1
)
)
GWORK2
(:,:)
=
SPREAD
(
GWORK1
(:),
DIM
=
2
,
NCOPIES
=
MAX
(
KKU
,
KKA
)
)
GWORK2
(:,:)
=
SPREAD
(
GWORK1
(:),
DIM
=
2
,
NCOPIES
=
MAX
(
KKU
,
KKA
)
)
ZCOEF
(:,:)
=
SPREAD
(
(
1.
-
(
PDEPTH
(:)
-
ZDEPTH_MAX1
)/(
ZDEPTH_MAX2
-
ZDEPTH_MAX1
)),
DIM
=
2
,
NCOPIES
=
SIZE
(
ZCOEF
,
2
))
ZCOEF
(:,:)
=
SPREAD
(
(
1.
-
(
PDEPTH
(:)
-
ZDEPTH_MAX1
)/(
ZDEPTH_MAX2
-
ZDEPTH_MAX1
)),
DIM
=
2
,
NCOPIES
=
SIZE
(
ZCOEF
,
2
))
print
*
,
"je sors de compute_updraft"
!
print*,"je sors de compute_updraft"
END
SUBROUTINE
COMPUTE_UPDRAFT_HRIO
END
SUBROUTINE
COMPUTE_UPDRAFT_HRIO
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