Skip to content
Merged

Tanks #1058

Show file tree
Hide file tree
Changes from 129 commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
b8f6514
remove macos test for now...
MarAlder Dec 6, 2023
12b6eab
create and implement new fuselageFuelTanks classes
MarAlder Dec 7, 2023
d82d0e8
Merge branch 'master' into tanks
MarAlder Dec 24, 2023
c1020f5
add classes to Swig config file
MarAlder Dec 28, 2023
3e9e890
set up first (dummy) unittest for fuselageTanks
MarAlder Dec 29, 2023
b1f8acd
format style
MarAlder Dec 29, 2023
22e9462
add CCPACSHull with most code except a problem with parent of segments
MarAlder Mar 16, 2024
87392bd
fix further stuff; ToDo: search of IsParent<CCPACSDuct> and add tanks…
MarAlder Mar 17, 2024
245085d
add GetConfiguration()
MarAlder Mar 17, 2024
15216cb
fix errors in loft-building
MarAlder Mar 17, 2024
c867888
add further Custom-Classes
MarAlder Mar 17, 2024
690afd6
code clean-up so far
MarAlder Mar 17, 2024
e22523d
allow to directly refer to other CTiglRelativelyPositionedComponents …
MarAlder Mar 18, 2024
e0c4709
combine hull shapes in tank
MarAlder Mar 18, 2024
0eca07e
add additional hull tests in c++ and python
MarAlder Mar 19, 2024
a55b3ad
add further tests
MarAlder Mar 19, 2024
2dbe361
add hull methods and corresponding tests
MarAlder Mar 20, 2024
4ba6e2c
CCPACSGenericFuelTank: add getter for hulls; add c++ and python tests
MarAlder Mar 20, 2024
3180c7a
forgot to add src in previous commit...
MarAlder Mar 20, 2024
ccd28ad
swig expose CPACSGenericFuelTank
MarAlder Mar 20, 2024
3668126
add CCPACSGenericFuelTanks methods; add python and c++ tests
MarAlder Mar 21, 2024
4122340
expose generated hull classes and add corresponding python tests
MarAlder Mar 22, 2024
79f2be3
pretty print (black formatter)
MarAlder Mar 22, 2024
b52ed8d
add second tank with guide curves; add test cases; swig expose CCPACS…
MarAlder Mar 22, 2024
20b0108
implement hull structure and corresponding tests
MarAlder Mar 26, 2024
7f20e74
format according to TiGL-style guide using clang
MarAlder Mar 26, 2024
5fe1f54
start implementation of parametric tanks
MarAlder May 17, 2024
dc1bf36
implement isotensoid domes. Working, but still ugly
MarAlder May 21, 2024
8c32e9f
refactor parametric tanks
MarAlder May 23, 2024
0491381
add some exception handling
MarAlder May 23, 2024
ee5f65b
remove spherical definition from CPACS, can be done via ellipsoid
MarAlder May 24, 2024
5b1b50f
restructure test XML; enrich warning information
MarAlder May 24, 2024
5ad20a6
align tests with modified XML test case
MarAlder May 24, 2024
9485ea0
add exeptions
MarAlder May 24, 2024
220ff4c
merge parametric tanks into tanks; hulls inherit scaling und rotation…
MarAlder May 25, 2024
f914a80
add tankType and domeType identifiers
MarAlder May 30, 2024
d3733d8
pull fuelTanks out of fuselage
MarAlder May 30, 2024
4cfcd4d
allow isotensoids and torispherical to have zero length
MarAlder May 30, 2024
ffa35ab
allow half axis ratio larger 1
MarAlder May 30, 2024
a21b858
add and refactor tests
MarAlder May 31, 2024
8494c6d
improve tests
MarAlder May 31, 2024
eef8979
simplify evaluation (remove enumes); adopt test cases
MarAlder Jun 4, 2024
966e03d
merge master
MarAlder Jun 4, 2024
c75ab04
adopt header of test case to CPACS v3.5
MarAlder Jun 4, 2024
906967d
cosmetic improvements
MarAlder Jun 5, 2024
cfb1f28
add tests; code cosmetics
MarAlder Jun 5, 2024
beb3f2f
add guide curve tests
MarAlder Jun 5, 2024
9caa6d4
XSD: add walls; generate classes
MarAlder Jun 5, 2024
120e4ad
add hullSection as additional choice for x-referencing
MarAlder Jun 6, 2024
ba1bfd4
add accessability from configuration manager
MarAlder Jun 6, 2024
f2aa8e2
add lid to isotensoid opening
MarAlder Jun 6, 2024
0df053e
Merge branch 'tanks' into tankWalls
MarAlder Jun 6, 2024
f43c74b
walls part1: implement wall positions
MarAlder Jun 9, 2024
6b45fdf
walls part2: implement wall segments
MarAlder Jun 9, 2024
9efac8e
sort out redundant code into ITiglWallUtils.h
MarAlder Jun 13, 2024
001281e
merge latest master
MarAlder Nov 21, 2024
b6e8973
merge latest master
MarAlder Nov 21, 2024
4e4b139
fix how to get instance of CCPACSConfigurationManager in fuelTanks test
MarAlder Nov 23, 2024
e99653c
rename hulls -> vessels; do some xsd restructuring
MarAlder Nov 23, 2024
2c33bad
fix usage of more general structuralMountType
MarAlder Nov 23, 2024
8dbe255
merge master with fixed get_walls and resolve conflicts
MarAlder Nov 29, 2024
8234a09
Merge branch 'master' into tanks
MarAlder Dec 19, 2024
dd30fb4
apply clang formatting
MarAl3 Jan 13, 2025
11c5eba
fix structure tests
MarAl3 Feb 8, 2025
dc785bb
Merge branch 'master' into tanks
MarAl3 Feb 8, 2025
c194ffc
add tanks to changelog
MarAl3 Feb 8, 2025
4b25ff4
delete html test
MarAl3 Feb 8, 2025
5025679
rename entries in enum TiglGeometricComponentType
MarAl3 Feb 8, 2025
80779b6
exclude fuselageFuelTanks again
MarAl3 Feb 8, 2025
6752aa4
exclude fuselageFuelTanks again v2
MarAl3 Feb 8, 2025
719d473
revert python-tests which are not part of this issue
MarAl3 Feb 8, 2025
15208be
revert stuff which where not intended to be changed in this issue
MarAl3 Feb 8, 2025
64b6cb7
revert stuff which where not intended to be changed in this issue (v2)
MarAl3 Feb 8, 2025
bfd195b
revert stuff which where not intended to be changed in this issue (v3)
MarAl3 Feb 8, 2025
550edea
extend framesAssembly by vessels
MarAl3 Feb 8, 2025
f96d4d9
Merge pull request #1057 from MarAlder/tanks
joergbrech Feb 10, 2025
0f762f7
remove incomplete test artifacts
MarAl3 Feb 10, 2025
4dd4bfa
add more meaningful structure tests
MarAl3 Feb 10, 2025
1f6fc5e
remove commeted includes which where not used
MarAlder Feb 15, 2025
e37ca94
add test for BuildFace(segment.GetStartWire)
MarAlder Mar 23, 2025
cea6a1a
add tests for GetSegment
MarAlder Mar 23, 2025
8221216
add tests for vessel exception handling
MarAlder Mar 23, 2025
c299238
change short shape name letters
MarAlder Mar 23, 2025
e5dbe73
add tests for CCPACSFuelTanks exceptions. Also small code changes.
MarAlder Mar 24, 2025
d266508
add tests for exceptions in ccpacsvessels
MarAlder Mar 24, 2025
a357458
Merge branch 'master' into tanks
MarAlder Mar 24, 2025
fd59074
add tests for parametric lofts
MarAlder Mar 24, 2025
191011f
fuelTank: add tests, add invalidation stuff
MarAlder Mar 25, 2025
c3b3bdb
add tests for fuelTank
MarAlder Mar 25, 2025
08bda42
add test for tank with symmetric profiles
MarAlder Mar 27, 2025
1ff41f6
add test covering unknown short name in CCPACSVessel
MarAlder Mar 28, 2025
7b7960d
add test covering exit condition in GetGuideCurvePoints if no guide c…
MarAlder Mar 28, 2025
9e6936e
add tests for parametric vessel exceptions
MarAlder Mar 29, 2025
a462b9a
add tests covering axRatio > 1 of elliptical domes
MarAlder Mar 29, 2025
92e9c3a
add test for polar opening radius exception
MarAlder Mar 29, 2025
0afc3ca
add GetSection via sectionUID
MarAlder Apr 4, 2025
2c96fbc
some code refactoring and improvement of tests
MarAlder Apr 5, 2025
645d959
add description for isotensoid magic numbers
MarAlder Apr 9, 2025
306bcc2
Remove previous date
MarAlder Apr 24, 2025
8a1bf2c
Update src/api/tigl.h
MarAlder Apr 24, 2025
c54499d
replace GetFirstVertex and GetLastVertex by TopExp::FirstVertex and T…
MarAlder Apr 25, 2025
eec8eeb
Merge branch 'tanks' of https://github.com/DLR-SC/tigl into tanks
MarAlder Apr 25, 2025
2bc899a
remove Anton
MarAlder Apr 28, 2025
f970bdb
add checks before dereferencing; return GetFuelTank as const&
MarAlder Apr 29, 2025
1655976
return CCPACSConfiguration as const reference
MarAlder Apr 30, 2025
8811e1d
add const and non-const methods
MarAlder Apr 30, 2025
3f4e734
refactoring EvaluateDome function
MarAlder Apr 30, 2025
8146075
remove getPoint and pointBehavior functions for now
MarAlder Apr 30, 2025
84c06d0
refactor isotensoid contour by introducing a struct and extending the…
MarAlder May 3, 2025
ab21f7e
add null pointer checks for parametric vessels
MarAlder May 5, 2025
c427b08
move bspline and edge conversion to isotensoid contour struct
MarAlder May 5, 2025
76b1ade
add faceTraits for parametric vessels
MarAlder May 5, 2025
b4cea2e
make _vesselTypeException a static member variable
MarAlder May 5, 2025
b293190
move CheckExceptionMessage to testUtils and use string_view
MarAlder May 6, 2025
f4cffca
remove unnessesary include
MarAlder May 6, 2025
f1358e8
renae dummyPositionings -> emptyPositionings
MarAlder May 6, 2025
68d2789
add ParentComponentHasPositionings to CTiglFuselageConnection
MarAlder May 7, 2025
cdfb617
remove ToDo remark
MarAlder May 7, 2025
c819921
add tests covering const GetSection methods
MarAlder May 8, 2025
d23a315
add tests covering parametric faceTraits
MarAlder May 8, 2025
088c3b0
remove if-handling for nFaces != 4 or 6, as this is directly implemen…
MarAlder May 8, 2025
2637356
add test covering incomplete combination of radius, length and domeType
MarAlder May 8, 2025
457a53f
add/fix InvalidateImpl methods for tank and vessel; remove uID from s…
MarAlder May 8, 2025
05f3c81
apply clang formatting; update created by info; update copyright date
MarAlder May 9, 2025
d2eae98
fix date in header
MarAlder May 9, 2025
b8cb8cb
fix copyright date
MarAlder May 9, 2025
b035642
introduce default behavior for scaling and rotation via CCPACSTransfo…
MarAlder May 9, 2025
af57dda
add test for correct location of wall base point
MarAlder May 9, 2025
feb2c7f
add bugfix for isotensoid domes
MarAlder May 12, 2025
5cb2854
fix isotensoids
MarAlder May 20, 2025
03efb9f
fix inline comment
MarAlder May 20, 2025
19a657e
remove unnecessary includes
MarAlder May 20, 2025
58dec1a
refactor isotensoid contour computation
MarAlder May 21, 2025
95ddf34
Merge branch 'master' into tanks
joergbrech May 21, 2025
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
6 changes: 5 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ Changelog

Changes since last release
-------------
10/01/2025

08/02/2025

- General changes:
- Implemented the new CPACS fuelTanks.

- Fixes

Expand Down
6 changes: 6 additions & 0 deletions bindings/python_internal/common.i
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ enum TiglCoordinateSystem
FUSELAGE_COORDINATE_SYSTEM = 2
};

enum TiglGetPointBehavior {
asParameterOnSurface = 0,
onLinearLoft = 1,
numGetPointBehaviors = 2
};


%{
// includes are required to for compilation
Expand Down
55 changes: 50 additions & 5 deletions bindings/python_internal/configuration.i
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "CTiglError.h"
#include "CCPACSWalls.h"
#include "CCPACSWallPosition.h"
#include "CCPACSFuselageWallSegment.h"
#include "CCPACSWallSegment.h"
#include "CCPACSWingSegment.h"
#include "CCPACSFuselageSegment.h"
#include "CTiglWingConnection.h"
Expand Down Expand Up @@ -100,6 +100,18 @@
#include "CCPACSDucts.h"
#include "CCPACSDuctAssembly.h"
#include "CCPACSDuct.h"
#include "generated/CPACSFuelTanks.h"
#include "generated/CPACSFuelTank.h"
#include "generated/CPACSFuelTankVolume.h"
#include "CCPACSFuelTanks.h"
#include "CCPACSFuelTank.h"
#include "generated/CPACSVessels.h"
#include "CCPACSVessels.h"
#include "generated/CPACSVessel.h"
#include "CCPACSVessel.h"
#include "generated/CPACSVesselStructure.h"
#include "CCPACSVesselStructure.h"
#include "CCPACSFrame.h"
%}

%feature("autodoc", "3");
Expand Down Expand Up @@ -194,11 +206,11 @@
%boost_optional(tigl::CCPACSWalls)
%boost_optional(tigl::generated::CPACSWalls)
%boost_optional(tigl::CCPACSWallPosition)
%boost_optional(tigl::CCPACSFuselageWallSegment)
%boost_optional(tigl::CCPACSWallSegment)
%include "generated/CPACSWalls.h"
%include "CCPACSWalls.h"
%include "CCPACSWallPosition.h"
%include "CCPACSFuselageWallSegment.h"
%include "CCPACSWallSegment.h"

// ----------------- Engines ---------------------------//
%boost_optional(tigl::CCPACSEngines)
Expand Down Expand Up @@ -335,6 +347,36 @@ namespace tigl
%include "CTiglAttachedRotorBlade.h"
%include "CPACSRotorHubHinge_type.h"

// --------------- Fuselage tanks -----------------//
%boost_optional(tigl::generated::CPACSFuelTanks)
%boost_optional(tigl::CCPACSFuelTanks)
%boost_optional(tigl::generated::CPACSFuelTankVolume)
%boost_optional(tigl::CCPACSVesselStructure)

namespace tigl {
class CCPACSFuselageSegments;
class CCPACSVessels;
}

%include "generated/CPACSIsotensoidDome.h"
%include "generated/CPACSTorisphericalDome.h"
%include "generated/CPACSEllipsoidDome.h"
%include "generated/CPACSDomeType.h"
%include "generated/CPACSVesselStructure.h"
%include "CCPACSVesselStructure.h"
%include "generated/CPACSFuelTanks.h"
%include "generated/CPACSFuelTankVolume.h"
%include "generated/CPACSFuelTank.h"
%include "CTiglFuselageConnection.h"
%include "CCPACSFuselageSegment.h"
%include "CCPACSFuselageSegments.h"
%include "CCPACSFuelTanks.h"
%include "CCPACSFuelTank.h"
%include "generated/CPACSVessels.h"
%include "CCPACSVessels.h"
%include "generated/CPACSVessel.h"
%include "CCPACSVessel.h"

// -------------------- Wing Structure -------------------//

namespace tigl {
Expand Down Expand Up @@ -409,6 +451,7 @@ class CCPACSWingRibsPositioning;
%include "CPACSGuideCurve_continuity.h"
%include "generated/CPACSGuideCurve.h"
%include "generated/CPACSGuideCurves.h"
%include "CCPACSGuideCurve.h"
%include "CCPACSGuideCurves.h"
%include "generated/CPACSCst2D.h"
%include "ITiglWingProfileAlgo.h"
Expand Down Expand Up @@ -527,7 +570,7 @@ class CCPACSWingRibsPositioning;
%factory(tigl::ITiglGeometricComponent& tigl::CTiglUIDManager::GetGeometricComponent,
tigl::CCPACSFuselage,
tigl::CCPACSFuselageSegment,
tigl::CCPACSFuselageWallSegment,
tigl::CCPACSWallSegment,
tigl::CCPACSWing,
tigl::CCPACSWingSegment,
tigl::CCPACSWingComponentSegment,
Expand All @@ -547,7 +590,9 @@ class CCPACSWingRibsPositioning;
tigl::CCPACSEnginePylon,
tigl::CCPACSTrailingEdgeDevice,
tigl::CCPACSDuct,
tigl::CCPACSDuctAssembly
tigl::CCPACSDuctAssembly,
tigl::CCPACSFuelTank,
tigl::CCPACSVessel
);

namespace tigl
Expand Down
9 changes: 8 additions & 1 deletion cpacs_gen_input/CustomTypes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ CPACSPointXY CCPACSPointXY
CPACSStringerFramePosition CCPACSFuselageStringerFramePosition
CPACSSkin CCPACSSkin
CPACSSkinSegment CCPACSSkinSegment
CPACSWallSegment CCPACSFuselageWallSegment
CPACSWallSegment CCPACSWallSegment
CPACSWallPosition CCPACSWallPosition
CPACSWalls CCPACSWalls

Expand Down Expand Up @@ -149,3 +149,10 @@ CPACSDuct CCPACSDuct
CPACSDuctStructure CCPACSDuctStructure
CPACSDuctAssembly CCPACSDuctAssembly
CPACSDucts CCPACSDucts

// Tanks
CPACSVessel CCPACSVessel
CPACSVessels CCPACSVessels
CPACSFuelTank CCPACSFuelTank
CPACSFuelTanks CCPACSFuelTanks
CPACSVesselStructure CCPACSVesselStructure
Loading