Skip to content

[Draft] Combine split utils #1333

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.

Sign up for GitHub

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

Draft
xjjiang wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[Draft] Combine split utils #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd20086
add functions in math_utils.py to utils.py in utils folder
xjjiang Oct 9, 2026
0a4f0fc
add functions in math_utils.py to utils.py in utils folder
xjjiang Oct 9, 2026
b8d32f6
added function in conversion_utils.py to utils.py
xjjiang Oct 9, 2026
251a291
Merge branch 'OpenMDAO:main' into combine_split_utils
xjjiang Oct 9, 2026
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
2 changes: 1 addition & 1 deletion aviary/subsystems/aerodynamics/gasp_based/gaspaero.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.subsystems.aerodynamics.gasp_based.common import AeroForces, CLFromLift, TanhRampComp
from aviary.utils.math_utils import d_smooth_min, sigmoidX, smooth_min
from aviary.utils.utils import d_smooth_min, sigmoidX, smooth_min
from aviary.variable_info.enums import AircraftTypes, Verbosity
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft, Dynamic, Settings
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/geometry/flops_based/fuselage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
import openmdao.api as om

from aviary.utils.math_utils import smooth_int_tanh
from aviary.utils.utils import smooth_int_tanh
from aviary.variable_info.enums import Verbosity
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft, Settings
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/geometry/gasp_based/fuselage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import openmdao.api as om

from aviary.utils.math_utils import sigmoidX
from aviary.utils.utils import sigmoidX
from aviary.variable_info.enums import Verbosity
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft, Settings
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/geometry/gasp_based/wing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
)
from aviary.subsystems.geometry.gasp_based.strut import StrutGeom
from aviary.utils.conflict_checks import check_fold_location_definition
from aviary.utils.math_utils import dSigmoidXdx, sigmoidX
from aviary.utils.utils import dSigmoidXdx, sigmoidX
from aviary.variable_info.enums import AircraftTypes, Verbosity
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft, Settings
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/flops_based/cargo_containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import openmdao.api as om

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.utils.math_utils import dydx_sin_int4, sin_int4
from aviary.utils.utils import dydx_sin_int4, sin_int4
from aviary.variable_info.functions import add_aviary_input, add_aviary_output
from aviary.variable_info.variables import Aircraft

Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/air_conditioning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import openmdao.api as om

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.utils.math_utils import dSigmoidXdx, sigmoidX
from aviary.utils.utils import dSigmoidXdx, sigmoidX
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft

Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/anti_icing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import openmdao.api as om

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.utils.math_utils import d_smooth_max, smooth_max
from aviary.utils.utils import d_smooth_max, smooth_max
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft

Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/design_load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import numpy as np
import openmdao.api as om

from aviary.utils.math_utils import dSigmoidXdx, sigmoidX
from aviary.utils.utils import dSigmoidXdx, sigmoidX
from aviary.variable_info.enums import Verbosity
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft, Mission, Settings
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/fixed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from aviary.subsystems.mass.gasp_based.control import ControlMassGroup
from aviary.subsystems.mass.gasp_based.engine import EngineMassGroup
from aviary.subsystems.mass.gasp_based.landing import LandingGearMassGroup
from aviary.utils.math_utils import dSigmoidXdx, sigmoidX
from aviary.utils.utils import dSigmoidXdx, sigmoidX
from aviary.variable_info.enums import FlapType, Verbosity
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft, Mission, Settings
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/fuel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import openmdao.api as om

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.utils.math_utils import d_smooth_max, dSigmoidXdx, sigmoidX, smooth_max
from aviary.utils.utils import d_smooth_max, dSigmoidXdx, sigmoidX, smooth_max
from aviary.variable_info.enums import Verbosity
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft, Mission, Settings
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/fuel_capacity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import openmdao.api as om

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.utils.math_utils import dSigmoidXdx, sigmoidX
from aviary.utils.utils import dSigmoidXdx, sigmoidX
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft

Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/furnishings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import openmdao.api as om

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.utils.math_utils import d_smooth_max, dSigmoidXdx, sigmoidX, smooth_max
from aviary.utils.utils import d_smooth_max, dSigmoidXdx, sigmoidX, smooth_max
from aviary.variable_info.enums import GASPEngineType
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/landing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from openmdao.components.ks_comp import KSfunction

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.utils.math_utils import dSigmoidXdx, sigmoidX
from aviary.utils.utils import dSigmoidXdx, sigmoidX
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft

Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/mass/gasp_based/oxygen_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import openmdao.api as om

from aviary.constants import GRAV_ENGLISH_LBM
from aviary.utils.math_utils import dSigmoidXdx, sigmoidX
from aviary.utils.utils import dSigmoidXdx, sigmoidX
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft

Expand Down
3 changes: 2 additions & 1 deletion aviary/subsystems/mass/mass_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ def report(self, prob, reports_folder, **kwargs):

# OTHER STRUCTURES (NOT IN GROUP) #
val, units = find_variable_in_problem(Aircraft.Nacelle.MASS, prob, self.meta_data)
f.write(f'|Nacelles|{np.dot(val, num_engines)}||\n')
if val != 'Not Found in Model':
f.write(f'|Nacelles|{np.dot(val, num_engines)}||\n')
for i, engine in enumerate(engine_models):
if isinstance(val, (np.ndarray, list, tuple)):
val = val[i]
Expand Down
2 changes: 1 addition & 1 deletion aviary/subsystems/propulsion/propeller/propeller_performance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
)
from aviary.subsystems.propulsion.propeller.propeller_map import PropellerMap
from aviary.utils.aviary_values import AviaryValues
from aviary.utils.math_utils import d_smooth_min, smooth_min
from aviary.utils.utils import d_smooth_min, smooth_min
from aviary.utils.named_values import NamedValues
from aviary.variable_info.functions import add_aviary_input, add_aviary_option, add_aviary_output
from aviary.variable_info.variables import Aircraft, Dynamic
Expand Down
2 changes: 1 addition & 1 deletion aviary/utils/aero_table_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from openmdao.components.interp_util.interp import InterpND
from scipy.interpolate import interp1d

from aviary.utils.conversion_utils import _parse, _read_map, _rep
from aviary.utils.utils import _parse, _read_map, _rep
from aviary.utils.csv_data_file import write_data_file
from aviary.utils.functions import get_path
from aviary.utils.named_values import NamedValues
Expand Down
2 changes: 1 addition & 1 deletion aviary/utils/engine_deck_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from aviary.subsystems.atmosphere.atmosphere import Atmosphere
from aviary.subsystems.propulsion.engine_deck import normalize
from aviary.subsystems.propulsion.utils import EngineModelVariables, default_units
from aviary.utils.conversion_utils import _parse, _read_map, _rep
from aviary.utils.utils import _parse, _read_map, _rep
from aviary.utils.csv_data_file import write_data_file
from aviary.utils.functions import get_aviary_resource_path
from aviary.utils.named_values import NamedValues
Expand Down
2 changes: 1 addition & 1 deletion aviary/utils/propeller_map_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import numpy as np

from aviary.utils.conversion_utils import _parse, _read_map, _rep
from aviary.utils.utils import _parse, _read_map, _rep
from aviary.utils.csv_data_file import write_data_file
from aviary.utils.functions import get_path
from aviary.utils.named_values import NamedValues
Expand Down
Loading
Loading