Skip to content
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.

Sign up for GitHub

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

Add support for two FESOM grids #171

Merged
merged 4 commits into from
Oct 19, 2023
Merged

Add support for two FESOM grids #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40003ea
ECC-1695: GRIB2 definitions: Group files into sub-directories (Part 1)
shahramn Sep 29, 2023
6112d06
Bump up version
shahramn Oct 2, 2023
7e82370
ECC-1333: GRIB2 only: make levtype read-only
shahramn Oct 2, 2023
21e28ab
Add support for two FESOM grids
dsarmany Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.32.0
2.33.0
98 changes: 0 additions & 98 deletions definitions/grib2/d
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions definitions/grib2/localConcepts/ecmf/unstructuredGridSubtype.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
'V' = { numberOfGridInReference = 3; }
'W' = { numberOfGridInReference = 4; }
'F' = { numberOfGridInReference = 5; }
'E' = { numberOfGridInReference = 6; }
'N' = { numberOfGridInReference = 7; }
2 changes: 2 additions & 0 deletions definitions/grib2/localConcepts/ecmf/unstructuredGridType.def
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do these new ones not follow the convention of the others? i.e. they do not include the ORCA substring

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not ORCA grids. They also do not follow the ARAKAWA staggering so we don't have a difference between U and V, etc. So Seb suggested we use different subtypes also.

If we can restrict what subtypes each type can take, it would be that NG5 and CORE2 would only be able to take these two subtypes (E, N).

Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@
'eORCA1' = { numberOfGridUsed = 5; }
'eORCA025' = { numberOfGridUsed = 6; }
'eORCA12' = { numberOfGridUsed = 7; }
'CORE2' = { numberOfGridUsed = 8; }
'NG5' = { numberOfGridUsed = 9; }
2 changes: 0 additions & 2 deletions definitions/grib2/ls.def
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions definitions/grib2/meta.def
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions definitions/grib2/rules.def
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion definitions/grib2/template.4.horizontal.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if (extraDim) {
}
}
# ECC-1333: levtype should be read-only in GRIB2
concept mars.levtype(unknown,"marsLevtypeConcept.def",conceptsDir2,conceptsDir1):no_copy;
concept mars.levtype(unknown,"marsLevtypeConcept.def",conceptsDir2,conceptsDir1):no_copy, read_only;
# GRIB-372: levelist alias does not pertain to surface parameters
if (levtype is "sfc" || levtype is "o2d") {
unalias mars.levelist;
Expand Down
45 changes: 0 additions & 45 deletions definitions/grib2/tigge_name.def
View file
Open in desktop

This file was deleted.

Loading
Loading