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
82cdae62
Commit
82cdae62
authored
9 months ago
by
Olivier Sauter
Browse files
Options
Downloads
Patches
Plain Diff
synchronize with add_d3d_requests
parent
7e494aa8
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!168
D3d add nete rho
Pipeline
#204743
passed
9 months ago
Stage: test
Stage: post-test
Changes
2
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/D3D/d3d_requests_mapping.m
+18
-6
18 additions, 6 deletions
matlab/D3D/d3d_requests_mapping.m
matlab/D3D/gdat_d3d.m
+289
-170
289 additions, 170 deletions
matlab/D3D/gdat_d3d.m
with
307 additions
and
176 deletions
matlab/D3D/d3d_requests_mapping.m
+
18
−
6
View file @
82cdae62
...
@@ -109,6 +109,11 @@ switch lower(data_request)
...
@@ -109,6 +109,11 @@ switch lower(data_request)
mapping
.
gdat_timedim
=
2
;
mapping
.
gdat_timedim
=
2
;
mapping
.
method
=
'switchcase'
;
mapping
.
method
=
'switchcase'
;
mapping
.
expression
=
''
;
mapping
.
expression
=
''
;
case
{
'gas'
,
'gasa'
}
mapping
.
timedim
=
1
;
mapping
.
label
=
'gasa'
;
mapping
.
method
=
'signal'
;
mapping
.
expression
=
[{
'D3D'
},{
'\gasa'
}];
case
'halpha'
case
'halpha'
mapping
.
timedim
=
1
;
mapping
.
timedim
=
1
;
mapping
.
label
=
'Halpha'
;
mapping
.
label
=
'Halpha'
;
...
@@ -194,19 +199,26 @@ switch lower(data_request)
...
@@ -194,19 +199,26 @@ switch lower(data_request)
mapping
.
timedim
=
1
;
mapping
.
timedim
=
1
;
mapping
.
label
=
'line integrated el. density'
;
mapping
.
label
=
'line integrated el. density'
;
mapping
.
method
=
'signal'
;
mapping
.
method
=
'signal'
;
mapping
.
expression
=
{
'd3d'
,
'\d3d::top.electrons.bci:den
v1
'
};
mapping
.
expression
=
{
'd3d'
,
'\d3d::top.electrons.bci:den
r0
'
};
case
{
'neints'
}
case
{
'neints'
}
mapping
.
timedim
=
1
;
mapping
.
timedim
=
1
;
mapping
.
label
=
{
'denv1'
,
'denv2'
,
'denv3'
};
mapping
.
label
=
{
'
denr0'
,
'
denv1'
,
'denv2'
,
'denv3'
};
mapping
.
method
=
'expression'
;
mapping
.
method
=
'expression'
;
mapping
.
expression
=
[
'params_eff = gdat_data.gdat_params;params_eff.data_request=
''
\d3d::top.electrons.bci:den
v1
''
;'
...
mapping
.
expression
=
[
'params_eff = gdat_data.gdat_params;params_eff.data_request=
''
\d3d::top.electrons.bci:den
r0
''
;'
...
'gdat_tmp=gdat_d3d(shot,params_eff);gdat_tmp.denv1=gdat_tmp;'
...
'gdat_tmp=gdat_d3d(shot,params_eff);gdat_tmp.denv1=gdat_tmp;'
...
'params_eff.data_request=
''
\d3d::top.electrons.bci:denv1
''
;gdat_denv1=gdat_d3d(shot,params_eff);'
...
'gdat_tmp.denv1=gdat_denv1;gdat_tmp.data(:,2)=gdat_denv1.data;'
...
'params_eff.data_request=
''
\d3d::top.electrons.bci:denv2
''
;gdat_denv2=gdat_d3d(shot,params_eff);'
...
'params_eff.data_request=
''
\d3d::top.electrons.bci:denv2
''
;gdat_denv2=gdat_d3d(shot,params_eff);'
...
'gdat_tmp.denv2=gdat_denv2;gdat_tmp.data(:,
2
)=gdat_denv2.data;'
...
'gdat_tmp.denv2=gdat_denv2;gdat_tmp.data(:,
3
)=gdat_denv2.data;'
...
'params_eff.data_request=
''
\d3d::top.electrons.bci:denv3
''
;gdat_denv3=gdat_d3d(shot,params_eff);'
...
'params_eff.data_request=
''
\d3d::top.electrons.bci:denv3
''
;gdat_denv3=gdat_d3d(shot,params_eff);'
...
'gdat_tmp.denv3=gdat_denv3;gdat_tmp.data(:,
3
)=gdat_denv3.data;'
...
'gdat_tmp.denv3=gdat_denv3;gdat_tmp.data(:,
4
)=gdat_denv3.data;'
...
'gdat_tmp.dim{2} = [1:
3
];gdat_tmp.dimunits{2} = {
''
denv1
''
,
''
denv2
''
,
''
denv3
''
};'
...
'gdat_tmp.dim{2} = [1:
4
];gdat_tmp.dimunits{2} = {
''
denr0
''
,
''
denv1
''
,
''
denv2
''
,
''
denv3
''
};'
...
';gdat_tmp.dimunits{1}=
''
s
''
;'
];
';gdat_tmp.dimunits{1}=
''
s
''
;'
];
case
{
'neint_ts'
}
% assumes ne_rho in source input
mapping
.
timedim
=
1
;
mapping
.
label
=
'neint from TS'
;
mapping
.
method
=
'switchcase'
;
case
'nel'
case
'nel'
mapping
.
timedim
=
1
;
mapping
.
timedim
=
1
;
mapping
.
label
=
'NEBAR\_R0'
;
mapping
.
label
=
'NEBAR\_R0'
;
...
...
This diff is collapsed.
Click to expand it.
matlab/D3D/gdat_d3d.m
+
289
−
170
View file @
82cdae62
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