Skip to content

Commit

Permalink
Merge pull request #626 from DLR-SL/develop
Browse files Browse the repository at this point in the history 
merge develop into master
  • Loading branch information
@MarAlder
MarAlder authored Feb 18, 2020
2 parents abaf240 + c711f57 commit 8777316
Show file tree
Hide file tree
Showing 13 changed files with 2,187 additions and 12,007 deletions.
5 changes: 4 additions & 1 deletion createDocumentation.bat
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
MSBuild.exe .\documentation\Cpacs_doc_project.shfbproj
REM for first time user, first unzip the file *development/3rdparty.zip*!
REM potentially remove path to installed SandCastle from environment variable as the build might not success.

MSBuild.exe .\documentation\Cpacs_doc_project.shfbproj
3 changes: 1 addition & 2 deletions development/tools.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ The python library can be created using the generateDS packacke provided by Dave
The Java library is generated via JAXB or rather the xjc tool. If you are lucky and you live in a world where there is no outsourced IT-department you might have xjc in your standard java distribution. If not, please feel free to browse to https://jaxb.java.net/ for a download.

## Documentation
The documentation for CPACS is generated using the MSBuild command from the .Net framework. For a plain build of the CPACS documentation run MS Build from the corresponding .Net version with the CPACS_doc_project.shfbproj file. For adaptions to the project please use the sandcastle help file builder. It can be found here: https://shfb.codeplex.com/
Furthermore the XSD plugin needs to be installed: It can be found here: https://github.com/terrajobst/xsddoc/releases
The documentation for CPACS is generated using the MSBuild command from the .Net framework. For a plain build of the CPACS documentation run MS Build from the corresponding .Net version with the CPACS_doc_project.shfbproj file. For adaptions to the project please use the sandcastle help file builder and the XSD plugin available in [development/3rdparty.zip](../development/3rdparty.zip).

4 changes: 4 additions & 0 deletions documentation/Cpacs_doc_project.shfbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@
</ContentLayout>
</ItemGroup>
<ItemGroup>
<Image Include="basicPrinciple.png">
<ImageId>basicPrinciple</ImageId>
<AlternateText>basic principle of CPACS</AlternateText>
</Image>
<Image Include="axissystem.png">
<ImageId>axissystem</ImageId>
<AlternateText>axissystem</AlternateText>
Expand Down
Binary file added documentation/basicPrinciple.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 added documentation/basicPrinciple.vsd
View file
Binary file not shown.
132 changes: 132 additions & 0 deletions examples/basicWing.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
<cpacs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../schema/cpacs_schema.xsd">
<header>
<name>Basic Wing Model</name>
<creator>Marko Alder</creator>
<timestamp>2019-12-04T10:30:00</timestamp>
<version>1.0</version>
<cpacsVersion>3.2</cpacsVersion>
</header>
<vehicles>
<aircraft>
<model uID="aircraft">
<name>aircraft</name>
<wings>
<wing uID="wing1">
<name>main wing</name>
<transformation/>
<sections>
<section uID="wing1section1">
<name>root section</name>
<transformation>
<rotation>
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</rotation>
<scaling>
<x>1</x>
<y>1</y>
<z>1</z>
</scaling>
<translation>
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</translation>
</transformation>
<elements>
<element uID="wing1section1element1">
<name>wing root element</name>
<airfoilUID>NACA0009</airfoilUID>
<transformation>
<rotation>
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</rotation>
<scaling>
<x>1</x>
<y>1</y>
<z>1</z>
</scaling>
<translation>
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</translation>
</transformation>
</element>
</elements>
</section>
<section uID="wing1section2">
<name>tip section</name>
<transformation>
<rotation>
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</rotation>
<scaling>
<x>1</x>
<y>1</y>
<z>1</z>
</scaling>
<translation>
<x>0.5</x>
<y>1.0</y>
<z>0.0</z>
</translation>
</transformation>
<elements>
<element uID="wing1section2element1">
<name>wing tip element</name>
<airfoilUID>NACA0009</airfoilUID>
<transformation>
<rotation>
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</rotation>
<scaling>
<x>0.5</x>
<y>1</y>
<z>0.5</z>
</scaling>
<translation>
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</translation>
</transformation>
</element>
</elements>
</section>
</sections>
<segments>
<segment uID="wing1segment1">
<name>wing segment</name>
<fromElementUID>wing1section1element1</fromElementUID>
<toElementUID>wing1section2element1</toElementUID>
</segment>
</segments>
</wing>
</wings>
</model>
</aircraft>
<profiles>
<wingAirfoils>
<wingAirfoil uID="NACA0009">
<name>NACA0009 Airfoil</name>
<description>NACA 4-digit symmetrical airfoil with a thickness of 9percent</description>
<pointList>
<x mapType="vector">1.0;0.99572;0.98296;0.96194;0.93301;0.89668;0.85355;0.80438;0.75;0.69134;0.62941;0.56526;0.5;0.43474;0.37059;0.33928;0.30866;0.27886;0.25;0.22221;0.19562;0.17033;0.14645;0.12408;0.10332;0.08427;0.06699;0.05156;0.03806;0.02653;0.01704;0.00961;0.00428;0.00107;0.0;0.00107;0.00428;0.00961;0.01704;0.02653;0.03806;0.05156;0.06699;0.08427;0.10332;0.12408;0.14645;0.17033;0.19562;0.22221;0.25;0.27886;0.30866;0.33928;0.37059;0.43474;0.5;0.56526;0.62941;0.69134;0.75;0.80438;0.85355;0.89668;0.93301;0.96194;0.98296;0.99572;1.0</x>
<y mapType="vector">0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0</y>
<z mapType="vector">0.0;0.00057;0.00218;0.00463;0.0077;0.01127;0.01522;0.01945;0.02384;0.02823;0.03247;0.03638;0.03978;0.04248;0.04431;0.04484;0.04509;0.04504;0.04466;0.04397;0.04295;0.04161;0.03994;0.03795;0.03564;0.03305;0.03023;0.0272;0.02395;0.02039;0.01646;0.01214;0.00767;0.00349;0.0;-0.00349;-0.00767;-0.01214;-0.01646;-0.02039;-0.02395;-0.0272;-0.03023;-0.03305;-0.03564;-0.03795;-0.03994;-0.04161;-0.04295;-0.04397;-0.04466;-0.04504;-0.04509;-0.04484;-0.04431;-0.04248;-0.03978;-0.03638;-0.03247;-0.02823;-0.02384;-0.01945;-0.01522;-0.01127;-0.0077;-0.00463;-0.00218;-0.00057;0.0</z>
</pointList>
</wingAirfoil>
</wingAirfoils>
</profiles>
</vehicles>
</cpacs>
55 changes: 37 additions & 18 deletions examples/genericSystemShapes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<cpacs>
<?xml version="1.0" encoding="UTF-8"?>
<cpacs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../schema/cpacs_schema.xsd">
<header>
<name>genericSystem example file</name>
<description>Example file for use of genericSystem components</description>
<creator>Jonas Jepsen from TU-Hamburg-Harburg</creator>
<timestamp>2017-05-31T08:55:23</timestamp>
<version>1.0</version>
<cpacsVersion>3.0</cpacsVersion>
<cpacsVersion>3.2</cpacsVersion>
</header>
<vehicles>
<aircraft>
Expand All @@ -15,86 +17,103 @@
<systems>
<genericSystems>
<genericSystem uID="kjashdi">
<geometricBaseType>sphere</geometricBaseType>
<name>sphere</name><geometricBaseType>sphere</geometricBaseType>
<transformation>
<scaling uID="Aircraft1_Fuselage1_Transf_Sca">
<scaling uID="Aircraft1_Fuselage1_Transf_Sca1">
<x>1.0</x>
<y>1.0</y>
<z>1.0</z>
</scaling>
<rotation uID="Aircraft1_Fuselage1_Transf_Rot">
<rotation uID="Aircraft1_Fuselage1_Transf_Rot1">
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</rotation>
<translation refType="absGlobal" uID="Aircraft1_Fuselage1_Transf_Transl">
<translation refType="absGlobal" uID="Aircraft1_Fuselage1_Transf_Transl1">
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</translation>
</transformation>
</genericSystem>
<genericSystem uID="dfhert">
<geometricBaseType>cube</geometricBaseType>
<name>cube</name><geometricBaseType>cube</geometricBaseType>
<transformation>
<scaling uID="Aircraft1_Fuselage1_Transf_Sca">
<scaling uID="Aircraft1_Fuselage1_Transf_Sca2">
<x>1.0</x>
<y>1.0</y>
<z>1.0</z>
</scaling>
<rotation uID="Aircraft1_Fuselage1_Transf_Rot">
<rotation uID="Aircraft1_Fuselage1_Transf_Rot2">
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</rotation>
<translation refType="absGlobal" uID="Aircraft1_Fuselage1_Transf_Transl">
<translation refType="absGlobal" uID="Aircraft1_Fuselage1_Transf_Transl2">
<x>2.0</x>
<y>0.0</y>
<z>0.0</z>
</translation>
</transformation>

</genericSystem>
<genericSystem uID="erztghf">
<geometricBaseType>cylinder</geometricBaseType>
<name>cylinder</name><geometricBaseType>cylinder</geometricBaseType>
<transformation>
<scaling uID="Aircraft1_Fuselage1_Transf_Sca">
<scaling uID="Aircraft1_Fuselage1_Transf_Sca3">
<x>1.0</x>
<y>1.0</y>
<z>1.0</z>
</scaling>
<rotation uID="Aircraft1_Fuselage1_Transf_Rot">
<rotation uID="Aircraft1_Fuselage1_Transf_Rot3">
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</rotation>
<translation refType="absGlobal" uID="Aircraft1_Fuselage1_Transf_Transl">
<translation refType="absGlobal" uID="Aircraft1_Fuselage1_Transf_Transl3">
<x>4.0</x>
<y>0.0</y>
<z>0.0</z>
</translation>
</transformation>

</genericSystem>
<genericSystem uID="kjsdhfgt">
<geometricBaseType>cone</geometricBaseType>
<name>cone</name><geometricBaseType>cone</geometricBaseType>
<transformation>
<scaling uID="Aircraft1_Fuselage1_Transf_Sca">
<scaling uID="Aircraft1_Fuselage1_Transf_Sca4">
<x>1.0</x>
<y>1.0</y>
<z>1.0</z>
</scaling>
<rotation uID="Aircraft1_Fuselage1_Transf_Rot">
<rotation uID="Aircraft1_Fuselage1_Transf_Rot4">
<x>0.0</x>
<y>0.0</y>
<z>0.0</z>
</rotation>
<translation refType="absGlobal" uID="Aircraft1_Fuselage1_Transf_Transl">
<translation refType="absGlobal" uID="Aircraft1_Fuselage1_Transf_Transl4">
<x>6.0</x>
<y>0.0</y>
<z>0.0</z>
</translation>
</transformation>

</genericSystem>
</genericSystems>
<controlDistributors>
<controlDistributor uID="idvalue0">
<commandInputs mapType="vector">0.</commandInputs>
<controlElements>
<controlElement>
<controlDeviceUID>
idvalue0
</controlDeviceUID>
<controlParameters
mapType="vector">0.</controlParameters>
</controlElement>
</controlElements>
</controlDistributor>
</controlDistributors>
</systems>
<wings>
<wing uID="Aircraft1_Wing1" symmetry="x-z-plane">
Expand Down
24 changes: 24 additions & 0 deletions examples/toolspecific.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<cpacs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../schema/cpacs_schema.xsd"
xsi:schemaLocation="http://www.cpacs.de/myTool ../schema/toolspecific_template.xsd">
<header>
<name>Toolspecific example file</name>
<creator>DLR</creator>
<timestamp>2020-02-20T08:37:00</timestamp>
<version>1.0</version>
<cpacsVersion>3.2</cpacsVersion>
</header>
<toolspecific>
<tool>
<name>myToolName</name>
<version>1.2.3</version>
<myToolName xmlns="http://www.cpacs.de/myTool" schemaVersion="1.0">
<parentElement>
<childElement1>stringValue</childElement1>
<childElement2>1.0</childElement2>
</parentElement>
</myToolName>
</tool>
</toolspecific>
</cpacs>
Loading

0 comments on commit 8777316

Please sign in to comment.