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
eb5547ed
Commit
eb5547ed
authored
1 year ago
by
Antonia Frank
Browse files
Options
Downloads
Patches
Plain Diff
Add parallel conductivity
parent
a2fcdbf9
No related branches found
Branches containing commit
No related tags found
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_profiles.m
+6
-0
6 additions, 0 deletions
matlab/TCV_IMAS/tcv_get_ids_core_profiles.m
matlab/TCV_IMAS/tcv_get_ids_equilibrium.m
+10
-5
10 additions, 5 deletions
matlab/TCV_IMAS/tcv_get_ids_equilibrium.m
with
16 additions
and
5 deletions
matlab/TCV_IMAS/tcv_get_ids_core_profiles.m
+
6
−
0
View file @
eb5547ed
...
...
@@ -359,6 +359,12 @@ for it=1:length(ids_core_profiles.time)
temp_1d_desc
.
j_ohmic
=
current_non_inductive
.
ohm
.
ohm_data
.
cd_dens
.
label
;
end
%% parallel conductivity (neoclassical)
signeo
=
gdat
(
params_cores_profiles
.
shot
,
'\results::ibs:signeo'
);
for
it
=
1
:
length
(
ids_core_profiles
.
time
)
ids_core_profiles
.
profiles_1d
{
it
}
.
conductivity_parallel
=
signeo
.
data
(:,
it
);
temp_1d_desc
.
j_bootstrap
=
signeo
.
label
;
end
%% add descriptions for profiles_1d
ids_core_profiles_description
.
profiles_1d
=
temp_1d_desc
;
...
...
This diff is collapsed.
Click to expand it.
matlab/TCV_IMAS/tcv_get_ids_equilibrium.m
+
10
−
5
View file @
eb5547ed
function
[
ids_equilibrium
,
ids_equilibrium_description
,
varargout
]
=
tcv_get_ids_equilibrium
(
shot
,
ids_equil_empty
,
gdat_params
,
varargin
)
function
[
ids_equilibrium
,
ids_equilibrium_description
,
varargout
]
=
...
tcv_get_ids_equilibrium
(
shot
,
ids_equil_empty
,
gdat_params
,
varargin
)
%
% [ids_equilibrium,ids_equilibrium_description,varargout] = tcv_get_ids_equilibrium(shot,ids_equil_empty,varargin);
% [ids_equilibrium,ids_equilibrium_description,varargout] = ...
% tcv_get_ids_equilibrium(shot,ids_equil_empty,gdat_params,varargin);
%
%
% gdat_params: gdat_data.gdat_params to get all params passed from original call, in particular error_bar and cocos_out options
% gdat_params: gdat_data.gdat_params to get all params passed from original call,
% in particular error_bar and cocos_out options
%
if
exist
(
'gdat_params'
,
'var'
)
[
ids_equilibrium
,
params_equilibrium
]
=
tcv_ids_headpart
(
shot
,
ids_equil_empty
,
'equilibrium'
,
'gdat_params'
,
gdat_params
,
varargin
{:});
[
ids_equilibrium
,
params_equilibrium
]
=
...
tcv_ids_headpart
(
shot
,
ids_equil_empty
,
'equilibrium'
,
'gdat_params'
,
gdat_params
,
varargin
{:});
else
[
ids_equilibrium
,
params_equilibrium
]
=
tcv_ids_headpart
(
shot
,
ids_equil_empty
,
'equilibrium'
,
varargin
{:});
[
ids_equilibrium
,
params_equilibrium
]
=
...
tcv_ids_headpart
(
shot
,
ids_equil_empty
,
'equilibrium'
,
varargin
{:});
aa
=
gdat_tcv
;
gdat_params
=
aa
.
gdat_params
;
% to get default params
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