Fix for issue #2 and breaks caused by '^M' characters#4
Open
jtsiddons wants to merge 16 commits intoNOAA-PSL:masterfrom
Open
Fix for issue #2 and breaks caused by '^M' characters#4jtsiddons wants to merge 16 commits intoNOAA-PSL:masterfrom
jtsiddons wants to merge 16 commits intoNOAA-PSL:masterfrom
Conversation
+ 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. |
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
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.pyfile had been forced into a single line.This also implements the fix to
meteo.rhodfollowing pull request #3 by @milancurcicOther misc fixes:
np.floatandnp.intto 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