Merge branch 'insert_svn_modif' into 'master' (fb2839df) · Commits · SPC / gdat · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

gdat
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

fb2839df

Commit fb2839df authored 5 years ago by Federico Felici

Downloads
- Plain Diff

Merge branch 'insert_svn_modif' into 'master'

merge git and svn versions

See merge request spc/tcv/tbx/gdat!7

parents 882952fd 58efc888

No related branches found

No related tags found

Loading

Pipeline #15378 passed with stage

in 1 minute and 8 seconds

Changes 9
Pipelines 6

Hide whitespace changes

Inline Side-by-side

Showing

matlab/JET/gdat_jet.m 7 additions, 0 deletions

matlab/JET/gdat_jet.m
matlab/JET/jet_requests_mapping.m 11 additions, 10 deletions

matlab/JET/jet_requests_mapping.m
matlab/JET/rda_jet.m 5 additions, 6 deletions

matlab/JET/rda_jet.m
matlab/TCV/gdat_tcv.m 29 additions, 7 deletions

matlab/TCV/gdat_tcv.m
matlab/TCV_IMAS/tcv_ids_circuit.m 2 additions, 3 deletions

matlab/TCV_IMAS/tcv_ids_circuit.m
matlab/TCV_IMAS/tcv_ids_supply.m 1 addition, 1 deletion

matlab/TCV_IMAS/tcv_ids_supply.m
matlab/TCV_IMAS/test_tcv_get_ids.m 6 additions, 6 deletions

matlab/TCV_IMAS/test_tcv_get_ids.m
matlab/gdat.m 1 addition, 0 deletions

matlab/gdat.m
matlab/gdat_plot.m 13 additions, 1 deletion

matlab/gdat_plot.m

with 75 additions and 34 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment