-
Notifications
You must be signed in to change notification settings - Fork 31
Snow cover fraction for Advancing Arctic Capabilities Programme #105
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Richard Essery (RichardEssery)
wants to merge
19
commits into
MetOffice:main
Choose a base branch
from
RichardEssery:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
99cfc84
snow cover fraction
RichardEssery 863f948
snow cover fraction
RichardEssery 5008336
snow cover fraction
RichardEssery 2b1feef
snow cover fraction
RichardEssery 732fe6a
snow cover fraction
RichardEssery 32b887d
snow cover fraction
RichardEssery 95ace56
snow cover fraction
RichardEssery 9dabf31
snow cover fraction
RichardEssery 8b45203
snow cover fraction
RichardEssery 85e8e8d
snow cover fraction
RichardEssery 55b5c09
snow cover fraction
RichardEssery 51ae7c3
snow cover fraction
RichardEssery 3acf9da
Update CONTRIBUTORS.md
RichardEssery c077930
snow cover fraction
RichardEssery 0551344
snow cover fraction
RichardEssery ddc2f89
snow cover fraction
RichardEssery 33b21bf
snow cover fraction
RichardEssery 7103e71
snow cover fraction
RichardEssery af8c70d
snow cover fraction
RichardEssery File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -16,6 +16,8 @@ MODULE tilepts_mod | |||||
| SUBROUTINE tilepts(land_pts,frac,surft_pts,surft_index,l_lice_point, & | ||||||
| l_lice_surft) | ||||||
|
|
||||||
| USE jules_snow_mod, ONLY: i_snow_tile | ||||||
|
|
||||||
| USE jules_surface_mod, ONLY: all_tiles, l_elev_land_ice | ||||||
|
|
||||||
| USE jules_surface_types_mod, ONLY: ntype, ice, elev_ice, elev_rock | ||||||
|
|
@@ -41,6 +43,9 @@ SUBROUTINE tilepts(land_pts,frac,surft_pts,surft_index,l_lice_point, & | |||||
| LOGICAL, INTENT(IN) :: l_lice_point(land_pts) | ||||||
| LOGICAL, INTENT(OUT) :: l_lice_surft(ntype) | ||||||
|
|
||||||
| LOGICAL :: snow_tile(land_pts) | ||||||
| ! Indicates if a separate snow tile is used on a land point | ||||||
|
|
||||||
| LOGICAL :: use_tile ! Indicates if we will model the tile for the current | ||||||
| ! land point | ||||||
|
|
||||||
|
|
@@ -62,6 +67,7 @@ SUBROUTINE tilepts(land_pts,frac,surft_pts,surft_index,l_lice_point, & | |||||
| !$OMP elev_ice, elev_rock, l_lice_point, l_lice_surft, & | ||||||
| !$OMP l_elev_land_ice, surft_pts ) & | ||||||
| !$OMP PRIVATE( l, n, c, use_tile ) | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| snow_tile(:) = .FALSE. | ||||||
| DO n = 1,ntype | ||||||
| c = 0 | ||||||
| l_lice_surft(n) = ( n == ice .OR. ANY(elev_ice == n) ) | ||||||
|
|
@@ -75,6 +81,14 @@ SUBROUTINE tilepts(land_pts,frac,surft_pts,surft_index,l_lice_point, & | |||||
| ! as this may be needed for on- or off-line icesheet coupling | ||||||
| IF (l_elev_land_ice .AND. l_lice_point(l) .AND. l_lice_surft(n)) & | ||||||
| use_tile = .TRUE. | ||||||
| ! Ice tile can be used as a separate snow tile | ||||||
| IF (ANY(i_snow_tile == 1)) THEN | ||||||
| IF (i_snow_tile(n) == 1 .AND. frac(l,n) > 0.0) THEN | ||||||
| snow_tile(l) = .TRUE. | ||||||
| ELSE IF (n == ice .AND. snow_tile(l)) THEN | ||||||
| use_tile = .TRUE. | ||||||
| END IF | ||||||
| END IF | ||||||
| ELSE | ||||||
| ! with all_tiles we do | ||||||
| ! * All tiles except the ice/elevated tiles on non-land-ice points | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.