Skip to content

Commit 6991a4f

Browse files
TheKorposTheKorpos
committed
Merge remote-tracking branch 'origin/master' into ST6RI-830
2 parents e9bcf65 + 2c9307b commit 6991a4f

16 files changed

Lines changed: 37 additions & 37 deletions

‎tool-support/quantities_lib_generator/data/iso-iec-80000/iso_iec_80000_quantities_and_units.xlsx‎

-9 KB
Binary file not shown.

‎tool-support/quantities_lib_generator/data_templates.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class DATA:
149149
attribute :>> isOrthogonal = true;
150150
}
151151
152-
readonly attribute universalCartesianSpatial3dCoordinateFrame : CartesianSpatial3dCoordinateFrame[1] {
152+
attribute universalCartesianSpatial3dCoordinateFrame : CartesianSpatial3dCoordinateFrame[1] {
153153
doc
154154
/*
155155
* A singleton CartesianSpatial3dCoordinateFrame that can be used as a default universal Cartesian 3D coordinate frame.

‎tool-support/quantities_lib_generator/libs_generated/ISQAcoustics.sysml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ standard library package ISQAcoustics {
22
doc
33
/*
44
* International System of Quantities and Units
5-
* Generated on 2025-02-14T22:58:27Z from standard ISO-80000-8:2020 "Acoustics"
5+
* Generated on 2025-03-13T15:00:05Z from standard ISO-80000-8:2020 "Acoustics"
66
* see also https://www.iso.org/standard/64978.html
77
*
88
* Note 1: In documentation comments, AsciiMath notation (see http://asciimath.org/) is used for mathematical concepts,
@@ -97,7 +97,7 @@ standard library package ISQAcoustics {
9797
* remarks: None.
9898
*/
9999
attribute :>> isBound = false;
100-
attribute :>> mRef: Spatial3dCoordinateFrame[1];
100+
attribute :>> mRef: CartesianSpatial3dCoordinateFrame[1];
101101
}
102102

103103
attribute cartesianSoundParticleDisplacement3dVector: CartesianSoundParticleDisplacement3dVector :> vectorQuantities;

‎tool-support/quantities_lib_generator/libs_generated/ISQAtomicNuclear.sysml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ standard library package ISQAtomicNuclear {
22
doc
33
/*
44
* International System of Quantities and Units
5-
* Generated on 2025-02-14T22:58:27Z from standard ISO-80000-10:2019 "Atomic and nuclear physics"
5+
* Generated on 2025-03-13T15:00:05Z from standard ISO-80000-10:2019 "Atomic and nuclear physics"
66
* see also https://www.iso.org/standard/64980.html
77
*
88
* Note 1: In documentation comments, AsciiMath notation (see http://asciimath.org/) is used for mathematical concepts,

‎tool-support/quantities_lib_generator/libs_generated/ISQBase.sysml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ standard library package ISQBase {
22
doc
33
/*
44
* International System of Quantities and Units
5-
* Generated on 2025-02-14T22:58:27Z from standard ISO/IEC 80000
5+
* Generated on 2025-03-13T15:00:05Z from standard ISO/IEC 80000
66
*
77
* Note 1: In documentation comments, AsciiMath notation (see http://asciimath.org/) is used for mathematical concepts,
88
* with Greek letters in Unicode encoding. In running text, AsciiMath is placed between backticks.

‎tool-support/quantities_lib_generator/libs_generated/ISQCharacteristicNumbers.sysml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ standard library package ISQCharacteristicNumbers {
22
doc
33
/*
44
* International System of Quantities and Units
5-
* Generated on 2025-02-14T22:58:27Z from standard ISO-80000-11:2019 "Characteristic numbers"
5+
* Generated on 2025-03-13T15:00:05Z from standard ISO-80000-11:2019 "Characteristic numbers"
66
* see also https://www.iso.org/standard/64982.html
77
*
88
* Note 1: In documentation comments, AsciiMath notation (see http://asciimath.org/) is used for mathematical concepts,

‎tool-support/quantities_lib_generator/libs_generated/ISQChemistryMolecular.sysml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ standard library package ISQChemistryMolecular {
22
doc
33
/*
44
* International System of Quantities and Units
5-
* Generated on 2025-02-14T22:58:27Z from standard ISO-80000-9:2019 "Physical chemistry and molecular physics"
5+
* Generated on 2025-03-13T15:00:05Z from standard ISO-80000-9:2019 "Physical chemistry and molecular physics"
66
* see also https://www.iso.org/standard/64979.html
77
*
88
* Note 1: In documentation comments, AsciiMath notation (see http://asciimath.org/) is used for mathematical concepts,

‎tool-support/quantities_lib_generator/libs_generated/ISQCondensedMatter.sysml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ standard library package ISQCondensedMatter {
22
doc
33
/*
44
* International System of Quantities and Units
5-
* Generated on 2025-02-14T22:58:27Z from standard ISO-80000-12:2019 "Condensed matter physics"
5+
* Generated on 2025-03-13T15:00:05Z from standard ISO-80000-12:2019 "Condensed matter physics"
66
* see also https://www.iso.org/standard/63480.html
77
*
88
* Note 1: In documentation comments, AsciiMath notation (see http://asciimath.org/) is used for mathematical concepts,
@@ -42,7 +42,7 @@ standard library package ISQCondensedMatter {
4242
* remarks: The non-SI unit ångström (Å) is widely used by x-ray crystallographers and structural chemists.
4343
*/
4444
attribute :>> isBound = false;
45-
attribute :>> mRef: Spatial3dCoordinateFrame[1];
45+
attribute :>> mRef: CartesianSpatial3dCoordinateFrame[1];
4646
}
4747

4848
attribute cartesianLattice3dVector: CartesianLattice3dVector :> vectorQuantities;
@@ -62,7 +62,7 @@ standard library package ISQCondensedMatter {
6262
* remarks: The lattice vector (item 12-1.1) can be given as `vec(R) = n_1 vec(a_1) + n_2 vec(a_2) + n_3 vec(a_3)` where `n_1`, `n_2` and `n_3` are integers.
6363
*/
6464
attribute :>> isBound = false;
65-
attribute :>> mRef: Spatial3dCoordinateFrame[1];
65+
attribute :>> mRef: CartesianSpatial3dCoordinateFrame[1];
6666
}
6767

6868
attribute cartesianFundamentalLattice3dVector: CartesianFundamentalLattice3dVector :> vectorQuantities;
@@ -282,7 +282,7 @@ standard library package ISQCondensedMatter {
282282
* remarks: None.
283283
*/
284284
attribute :>> isBound = false;
285-
attribute :>> mRef: Spatial3dCoordinateFrame[1];
285+
attribute :>> mRef: CartesianSpatial3dCoordinateFrame[1];
286286
}
287287

288288
attribute cartesianBurgers3dVector: CartesianBurgers3dVector :> vectorQuantities;
@@ -302,7 +302,7 @@ standard library package ISQCondensedMatter {
302302
* remarks: Often, `r` is used for electrons and `R` is used for atoms and other heavier particles.
303303
*/
304304
attribute :>> isBound = true;
305-
attribute :>> mRef: Spatial3dCoordinateFrame[1];
305+
attribute :>> mRef: CartesianSpatial3dCoordinateFrame[1];
306306
}
307307

308308
attribute cartesianParticlePosition3dVector: CartesianParticlePosition3dVector :> vectorQuantities;
@@ -322,7 +322,7 @@ standard library package ISQCondensedMatter {
322322
* remarks: None.
323323
*/
324324
attribute :>> isBound = true;
325-
attribute :>> mRef: Spatial3dCoordinateFrame[1];
325+
attribute :>> mRef: CartesianSpatial3dCoordinateFrame[1];
326326
}
327327

328328
attribute cartesianEquilibriumPosition3dVector: CartesianEquilibriumPosition3dVector :> vectorQuantities;
@@ -342,7 +342,7 @@ standard library package ISQCondensedMatter {
342342
* remarks: The displacement vector can be expressed by: `vec(u) = vec(R) − vec(R_0)`, where `vec(R)` is particle position vector (item 12-7.1) and `vec(R_0)` is position vector of an ion or atom in equilibrium (item 12-7.2).
343343
*/
344344
attribute :>> isBound = false;
345-
attribute :>> mRef: Spatial3dCoordinateFrame[1];
345+
attribute :>> mRef: CartesianSpatial3dCoordinateFrame[1];
346346
}
347347

348348
attribute cartesianDisplacement3dVector: CartesianDisplacement3dVector :> vectorQuantities;

‎tool-support/quantities_lib_generator/libs_generated/ISQElectromagnetism.sysml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ standard library package ISQElectromagnetism {
22
doc
33
/*
44
* International System of Quantities and Units
5-
* Generated on 2025-02-14T22:58:27Z from standard IEC-80000-6:2008 "Electromagnetism"
5+
* Generated on 2025-03-13T15:00:05Z from standard IEC-80000-6:2008 "Electromagnetism"
66
* see also https://www.iso.org/obp/ui/#iso:std:iec:80000:-6:ed-1:v1:en,fr
77
*
88
* Note 1: In documentation comments, AsciiMath notation (see http://asciimath.org/) is used for mathematical concepts,
@@ -300,7 +300,7 @@ standard library package ISQElectromagnetism {
300300
}
301301

302302
alias CartesianAreicElectricCurrent3dCoordinateFrame for CartesianElectricCurrentDensity3dCoordinateFrame;
303-
alias areicElectricCurrentVector for electricCurrentDensityVector;
303+
alias cartesianAreicElectricCurrent3dVector for cartesianElectricCurrentDensity3dVector;
304304

305305
/* IEC-80000-6 item 6-9 linear electric current density, lineic electric current */
306306
attribute def LinearElectricCurrentDensityValue :> ScalarQuantityValue {
@@ -354,7 +354,7 @@ standard library package ISQElectromagnetism {
354354
}
355355

356356
alias CartesianLineicElectricCurrent3dCoordinateFrame for CartesianLinearElectricCurrentDensity3dCoordinateFrame;
357-
alias lineicElectricCurrentVector for linearElectricCurrentDensityVector;
357+
alias cartesianLineicElectricCurrent3dVector for cartesianLinearElectricCurrentDensity3dVector;
358358

359359
/* IEC-80000-6 item 6-10 electric field strength */
360360
attribute def ElectricFieldStrengthValue :> ScalarQuantityValue {
@@ -536,7 +536,7 @@ standard library package ISQElectromagnetism {
536536
}
537537

538538
alias CartesianElectricDisplacement3dCoordinateFrame for CartesianElectricFluxDensity3dCoordinateFrame;
539-
alias electricDisplacementVector for electricFluxDensityVector;
539+
alias cartesianElectricDisplacement3dVector for cartesianElectricFluxDensity3dVector;
540540

541541
/* IEC-80000-6 item 6-13 capacitance */
542542
attribute def CapacitanceValue :> ScalarQuantityValue {
@@ -980,7 +980,7 @@ standard library package ISQElectromagnetism {
980980
}
981981

982982
alias CartesianMagneticAreaMoment3dCoordinateFrame for CartesianMagneticMoment3dCoordinateFrame;
983-
alias magneticAreaMomentVector for magneticMomentVector;
983+
alias cartesianMagneticAreaMoment3dVector for cartesianMagneticMoment3dVector;
984984

985985
/* IEC-80000-6 item 6-24 magnetization */
986986
attribute def MagnetizationValue :> ScalarQuantityValue {
@@ -1085,7 +1085,7 @@ standard library package ISQElectromagnetism {
10851085
}
10861086

10871087
alias CartesianMagnetizingField3dCoordinateFrame for CartesianMagneticFieldStrength3dCoordinateFrame;
1088-
alias magnetizingFieldVector for magneticFieldStrengthVector;
1088+
alias cartesianMagnetizingField3dVector for cartesianMagneticFieldStrength3dVector;
10891089

10901090
/* IEC-80000-6 item 6-26.1 magnetic constant, permeability of vacuum */
10911091
attribute def MagneticConstantValue :> ScalarQuantityValue {

‎tool-support/quantities_lib_generator/libs_generated/ISQInformation.sysml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ standard library package ISQInformation {
22
doc
33
/*
44
* International System of Quantities and Units
5-
* Generated on 2025-02-14T22:58:27Z from standard IEC-80000-13:2008 "Information science and technology"
5+
* Generated on 2025-03-13T15:00:05Z from standard IEC-80000-13:2008 "Information science and technology"
66
* see also https://www.iso.org/obp/ui/#iso:std:iec:80000:-13:ed-1:v1:en
77
*
88
* Note 1: In documentation comments, AsciiMath notation (see http://asciimath.org/) is used for mathematical concepts,

0 commit comments

Comments
 (0)