From 6bbeda30d8608da13cfbf58943b14123d4d5ef9c Mon Sep 17 00:00:00 2001 From: Adrien DELSALLE Date: Tue, 21 Feb 2023 10:25:48 +0100 Subject: [PATCH] update license update HISTORY --- HISTORY.md | 6 +++--- LICENSE | 2 +- pyturbo/__init__.py | 2 +- pyturbo/_version.py | 2 +- pyturbo/mft/__init__.py | 2 +- pyturbo/mft/compressor.py | 2 +- pyturbo/ports/__init__.py | 2 +- pyturbo/ports/fluidport.py | 2 +- pyturbo/ports/keypoints.py | 2 +- pyturbo/ports/shaftport.py | 2 +- pyturbo/systems/__init__.py | 2 +- pyturbo/systems/atmosphere/__init__.py | 3 +++ pyturbo/systems/atmosphere/atmosphere.py | 3 +++ pyturbo/systems/channel/__init__.py | 3 +++ pyturbo/systems/channel/channel.py | 3 +++ pyturbo/systems/channel/channel_aero.py | 3 +++ pyturbo/systems/channel/channel_geom.py | 3 +++ pyturbo/systems/combustor/__init__.py | 2 +- pyturbo/systems/combustor/combustor.py | 3 +++ pyturbo/systems/combustor/combustor_aero.py | 3 +++ pyturbo/systems/compressor/__init__.py | 2 +- pyturbo/systems/compressor/compressor.py | 3 +++ pyturbo/systems/compressor/compressor_aero.py | 2 +- pyturbo/systems/compressor/compressor_geom.py | 3 +++ pyturbo/systems/compressor/compressor_mft_aero.py | 2 +- pyturbo/systems/duct/__init__.py | 3 +++ pyturbo/systems/duct/fan_duct.py | 3 +-- pyturbo/systems/duct/fan_duct_geom.py | 2 +- pyturbo/systems/fan_module/__init__.py | 3 +++ pyturbo/systems/fan_module/fan_module.py | 3 +++ pyturbo/systems/fan_module/fan_module_geom.py | 3 +++ pyturbo/systems/fan_module/spinner.py | 3 +++ pyturbo/systems/gas_generator/__init__.py | 2 +- pyturbo/systems/gas_generator/gas_generator.py | 2 +- pyturbo/systems/gas_generator/gas_generator_geom.py | 3 +++ pyturbo/systems/generic/__init__.py | 2 +- pyturbo/systems/generic/cowl.py | 2 +- pyturbo/systems/generic/generic_simple_geom.py | 2 +- pyturbo/systems/inlet/__init__.py | 3 +++ pyturbo/systems/inlet/inlet.py | 3 +++ pyturbo/systems/inlet/inlet_aero.py | 3 +++ pyturbo/systems/inlet/inlet_geom.py | 3 +++ pyturbo/systems/mixers/__init__.py | 3 +++ pyturbo/systems/mixers/mixer_fluid.py | 3 +++ pyturbo/systems/mixers/mixer_shaft.py | 3 +++ pyturbo/systems/nacelle/__init__.py | 3 +++ pyturbo/systems/nacelle/nacelle.py | 3 +++ pyturbo/systems/nacelle/nacelle_geom.py | 3 +++ pyturbo/systems/nacelle/plug.py | 3 +++ pyturbo/systems/nacelle/plug_geom.py | 3 +++ pyturbo/systems/nozzle/__init__.py | 3 +++ pyturbo/systems/nozzle/nozzle.py | 3 +++ pyturbo/systems/nozzle/nozzle_aero.py | 3 +++ pyturbo/systems/nozzle/nozzle_geom.py | 3 +++ pyturbo/systems/structures/__init__.py | 3 +++ pyturbo/systems/structures/core_cowl.py | 2 +- pyturbo/systems/structures/intermediate_casing.py | 3 +++ pyturbo/systems/turbine/__init__.py | 2 +- pyturbo/systems/turbine/turbine_aero.py | 2 +- pyturbo/systems/turbine/turbine_geom.py | 2 +- pyturbo/systems/turbofan/__init__.py | 3 +++ pyturbo/systems/turbofan/turbofan.py | 3 +++ pyturbo/systems/turbofan/turbofan_aero.py | 3 +++ pyturbo/systems/turbofan/turbofan_geom.py | 3 +++ pyturbo/systems/turbofan/turbofan_weight.py | 2 +- pyturbo/thermo/__init__.py | 2 +- pyturbo/thermo/ideal_gas.py | 4 ++-- setup.cfg | 2 +- setup.py | 2 +- tests/__init__.py | 2 +- tests/test_atmosphere.py | 3 +++ tests/test_combustor.py | 3 +++ tests/test_compressor.py | 2 +- tests/test_compressor_aero.py | 3 +++ tests/test_compressor_geom.py | 3 +++ tests/test_fan_module.py | 3 +++ tests/test_fan_module_geom.py | 3 +++ tests/test_gas_generator.py | 3 +++ tests/test_generic_geom.py | 2 +- tests/test_ideal_gas.py | 2 +- tests/test_inlet_module.py | 3 +++ tests/test_mixer_fluid.py | 3 +++ tests/test_mixer_shaft.py | 3 +++ tests/test_nozzle.py | 3 +++ tests/test_structures.py | 3 +++ tests/test_turbine.py | 3 +++ tests/test_turbofan.py | 3 +++ tests/test_turbofan_geom.py | 3 +++ tests/test_turbofan_weight.py | 2 +- 89 files changed, 198 insertions(+), 40 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 7674c44..fd518fe 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,22 +1,22 @@ # History -## 0.2.0 (2023-02-20) +## 0.2.0 (2023-02-21) ### Features - Add new system `Atmosphere` and `TurbofanWithAtm` to ease computing of ambient conditions (from altitude, Mach and delta tamb) - Use `pythermo` for gas modeling -### Code quality & packaging +### API - Add `Compressor` to public API of the `systems.compressor` and `systems` modules -- Fix demo turbofan notebook to set design target before adding targets to the non-linear solver ### Bug fix - Fix `TurbineAero` exit total pressure computation from polytropic efficiency - Fix some descriptions, especially related to gas models - Fix incorrectly automatic pulling of `fan_duct_core_cowl_slope` in `Turbofan` +- Fix demo turbofan notebook to set design targets before adding targets to the non-linear solver ## 0.1.0 (2022-10-18) diff --git a/LICENSE b/LICENSE index 814f490..1947590 100755 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2022, twiinIT +Copyright (c) 2022-2023, twiinIT All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/pyturbo/__init__.py b/pyturbo/__init__.py index 84f9a7a..d29e9c2 100644 --- a/pyturbo/__init__.py +++ b/pyturbo/__init__.py @@ -1,2 +1,2 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause diff --git a/pyturbo/_version.py b/pyturbo/_version.py index 22a037b..d834f6c 100644 --- a/pyturbo/_version.py +++ b/pyturbo/_version.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause __version__ = "0.2.0" diff --git a/pyturbo/mft/__init__.py b/pyturbo/mft/__init__.py index 84f9a7a..d29e9c2 100644 --- a/pyturbo/mft/__init__.py +++ b/pyturbo/mft/__init__.py @@ -1,2 +1,2 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause diff --git a/pyturbo/mft/compressor.py b/pyturbo/mft/compressor.py index f0e1b59..89b85b1 100644 --- a/pyturbo/mft/compressor.py +++ b/pyturbo/mft/compressor.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause import numpy as np diff --git a/pyturbo/ports/__init__.py b/pyturbo/ports/__init__.py index 17286a7..a8ad7b2 100644 --- a/pyturbo/ports/__init__.py +++ b/pyturbo/ports/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.ports.fluidport import FluidPort diff --git a/pyturbo/ports/fluidport.py b/pyturbo/ports/fluidport.py index 835f181..eeca5af 100644 --- a/pyturbo/ports/fluidport.py +++ b/pyturbo/ports/fluidport.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from math import sqrt diff --git a/pyturbo/ports/keypoints.py b/pyturbo/ports/keypoints.py index bd20919..e22bbdd 100644 --- a/pyturbo/ports/keypoints.py +++ b/pyturbo/ports/keypoints.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause import numpy as np diff --git a/pyturbo/ports/shaftport.py b/pyturbo/ports/shaftport.py index 04d7639..adc5fcd 100644 --- a/pyturbo/ports/shaftport.py +++ b/pyturbo/ports/shaftport.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from cosapp.ports import Port diff --git a/pyturbo/systems/__init__.py b/pyturbo/systems/__init__.py index 11a07e3..21d24ba 100644 --- a/pyturbo/systems/__init__.py +++ b/pyturbo/systems/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.systems.atmosphere import Atmosphere diff --git a/pyturbo/systems/atmosphere/__init__.py b/pyturbo/systems/atmosphere/__init__.py index 5d31246..9fff0df 100644 --- a/pyturbo/systems/atmosphere/__init__.py +++ b/pyturbo/systems/atmosphere/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from .atmosphere import Atmosphere __all__ = ["Atmosphere"] diff --git a/pyturbo/systems/atmosphere/atmosphere.py b/pyturbo/systems/atmosphere/atmosphere.py index 1a419e7..2ded7c9 100644 --- a/pyturbo/systems/atmosphere/atmosphere.py +++ b/pyturbo/systems/atmosphere/atmosphere.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import ambiance from cosapp.systems import System diff --git a/pyturbo/systems/channel/__init__.py b/pyturbo/systems/channel/__init__.py index 73b3848..e1dc21c 100644 --- a/pyturbo/systems/channel/__init__.py +++ b/pyturbo/systems/channel/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.channel.channel_aero import ChannelAero from pyturbo.systems.channel.channel_geom import ChannelGeom diff --git a/pyturbo/systems/channel/channel.py b/pyturbo/systems/channel/channel.py index 96857eb..e568d65 100644 --- a/pyturbo/systems/channel/channel.py +++ b/pyturbo/systems/channel/channel.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.systems.channel import ChannelAero, ChannelGeom diff --git a/pyturbo/systems/channel/channel_aero.py b/pyturbo/systems/channel/channel_aero.py index 5fe982e..9c276a8 100644 --- a/pyturbo/systems/channel/channel_aero.py +++ b/pyturbo/systems/channel/channel_aero.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.ports import FluidPort diff --git a/pyturbo/systems/channel/channel_geom.py b/pyturbo/systems/channel/channel_geom.py index 4cbba6f..0249d39 100644 --- a/pyturbo/systems/channel/channel_geom.py +++ b/pyturbo/systems/channel/channel_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from pyturbo.systems.generic.generic_simple_geom import GenericSimpleGeom diff --git a/pyturbo/systems/combustor/__init__.py b/pyturbo/systems/combustor/__init__.py index 3968dde..0226182 100644 --- a/pyturbo/systems/combustor/__init__.py +++ b/pyturbo/systems/combustor/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.systems.combustor.combustor_aero import CombustorAero diff --git a/pyturbo/systems/combustor/combustor.py b/pyturbo/systems/combustor/combustor.py index b7a5126..0a0a22b 100644 --- a/pyturbo/systems/combustor/combustor.py +++ b/pyturbo/systems/combustor/combustor.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.systems.combustor.combustor_aero import CombustorAero diff --git a/pyturbo/systems/combustor/combustor_aero.py b/pyturbo/systems/combustor/combustor_aero.py index 67d6836..987f558 100644 --- a/pyturbo/systems/combustor/combustor_aero.py +++ b/pyturbo/systems/combustor/combustor_aero.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.ports import FluidPort diff --git a/pyturbo/systems/compressor/__init__.py b/pyturbo/systems/compressor/__init__.py index 1ffd92c..7102007 100644 --- a/pyturbo/systems/compressor/__init__.py +++ b/pyturbo/systems/compressor/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.systems.compressor.compressor import HPC, Booster, Compressor, CompressorAero, Fan diff --git a/pyturbo/systems/compressor/compressor.py b/pyturbo/systems/compressor/compressor.py index 8d9ecd3..4eada24 100644 --- a/pyturbo/systems/compressor/compressor.py +++ b/pyturbo/systems/compressor/compressor.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System diff --git a/pyturbo/systems/compressor/compressor_aero.py b/pyturbo/systems/compressor/compressor_aero.py index 70c4894..a773277 100644 --- a/pyturbo/systems/compressor/compressor_aero.py +++ b/pyturbo/systems/compressor/compressor_aero.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from math import sqrt diff --git a/pyturbo/systems/compressor/compressor_geom.py b/pyturbo/systems/compressor/compressor_geom.py index 25aa863..47182df 100644 --- a/pyturbo/systems/compressor/compressor_geom.py +++ b/pyturbo/systems/compressor/compressor_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from pyturbo.systems.generic.generic_simple_geom import GenericSimpleGeom diff --git a/pyturbo/systems/compressor/compressor_mft_aero.py b/pyturbo/systems/compressor/compressor_mft_aero.py index ee41eb5..e1e5ca4 100644 --- a/pyturbo/systems/compressor/compressor_mft_aero.py +++ b/pyturbo/systems/compressor/compressor_mft_aero.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause import numpy as np diff --git a/pyturbo/systems/duct/__init__.py b/pyturbo/systems/duct/__init__.py index 9344101..d381c5b 100644 --- a/pyturbo/systems/duct/__init__.py +++ b/pyturbo/systems/duct/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.duct.fan_duct import FanDuct __all__ = ["FanDuct"] diff --git a/pyturbo/systems/duct/fan_duct.py b/pyturbo/systems/duct/fan_duct.py index 96e92e1..15a055c 100644 --- a/pyturbo/systems/duct/fan_duct.py +++ b/pyturbo/systems/duct/fan_duct.py @@ -1,7 +1,6 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause - from cosapp.base import System from pyturbo.systems.channel import ChannelAero diff --git a/pyturbo/systems/duct/fan_duct_geom.py b/pyturbo/systems/duct/fan_duct_geom.py index 0b9f38d..93fe1d3 100644 --- a/pyturbo/systems/duct/fan_duct_geom.py +++ b/pyturbo/systems/duct/fan_duct_geom.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from typing import Dict diff --git a/pyturbo/systems/fan_module/__init__.py b/pyturbo/systems/fan_module/__init__.py index 8a24452..bf4108b 100644 --- a/pyturbo/systems/fan_module/__init__.py +++ b/pyturbo/systems/fan_module/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.fan_module.fan_module_geom import FanModuleGeom from pyturbo.systems.fan_module.fan_module import FanModule # isort: skip diff --git a/pyturbo/systems/fan_module/fan_module.py b/pyturbo/systems/fan_module/fan_module.py index 1f33dce..a67878f 100644 --- a/pyturbo/systems/fan_module/fan_module.py +++ b/pyturbo/systems/fan_module/fan_module.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System diff --git a/pyturbo/systems/fan_module/fan_module_geom.py b/pyturbo/systems/fan_module/fan_module_geom.py index a0b7bcb..b88e84c 100644 --- a/pyturbo/systems/fan_module/fan_module_geom.py +++ b/pyturbo/systems/fan_module/fan_module_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System diff --git a/pyturbo/systems/fan_module/spinner.py b/pyturbo/systems/fan_module/spinner.py index 834eeba..198c59c 100644 --- a/pyturbo/systems/fan_module/spinner.py +++ b/pyturbo/systems/fan_module/spinner.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System from pyoccad.create import CreateAxis, CreateBezier, CreateRevolution, CreateTopology diff --git a/pyturbo/systems/gas_generator/__init__.py b/pyturbo/systems/gas_generator/__init__.py index d685f0d..c90c593 100644 --- a/pyturbo/systems/gas_generator/__init__.py +++ b/pyturbo/systems/gas_generator/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.systems.gas_generator.gas_generator_geom import GasGeneratorGeom diff --git a/pyturbo/systems/gas_generator/gas_generator.py b/pyturbo/systems/gas_generator/gas_generator.py index 9379063..a901561 100644 --- a/pyturbo/systems/gas_generator/gas_generator.py +++ b/pyturbo/systems/gas_generator/gas_generator.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from cosapp.systems import System diff --git a/pyturbo/systems/gas_generator/gas_generator_geom.py b/pyturbo/systems/gas_generator/gas_generator_geom.py index 414269d..a6ed5e3 100644 --- a/pyturbo/systems/gas_generator/gas_generator_geom.py +++ b/pyturbo/systems/gas_generator/gas_generator_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System diff --git a/pyturbo/systems/generic/__init__.py b/pyturbo/systems/generic/__init__.py index 3fb2ae0..359c0d3 100644 --- a/pyturbo/systems/generic/__init__.py +++ b/pyturbo/systems/generic/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.systems.generic.cowl import Cowl diff --git a/pyturbo/systems/generic/cowl.py b/pyturbo/systems/generic/cowl.py index 3069732..74fece7 100644 --- a/pyturbo/systems/generic/cowl.py +++ b/pyturbo/systems/generic/cowl.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from typing import Dict diff --git a/pyturbo/systems/generic/generic_simple_geom.py b/pyturbo/systems/generic/generic_simple_geom.py index 1861692..ca21e63 100644 --- a/pyturbo/systems/generic/generic_simple_geom.py +++ b/pyturbo/systems/generic/generic_simple_geom.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from typing import Dict diff --git a/pyturbo/systems/inlet/__init__.py b/pyturbo/systems/inlet/__init__.py index 1057508..5c0edd9 100644 --- a/pyturbo/systems/inlet/__init__.py +++ b/pyturbo/systems/inlet/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.inlet.inlet_aero import InletAero from pyturbo.systems.inlet.inlet_geom import InletGeom diff --git a/pyturbo/systems/inlet/inlet.py b/pyturbo/systems/inlet/inlet.py index 4392002..8495f18 100644 --- a/pyturbo/systems/inlet/inlet.py +++ b/pyturbo/systems/inlet/inlet.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.systems.inlet.inlet_aero import InletAero diff --git a/pyturbo/systems/inlet/inlet_aero.py b/pyturbo/systems/inlet/inlet_aero.py index d505a8a..da28ef7 100644 --- a/pyturbo/systems/inlet/inlet_aero.py +++ b/pyturbo/systems/inlet/inlet_aero.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.ports import FluidPort diff --git a/pyturbo/systems/inlet/inlet_geom.py b/pyturbo/systems/inlet/inlet_geom.py index a7dba0b..83668ee 100644 --- a/pyturbo/systems/inlet/inlet_geom.py +++ b/pyturbo/systems/inlet/inlet_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System from pyoccad.create import CreateAxis, CreateBezier, CreateRevolution, CreateWire diff --git a/pyturbo/systems/mixers/__init__.py b/pyturbo/systems/mixers/__init__.py index 7af5c5f..3a4fda1 100644 --- a/pyturbo/systems/mixers/__init__.py +++ b/pyturbo/systems/mixers/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.mixers.mixer_fluid import MixerFluid from pyturbo.systems.mixers.mixer_shaft import MixerShaft diff --git a/pyturbo/systems/mixers/mixer_fluid.py b/pyturbo/systems/mixers/mixer_fluid.py index d84f657..21d7a1c 100644 --- a/pyturbo/systems/mixers/mixer_fluid.py +++ b/pyturbo/systems/mixers/mixer_fluid.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System diff --git a/pyturbo/systems/mixers/mixer_shaft.py b/pyturbo/systems/mixers/mixer_shaft.py index 9fc671f..e1191fb 100644 --- a/pyturbo/systems/mixers/mixer_shaft.py +++ b/pyturbo/systems/mixers/mixer_shaft.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System diff --git a/pyturbo/systems/nacelle/__init__.py b/pyturbo/systems/nacelle/__init__.py index 04bb856..7e16205 100644 --- a/pyturbo/systems/nacelle/__init__.py +++ b/pyturbo/systems/nacelle/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.nacelle.nacelle_geom import NacelleGeom from pyturbo.systems.nacelle.plug_geom import PlugGeom diff --git a/pyturbo/systems/nacelle/nacelle.py b/pyturbo/systems/nacelle/nacelle.py index 6fb19dd..e0a1987 100644 --- a/pyturbo/systems/nacelle/nacelle.py +++ b/pyturbo/systems/nacelle/nacelle.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.systems.nacelle.nacelle_geom import NacelleGeom diff --git a/pyturbo/systems/nacelle/nacelle_geom.py b/pyturbo/systems/nacelle/nacelle_geom.py index 634301b..e6a77f8 100644 --- a/pyturbo/systems/nacelle/nacelle_geom.py +++ b/pyturbo/systems/nacelle/nacelle_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System from OCC.Core.Geom import Geom_RectangularTrimmedSurface diff --git a/pyturbo/systems/nacelle/plug.py b/pyturbo/systems/nacelle/plug.py index 8e34ebc..7da2dc0 100644 --- a/pyturbo/systems/nacelle/plug.py +++ b/pyturbo/systems/nacelle/plug.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.systems.nacelle.plug_geom import PlugGeom diff --git a/pyturbo/systems/nacelle/plug_geom.py b/pyturbo/systems/nacelle/plug_geom.py index 672dbe6..a07aa0c 100644 --- a/pyturbo/systems/nacelle/plug_geom.py +++ b/pyturbo/systems/nacelle/plug_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System from pyoccad.create import CreateAxis, CreateBezier, CreateEdge, CreateRevolution diff --git a/pyturbo/systems/nozzle/__init__.py b/pyturbo/systems/nozzle/__init__.py index fff6940..21d775a 100644 --- a/pyturbo/systems/nozzle/__init__.py +++ b/pyturbo/systems/nozzle/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.nozzle.nozzle_aero import NozzleAero from pyturbo.systems.nozzle.nozzle_geom import NozzleGeom diff --git a/pyturbo/systems/nozzle/nozzle.py b/pyturbo/systems/nozzle/nozzle.py index 403acdc..ca55e54 100644 --- a/pyturbo/systems/nozzle/nozzle.py +++ b/pyturbo/systems/nozzle/nozzle.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from typing import Dict from cosapp.systems import System diff --git a/pyturbo/systems/nozzle/nozzle_aero.py b/pyturbo/systems/nozzle/nozzle_aero.py index 6d19a2c..4f2cd24 100644 --- a/pyturbo/systems/nozzle/nozzle_aero.py +++ b/pyturbo/systems/nozzle/nozzle_aero.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.ports import FluidPort diff --git a/pyturbo/systems/nozzle/nozzle_geom.py b/pyturbo/systems/nozzle/nozzle_geom.py index fba736e..57cbabf 100644 --- a/pyturbo/systems/nozzle/nozzle_geom.py +++ b/pyturbo/systems/nozzle/nozzle_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from pyturbo.systems.generic.generic_simple_geom import GenericSimpleGeom diff --git a/pyturbo/systems/structures/__init__.py b/pyturbo/systems/structures/__init__.py index 4f6829c..5c50dc4 100644 --- a/pyturbo/systems/structures/__init__.py +++ b/pyturbo/systems/structures/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.structures.core_cowl import CoreCowl from pyturbo.systems.structures.intermediate_casing import IntermediateCasing diff --git a/pyturbo/systems/structures/core_cowl.py b/pyturbo/systems/structures/core_cowl.py index 3308936..6ec1425 100644 --- a/pyturbo/systems/structures/core_cowl.py +++ b/pyturbo/systems/structures/core_cowl.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from typing import Dict diff --git a/pyturbo/systems/structures/intermediate_casing.py b/pyturbo/systems/structures/intermediate_casing.py index f1c07c6..036477b 100644 --- a/pyturbo/systems/structures/intermediate_casing.py +++ b/pyturbo/systems/structures/intermediate_casing.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.systems.channel import ChannelAero diff --git a/pyturbo/systems/turbine/__init__.py b/pyturbo/systems/turbine/__init__.py index 8a8e6d7..fef0590 100644 --- a/pyturbo/systems/turbine/__init__.py +++ b/pyturbo/systems/turbine/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.systems.turbine.turbine_aero import TurbineAero diff --git a/pyturbo/systems/turbine/turbine_aero.py b/pyturbo/systems/turbine/turbine_aero.py index 03e9642..e558d34 100644 --- a/pyturbo/systems/turbine/turbine_aero.py +++ b/pyturbo/systems/turbine/turbine_aero.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause import numpy as np diff --git a/pyturbo/systems/turbine/turbine_geom.py b/pyturbo/systems/turbine/turbine_geom.py index c03e7fc..6041833 100644 --- a/pyturbo/systems/turbine/turbine_geom.py +++ b/pyturbo/systems/turbine/turbine_geom.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from typing import Dict diff --git a/pyturbo/systems/turbofan/__init__.py b/pyturbo/systems/turbofan/__init__.py index 93ffbbd..89998f0 100644 --- a/pyturbo/systems/turbofan/__init__.py +++ b/pyturbo/systems/turbofan/__init__.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems.turbofan.turbofan_aero import TurbofanAero from pyturbo.systems.turbofan.turbofan_geom import TurbofanGeom from pyturbo.systems.turbofan.turbofan_weight import TurbofanWeight diff --git a/pyturbo/systems/turbofan/turbofan.py b/pyturbo/systems/turbofan/turbofan.py index 02017cf..5b7fcf9 100644 --- a/pyturbo/systems/turbofan/turbofan.py +++ b/pyturbo/systems/turbofan/turbofan.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from typing import Dict import numpy as np diff --git a/pyturbo/systems/turbofan/turbofan_aero.py b/pyturbo/systems/turbofan/turbofan_aero.py index dfe0ed9..3c9750a 100644 --- a/pyturbo/systems/turbofan/turbofan_aero.py +++ b/pyturbo/systems/turbofan/turbofan_aero.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from cosapp.systems import System from pyturbo.ports import FluidPort diff --git a/pyturbo/systems/turbofan/turbofan_geom.py b/pyturbo/systems/turbofan/turbofan_geom.py index 8ef0d50..dc58774 100644 --- a/pyturbo/systems/turbofan/turbofan_geom.py +++ b/pyturbo/systems/turbofan/turbofan_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.systems import System diff --git a/pyturbo/systems/turbofan/turbofan_weight.py b/pyturbo/systems/turbofan/turbofan_weight.py index 122b794..c882baa 100644 --- a/pyturbo/systems/turbofan/turbofan_weight.py +++ b/pyturbo/systems/turbofan/turbofan_weight.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from cosapp.systems import System diff --git a/pyturbo/thermo/__init__.py b/pyturbo/thermo/__init__.py index 4feaef6..266d4ef 100644 --- a/pyturbo/thermo/__init__.py +++ b/pyturbo/thermo/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.thermo.ideal_gas import IdealDryAir, IdealGas diff --git a/pyturbo/thermo/ideal_gas.py b/pyturbo/thermo/ideal_gas.py index e08d44b..6a48c45 100644 --- a/pyturbo/thermo/ideal_gas.py +++ b/pyturbo/thermo/ideal_gas.py @@ -1,5 +1,5 @@ -# Copyright (c) 2023, twiinIT - All Rights Reserved -# twiinIT proprietary - See licence file packaged with this code +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause import numpy as np import pythermo diff --git a/setup.cfg b/setup.cfg index bf5c329..4975e3c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause [metadata] diff --git a/setup.py b/setup.py index e029c97..cef73ee 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause """The setup script.""" diff --git a/tests/__init__.py b/tests/__init__.py index 84f9a7a..d29e9c2 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,2 +1,2 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause diff --git a/tests/test_atmosphere.py b/tests/test_atmosphere.py index 195ab42..6626b41 100644 --- a/tests/test_atmosphere.py +++ b/tests/test_atmosphere.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + from pyturbo.systems import Atmosphere diff --git a/tests/test_combustor.py b/tests/test_combustor.py index e1eee25..15e4899 100644 --- a/tests/test_combustor.py +++ b/tests/test_combustor.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_compressor.py b/tests/test_compressor.py index 2cf7a36..3213b55 100644 --- a/tests/test_compressor.py +++ b/tests/test_compressor.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause import pytest diff --git a/tests/test_compressor_aero.py b/tests/test_compressor_aero.py index 4d360cc..1050d26 100644 --- a/tests/test_compressor_aero.py +++ b/tests/test_compressor_aero.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_compressor_geom.py b/tests/test_compressor_geom.py index fdce917..4eadd36 100644 --- a/tests/test_compressor_geom.py +++ b/tests/test_compressor_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np import pytest diff --git a/tests/test_fan_module.py b/tests/test_fan_module.py index 11165a6..341293b 100644 --- a/tests/test_fan_module.py +++ b/tests/test_fan_module.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_fan_module_geom.py b/tests/test_fan_module_geom.py index 44e71b3..aba19e3 100644 --- a/tests/test_fan_module_geom.py +++ b/tests/test_fan_module_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy.testing as npt from cosapp.drivers import NonLinearSolver diff --git a/tests/test_gas_generator.py b/tests/test_gas_generator.py index ce08a85..d404735 100644 --- a/tests/test_gas_generator.py +++ b/tests/test_gas_generator.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_generic_geom.py b/tests/test_generic_geom.py index 3b0a50c..04f435e 100644 --- a/tests/test_generic_geom.py +++ b/tests/test_generic_geom.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.systems.generic.generic_simple_geom import GenericSimpleGeom diff --git a/tests/test_ideal_gas.py b/tests/test_ideal_gas.py index 3bd715c..5ee4370 100644 --- a/tests/test_ideal_gas.py +++ b/tests/test_ideal_gas.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause import numpy as np diff --git a/tests/test_inlet_module.py b/tests/test_inlet_module.py index 6b223a4..0c0eef9 100644 --- a/tests/test_inlet_module.py +++ b/tests/test_inlet_module.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np import pytest diff --git a/tests/test_mixer_fluid.py b/tests/test_mixer_fluid.py index bc48791..36be92d 100644 --- a/tests/test_mixer_fluid.py +++ b/tests/test_mixer_fluid.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_mixer_shaft.py b/tests/test_mixer_shaft.py index 9aa52fa..ba6f3e1 100644 --- a/tests/test_mixer_shaft.py +++ b/tests/test_mixer_shaft.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_nozzle.py b/tests/test_nozzle.py index b294e51..f0b44cc 100644 --- a/tests/test_nozzle.py +++ b/tests/test_nozzle.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_structures.py b/tests/test_structures.py index ac16d1c..a590737 100644 --- a/tests/test_structures.py +++ b/tests/test_structures.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np from cosapp.drivers import NonLinearSolver diff --git a/tests/test_turbine.py b/tests/test_turbine.py index 0cd8071..25f4e7a 100644 --- a/tests/test_turbine.py +++ b/tests/test_turbine.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_turbofan.py b/tests/test_turbofan.py index b9881db..806ae90 100644 --- a/tests/test_turbofan.py +++ b/tests/test_turbofan.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import pytest from cosapp.drivers import NonLinearSolver diff --git a/tests/test_turbofan_geom.py b/tests/test_turbofan_geom.py index 6323f49..0b83865 100644 --- a/tests/test_turbofan_geom.py +++ b/tests/test_turbofan_geom.py @@ -1,3 +1,6 @@ +# Copyright (C) 2022-2023, twiinIT +# SPDX-License-Identifier: BSD-3-Clause + import numpy as np import numpy.testing as npt import pytest diff --git a/tests/test_turbofan_weight.py b/tests/test_turbofan_weight.py index b08130f..c066bef 100644 --- a/tests/test_turbofan_weight.py +++ b/tests/test_turbofan_weight.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022, twiinIT +# Copyright (C) 2022-2023, twiinIT # SPDX-License-Identifier: BSD-3-Clause from pyturbo.systems.turbofan import TurbofanWeight