18 atm1b data #31
Merged
18 atm1b data #31
Conversation
This file contains 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
trey-stafford
force-pushed
the
18-atm1b-data
branch
from
28b8310 to
ea775c8
Compare
trey-stafford
commented
Aug 28, 2024
| "ITRF88").""" | ||
| "ITRF88"). | ||
|
|
||
| ITRF2020 is recognized as "ITRF20". |
There was a problem hiding this comment.
This is maddening
trey-stafford
commented
Aug 28, 2024
trey-stafford
commented
Aug 28, 2024
trey-stafford
force-pushed
the
18-atm1b-data
branch
from
895c84a to
720bd7b
Compare
"ITRF2020" is not recognized, even though the ITRF seems to be designated as "ITRF2020"... https://itrf.ign.fr/en/solutions/itrf2020
…values. TODO: new tests to cover changes
trey-stafford
force-pushed
the
18-atm1b-data
branch
from
720bd7b to
a958395
Compare
File date is just that: a date with no time information. This constructs a datetime object representing the beginning of the day. ``` >>> dt.datetime(2020, 1, 2) datetime.datetime(2020, 1, 2, 0, 0) ```
trey-stafford
commented
Aug 28, 2024
mfisher87
approved these changes
Sep 5, 2024
| @@ -158,6 +159,7 @@ ignore = [ | |||
| "SIM108", # Use ternary operator. Sometimes this is less readable. | |||
| "T201", # Remove 'print' statements. Sometimes these are handy. | |||
| "SIM105", # Use contextlib.suppress instead of try-except-pass. The recommended approach is slower and less flexible. | |||
| "RET505", # Unnecessary else/elif: sometimes this is just more readable & explicit. | |||
| fn_date = "20" + fn_date | ||
| if not m: | ||
| err_msg = f"Failed to extract date from BLATM1B v1 file: {fn}" | ||
| raise RuntimeError(err_msg) |
src/nsidc/iceflow/data/atm1b.py
Outdated
Comment on lines
275
to
282
| try: | ||
| itrf_str = { | ||
| "ITRF05": "ITRF2005", | ||
| "ITRF08": "ITRF2008", | ||
| "ITRF2000": "ITRF20", | ||
| }[itrf_str] | ||
| except KeyError: | ||
| pass |
There was a problem hiding this comment.
Suggested change
| try: | |
| itrf_str = { | |
| "ITRF05": "ITRF2005", | |
| "ITRF08": "ITRF2008", | |
| "ITRF2000": "ITRF20", | |
| }[itrf_str] | |
| except KeyError: | |
| pass | |
| itrf_str = { | |
| "ITRF05": "ITRF2005", | |
| "ITRF08": "ITRF2008", | |
| "ITRF2000": "ITRF20", | |
| }.get(itrf_str, itrf_str) |
There was a problem hiding this comment.
I don't know if this is more readable or not 🙃
src/nsidc/iceflow/data/atm1b.py
Outdated
| itrf = itrfs[0] | ||
| def _find(gdt, i, lower, upper) -> str | None: | ||
| # Binary search for the correct ITRF to make this fast. If we | ||
| # do a naive linear search, it can run up to 10x longer. |
There was a problem hiding this comment.
It'd be nice to have a rangedict data structure :)
| "ITRF88").""" | ||
| "ITRF88"). | ||
|
|
||
| ITRF2020 is recognized as "ITRF20". |
We expect every qfit file to contain a header with the ITRF given within. The code responsible for reading headers originally failed to read some qfit headers du to different lengths of the header in bytes. Now that code is fixed and we should always get the source ITRF from the data itself, not a hard-coded list.
Remove hard-coded ITRF ranges for ATM1B data
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #18
Adds support for ILATM1B v2 and BLATM1B v1.
Also adds some code to deal with ATM1B qfit files that lack a header. see #35.
📚 Documentation preview 📚: https://readthedocs-preview--31.org.readthedocs.build/en/31/https://iceflow--31.org.readthedocs.build/en/31/
^RTD link generation should be fixed with
#32#33