-
Notifications
You must be signed in to change notification settings - Fork 24
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
Fix for issue #2 and breaks caused by '^M' characters #4
Open
jtsiddons
wants to merge
16
commits into
NOAA-PSL:master
Choose a base branch
from
jtsiddons:master
base: master
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.
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
+ chore: format + chore: move imports to top of file + chore: remove duplicated code
Fixes issue NOAA-PSL#2 - carriage return characters acting as ''
Duplicated from pull request NOAA-PSL#3 from @milancurcic
Note - python script was single line
+ correct shebang ('\r' was removed)
I have not tested, but approve of these changes. |
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.
Python version of COARE 3.5 was broken. '^M' (equivalent to carriage return) characters had been introduced in all files. This is the main cause of issue #2 (the new lines introduced by '^M' resulted in empty lines being read and
np.float('')
).Note that the original
coare35vn.py
file had been forced into a single line.This also implements the fix to
meteo.rhod
following pull request #3 by @milancurcicOther misc fixes:
np.float
andnp.int
to 64-bit versions (originals are depreciated in recent numpy versions)os.path.dirname(__file__)
to refer to the data file - users no longer need to edit the script (also in COARE 3.6)print
,raise
) for python 3