Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gdat
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
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
ba34b7fa
Commit
ba34b7fa
authored
5 years ago
by
Olivier Sauter
Browse files
Options
Downloads
Patches
Plain Diff
comment r_rho (r_contour), surfaces of all rho since not ready yet from liuqe.m
parent
aeb702d8
No related branches found
No related tags found
1 merge request
!4
Feature/testsuite
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/TCV/tcv_requests_mapping.m
+12
-12
12 additions, 12 deletions
matlab/TCV/tcv_requests_mapping.m
matlab/run_gdat_tests.m
+8
-9
8 additions, 9 deletions
matlab/run_gdat_tests.m
with
20 additions
and
21 deletions
matlab/TCV/tcv_requests_mapping.m
+
12
−
12
View file @
ba34b7fa
...
@@ -333,12 +333,12 @@ switch lower(data_request)
...
@@ -333,12 +333,12 @@ switch lower(data_request)
mapping
.
timedim
=
2
;
mapping
.
timedim
=
2
;
mapping
.
label
=
'R B_\phi'
;
mapping
.
label
=
'R B_\phi'
;
mapping
.
method
=
'switchcase'
;
mapping
.
method
=
'switchcase'
;
case
'r_contour'
% $$$
case 'r_contour'
% r_rho not yet implemented
mapping
.
timedim
=
2
;
% $$$
mapping.timedim = 2;
mapping
.
method
=
'tdiliuqe'
;
% $$$
mapping.method = 'tdiliuqe';
mapping
.
expression
=
'\results::r_contour'
;
% $$$
mapping.expression = '\results::r_contour';
mapping
.
expression
=
'\tcv_shot::top.results.equil_1.results:r_rho'
;
% several flux surfaces R coordinates (irho,itheta,t)
% $$$
mapping.expression = '\tcv_shot::top.results.equil_1.results:r_rho'; % several flux surfaces R coordinates (irho,itheta,t)
mapping
.
expression
=
'tcv_eq(
''''
r_rho
''''
,
''''
LIUQE.M
''''
)'
;
% $$$
mapping.expression = 'tcv_eq(''''r_rho'''',''''LIUQE.M'''')';
case
'r_contour_edge'
case
'r_contour_edge'
mapping
.
timedim
=
2
;
mapping
.
timedim
=
2
;
mapping
.
method
=
'tdiliuqe'
;
mapping
.
method
=
'tdiliuqe'
;
...
@@ -461,12 +461,12 @@ switch lower(data_request)
...
@@ -461,12 +461,12 @@ switch lower(data_request)
mapping
.
expression
=
'\tcv_shot::top.results.equil_1.results:w_mhd'
;
mapping
.
expression
=
'\tcv_shot::top.results.equil_1.results:w_mhd'
;
mapping
.
expression
=
'tcv_eq(
''''
w_mhd
''''
,
''''
LIUQE.M
''''
)'
;
mapping
.
expression
=
'tcv_eq(
''''
w_mhd
''''
,
''''
LIUQE.M
''''
)'
;
% $$$ end
% $$$ end
case
'z_contour'
% $$$
case 'z_contour'
% z_rho not yet implemented
mapping
.
timedim
=
2
;
% $$$
mapping.timedim = 2;
mapping
.
method
=
'tdiliuqe'
;
% $$$
mapping.method = 'tdiliuqe';
mapping
.
expression
=
'\results::z_contour'
;
% $$$
mapping.expression = '\results::z_contour';
mapping
.
expression
=
'\tcv_shot::top.results.equil_1.results:z_rho'
;
% several flux surfaces Z coordinates (irho,itheta,t)
% $$$
mapping.expression = '\tcv_shot::top.results.equil_1.results:z_rho'; % several flux surfaces Z coordinates (irho,itheta,t)
mapping
.
expression
=
'tcv_eq(
''''
z_rho
''''
,
''''
LIUQE.M
''''
)'
;
% $$$
mapping.expression = 'tcv_eq(''''z_rho'''',''''LIUQE.M'''')';
case
'z_contour_edge'
case
'z_contour_edge'
mapping
.
timedim
=
2
;
mapping
.
timedim
=
2
;
mapping
.
method
=
'tdiliuqe'
;
mapping
.
method
=
'tdiliuqe'
;
...
...
This diff is collapsed.
Click to expand it.
matlab/run_gdat_tests.m
+
8
−
9
View file @
ba34b7fa
...
@@ -6,6 +6,7 @@ function [passed,results] = run_gdat_tests(test_case)
...
@@ -6,6 +6,7 @@ function [passed,results] = run_gdat_tests(test_case)
if
nargin
==
0
||
isempty
(
test_case
)
if
nargin
==
0
||
isempty
(
test_case
)
test_case
=
'basic'
;
% default
test_case
=
'basic'
;
% default
end
end
test_case
=
lower
(
test_case
);
%% Import some classes we need
%% Import some classes we need
import
matlab
.
unittest
.
selectors
.
HasTag
;
import
matlab
.
unittest
.
selectors
.
HasTag
;
...
@@ -25,19 +26,19 @@ switch test_case
...
@@ -25,19 +26,19 @@ switch test_case
case
'all'
case
'all'
suite
=
suite_all
;
% run all
suite
=
suite_all
;
% run all
case
'basic'
case
'basic'
s
=
~
HasTag
(
'
S
low'
);
s
=
~
HasTag
(
'
s
low'
);
suite
=
suite_all
.
selectIf
(
s
);
suite
=
suite_all
.
selectIf
(
s
);
case
'
IMAS
'
case
'
imas
'
s
=
HasTag
(
'
IMAS
'
);
s
=
HasTag
(
'
imas
'
);
suite
=
suite_all
.
selectIf
(
s
);
suite
=
suite_all
.
selectIf
(
s
);
case
'
TCV
'
case
'
tcv
'
s
=
HasName
(
ContainsSubstring
(
'TCV'
));
s
=
HasName
(
ContainsSubstring
(
'TCV'
));
suite
=
suite_all
.
selectIf
(
s
);
suite
=
suite_all
.
selectIf
(
s
);
case
'
AUG
'
case
'
aug
'
s
=
HasName
(
ContainsSubstring
(
'
AUG
'
));
s
=
HasName
(
ContainsSubstring
(
'
aug
'
));
suite
=
suite_all
.
selectIf
(
s
);
suite
=
suite_all
.
selectIf
(
s
);
otherwise
otherwise
error
(
'not yet implemented'
)
error
(
'not yet implemented'
)
end
end
...
@@ -64,5 +65,3 @@ else
...
@@ -64,5 +65,3 @@ else
end
end
passed
=
false
;
passed
=
false
;
end
end
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