Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Oceano2python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
US191
Oceano2python
Commits
0b3b036b
Commit
0b3b036b
authored
2 years ago
by
Jacques Grelet
Browse files
Options
Downloads
Patches
Plain Diff
correct bug: don't print line if data is _fillValue
parent
d024f3ac
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+1
-1
1 addition, 1 deletion
Makefile
ascii.py
+2
-2
2 additions, 2 deletions
ascii.py
oceano.py
+1
-0
1 addition, 0 deletions
oceano.py
with
4 additions
and
3 deletions
Makefile
+
1
−
1
View file @
0b3b036b
...
...
@@ -6,7 +6,7 @@ TEST_PATH = tests
OPTIONS_CTD
=
data/CTD/cnv/dfr2900?.cnv
-i
CTD
-k
PRES ETDD TEMP PSAL DOX2 DENS SVEL FLU2 FLU3 TUR3 NAVG
OPTIONS_XBT
=
data/XBT/T7_0000
*
.EDF
-i
XBT
-k
DEPTH TEMP SVEL
OPTIONS_LADCP
=
data/LADCP/
*
.lad
-i
LADCP
-k
DEPTH EWCT NSCT
OPTIONS_BTL
=
data/CTD/btl/fr290
*
.btl
-i
BTL
-k
PRES DEPTH ETDD TE01 TE02 PSA1 PSA2 DO11 DO12 DO21 DO22 FLU2
OPTIONS_BTL
=
data/CTD/btl/fr290
*
.btl
-i
BTL
-k
BOTL
PRES DEPTH ETDD TE01 TE02 PSA1 PSA2 DO11 DO12 DO21 DO22 FLU2
.PHONY
:
clean-pyc clean-build lint test run build
...
...
This diff is collapsed.
Click to expand it.
ascii.py
+
2
−
2
View file @
0b3b036b
...
...
@@ -113,8 +113,8 @@ def writeData(dataFile, cfg, device, fe, r):
# for each valid line in array (not _fillvalue)
for
m
in
range
(
fe
.
m
):
#
todo: replace 1e35 by
fillValue
if
fe
[
fe
.
keys
[
0
]][
i
][
m
]
<
1e35
:
#
don't print line if data is _
fillValue
if
fe
[
fe
.
keys
[
0
]][
i
][
m
]
!=
fe
.
roscop
[
fe
.
keys
[
0
]][
'
_FillValue
'
]
:
fmt
=
fe
.
roscop
[
'
PROFILE
'
][
'
format
'
]
f
.
write
(
f
"
{
fmt
}
"
%
(
fe
[
'
PROFILE
'
][
i
]))
# add value for each parameter, use format from roscop
...
...
This diff is collapsed.
Click to expand it.
oceano.py
+
1
−
0
View file @
0b3b036b
...
...
@@ -46,6 +46,7 @@ def processArgs():
'
python oceano.py data/CTD/cnv/dfr29*.cnv -i CTD -d
\n
'
'
python oceano.py data/XBT/T7_0000*.EDF -i XBT -k DEPTH TEMP SVEL
\n
'
'
python oceano.py data/LADCP/*.lad - i LADCP - k DEPTH EWCT NSCT
\n
'
'
python oceano.py data/CTD/btl/fr290*.btl -i BTL -k BOTL PRES DEPTH ETDD TE01 TE02 PSA1 PSA2 DO11 DO12 DO21 DO22 FLU2
'
'
\n
'
,
epilog
=
'
J. Grelet IRD US191 - March 2019 / Feb 2020
'
)
parser
.
add_argument
(
'
-d
'
,
'
--debug
'
,
help
=
'
display debug informations
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment