Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge ducts #817

Closed
wants to merge 138 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
8777316
Merge pull request #626 from DLR-SL/develop
MarAlder Feb 18, 2020
bfa7c91
Merge branch 'develop' for v3.3-RC
MarAlder Apr 19, 2021
bebd689
Merge branch 'develop'
MarAlder Jun 3, 2021
6925b19
implement Agile 4.0 with a taste of Imothep
MarAlder Jul 7, 2021
ed5d9d6
rename subSystems to components
MarAlder Jul 7, 2021
6f31bd6
add ata chapter breakdowns (#721)
MarAlder Jul 9, 2021
b7595c8
add nominal loads breakdown (EXACT project) (#721)
MarAlder Jul 9, 2021
23dce08
add system trajectories from Imothep (#721)
MarAlder Jul 9, 2021
07b8b9c
add systemArchitectures and systemAssumptions; small fix for ataBreak…
MarAlder Jul 14, 2021
e757adc
update latest powerBreakdown from Exact project; modify Avacon breakd…
MarAlder Sep 30, 2021
10c3c72
merge Exact and Avacon proposals (#721, #732)
MarAlder Oct 20, 2021
a9a651a
fix typo (#721, #732)
MarAlder Oct 20, 2021
37030c6
make componentUIDs optional (#732)
MarAlder Oct 21, 2021
0b9c5d6
make latitude and longitude optional; uID of powerBreakdownCase optio…
MarAlder Nov 25, 2021
498d727
update release information
MarAlder Mar 4, 2022
a3f3b0c
update power breakdown
MarAlder Mar 17, 2022
fc56afd
some revisions of the power breakdown
MarAlder Mar 21, 2022
89e4e3e
reduce number of hierarchical levels in powerBreakdown
MarAlder Mar 25, 2022
c557bfb
fix altitude and machNumber to be doubleElements
MarAlder Apr 11, 2022
1425532
use all for specification
MarAlder Apr 11, 2022
8f3ddff
make choide optional; fix typo
MarAlder Apr 11, 2022
cd48bca
beautify for 3.4 release
MarAlder Apr 20, 2022
c84bb2d
fix release date; update figures
MarAlder Apr 20, 2022
fe12c2d
fix doc typo
MarAlder Apr 20, 2022
dcd3767
Merge pull request #773 from DLR-SL/develop
MarAlder Apr 20, 2022
305c944
schema/cpacs_schema.xsd
MarAlder Jun 22, 2022
f003bc2
add energy carriers and propulsion architecture node
MarAlder Jun 30, 2022
8719882
add type element to chemicalEnergyCarrier (#606)
MarAlder Jun 30, 2022
10cf039
mark isLink attribute as deprecated (#616)
MarAlder Jun 30, 2022
006beca
rename geometryUID to componentUID (#771)
MarAlder Jul 1, 2022
33bfffd
add syntax cleanup script and batch script
MarAlder Jul 4, 2022
42b2dc8
delete old script versions
MarAlder Jul 4, 2022
0b40001
add test scripts and github action
MarAlder Jul 5, 2022
28d3a3e
Fix typos
luzpaz Sep 9, 2022
1f9c9d3
implement new versioning approach (#796)
MarAlder Oct 4, 2022
b4cfb15
Follow-up fixes
luzpaz Oct 9, 2022
b80446b
remove regex
MarAlder Nov 11, 2022
cb76729
Merge pull request #794 from luzpaz/typos
MarAlder Nov 11, 2022
03e2baa
add uID for capType (closes #793)
MarAlder Nov 11, 2022
4a66b32
Extend sparPositionType by curvePoint choice (#795)
MarAlder Nov 11, 2022
a984bd3
update example files to schema adaption (#796)
MarAlder Nov 17, 2022
b6b0169
Merge pull request #801 from DLR-SL/versioning
MarAlder Nov 17, 2022
cd3efa4
link mass-breakdown and geometry (closes #771)
MarAlder Nov 17, 2022
2386484
Resolve merge conflict by sticking to componentUID in #771
MarAlder Nov 17, 2022
2945c03
Merge pull request #802 from DLR-SL/massBreakdown
MarAlder Nov 17, 2022
866be8e
resolve merge conflicts by cleaning development schema, keeping valid…
MarAlder Nov 17, 2022
ff33c61
Merge pull request #803 from DLR-SL/syntax_cleanup
MarAlder Nov 17, 2022
a3a6b6c
add cryogenicFuelTanks proposal
MarAlder Nov 18, 2022
c5af531
refactoring; add example file
MarAlder Nov 30, 2022
2d65442
indentation to spaces
MarAlder Nov 30, 2022
6f6d3c9
apply new schema formatting script
MarAlder Dec 2, 2022
fc626d7
apply new schema formatting script to the correct schema file...
MarAlder Dec 2, 2022
20b4dca
resolve merge conflicts
MarAlder Dec 2, 2022
a0c94d7
solve merge conflicts
MarAlder Dec 2, 2022
5ff44d6
add systemArchitecture
MarAlder Dec 2, 2022
219d48f
begin with example; rearrange rotors
MarAlder Dec 2, 2022
bb2b62c
enhance example and fix some errors in schema
MarAlder Dec 2, 2022
f5424a2
adopt tests to new generic systems
MarAlder Dec 6, 2022
9c9f705
extend system examples, with some smaller schema adaptions
MarAlder Dec 6, 2022
cc6a8b8
add powerBreakdown example
MarAlder Dec 6, 2022
3711d7a
remove empty fuelFlow system architecture
MarAlder Dec 6, 2022
6c9052f
add union type for systemTypeType; rename unModeledComponent
MarAlder Dec 7, 2022
4b14104
fix schema test
MarAlder Dec 7, 2022
e0901e4
add/modify configurationDefinitions
MarAlder Dec 7, 2022
e1ca646
extend configurationDefinitions node and examples
MarAlder Dec 9, 2022
faa2404
add configuration events to weight and balance; show with example file
MarAlder Dec 13, 2022
cac087e
fix indent for simpleTypes
MarAlder Dec 15, 2022
29a2578
directly make use of material definition
MarAlder Dec 20, 2022
eb77e24
modify according to meeting results (#786)
MarAlder Dec 20, 2022
d667628
add generic design parameters (#786)
MarAlder Jan 2, 2023
30a14a5
move burstPressure up; make materialUID mandatory (#786)
MarAlder Jan 2, 2023
4085ca7
fix material definition (#786)
MarAlder Jan 2, 2023
ce852a9
some renaming
MarAlder May 25, 2023
aacb550
fix massFlow phase description
MarAlder Jun 6, 2023
229a31d
add explicit link to rotorElements
MarAlder Jun 7, 2023
dbae468
add connection between systemArchitectures
MarAlder Jun 7, 2023
791495d
correct sequence of elements
MarAlder Jun 7, 2023
86dd9a9
rename batteryUIDs
MarAlder Jun 7, 2023
975ebb0
rotorType: make type optional
MarAlder Aug 4, 2023
964bc06
add indents
MarAlder Aug 4, 2023
6df811d
configurationUIDs -> configurationDefinitionUIDs
MarAlder Aug 4, 2023
a7c3515
Merge pull request #815 from DLR-SL/systems
MarAlder Aug 4, 2023
45ce150
remove propulsionPerformance
MarAlder Aug 4, 2023
32a7ce8
Update run_tests.yml
MarAlder Aug 4, 2023
ec33642
Update run_tests.yml
MarAlder Aug 4, 2023
6ec4083
Update run_tests.yml
MarAlder Aug 4, 2023
462496e
Update run_tests.yml
MarAlder Aug 4, 2023
6eb242e
Update run_tests.yml
MarAlder Aug 4, 2023
cdbebbc
Update run_tests.yml
MarAlder Aug 4, 2023
956021c
Update run_tests.yml
MarAlder Aug 4, 2023
7c96a95
Update run_tests.yml
MarAlder Aug 4, 2023
26dfba7
Update run_tests.yml
MarAlder Aug 4, 2023
0b14bb2
Update run_tests.yml
MarAlder Aug 4, 2023
f50927f
Update run_tests.yml
MarAlder Aug 4, 2023
84bca4e
Update run_tests.yml
MarAlder Aug 4, 2023
efaf2c0
Update run_tests.yml
MarAlder Aug 4, 2023
af2d72c
Update run_tests.yml
MarAlder Aug 4, 2023
6de3d35
Update run_tests.yml
MarAlder Aug 4, 2023
1e0ec29
Update run_tests.yml
MarAlder Aug 4, 2023
847ff1e
Update run_tests.yml
MarAlder Aug 4, 2023
06ee4ca
Update run_tests.yml
MarAlder Aug 4, 2023
89dee7c
fix typo
MarAlder Aug 4, 2023
6050dd8
resolve merge conflict
MarAlder Aug 4, 2023
a0b2b06
fix typo in fuelTank example
MarAlder Aug 4, 2023
473627d
Merge pull request #816 from DLR-SL/cryogenicFuelTanks
MarAlder Aug 4, 2023
50879f2
fix typo at mAdditionalCenterTanks. Thanks @marcengelmann (closes #812)
MarAlder Aug 4, 2023
abb1348
fix typo at airportCompatability. Thanks @marcengelmann (closes #813)
MarAlder Aug 4, 2023
9d6bd10
update doc config
MarAlder Aug 4, 2023
a4640fd
add htmlDoc to appveyor
MarAlder Aug 4, 2023
722493e
fix appveyor
MarAlder Aug 4, 2023
64bdda2
fix appveyor
MarAlder Aug 4, 2023
e3c04bb
fix appveyor
MarAlder Aug 4, 2023
f6bbdb7
fix appveyor
MarAlder Aug 4, 2023
6fa3646
Create build_docs.yml
MarAlder Aug 4, 2023
cdf2c17
Update build_docs.yml
MarAlder Aug 4, 2023
c89c5c9
Update build_docs.yml
MarAlder Aug 4, 2023
41084f4
add pages deploy
MarAlder Aug 4, 2023
174bb3d
Update build_docs.yml
MarAlder Aug 4, 2023
0042585
Update build_docs.yml
MarAlder Aug 4, 2023
149288a
Update build_docs.yml
MarAlder Aug 4, 2023
2fd397d
Update build_docs.yml
MarAlder Aug 4, 2023
2ffe48a
Update build_docs.yml
MarAlder Aug 4, 2023
ef25daa
Update run_tests.yml
MarAlder Aug 5, 2023
d6e7b48
Update build_docs.yml
MarAlder Aug 5, 2023
b19c192
Update build_docs.yml
MarAlder Aug 5, 2023
12bdeb1
Update build_docs.yml
MarAlder Aug 5, 2023
4c52fc1
Update build_docs.yml
MarAlder Aug 5, 2023
52102c6
Update build_docs.yml
MarAlder Aug 5, 2023
12ca98b
Update build_docs.yml
MarAlder Aug 5, 2023
9317d03
Update build_docs.yml
MarAlder Aug 5, 2023
efc33e4
Update build_docs.yml
MarAlder Aug 5, 2023
c1612ae
Update build_docs.yml
MarAlder Aug 6, 2023
f58d523
Update build_docs.yml
MarAlder Aug 6, 2023
e0b3a93
Update build_docs.yml
MarAlder Aug 6, 2023
4d0f0f9
Update build_docs.yml
MarAlder Aug 6, 2023
2dce89d
Update build_docs.yml
MarAlder Aug 6, 2023
6335580
update schema version
MarAlder Aug 6, 2023
bb5c6d0
Update readme.md
MarAlder Aug 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Build documentation

on:
push:
branches:
- develop

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
build:
runs-on: windows-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v3

- name: Add MSBuild to PATH
uses: microsoft/[email protected]

- name: Install 7-Zip
run: |
Invoke-WebRequest -Uri https://www.7-zip.org/a/7z1900-x64.exe -OutFile 7z.exe
Start-Process -Wait -FilePath 7z.exe
Remove-Item -Force 7z.exe

- name: Extract 3rdparty.zip
run: |
Start-Process -Wait -FilePath 'C:\Program Files\7-Zip\7z.exe' -ArgumentList "x -y .\development\3rdparty.zip -o.\development\"

- name: Build Documentation
run: msbuild /p:Configuration=Release documentation\Cpacs_doc_project.shfbproj

- name: Package HTML Docs
run: 7z a -tzip .\build\doc\htmlDocs.zip .\build\doc\*

- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: cpacsDocs
path: |
.\build\doc\*.chm
.\build\doc\htmlDocs.zip

deploy:
needs: build

# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
contents: read
pages: write
id-token: write

# Deploy to the github-pages environment
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

# Specify runner + deployment step
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Download html zip
uses: actions/download-artifact@v3
with:
name: cpacsDocs
- name: Extract HTML Docs
run: |
7z x -y htmlDocs.zip
- name: Fix permissions
run: |
chmod -c -R +rX "." | while read line; do
echo "::warning title=Invalid file permissions automatically fixed::$line"
done
- name: Upload Artifacts
uses: actions/upload-pages-artifact@v2
with:
path: .
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
27 changes: 27 additions & 0 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Validate example files
on: [push]
jobs:
build-linux:
runs-on: ubuntu-latest
defaults:
run:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: anaconda-client-env
auto-activate-base: false
- name: Create new conda environment
run: |
conda create -n cpacs python=3.9
- name: Activate new conda environment
run: |
conda activate cpacs
- name: Install python modules
run: |
conda install pytest lxml tixi3 -c dlr-sc
- name: Run pytest
run: |
pytest
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.project
*.pyc
*.vscode
build
6 changes: 5 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ os: Visual Studio 2015

artifacts:
- path: 'build/doc/*.chm'
name: Documentation
name: chmDocs
- path: 'build/doc/htmlDocs.zip'
name: htmlDocs

install:
- cmd: 7z x -y c:\projects\cpacs\development\3rdparty.zip -oc:\projects\cpacs\development\
Expand All @@ -17,3 +19,5 @@ configuration: Release
build:
project: documentation\Cpacs_doc_project.shfbproj

after_build:
- cmd: 7z a -tzip build\doc\htmlDocs.zip build\doc\*
1 change: 1 addition & 0 deletions clean.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python .\scripts\syntax_cleanup.py .\schema\cpacs_schema.xsd .\schema\cpacs_schema.xsd
2 changes: 0 additions & 2 deletions cleanNamespaces.bat

This file was deleted.

144 changes: 0 additions & 144 deletions converter/ElementBuilder.py

This file was deleted.

Loading
Loading