diff --git a/README b/README index aafa7ea6b1c01d8c547c15d5a93f8cd0c1430d9f..7edeb69fc6f8910d7d72c2d334ebbffbed0cd423 100644 --- a/README +++ b/README @@ -7,6 +7,11 @@ git-hosted version currently under development for automated tests etc. ## Policy for contributing * `master` branch is protected, changes can only be made via merge requests. * To propose changes: - * Open an issue to discuss the matter - * Then open a branch to work on the issue - * When done, submit a merge request to the master branch. + * Open an issue to discuss the matter (in gitlab project page -> issues) + * Then open a branch to work on the issue. There are several ways to do this: + * Click on 'create branch' on the issue page on gitlab (then `git fetch` and `git checkout <branchname>`) + * In your local space, do `git checkout -b <branchname>` to create a new branch from your current `HEAD`. + * When done, `git push` the branch and submit a merge request. + * The link to open the merge request is shown following the commit. + * Assign someone (other than yourself) to review the merge request. + * Follow up on any questions/comments and optionally amend your branch (and re-push) to fix any new issues that arise. \ No newline at end of file diff --git a/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m b/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m index 760fd636d70ff7ccf8ea69d37e755ff66c87bd66..c864b2d54e725b483fc12989471f642a3fe34060 100644 --- a/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m +++ b/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m @@ -357,4 +357,18 @@ end ids_equilibrium.grids_ggd = {}; for it=1:numel(ids_equilibrium.time_slice) ids_equilibrium.time_slice{it}.ggd = {}; + ids_equilibrium.time_slice{it}.boundary.strike_point = {}; + ids_equilibrium.time_slice{it}.boundary_separatrix.x_point = {}; + ids_equilibrium.time_slice{it}.boundary_separatrix.strike_point = {}; + ids_equilibrium.time_slice{it}.constraints.bpol_probe = {}; + ids_equilibrium.time_slice{it}.constraints.faraday_angle = {}; + ids_equilibrium.time_slice{it}.constraints.mse_polarisation_angle = {}; + ids_equilibrium.time_slice{it}.constraints.flux_loop = {}; + ids_equilibrium.time_slice{it}.constraints.iron_core_segment = {}; + ids_equilibrium.time_slice{it}.constraints.n_e = {}; + ids_equilibrium.time_slice{it}.constraints.n_e_line = {}; + ids_equilibrium.time_slice{it}.constraints.pf_current = {}; + ids_equilibrium.time_slice{it}.constraints.pressure = {}; + ids_equilibrium.time_slice{it}.constraints.q = {}; + ids_equilibrium.time_slice{it}.constraints.x_point = {}; end