From 7574d72230bb282e7297b3d7609f0be2cea694ab Mon Sep 17 00:00:00 2001 From: Frederic Imbeaux Date: Tue, 8 Jul 2025 11:38:29 +0200 Subject: [PATCH 01/11] First modifications of the distributions IDS (issue-85) --- schemas/distributions/dd_distributions.xsd | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/schemas/distributions/dd_distributions.xsd b/schemas/distributions/dd_distributions.xsd index 7e62893b..16ac1b03 100644 --- a/schemas/distributions/dd_distributions.xsd +++ b/schemas/distributions/dd_distributions.xsd @@ -2885,6 +2885,36 @@ Grid. The grid has to be rectangular in a pair of coordinates, as specified in type + + + Major radius (for plotting purposes, if the 2D grid is not given in (R,Z)) + + ../grid/rho_tor_norm + ../grid/theta_geometric OR ../grid/theta_straight + m^-3 + dynamic + 4.0.0 + + + + + + + + + Height (for plotting purposes, if the 2D grid is not given in (R,Z)) + + ../grid/rho_tor_norm + ../grid/theta_geometric OR ../grid/theta_straight + m^-3 + dynamic + 4.0.0 + + + + + + Density (thermal+non-thermal) From 3fb20be8b22fc5e3f0c05817581286dbfb99047b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Imbeaux?= Date: Wed, 3 Sep 2025 10:26:36 +0200 Subject: [PATCH 02/11] [issue-85] Implementing points 4 and 5 --- schemas/utilities/dd_support.xsd | 72 ++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/schemas/utilities/dd_support.xsd b/schemas/utilities/dd_support.xsd index 9ce50cbc..0de0b803 100644 --- a/schemas/utilities/dd_support.xsd +++ b/schemas/utilities/dd_support.xsd @@ -6887,6 +6887,61 @@ + + + Midplane values of the motion invariants, for each orbit, evaluated at the minimum of B.grad(B) along the orbit + + yes + + + + + + Major radius, for various grid subsets + + 1...N + m + + + + + + Height, for various grid subsets + + 1...N + m + + + + + + Parallel velocity, for various grid subsets + + 1...N + m.s^-1 + + + + + + Electric field, for various grid subsets + + 1...N + V.m^-1 + + + + + + Phase, for various grid subsets + + 1...N + rad + + + + + Description of the particle orbits for a given time slice, using a GGD representation @@ -7014,6 +7069,23 @@ + + + Midplane values of the motion invariants, for each orbit, evaluated at the minimum of B.grad(B) along the orbit + + 4.0.0 + + + + + + Volume of the invariants of motion space volume elements + + T.m^2.eV + 4.0.0 + + + Time From fb466909d6c85a9697b8ab35b7e59f536d07792a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Imbeaux?= Date: Tue, 23 Sep 2025 17:02:43 +0200 Subject: [PATCH 03/11] [issue-85] remove irrelevant structure --- schemas/utilities/dd_support.xsd | 9 --------- 1 file changed, 9 deletions(-) diff --git a/schemas/utilities/dd_support.xsd b/schemas/utilities/dd_support.xsd index 0de0b803..2f57555e 100644 --- a/schemas/utilities/dd_support.xsd +++ b/schemas/utilities/dd_support.xsd @@ -6922,15 +6922,6 @@ - - - Electric field, for various grid subsets - - 1...N - V.m^-1 - - - Phase, for various grid subsets From c9be00be8547237b74f032ec862b052b69d48a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Imbeaux?= Date: Tue, 23 Sep 2025 17:04:45 +0200 Subject: [PATCH 04/11] [issue-85] Update dd_versions.html --- html_documentation/dd_versions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html_documentation/dd_versions.html b/html_documentation/dd_versions.html index 9daacd95..532befb3 100644 --- a/html_documentation/dd_versions.html +++ b/html_documentation/dd_versions.html @@ -19,7 +19,7 @@

Back to top IDS list

develop - Add Boron species to the SUMMARY IDS. Add state velocity structure in CORE_PROFILES and PLASMA_PROFILES. Add total ion density source term in CORE_SOURCES and PLASMA_SOURCES. Add a few power loss global quantities in the DISTRIBUTIONS IDS. Add b_field and em_force_density in the WALL IDS. Change to _phi the suffix of toroidal vector components that had been missed and remained as _tor (affects the following IDSs: SPI, SAWTEETH, RUNAWAY_ELECTRONS, DISTRIBUTIONS, DISTRIBUTIONS_SOURCES, LH_ANTENNAS, B_FIELD_NON_AXISYMMETRIC, SPECTROMETER_VISIBLE). Add coil geometry in PF_ACTIVE IDS. Add new global quantities in the PLASMA_INITIATION IDS. Add perpendicular pressure in the DISTRIBUTIONS IDS. Restructuring of the BOLOMETER IDS. Add validity signals in the THOMSON_SCATTERING IDS. Restructuring of the CAMERA_IR IDS, addition of Bidirectional Reflectance Distribution Function (BRDF) to the WALL IDS. Small change in the EQUILIBRIUM IDS. Add a list of equivalent field probes in the MAGNETICS IDS. Extension of the NEUTRON_DIAGNOSTIC IDS. New BALANCE_OF_PLANT and BREEDING_BLANKET IDSs. Add parallel direction for the GGD transport coefficients in the PLASMA_TRANSPORT IDS. Extensions to the EQUILIBRIUM and DISRUPTION IDS. Merge the DATASET_DESCRIPTION IDS into the SUMMARY IDS (and delete the DATASET_DESCRIPTION IDS). Extension of the CHARGE_EXCHANGE IDS. Add constant plasma composition in the SUMMARY IDS. Add estimated central electron temperature to the CAMERA_X_RAYS IDS. Rename some remaining "label" nodes into "name" in the PLASMA_PROFILES and PLASMA_TRANSPORT IDSs. Replace id/identifier string by description string and put the standard name definition in the FOCS, TF_COIL, LH_ANTENNAS, OPERATIONAL_INSTRUMENTATION and COILS_NON_AXISYMMETRIC IDSs. Modification of sputtering coefficients dimensions in the WALL IDS (global quantities). Extension of the EC_LAUNCHERS IDS with a mirror structure. Corrected the notation of isotopes in the node descriptions in DISTRIBUTIONS, DISTRIBUTIONS_SOURCES and SPECTROMETER_VISIBLE IDS, and also in the DISTRIBUTION_SOURCE_IDENTIFIER names. Will result in a minor revision + Add Boron species to the SUMMARY IDS. Add state velocity structure in CORE_PROFILES and PLASMA_PROFILES. Add total ion density source term in CORE_SOURCES and PLASMA_SOURCES. Add a few power loss global quantities in the DISTRIBUTIONS IDS. Add b_field and em_force_density in the WALL IDS. Change to _phi the suffix of toroidal vector components that had been missed and remained as _tor (affects the following IDSs: SPI, SAWTEETH, RUNAWAY_ELECTRONS, DISTRIBUTIONS, DISTRIBUTIONS_SOURCES, LH_ANTENNAS, B_FIELD_NON_AXISYMMETRIC, SPECTROMETER_VISIBLE). Add coil geometry in PF_ACTIVE IDS. Add new global quantities in the PLASMA_INITIATION IDS. Add perpendicular pressure in the DISTRIBUTIONS IDS. Restructuring of the BOLOMETER IDS. Add validity signals in the THOMSON_SCATTERING IDS. Restructuring of the CAMERA_IR IDS, addition of Bidirectional Reflectance Distribution Function (BRDF) to the WALL IDS. Small change in the EQUILIBRIUM IDS. Add a list of equivalent field probes in the MAGNETICS IDS. Extension of the NEUTRON_DIAGNOSTIC IDS. New BALANCE_OF_PLANT and BREEDING_BLANKET IDSs. Add parallel direction for the GGD transport coefficients in the PLASMA_TRANSPORT IDS. Extensions to the EQUILIBRIUM and DISRUPTION IDS. Merge the DATASET_DESCRIPTION IDS into the SUMMARY IDS (and delete the DATASET_DESCRIPTION IDS). Extension of the CHARGE_EXCHANGE IDS. Add constant plasma composition in the SUMMARY IDS. Add estimated central electron temperature to the CAMERA_X_RAYS IDS. Rename some remaining "label" nodes into "name" in the PLASMA_PROFILES and PLASMA_TRANSPORT IDSs. Replace id/identifier string by description string and put the standard name definition in the FOCS, TF_COIL, LH_ANTENNAS, OPERATIONAL_INSTRUMENTATION and COILS_NON_AXISYMMETRIC IDSs. Modification of sputtering coefficients dimensions in the WALL IDS (global quantities). Extension of the EC_LAUNCHERS IDS with a mirror structure. Corrected the notation of isotopes in the node descriptions in DISTRIBUTIONS, DISTRIBUTIONS_SOURCES and SPECTROMETER_VISIBLE IDS, and also in the DISTRIBUTION_SOURCE_IDENTIFIER names. Extension of the DISTRIBUTIONS and DISTRIBUTIONS_SOURCES IDS with constants of motion. Will result in a minor revision 4.0.0 From 444a7931da8fc45eb7d888e3bd926bafb81ce517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Imbeaux?= Date: Thu, 2 Oct 2025 13:53:00 +0200 Subject: [PATCH 05/11] Correct units Co-authored-by: Simon Pinches --- schemas/distributions/dd_distributions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/distributions/dd_distributions.xsd b/schemas/distributions/dd_distributions.xsd index 16ac1b03..9173af07 100644 --- a/schemas/distributions/dd_distributions.xsd +++ b/schemas/distributions/dd_distributions.xsd @@ -2891,7 +2891,7 @@ ../grid/rho_tor_norm ../grid/theta_geometric OR ../grid/theta_straight - m^-3 + m dynamic 4.0.0 From 22e88cf9288790c1adda11f39a4b760502703226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Imbeaux?= Date: Thu, 2 Oct 2025 13:53:48 +0200 Subject: [PATCH 06/11] Correct units Co-authored-by: Simon Pinches --- schemas/distributions/dd_distributions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/distributions/dd_distributions.xsd b/schemas/distributions/dd_distributions.xsd index 9173af07..279b5c58 100644 --- a/schemas/distributions/dd_distributions.xsd +++ b/schemas/distributions/dd_distributions.xsd @@ -2906,7 +2906,7 @@ ../grid/rho_tor_norm ../grid/theta_geometric OR ../grid/theta_straight - m^-3 + m dynamic 4.0.0 From 2d8022c6f6c44b7ce3fe483bc6e1275be3c85aa9 Mon Sep 17 00:00:00 2001 From: Frederic Imbeaux Date: Thu, 2 Oct 2025 14:01:06 +0200 Subject: [PATCH 07/11] [issue-85] Correct units and precise description of gyrophase --- schemas/utilities/dd_support.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/utilities/dd_support.xsd b/schemas/utilities/dd_support.xsd index 2c60428d..5f01a289 100644 --- a/schemas/utilities/dd_support.xsd +++ b/schemas/utilities/dd_support.xsd @@ -6923,7 +6923,7 @@ - Phase, for various grid subsets + Gyrophase, for various grid subsets 1...N rad @@ -7071,7 +7071,7 @@ Volume of the invariants of motion space volume elements - T.m^2.eV + T.m^2.J 4.0.0 From c01f5789d7053c4470f339ebcb5343995e197d28 Mon Sep 17 00:00:00 2001 From: Frederic Imbeaux Date: Fri, 17 Oct 2025 16:29:58 +0200 Subject: [PATCH 08/11] [issue-85] Added energy and improved definition of the CoM cell volume --- schemas/utilities/dd_support.xsd | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/schemas/utilities/dd_support.xsd b/schemas/utilities/dd_support.xsd index 5f01a289..846eca8a 100644 --- a/schemas/utilities/dd_support.xsd +++ b/schemas/utilities/dd_support.xsd @@ -6930,6 +6930,15 @@ + + + Energy, for various grid subsets + + 1...N + J + + + @@ -7069,7 +7078,7 @@ - Volume of the invariants of motion space volume elements + Normalised volume of the CoM (constants of motion) cell elements T.m^2.J 4.0.0 From 3fcb942ab1df9708346cba31cf1781fbc57b6c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Imbeaux?= Date: Mon, 3 Nov 2025 15:56:53 +0100 Subject: [PATCH 09/11] Update schemas/distributions/dd_distributions.xsd Co-authored-by: Simon Pinches --- schemas/distributions/dd_distributions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/distributions/dd_distributions.xsd b/schemas/distributions/dd_distributions.xsd index 279b5c58..954fb872 100644 --- a/schemas/distributions/dd_distributions.xsd +++ b/schemas/distributions/dd_distributions.xsd @@ -2887,7 +2887,7 @@ - Major radius (for plotting purposes, if the 2D grid is not given in (R,Z)) + Major radius (if 2D grid is not given in (R,Z)) ../grid/rho_tor_norm ../grid/theta_geometric OR ../grid/theta_straight From 13b5e37c1f52ee93932f2497f7358721768dc7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Imbeaux?= Date: Mon, 3 Nov 2025 15:57:04 +0100 Subject: [PATCH 10/11] Update schemas/distributions/dd_distributions.xsd Co-authored-by: Simon Pinches --- schemas/distributions/dd_distributions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/distributions/dd_distributions.xsd b/schemas/distributions/dd_distributions.xsd index 954fb872..506c7b7a 100644 --- a/schemas/distributions/dd_distributions.xsd +++ b/schemas/distributions/dd_distributions.xsd @@ -2902,7 +2902,7 @@ - Height (for plotting purposes, if the 2D grid is not given in (R,Z)) + Height (if 2D grid is not given in (R,Z)) ../grid/rho_tor_norm ../grid/theta_geometric OR ../grid/theta_straight From 2e06f10a3ec80a07ac89aa73ef322b616b853400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Imbeaux?= Date: Wed, 12 Nov 2025 16:08:56 +0100 Subject: [PATCH 11/11] [issue-85] Clarification of the definition of the normalised CoM volume element + restore eV for the energy --- schemas/utilities/dd_support.xsd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/schemas/utilities/dd_support.xsd b/schemas/utilities/dd_support.xsd index 846eca8a..41b7b568 100644 --- a/schemas/utilities/dd_support.xsd +++ b/schemas/utilities/dd_support.xsd @@ -6935,7 +6935,7 @@ Energy, for various grid subsets 1...N - J + eV @@ -7076,11 +7076,11 @@ - + - Normalised volume of the CoM (constants of motion) cell elements + Normalised volume of the CoM (constants of motion) cell elements. The normalization is made on the maximum value of the CoM volume on the grid, i.e. Delta(E).Delta(lambda).Delta(P_phi). - T.m^2.J + 1 4.0.0