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
57399d1f
Commit
57399d1f
authored
2 years ago
by
WURTZ Jean
Committed by
Jean Wurtz
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Jean Wurtz pgd_cover.F90 Bugfix when water fraction is 1
parent
9d7f29ad
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/SURFEX/pgd_cover.F90
+24
-6
24 additions, 6 deletions
src/SURFEX/pgd_cover.F90
with
24 additions
and
6 deletions
src/SURFEX/pgd_cover.F90
+
24
−
6
View file @
57399d1f
...
...
@@ -573,7 +573,7 @@ ELSE
!
CALL
FIT_COVERS
(
XDATA_NATURE
,
U
%
XNATURE
,
4
,
ICOVER
,
IC_NAT
)
CALL
FIT_COVERS
(
XDATA_TOWN
,
U
%
XTOWN
,
7
,
ICOVER
,
IC_TWN
)
CALL
FIT_COVERS
(
XDATA_WATER
,
U
%
XWATER
,
2
,
ICOVER
,
IC_WAT
)
CALL
FIT_COVERS
(
XDATA_WATER
,
U
%
XWATER
,
2
,
ICOVER
,
IC_WAT
,
KSURF_ADDITIONNAL
=
3
)
! Jean Wurtz Adding KSURF_ADDITIONNAL TO ADD RIVER WHICH CAN BE =1 AT HIGH RESOLUTION
CALL
FIT_COVERS
(
XDATA_SEA
,
U
%
XSEA
,
1
,
ICOVER
,
IC_SEA
)
!
ALLOCATE
(
ZCOVER_NATURE
(
NL
,
ICOVER
))
...
...
@@ -641,6 +641,7 @@ ELSE
'*********************************************************************'
NSIZE
(:,
1
)
=
1
WHERE
(
U
%
XWATER
(:)
.NE.
0.
.AND.
ZWATER
(:)
.EQ.
0.
)
NSIZE
(:,
1
)
=
0
!IC_WAT=0
! if water imposed to 1 in a grid cell: no extrapolation
DO
JL
=
1
,
SIZE
(
U
%
XCOVER
,
1
)
IF
(
U
%
XWATER
(
JL
)
==
1.0
)
THEN
...
...
@@ -733,15 +734,17 @@ IF (LHOOK) CALL DR_HOOK('PGD_COVER',1,ZHOOK_HANDLE)
!-------------------------------------------------------------------------------
CONTAINS
!
SUBROUTINE
FIT_COVERS
(
PDATA_SURF
,
PSURF
,
KSURF
,
KCOVER
,
KC_SURF
)
SUBROUTINE
FIT_COVERS
(
PDATA_SURF
,
PSURF
,
KSURF
,
KCOVER
,
KC_SURF
,
KSURF_ADDITIONNAL
)
!
REAL
,
DIMENSION
(:),
INTENT
(
IN
)
::
PDATA_SURF
REAL
,
DIMENSION
(:),
INTENT
(
IN
)
::
PSURF
INTEGER
,
INTENT
(
IN
)
::
KSURF
INTEGER
,
INTENT
(
INOUT
)
::
KCOVER
INTEGER
,
INTENT
(
OUT
)
::
KC_SURF
INTEGER
,
INTENT
(
IN
),
OPTIONAL
::
KSURF_ADDITIONNAL
!
LOGICAL
::
GPRESENT
LOGICAL
::
G_IS_PRESENT_ADDITIONNAL_KSURF
REAL
(
KIND
=
JPRB
)
::
ZHOOK_HANDLE
!
IF
(
LHOOK
)
CALL
DR_HOOK
(
'PGD_COVER:FIT_COVERS'
,
0
,
ZHOOK_HANDLE
)
...
...
@@ -754,15 +757,30 @@ DO JCOV=1,KCOVER
ENDIF
ENDDO
!
G_IS_PRESENT_ADDITIONNAL_KSURF
=
.FALSE.
IF
(
PRESENT
(
KSURF_ADDITIONNAL
))
THEN
G_IS_PRESENT_ADDITIONNAL_KSURF
=
.TRUE.
END
IF
IF
(
ANY
(
PSURF
(:)/
=
0.
))
THEN
!
IF
(
GPRESENT
)
THEN
!
DO
JCOV
=
1
,
KCOVER
IF
(
IMASK_COVER
(
JCOV
)
==
KSURF
)
THEN
KC_SURF
=
JCOV
EXIT
ENDIF
IF
(
G_IS_PRESENT_ADDITIONNAL_KSURF
)
THEN
IF
(
IMASK_COVER
(
JCOV
)
==
KSURF
.OR.
IMASK_COVER
(
JCOV
)
==
KSURF_ADDITIONNAL
)
THEN
KC_SURF
=
JCOV
EXIT
ENDIF
ELSE
IF
(
IMASK_COVER
(
JCOV
)
==
KSURF
)
THEN
KC_SURF
=
JCOV
EXIT
ENDIF
END
IF
ENDDO
!
ELSE
...
...
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