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
4b02143f
Commit
4b02143f
authored
9 months ago
by
Antonia Frank
Browse files
Options
Downloads
Patches
Plain Diff
Add vacuum toroidal field and change homogeneous time flag to 0
parent
14cd8d17
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!137
Add quantities to ids for MRE
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/TCV_IMAS/tcv_get_ids_core_sources.m
+14
-4
14 additions, 4 deletions
matlab/TCV_IMAS/tcv_get_ids_core_sources.m
matlab/TCV_IMAS/tcv_get_ids_summary.m
+1
-1
1 addition, 1 deletion
matlab/TCV_IMAS/tcv_get_ids_summary.m
with
15 additions
and
5 deletions
matlab/TCV_IMAS/tcv_get_ids_core_sources.m
+
14
−
4
View file @
4b02143f
...
@@ -14,10 +14,11 @@ tens_rho = -0.1;
...
@@ -14,10 +14,11 @@ tens_rho = -0.1;
if
exist
(
'gdat_params'
,
'var'
)
if
exist
(
'gdat_params'
,
'var'
)
[
ids_core_sources
,
params_core_sources
]
=
...
[
ids_core_sources
,
params_core_sources
]
=
...
tcv_ids_headpart
(
shot
,
ids_equil_empty
,
'cores_sources'
,
'gdat_params'
,
gdat_params
,
varargin
{:});
tcv_ids_headpart
(
shot
,
ids_equil_empty
,
'cores_sources'
,
'gdat_params'
,
gdat_params
,
...
'homogeneous_time'
,
0
,
varargin
{:});
else
else
[
ids_core_sources
,
params_core_sources
]
=
...
[
ids_core_sources
,
params_core_sources
]
=
...
tcv_ids_headpart
(
shot
,
ids_equil_empty
,
'cores_sources'
,
varargin
{:});
tcv_ids_headpart
(
shot
,
ids_equil_empty
,
'cores_sources'
,
'homogeneous_time'
,
0
,
varargin
{:});
aa
=
gdat_tcv
;
aa
=
gdat_tcv
;
gdat_params
=
aa
.
gdat_params
;
% to get default params
gdat_params
=
aa
.
gdat_params
;
% to get default params
end
end
...
@@ -27,14 +28,23 @@ try params_eff_ref=rmfield(params_eff_ref,'source');catch;end % make sure no sou
...
@@ -27,14 +28,23 @@ try params_eff_ref=rmfield(params_eff_ref,'source');catch;end % make sure no sou
% initialize description
% initialize description
ids_core_sources_description
=
[];
ids_core_sources_description
=
[];
%% fill vacuum_toroidal field
params_eff
=
params_eff_ref
;
params_eff
.
data_request
=
'b0'
;
b0_gdat
=
gdat
(
params_core_sources
.
shot
,
params_eff
);
ids_core_sources
.
vacuum_toroidal_field
.
r0
=
b0_gdat
.
r0
;
ids_core_sources
.
vacuum_toroidal_field
.
b0
=
b0_gdat
.
data
;
ids_core_sources_description
.
vacuum_toroidal_field
=
b0_gdat
.
request_description
;
ids_core_sources
.
time
=
b0_gdat
.
t
;
%%
%%
% save source template to fill for differnet source options
% save source template to fill for differnet source options
source_template
=
ids_core_sources
.
source
{
1
};
source_template
=
ids_core_sources
.
source
{
1
};
profiles_template
=
source_template
.
profiles_1d
{
1
};
profiles_template
=
source_template
.
profiles_1d
{
1
};
globals_template
=
source_template
.
global_quantities
{
1
};
globals_template
=
source_template
.
global_quantities
{
1
};
%% get time grid and data from gdat
%% get time grid and data from gdat
ohm_gdat
=
gdat
(
shot
,
'ohm_data'
);
params_eff
=
params_eff_ref
;
params_eff
.
data_request
=
'ohm_data'
;
powers_gdat
=
gdat
(
shot
,
'powers'
);
ohm_gdat
=
gdat
(
params_core_sources
.
shot
,
params_eff
);
params_eff
=
params_eff_ref
;
params_eff
.
data_request
=
'powers'
;
powers_gdat
=
gdat
(
params_core_sources
.
shot
,
params_eff
);
% fix time grid to ohm time grid, same as bs
% fix time grid to ohm time grid, same as bs
last_index
=
0
;
last_index
=
0
;
...
...
This diff is collapsed.
Click to expand it.
matlab/TCV_IMAS/tcv_get_ids_summary.m
+
1
−
1
View file @
4b02143f
...
@@ -16,7 +16,7 @@ end
...
@@ -16,7 +16,7 @@ end
% As a general rule, for a new substructure under the main ids, construct a local structure like:
% As a general rule, for a new substructure under the main ids, construct a local structure like:
% "global_quantities" with subfields being the relevant data to get and a local structure:
% "global_quantities" with subfields being the relevant data to get and a local structure:
% "global_quantities_desc" which contains the same subfields themselves containing the gdat string aft
r
e shot used
% "global_quantities_desc" which contains the same subfields themselves containing the gdat string afte
r
shot used
%
%
% vacuum_toroidal_field and time, using homogeneous
% vacuum_toroidal_field and time, using homogeneous
%
%
...
...
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