Skip to content

Commit 0fa9908

Browse files
MarAlderMarAlder
committed
geometry base types: fix parameter name; improve documenation
1 parent 107d053 commit 0fa9908

7 files changed

+53
-43
lines changed

‎documentation/geometryBaseTypes.png

25.1 KB
Loading

‎documentation/geometryBaseTypes.pptx

2.43 KB
Binary file not shown.

‎examples/genericSystemShapes.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@
2929
<name>Pre-defined sphere</name>
3030
<geometry>
3131
<ellipsoid>
32-
<a>0.62035</a>
32+
<radiusX>0.62035</radiusX>
3333
</ellipsoid>
3434
</geometry>
3535
</genericComponent>
3636
<genericComponent uID="predefinedCube">
3737
<name>Pre-defined cube</name>
3838
<geometry>
3939
<parallelepiped>
40-
<a>1</a>
41-
<b>1</b>
42-
<c>1</c>
40+
<length>1</length>
41+
<width>1</width>
42+
<height>1</height>
4343
</parallelepiped>
4444
</geometry>
4545
</genericComponent>
4646
<genericComponent uID="predefinedCylinder">
4747
<name>Pre-defined cylinder</name>
4848
<geometry>
4949
<frustum>
50-
<lowerRadius>0.56419</lowerRadius>
50+
<lowerRadiusX>0.56419</lowerRadiusX>
5151
<height>1</height>
5252
</frustum>
5353
</geometry>
@@ -56,9 +56,9 @@
5656
<name>Pre-defined cone</name>
5757
<geometry>
5858
<frustum>
59-
<lowerRadius>1</lowerRadius>
59+
<lowerRadiusX>1</lowerRadiusX>
6060
<height>0.95493</height>
61-
<upperRadius>0</upperRadius>
61+
<upperRadiusX>0</upperRadiusX>
6262
</frustum>
6363
</geometry>
6464
</genericComponent>

‎examples/simpleAircraft.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1716,9 +1716,9 @@
17161716
<name>Pre-defined cube</name>
17171717
<geometry>
17181718
<parallelepiped>
1719-
<a>0.4</a>
1720-
<b>0.3</b>
1721-
<c>0.2</c>
1719+
<length>0.4</length>
1720+
<width>0.3</width>
1721+
<height>0.2</height>
17221722
</parallelepiped>
17231723
</geometry>
17241724
</genericComponent>

‎examples/simpleBattery.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<name>Battery</name>
3232
<geometry>
3333
<parallelepiped>
34-
<a>0.2</a>
35-
<b>0.1</b>
36-
<c>0.1</c>
34+
<length>0.2</length>
35+
<width>0.1</width>
36+
<height>0.1</height>
3737
</parallelepiped>
3838
</geometry>
3939
<!-- Will be introduced in v3.6-->

‎examples/systemExample.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -483,9 +483,9 @@
483483
<name>E-Motor</name>
484484
<geometry>
485485
<frustum>
486-
<lowerRadius>1</lowerRadius>
486+
<lowerRadiusX>1</lowerRadiusX>
487487
<height>2</height>
488-
<upperRadius>1</upperRadius>
488+
<upperRadiusX>1</upperRadiusX>
489489
</frustum>
490490
</geometry>
491491
</electricMotor>
@@ -495,9 +495,9 @@
495495
<name>Heat exchanger</name>
496496
<geometry>
497497
<parallelepiped>
498-
<a>1</a>
499-
<b>1</b>
500-
<c>1</c>
498+
<length>1</length>
499+
<width>1</width>
500+
<height>1</height>
501501
</parallelepiped>
502502
</geometry>
503503
</heatExchanger>
@@ -507,9 +507,9 @@
507507
<name>Gear box</name>
508508
<geometry>
509509
<frustum>
510-
<lowerRadius>0.56419</lowerRadius>
510+
<lowerRadiusX>0.56419</lowerRadiusX>
511511
<height>1</height>
512-
<upperRadius>0.56419</upperRadius>
512+
<upperRadiusX>0.56419</upperRadiusX>
513513
</frustum>
514514
</geometry>
515515
</gearBox>
@@ -519,9 +519,9 @@
519519
<name>GasTurbine</name>
520520
<geometry>
521521
<frustum>
522-
<lowerRadius>1</lowerRadius>
522+
<lowerRadiusX>1</lowerRadiusX>
523523
<height>3</height>
524-
<upperRadius>1</upperRadius>
524+
<upperRadiusX>1</upperRadiusX>
525525
</frustum>
526526
</geometry>
527527
</gasTurbine>
@@ -531,9 +531,9 @@
531531
<name>Generator</name>
532532
<geometry>
533533
<frustum>
534-
<lowerRadius>0.56419</lowerRadius>
534+
<lowerRadiusX>0.56419</lowerRadiusX>
535535
<height>1</height>
536-
<upperRadius>0.56419</upperRadius>
536+
<upperRadiusX>0.56419</upperRadiusX>
537537
</frustum>
538538
</geometry>
539539
</generator>

‎schema/cpacs_schema.xsd

+29-19
Original file line numberDiff line numberDiff line change
@@ -12590,19 +12590,19 @@ [email protected]
1259012590
<xsd:complexContent>
1259112591
<xsd:extension base="complexBaseType">
1259212592
<xsd:all>
12593-
<xsd:element name="a" type="doubleBaseType">
12593+
<xsd:element name="radiusX" type="doubleBaseType">
1259412594
<xsd:annotation>
12595-
<xsd:documentation>a: Radius in x-direction [m]</xsd:documentation>
12595+
<xsd:documentation>Radius in x-direction [m]</xsd:documentation>
1259612596
</xsd:annotation>
1259712597
</xsd:element>
12598-
<xsd:element name="b" minOccurs="0" type="doubleBaseType">
12598+
<xsd:element name="radiusY" minOccurs="0" type="doubleBaseType">
1259912599
<xsd:annotation>
12600-
<xsd:documentation>b: Radius in y-direction [m] (if not defined: equals a)</xsd:documentation>
12600+
<xsd:documentation>Radius in y-direction [m] (if not defined: equals radiusX)</xsd:documentation>
1260112601
</xsd:annotation>
1260212602
</xsd:element>
12603-
<xsd:element name="c" minOccurs="0" type="doubleBaseType">
12603+
<xsd:element name="radiusZ" minOccurs="0" type="doubleBaseType">
1260412604
<xsd:annotation>
12605-
<xsd:documentation>c: Radius in z-direction [m] (if not defined: equals a)</xsd:documentation>
12605+
<xsd:documentation>Radius in z-direction [m] (if not defined: equals radiusX)</xsd:documentation>
1260612606
</xsd:annotation>
1260712607
</xsd:element>
1260812608
</xsd:all>
@@ -15482,19 +15482,29 @@ [email protected]
1548215482
<xsd:complexContent>
1548315483
<xsd:extension base="complexBaseType">
1548415484
<xsd:all>
15485-
<xsd:element name="lowerRadius" type="doubleBaseType">
15485+
<xsd:element name="lowerRadiusX" type="doubleBaseType">
1548615486
<xsd:annotation>
15487-
<xsd:documentation>Upper radius [m]</xsd:documentation>
15487+
<xsd:documentation>Upper radius in local x-direction [m]</xsd:documentation>
15488+
</xsd:annotation>
15489+
</xsd:element>
15490+
<xsd:element name="lowerRadiusY" minOccurs="0" type="doubleBaseType">
15491+
<xsd:annotation>
15492+
<xsd:documentation>Upper radius in local y-direction [m] (if not defined: equals lowerRadiusX)</xsd:documentation>
1548815493
</xsd:annotation>
1548915494
</xsd:element>
1549015495
<xsd:element name="height" type="doubleBaseType">
1549115496
<xsd:annotation>
1549215497
<xsd:documentation>Height [m]</xsd:documentation>
1549315498
</xsd:annotation>
1549415499
</xsd:element>
15495-
<xsd:element name="upperRadius" minOccurs="0" type="doubleBaseType">
15500+
<xsd:element name="upperRadiusX" minOccurs="0" type="doubleBaseType">
15501+
<xsd:annotation>
15502+
<xsd:documentation>Upper radius in local x-direction [m] (if not defined: equals lowerRadiusX)</xsd:documentation>
15503+
</xsd:annotation>
15504+
</xsd:element>
15505+
<xsd:element name="upperRadiusY" minOccurs="0" type="doubleBaseType">
1549615506
<xsd:annotation>
15497-
<xsd:documentation>Upper radius [m] (if not defined: equals lowerRadius)</xsd:documentation>
15507+
<xsd:documentation>Upper radius in local y-direction [m] (if not defined: equals lowerRadiusX)</xsd:documentation>
1549815508
</xsd:annotation>
1549915509
</xsd:element>
1550015510
</xsd:all>
@@ -27026,35 +27036,35 @@ The fuel tank volume type should also be used for the wing fuel tank</xsd:docume
2702627036
<xsd:complexContent>
2702727037
<xsd:extension base="complexBaseType">
2702827038
<xsd:sequence>
27029-
<xsd:element name="a" type="doubleBaseType">
27039+
<xsd:element name="length" type="doubleBaseType">
2703027040
<xsd:annotation>
27031-
<xsd:documentation>Length [m]</xsd:documentation>
27041+
<xsd:documentation>Length (in local x-direction) [m]</xsd:documentation>
2703227042
</xsd:annotation>
2703327043
</xsd:element>
27034-
<xsd:element name="b" type="doubleBaseType">
27044+
<xsd:element name="width" type="doubleBaseType">
2703527045
<xsd:annotation>
27036-
<xsd:documentation>Width [m]</xsd:documentation>
27046+
<xsd:documentation>Width (in local y-direction) [m]</xsd:documentation>
2703727047
</xsd:annotation>
2703827048
</xsd:element>
27039-
<xsd:element name="c" type="doubleBaseType">
27049+
<xsd:element name="height" type="doubleBaseType">
2704027050
<xsd:annotation>
27041-
<xsd:documentation>Height [m]</xsd:documentation>
27051+
<xsd:documentation>Height (in local z-direction) [m]</xsd:documentation>
2704227052
</xsd:annotation>
2704327053
</xsd:element>
2704427054
<xsd:sequence minOccurs="0">
2704527055
<xsd:element name="alpha" type="doubleBaseType">
2704627056
<xsd:annotation>
27047-
<xsd:documentation>Angle between b and c [deg]</xsd:documentation>
27057+
<xsd:documentation>Angle between edges in width and height direction (default: 90deg) [deg]</xsd:documentation>
2704827058
</xsd:annotation>
2704927059
</xsd:element>
2705027060
<xsd:element name="beta" type="doubleBaseType">
2705127061
<xsd:annotation>
27052-
<xsd:documentation>Angle between a and c [deg]</xsd:documentation>
27062+
<xsd:documentation>Angle between edges in length and height direction (default: 90deg) [deg]</xsd:documentation>
2705327063
</xsd:annotation>
2705427064
</xsd:element>
2705527065
<xsd:element name="gamma" type="doubleBaseType">
2705627066
<xsd:annotation>
27057-
<xsd:documentation>Angle between a and b [deg]</xsd:documentation>
27067+
<xsd:documentation>Angle between edges in length and width direction (default: 90deg) [deg]</xsd:documentation>
2705827068
</xsd:annotation>
2705927069
</xsd:element>
2706027070
</xsd:sequence>

0 commit comments

Comments
 (0)