Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
XSF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
fleet
formats
XSF
Commits
59744f80
Commit
59744f80
authored
Nov 20, 2020
by
Cyrille Poncelet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bugs due to merge errors
parent
0ff398c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
83 deletions
+4
-83
sources/xsf.generator/Environment.json
sources/xsf.generator/Environment.json
+3
-43
sources/xsf.generator/Sonar.json
sources/xsf.generator/Sonar.json
+1
-40
No files found.
sources/xsf.generator/Environment.json
View file @
59744f80
...
...
@@ -341,11 +341,7 @@
}
]
},
{
"name"
:
"temperature"
,
"obligation"
:
"O"
,
"comment"
:
"sea water temperature"
,
...
...
@@ -362,48 +358,16 @@
{
"name"
:
"units"
,
"value"
:
"degree_Celsius"
},
{
"name"
:
"_FillValue"
,
"value"
:
"0.0f"
},
},
{
"name"
:
"long_name"
,
"value"
:
"Indicative sea water temperature, For a Sound velocity profile , this will be set to 0.00"
}
]
},
{
"name"
:
"temperature"
,
"obligation"
:
"O"
,
"comment"
:
"sea water temperature"
,
"dims"
:
[
"profile"
,
"sampleCount"
],
"type"
:
"float"
,
"attributes"
:
[
{
"name"
:
"standard_name"
,
"value"
:
"sea_water_temperature"
},
{
"name"
:
"units"
,
"value"
:
"degree_Celsius"
},
{
"name"
:
"_FillValue"
,
"value"
:
"0.0f"
},
{
"name"
:
"long_name"
,
"value"
:
"Indicative sea water temperature, For a Sound velocity profile , this will be set to 0.00"
"value"
:
"Sea water temperature, For a Sound velocity profile"
}
]
},
{
"name"
:
"salinity"
,
"comment"
:
"Salinity of water at given depth,For a Sound velocity profile
, this will be set to 0.00
"
,
"comment"
:
"Salinity of water at given depth,For a Sound velocity profile"
,
"dims"
:
[
"profile"
,
"sampleCount"
...
...
@@ -417,10 +381,6 @@
{
"name"
:
"long_name"
,
"value"
:
"Salinity of water at given depth"
},
{
"name"
:
"_FillValue"
,
"value"
:
"0.0f"
}
]
},
...
...
sources/xsf.generator/Sonar.json
View file @
59744f80
...
...
@@ -1137,44 +1137,6 @@
}
]
},
{
"name"
:
"transmit_transducer_index"
,
"obligation"
:
"MA"
,
"comment"
:
"Transmitting or monostatic transducer index associated with the given beam"
,
"dims"
:
[
"beam"
],
"type"
:
"int"
,
"attributes"
:
[
{
"name"
:
"valid_min"
,
"value"
:
"0"
},
{
"name"
:
"long_name"
,
"value"
:
"Transmit transducer index"
}
]
},
{
"name"
:
"transmit_beam_index"
,
"obligation"
:
"MA"
,
"comment"
:
"Transmit beam index associated with the given beam"
,
"dims"
:
[
"beam"
],
"type"
:
"int"
,
"attributes"
:
[
{
"name"
:
"valid_min"
,
"value"
:
"0"
},
{
"name"
:
"long_name"
,
"value"
:
"Transmit beam index associated with the given beam"
}
]
},
{
"name"
:
"transmit_transducer_index"
,
"obligation"
:
"MA"
,
...
...
@@ -6111,8 +6073,7 @@
"name"
:
"detection_ping_frequency"
,
"comment"
:
"Ping Frequency in Hz"
,
"dims"
:
[
"ping_time"
,
"detection"
"ping_time"
],
"type"
:
"float"
,
"attributes"
:
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment