Skip to content

[issue-180] Extension of the fitting structures in CORE_PROFILES, PLA… #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imbeauf wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[issue-180] Extension of the fitting structures in CORE_PROFILES, PLA… #181

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5aaa23
[issue-180] Extension of the fitting structures in CORE_PROFILES, PLA…
imbeauf Dec 5, 2025
2221123
[issue-180] Fix units
imbeauf Dec 5, 2025
94c4340
Update schemas/utilities/dd_support.xsd
imbeauf Dec 8, 2025
8fbb289
[issue-180] Correct unwanted change in distributions units
imbeauf Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions html_documentation/dd_versions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
<td>List of changes w.r.t. previous version</td>
</thead>
<p><a href="html_documentation.html">Back to top IDS list</a></p>
<tr>
<td><b>develop</b></td>
<td>
<ul>Additions
<li><b>Extension of the fitting structures in CORE_PROFILES, PLASMA_PROFILES, EDGE_PROFILES and EQUILIBRIUM</b></li>
</ul>
</td>
</tr>
<tr>
<td><b>4.1.0</b></td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion schemas/core_profiles/dd_core_profiles.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@
<xs:appinfo>
<lifecycle_status>active</lifecycle_status>
<lifecycle_version>3.1.0</lifecycle_version>
<lifecycle_last_change>4.1.0</lifecycle_last_change>
<lifecycle_last_change>4.2.0</lifecycle_last_change>
<specific_validation_rules>yes</specific_validation_rules>
</xs:appinfo>
</xs:annotation>
Expand Down
2 changes: 1 addition & 1 deletion schemas/edge_profiles/dd_edge_profiles.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<xs:appinfo>
<lifecycle_status>active</lifecycle_status>
<lifecycle_version>3.22.0</lifecycle_version>
<lifecycle_last_change>3.42.0</lifecycle_last_change>
<lifecycle_last_change>4.2.0</lifecycle_last_change>
<specific_validation_rules>yes</specific_validation_rules>
</xs:appinfo>
</xs:annotation>
Expand Down
80 changes: 79 additions & 1 deletion schemas/equilibrium/dd_equilibrium.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,19 @@
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="sigma">
<xs:annotation>
<xs:documentation>Standard deviation of the measurement error</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>m</units>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="position_reconstructed" type="rz0d_dynamic_aos">
<xs:annotation>
<xs:documentation>Position estimated from the reconstructed equilibrium</xs:documentation>
Expand Down Expand Up @@ -1149,6 +1162,19 @@
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="sigma">
<xs:annotation>
<xs:documentation>Standard deviation of the measurement error</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>as_parent</units>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="reconstructed">
<xs:annotation>
<xs:documentation>Value calculated from the reconstructed equilibrium</xs:documentation>
Expand Down Expand Up @@ -1241,6 +1267,19 @@
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="sigma">
<xs:annotation>
<xs:documentation>Standard deviation of the measurement error</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>as_parent</units>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="reconstructed">
<xs:annotation>
<xs:documentation>Value calculated from the reconstructed equilibrium</xs:documentation>
Expand Down Expand Up @@ -1336,6 +1375,19 @@
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="sigma">
<xs:annotation>
<xs:documentation>Standard deviation of the measurement error</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>as_parent</units>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="reconstructed">
<xs:annotation>
<xs:documentation>Value calculated from the reconstructed equilibrium</xs:documentation>
Expand Down Expand Up @@ -1431,6 +1483,19 @@
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="sigma">
<xs:annotation>
<xs:documentation>Standard deviation of the measurement error</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>as_parent</units>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="reconstructed">
<xs:annotation>
<xs:documentation>Value calculated from the reconstructed equilibrium</xs:documentation>
Expand Down Expand Up @@ -1523,6 +1588,19 @@
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="sigma">
<xs:annotation>
<xs:documentation>Standard deviation of the measurement error</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>as_parent</units>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_0D"/>
</xs:complexType>
</xs:element>
<xs:element name="reconstructed">
<xs:annotation>
<xs:documentation>Value calculated from the reconstructed equilibrium</xs:documentation>
Expand Down Expand Up @@ -2866,7 +2944,7 @@
<xs:appinfo>
<lifecycle_status>active</lifecycle_status>
<lifecycle_version>3.1.0</lifecycle_version>
<lifecycle_last_change>4.1.0</lifecycle_last_change>
<lifecycle_last_change>4.2.0</lifecycle_last_change>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
Expand Down
2 changes: 1 addition & 1 deletion schemas/plasma_profiles/dd_plasma_profiles.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<xs:appinfo>
<lifecycle_status>alpha</lifecycle_status>
<lifecycle_version>3.42.0</lifecycle_version>
<lifecycle_last_change>4.1.0</lifecycle_last_change>
<lifecycle_last_change>4.2.0</lifecycle_last_change>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
Expand Down
48 changes: 45 additions & 3 deletions schemas/utilities/dd_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3083,6 +3083,20 @@
<xs:group ref="FLT_1D"/>
</xs:complexType>
</xs:element>
<xs:element name="rho_pol_norm">
<xs:annotation>
<xs:documentation>Normalised poloidal flux coordinate of each measurement (local value for a local measurement, minimum value reached by the line of sight for a line measurement)</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>1</units>
<coordinate1>../measured</coordinate1>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_1D"/>
</xs:complexType>
</xs:element>
<xs:element name="weight">
<xs:annotation>
<xs:documentation>Weight given to each measured value</xs:documentation>
Expand All @@ -3096,6 +3110,20 @@
<xs:group ref="FLT_1D"/>
</xs:complexType>
</xs:element>
<xs:element name="sigma">
<xs:annotation>
<xs:documentation>Standard deviation of the measurement error</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>mixed</units>
<coordinate1>../measured</coordinate1>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_1D"/>
</xs:complexType>
</xs:element>
<xs:element name="reconstructed">
<xs:annotation>
<xs:documentation>Value reconstructed from the fit</xs:documentation>
Expand Down Expand Up @@ -6981,7 +7009,7 @@
<xs:documentation>Distribution function expanded into a vector of successive approximations. The first element in the vector (expansion(1)) is the zeroth order distribution function, while the K:th element in the vector (expansion(K)) is the K:th correction, such that the total distribution function is a sum over all elements in the expansion vector.</xs:documentation>
<xs:appinfo>
<coordinate1>1...N</coordinate1>
<units>m^-6.s^3</units>
<units>(m.s^-1)^-3.m^-3</units>
</xs:appinfo>
</xs:annotation>
</xs:element>
Expand All @@ -6999,7 +7027,7 @@
<xs:annotation>
<xs:documentation>Value of the distribution function at the grid position in phase space. The interpolation coefficients refer to a C-2 spline.</xs:documentation>
<xs:appinfo>
<units>m^-6.s^3</units>
<units>m^-6.s^-3</units>
<introduced_after_version>3.41.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
Expand Down Expand Up @@ -9412,6 +9440,20 @@
<xs:group ref="FLT_1D"/>
</xs:complexType>
</xs:element>
<xs:element name="sigma">
<xs:annotation>
<xs:documentation>Standard deviation of the measurement error</xs:documentation>
<xs:appinfo>
<type>dynamic</type>
<units>mixed</units>
<coordinate1>../measured</coordinate1>
<introduced_after_version>4.1.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:group ref="FLT_1D"/>
</xs:complexType>
</xs:element>
<xs:element name="reconstructed">
<xs:annotation>
<xs:documentation>Value reconstructed from the fit</xs:documentation>
Expand Down Expand Up @@ -14629,7 +14671,7 @@
<xs:annotation>
<xs:documentation>Position of the center of the sphere which defines the mirror, in the case of a spherical mirror (geometry_type = 2), derived from the above geometric data</xs:documentation>
<xs:appinfo>
<introduced_after_version>4.0.0</introduced_after_version>
<introduced_after_version>4.0.0</introduced_after_version>
</xs:appinfo>
</xs:annotation>
</xs:element>
Expand Down