Skip to content

Commit

Permalink
remove electricEnergyCarriers
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarAlder
MarAlder committed Dec 4, 2023
1 parent c2825b7 commit a4fe3e6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 198 deletions.
51 changes: 0 additions & 51 deletions examples/configurationDefinition.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@
<name>Base configuration</name>
<description>This base config serves as a collection of several configuration settings</description>
<energyCarriers>
<storedElectricEnergies>
<storedElectricEnergy>
<componentUIDs>
<uID>installedBattery1</uID>
<uID>installedBattery2</uID>
<uID>installedBattery3</uID>
</componentUIDs>
<chargeLevel>1.0</chargeLevel>
</storedElectricEnergy>
</storedElectricEnergies>
<storedFuels>
<storedFuel uID="storedKerosene">
<fuelUID>kerosene</fuelUID>
Expand Down Expand Up @@ -174,27 +164,6 @@
</componentSegments>
</wing>
</wings>
<systems>
<genericSystems>
<genericSystem uID="exampleSystem">
<name>Example system</name>
<components>
<component uID="installedBattery1">
<name>Battery installed</name>
<systemElementUID>battery</systemElementUID>
</component>
<component uID="installedBattery2">
<name>Battery installed</name>
<systemElementUID>battery</systemElementUID>
</component>
<component uID="installedBattery3">
<name>Battery installed</name>
<systemElementUID>battery</systemElementUID>
</component>
</components>
</genericSystem>
</genericSystems>
</systems>
<analyses>
<trajectories>
<trajectory uID="exTraj">
Expand Down Expand Up @@ -230,21 +199,6 @@
</analyses>
</model>
</aircraft>
<systemElements>
<batteries>
<battery uID="battery">
<name>Battery</name>
<geometry>
<parallelepiped>
<a>1</a>
<b>1</b>
<c>1</c>
</parallelepiped>
</geometry>
<electricEnergyCarrierUID>liIo</electricEnergyCarrierUID>
</battery>
</batteries>
</systemElements>
<energyCarriers>
<fuels>
<fuel uID="kerosene">
Expand All @@ -254,11 +208,6 @@
<density>0.1234</density>
</fuel>
</fuels>
<electricEnergyCarriers>
<electricEnergyCarrier uID="liIo">
<name>Lithium-Ion</name>
</electricEnergyCarrier>
</electricEnergyCarriers>
</energyCarriers>
<profiles>
<wingAirfoils>
Expand Down
14 changes: 8 additions & 6 deletions examples/simpleBattery.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
</header>
<vehicles>

<!-- (1) Pre-define the electric energy carrier -->
<energyCarriers>
<!-- (1) Pre-define the electric energy carrier (will be introduced in v3.6) -->
<!-- <energyCarriers>
<electricEnergyCarriers>
<electricEnergyCarrier uID="liIon">
<name>Lithium-Ion</name>
<maxCRate>2</maxCRate>
<nominalCRate>1</nominalCRate>
</electricEnergyCarrier>
</electricEnergyCarriers>
</energyCarriers>
</energyCarriers> -->

<!-- (2) Pre-define a battery -->
<systemElements>
Expand All @@ -36,7 +36,8 @@
<c>0.1</c>
</parallelepiped>
</geometry>
<electricEnergyCarrierUID>liIon</electricEnergyCarrierUID>
<!-- Will be introduced in v3.6-->
<!-- <electricEnergyCarrierUID>liIon</electricEnergyCarrierUID> -->
</battery>
</batteries>
</systemElements>
Expand Down Expand Up @@ -103,7 +104,8 @@
<name>Initial configuration</name>
<description>At the ramp, batteries charged, ready for taxi and take-off</description>
<energyCarriers>
<storedElectricEnergies>
<!-- Will be introduced in v3.6-->
<!-- <storedElectricEnergies>
<storedElectricEnergy>
<componentUIDs>
<uID>battery_inst1</uID>
Expand All @@ -112,7 +114,7 @@
</componentUIDs>
<chargeLevel>0.98</chargeLevel>
</storedElectricEnergy>
</storedElectricEnergies>
</storedElectricEnergies> -->
</energyCarriers>
</configurationDefinition>
</configurationDefinitions>
Expand Down
148 changes: 7 additions & 141 deletions schema/cpacs_schema.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4860,15 +4860,7 @@ [email protected]
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="vehicleElementBaseType">
<xsd:sequence>
<xsd:element name="electricEnergyCarrierUID" type="stringUIDBaseType">
<xsd:annotation>
<xsd:documentation>UID of an electric energy carrier</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:extension>
<xsd:extension base="vehicleElementBaseType"/>
</xsd:complexContent>
</xsd:complexType>

Expand Down Expand Up @@ -7574,7 +7566,7 @@ [email protected]
</xsd:annotation>
</xsd:element>
<xsd:element name="controlElements" minOccurs="0" type="aircraftControlElementsType"/>
<xsd:element name="energyCarriers" minOccurs="0" type="energyCarrierType"/>
<xsd:element name="energyCarriers" minOccurs="0" type="storedEnergyCarriersType"/>
</xsd:all>
<xsd:attribute name="uID" use="required" type="xsd:ID"/>
</xsd:extension>
Expand Down Expand Up @@ -13019,79 +13011,6 @@ [email protected]
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="electricalEnergyCarriersType">
<xsd:annotation>
<xsd:appinfo>
<sd:schemaDoc>
<ddue:summary>
<ddue:para>Electrical energy carriers</ddue:para>
</ddue:summary>
</sd:schemaDoc>
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:sequence>
<xsd:element name="electricEnergyCarrier" maxOccurs="unbounded" type="electricalEnergyCarrierType"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="electricalEnergyCarrierType">
<xsd:annotation>
<xsd:appinfo>
<sd:schemaDoc>
<ddue:summary>
<ddue:para>Electrical energy carrier</ddue:para>
</ddue:summary>
</sd:schemaDoc>
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:all>
<xsd:element name="name" type="stringBaseType">
<xsd:annotation>
<xsd:documentation>Name</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="description" minOccurs="0" type="stringBaseType">
<xsd:annotation>
<xsd:documentation>Description</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="massFlowPerEnergyFlow" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Ratio of mass flow per energy flow</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="specificEnergy" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Specific energy</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="density" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Density at 15deg C</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="nominalCRate" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Nominal C-Rate</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="maxCRate" minOccurs="0" type="doubleBaseType">
<xsd:annotation>
<xsd:documentation>Maximum C-Rate</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:all>
<xsd:attribute name="uID" use="required" type="xsd:ID"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="electricMotorsType">
<xsd:annotation>
<xsd:appinfo>
Expand Down Expand Up @@ -13358,33 +13277,12 @@ [email protected]
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:all>
<xsd:element name="electricEnergyCarriers" minOccurs="0" type="electricalEnergyCarriersType"/>
<xsd:element name="fuels" minOccurs="0" type="fuelsType"/>
</xsd:all>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="energyCarrierType">
<xsd:annotation>
<xsd:appinfo>
<sd:schemaDoc>
<ddue:summary>
<ddue:para>Energy carrier configuration</ddue:para>
</ddue:summary>
</sd:schemaDoc>
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:all>
<xsd:element name="storedElectricEnergies" minOccurs="0" type="storedElectricEnergiesType"/>
<xsd:element name="storedFuels" minOccurs="0" type="storedFuelsType"/>
</xsd:all>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="engineAnalysisType">
<xsd:annotation>
<xsd:appinfo>
Expand Down Expand Up @@ -34287,53 +34185,21 @@ The fuel tank volume type should also be used for the wing fuel tank</xsd:docume
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="storedElectricalEnergyType">
<xsd:complexType name="storedEnergyCarriersType">
<xsd:annotation>
<xsd:appinfo>
<sd:schemaDoc>
<ddue:summary>
<ddue:para>Stored electrical energy</ddue:para>
</ddue:summary>
</sd:schemaDoc>
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:sequence>
<xsd:element name="componentUIDs" type="uIDSequenceType"/>
<xsd:element name="chargeLevel" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Charge level
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:double">
<xsd:minInclusive value="0"/>
<xsd:maxInclusive value="1"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="uID" type="xsd:ID"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="storedElectricEnergiesType">
<xsd:annotation>
<xsd:appinfo>
<sd:schemaDoc>
<ddue:summary>
<ddue:para>Stored electric energies</ddue:para>
<ddue:para>Energy carrier configuration</ddue:para>
</ddue:summary>
</sd:schemaDoc>
</xsd:appinfo>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="complexBaseType">
<xsd:sequence>
<xsd:element name="storedElectricEnergy" maxOccurs="unbounded" type="storedElectricalEnergyType"/>
</xsd:sequence>
<xsd:all>
<xsd:element name="storedFuels" minOccurs="0" type="storedFuelsType"/>
</xsd:all>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Expand Down

0 comments on commit a4fe3e6

Please sign in to comment.