Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
artoa4argo
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
argoTools
artoa4argo
Commits
2b62443c
Commit
2b62443c
authored
5 years ago
by
leprob001
Browse files
Options
Downloads
Patches
Plain Diff
Adjusted soundspeed calculations.
parent
eafcf6fe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/+artoa/+controller/+track/run.m
+9
-10
9 additions, 10 deletions
lib/+artoa/+controller/+track/run.m
lib/+artoa/+data/calculateSoundVelocity.m
+1
-3
1 addition, 3 deletions
lib/+artoa/+data/calculateSoundVelocity.m
with
10 additions
and
13 deletions
lib/+artoa/+controller/+track/run.m
+
9
−
10
View file @
2b62443c
...
@@ -30,10 +30,6 @@ for i = 1:size(soundVelocity, 1)
...
@@ -30,10 +30,6 @@ for i = 1:size(soundVelocity, 1)
if
strcmpi
(
...
if
strcmpi
(
...
artoaWorkspace
.
trackParameter
.
soundspeedMethodString
,
...
artoaWorkspace
.
trackParameter
.
soundspeedMethodString
,
...
'manual'
...
'manual'
...
)
...
&&
strcmpi
(
...
artoaWorkspace
.
trackParameter
.
trackingMethodString
,
...
'hyperbolic'
...
)
)
soundVelocity
(
i
,
:)
=
[
...
soundVelocity
(
i
,
:)
=
[
...
artoaWorkspace
.
trackParameter
.
soundsourceCombinations
.
soundspeed1
(
i
),
...
artoaWorkspace
.
trackParameter
.
soundsourceCombinations
.
soundspeed1
(
i
),
...
...
@@ -42,17 +38,20 @@ for i = 1:size(soundVelocity, 1)
...
@@ -42,17 +38,20 @@ for i = 1:size(soundVelocity, 1)
];
];
elseif
strcmpi
(
...
elseif
strcmpi
(
...
artoaWorkspace
.
trackParameter
.
soundspeedMethodString
,
...
artoaWorkspace
.
trackParameter
.
soundspeedMethodString
,
...
'
manual
'
...
'
soundsource file
'
...
)
)
soundVelocity
(
i
,
:)
=
...
% get soundsource names
artoaWorkspace
.
trackParameter
.
soundsourceCombinations
.
soundspeed1
(
i
);
soundsourceNames
=
strsplit
(
artoaWorkspace
.
trackParameter
.
soundsourceCombinations
.
soundsources
{
i
});
% get soundspeed for every soundsource
for
oName
=
1
:
length
(
soundsourceNames
)
soundVelocity
(
i
,
oName
)
=
...
artoaWorkspace
.
filteredSoundsources
.
(
soundsourceNames
{
oName
})
.
sound_speed
;
end
else
else
fnames
=
fieldnames
(
artoaWorkspace
.
filteredSoundsources
);
soundVelocity
(
i
,
:)
=
artoa
.
data
.
calculateSoundVelocity
(
...
soundVelocity
(
i
,
:)
=
artoa
.
data
.
calculateSoundVelocity
(
...
artoaWorkspace
.
temperature
(
artoaWorkspace
.
statusTemperature
==
1
),
...
artoaWorkspace
.
temperature
(
artoaWorkspace
.
statusTemperature
==
1
),
...
artoaWorkspace
.
pressure
(
artoaWorkspace
.
statusPressure
==
1
),
...
artoaWorkspace
.
pressure
(
artoaWorkspace
.
statusPressure
==
1
),
...
artoaWorkspace
.
trackParameter
.
soundspeedMethodString
,
...
artoaWorkspace
.
trackParameter
.
soundspeedMethodString
...
artoaWorkspace
.
filteredSoundsources
.
(
fnames
{
1
})
...
% WHICH SOUNDSOURCE TO USE IF "soundsource" IS SELECTED??
);
);
% TODO: IMPLEMENT OTHER SOUNDVELOCITY OPTIONS
% TODO: IMPLEMENT OTHER SOUNDVELOCITY OPTIONS
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/+artoa/+data/calculateSoundVelocity.m
+
1
−
3
View file @
2b62443c
function
[
calculatedSoundVelocity
]
=
calculateSoundVelocity
(
pTemperature
,
pPressure
,
pMethod
,
pSoundSource
)
function
[
calculatedSoundVelocity
]
=
calculateSoundVelocity
(
pTemperature
,
pPressure
,
pMethod
)
%CALCULATESOUNDVELOCITY Calculates the sound velocity based on the given values.
%CALCULATESOUNDVELOCITY Calculates the sound velocity based on the given values.
% Parameters:
% Parameters:
% pTemperature The temperature array.
% pTemperature The temperature array.
...
@@ -23,8 +23,6 @@ switch lower(pMethod) % del grosso is default
...
@@ -23,8 +23,6 @@ switch lower(pMethod) % del grosso is default
calculatedSoundVelocity
=
1490
;
calculatedSoundVelocity
=
1490
;
end
end
clear
indices
;
clear
indices
;
case
'soundsource'
calculatedSoundVelocity
=
pSoundSource
.
sound_speed
;
otherwise
otherwise
calculatedSoundVelocity
=
artoa
.
vendor
.
oceanstoolbox
.
sndspd
(
...
calculatedSoundVelocity
=
artoa
.
vendor
.
oceanstoolbox
.
sndspd
(
...
35
,
mean
(
pTemperature
(
~
isnan
(
pTemperature
))),
mean
(
pPressure
(
~
isnan
(
pPressure
))),
'del grosso'
...
35
,
mean
(
pTemperature
(
~
isnan
(
pTemperature
))),
mean
(
pPressure
(
~
isnan
(
pPressure
))),
'del grosso'
...
...
...
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