Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gdat
Manage
Activity
Members
Labels
Plan
Issues
36
Issue boards
Milestones
Wiki
Code
Merge requests
13
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
SPC
gdat
Commits
56f235ad
Commit
56f235ad
authored
5 months ago
by
Olivier Sauter
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into add_gas_fluxes
parents
3b73a49b
f8cc9771
No related branches found
No related tags found
1 merge request
!169
add new array of gas traces and add source for rtc request
Pipeline
#209705
passed with stages
in 2 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/interpos_nan.m
+5
-23
5 additions, 23 deletions
matlab/interpos_nan.m
matlab/tests/test_requestnames.m
+1
-1
1 addition, 1 deletion
matlab/tests/test_requestnames.m
with
6 additions
and
24 deletions
matlab/interpos_nan.m
+
5
−
23
View file @
56f235ad
...
...
@@ -2,7 +2,7 @@ function [varargout] = interpos_nan(var1, var2, var3, varargin);
%
% see help interpos for details
%
% pre-exclude
NaN
s from either xin or yin before calling interpos
% pre-exclude
non-finite value
s from either xin or yin before calling interpos
%
nverbose
=
1
;
% warnings
%
...
...
@@ -18,35 +18,17 @@ else
yin
=
var2
;
kopt_provided
=
0
;
end
if
nverbose
>=
1
&&
(
any
(
is
nan
(
xin
))
||
any
(
is
nan
(
yin
))),
warning
(
'NaNs removed by interpos_nan'
);
end
if
nverbose
>=
1
&&
(
any
(
~
is
finite
(
xin
))
||
any
(
~
is
finite
(
yin
))),
warning
(
'NaNs removed by interpos_nan'
);
end
end
ij
=
find
(
~
is
nan
(
xin
)
&
~
is
nan
(
yin
));
ij
=
find
(
is
finite
(
xin
)
&
is
finite
(
yin
));
if
~
isempty
(
ij
)
xin_eff
=
xin
(
ij
);
yin_eff
=
yin
(
ij
);
if
kopt_provided
==
1
switch
nargout
case
1
[
varargout
{
1
}]
=
interpos
(
var1
,
xin_eff
,
yin_eff
,
varargin
{:});
case
2
[
varargout
{
1
},
varargout
{
2
}]
=
interpos
(
var1
,
xin_eff
,
yin_eff
,
varargin
{:});
case
3
[
varargout
{
1
},
varargout
{
2
},
varargout
{
3
}]
=
interpos
(
var1
,
xin_eff
,
yin_eff
,
varargin
{:});
otherwise
[
varargout
{
1
},
varargout
{
2
},
varargout
{
3
},
varargout
{
4
}]
=
interpos
(
var1
,
xin_eff
,
yin_eff
,
varargin
{:});
end
[
varargout
{
1
:
nargout
}]
=
interpos
(
var1
,
xin_eff
,
yin_eff
,
varargin
{:});
else
switch
nargout
case
1
[
varargout
{
1
}]
=
interpos
(
xin_eff
,
yin_eff
,
var3
,
varargin
{:});
case
2
[
varargout
{
1
},
varargout
{
2
}]
=
interpos
(
xin_eff
,
yin_eff
,
var3
,
varargin
{:});
case
3
[
varargout
{
1
},
varargout
{
2
},
varargout
{
3
}]
=
interpos
(
xin_eff
,
yin_eff
,
var3
,
varargin
{:});
otherwise
[
varargout
{
1
},
varargout
{
2
},
varargout
{
3
},
varargout
{
4
}]
=
interpos
(
xin_eff
,
yin_eff
,
var3
,
varargin
{:});
end
[
varargout
{
1
:
nargout
}]
=
interpos
(
xin_eff
,
yin_eff
,
var3
,
varargin
{:});
end
else
if
nargout
>
0
...
...
This diff is collapsed.
Click to expand it.
matlab/tests/test_requestnames.m
+
1
−
1
View file @
56f235ad
...
...
@@ -41,7 +41,7 @@ classdef (SharedTestFixtures={...
shot
=
81102
;
gdat_call
=
sprintf
([
'gdat_'
lower
(
testCase
.
Machine
)
'(%s,
''
%s
''
)'
],
shot
,
request
);
case
{
'mpx'
,
'xte'
}
% need a older shot
% need a
n
older shot
shot
=
65555
;
gdat_call
=
sprintf
([
'gdat_'
lower
(
testCase
.
Machine
)
'(%s,
''
%s
''
)'
],
shot
,
request
);
end
...
...
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