Skip to content

Commit

Permalink
geometry base types: fix parameter name; improve documenation
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarAlder
MarAlder committed Nov 24, 2024
1 parent 107d053 commit 0fa9908
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 43 deletions.
Binary file modified documentation/geometryBaseTypes.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified documentation/geometryBaseTypes.pptx
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions examples/genericSystemShapes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@
<name>Pre-defined sphere</name>
<geometry>
<ellipsoid>
<a>0.62035</a>
<radiusX>0.62035</radiusX>
</ellipsoid>
</geometry>
</genericComponent>
<genericComponent uID="predefinedCube">
<name>Pre-defined cube</name>
<geometry>
<parallelepiped>
<a>1</a>
<b>1</b>
<c>1</c>
<length>1</length>
<width>1</width>
<height>1</height>
</parallelepiped>
</geometry>
</genericComponent>
<genericComponent uID="predefinedCylinder">
<name>Pre-defined cylinder</name>
<geometry>
<frustum>
<lowerRadius>0.56419</lowerRadius>
<lowerRadiusX>0.56419</lowerRadiusX>
<height>1</height>
</frustum>
</geometry>
Expand All @@ -56,9 +56,9 @@
<name>Pre-defined cone</name>
<geometry>
<frustum>
<lowerRadius>1</lowerRadius>
<lowerRadiusX>1</lowerRadiusX>
<height>0.95493</height>
<upperRadius>0</upperRadius>
<upperRadiusX>0</upperRadiusX>
</frustum>
</geometry>
</genericComponent>
Expand Down
6 changes: 3 additions & 3 deletions examples/simpleAircraft.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1716,9 +1716,9 @@
<name>Pre-defined cube</name>
<geometry>
<parallelepiped>
<a>0.4</a>
<b>0.3</b>
<c>0.2</c>
<length>0.4</length>
<width>0.3</width>
<height>0.2</height>
</parallelepiped>
</geometry>
</genericComponent>
Expand Down
6 changes: 3 additions & 3 deletions examples/simpleBattery.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<name>Battery</name>
<geometry>
<parallelepiped>
<a>0.2</a>
<b>0.1</b>
<c>0.1</c>
<length>0.2</length>
<width>0.1</width>
<height>0.1</height>
</parallelepiped>
</geometry>
<!-- Will be introduced in v3.6-->
Expand Down
22 changes: 11 additions & 11 deletions examples/systemExample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,9 +483,9 @@
<name>E-Motor</name>
<geometry>
<frustum>
<lowerRadius>1</lowerRadius>
<lowerRadiusX>1</lowerRadiusX>
<height>2</height>
<upperRadius>1</upperRadius>
<upperRadiusX>1</upperRadiusX>
</frustum>
</geometry>
</electricMotor>
Expand All @@ -495,9 +495,9 @@
<name>Heat exchanger</name>
<geometry>
<parallelepiped>
<a>1</a>
<b>1</b>
<c>1</c>
<length>1</length>
<width>1</width>
<height>1</height>
</parallelepiped>
</geometry>
</heatExchanger>
Expand All @@ -507,9 +507,9 @@
<name>Gear box</name>
<geometry>
<frustum>
<lowerRadius>0.56419</lowerRadius>
<lowerRadiusX>0.56419</lowerRadiusX>
<height>1</height>
<upperRadius>0.56419</upperRadius>
<upperRadiusX>0.56419</upperRadiusX>
</frustum>
</geometry>
</gearBox>
Expand All @@ -519,9 +519,9 @@
<name>GasTurbine</name>
<geometry>
<frustum>
<lowerRadius>1</lowerRadius>
<lowerRadiusX>1</lowerRadiusX>
<height>3</height>
<upperRadius>1</upperRadius>
<upperRadiusX>1</upperRadiusX>
</frustum>
</geometry>
</gasTurbine>
Expand All @@ -531,9 +531,9 @@
<name>Generator</name>
<geometry>
<frustum>
<lowerRadius>0.56419</lowerRadius>
<lowerRadiusX>0.56419</lowerRadiusX>
<height>1</height>
<upperRadius>0.56419</upperRadius>
<upperRadiusX>0.56419</upperRadiusX>
</frustum>
</geometry>
</generator>
Expand Down
48 changes: 29 additions & 19 deletions schema/cpacs_schema.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12590,19 +12590,19 @@ [email protected]
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:all>
<xsd:element name="a" type="doubleBaseType">
<xsd:element name="radiusX" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>a: Radius in x-direction [m]</xsd:documentation>
<xsd:documentation>Radius in x-direction [m]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="b" minOccurs="0" type="doubleBaseType">
<xsd:element name="radiusY" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>b: Radius in y-direction [m] (if not defined: equals a)</xsd:documentation>
<xsd:documentation>Radius in y-direction [m] (if not defined: equals radiusX)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="c" minOccurs="0" type="doubleBaseType">
<xsd:element name="radiusZ" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>c: Radius in z-direction [m] (if not defined: equals a)</xsd:documentation>
<xsd:documentation>Radius in z-direction [m] (if not defined: equals radiusX)</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:all>
Expand Down Expand Up @@ -15482,19 +15482,29 @@ [email protected]
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:all>
<xsd:element name="lowerRadius" type="doubleBaseType">
<xsd:element name="lowerRadiusX" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Upper radius [m]</xsd:documentation>
<xsd:documentation>Upper radius in local x-direction [m]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="lowerRadiusY" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Upper radius in local y-direction [m] (if not defined: equals lowerRadiusX)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="height" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Height [m]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="upperRadius" minOccurs="0" type="doubleBaseType">
<xsd:element name="upperRadiusX" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Upper radius in local x-direction [m] (if not defined: equals lowerRadiusX)</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="upperRadiusY" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Upper radius [m] (if not defined: equals lowerRadius)</xsd:documentation>
<xsd:documentation>Upper radius in local y-direction [m] (if not defined: equals lowerRadiusX)</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:all>
Expand Down Expand Up @@ -27026,35 +27036,35 @@ The fuel tank volume type should also be used for the wing fuel tank</xsd:docume
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:sequence>
<xsd:element name="a" type="doubleBaseType">
<xsd:element name="length" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Length [m]</xsd:documentation>
<xsd:documentation>Length (in local x-direction) [m]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="b" type="doubleBaseType">
<xsd:element name="width" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Width [m]</xsd:documentation>
<xsd:documentation>Width (in local y-direction) [m]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="c" type="doubleBaseType">
<xsd:element name="height" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Height [m]</xsd:documentation>
<xsd:documentation>Height (in local z-direction) [m]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:sequence minOccurs="0">
<xsd:element name="alpha" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Angle between b and c [deg]</xsd:documentation>
<xsd:documentation>Angle between edges in width and height direction (default: 90deg) [deg]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="beta" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Angle between a and c [deg]</xsd:documentation>
<xsd:documentation>Angle between edges in length and height direction (default: 90deg) [deg]</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="gamma" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Angle between a and b [deg]</xsd:documentation>
<xsd:documentation>Angle between edges in length and width direction (default: 90deg) [deg]</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down

0 comments on commit 0fa9908

Please sign in to comment.