Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
haiiliin committed Dec 7, 2024
1 parent 25a7f61 commit f6d616f
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 54 deletions.
15 changes: 8 additions & 7 deletions src/abaqus/Interaction/FluidExchangeActivation.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@

from abqpy.decorators import abaqus_class_doc, abaqus_method_doc

from ..UtilityAndView.abaqusConstants import Boolean, OFF
from .Interaction import Interaction
from ..UtilityAndView.abaqusConstants import OFF, Boolean
from .FluidExchange import FluidExchange
from .Interaction import Interaction


@abaqus_class_doc
class FluidExchangeActivation(Interaction):
Expand All @@ -33,21 +34,21 @@ class FluidExchangeActivation(Interaction):

#: A String specifying the name of the step in which the FluidExchange object is created.
createStepName: str

#: A List specifying fluid exchanges to be activated.
exchanges: List[FluidExchange]

#: A String specifying the name of the amplitude curve defining a mapping between the inflation time and the actual
#: time.
amplitude: str

#: A Boolean specifying the vent and leakage area obstruction by contacted surfaces.
isBlockage: Boolean

#: A Boolean specifying if the flow of fluid is only from the first fluid cavity to the second fluid cavity defined
#: in the FluidExchange object.
isOnlyOutflow: Boolean

#: A Float specifying the ratio of the actual surface area over the initial surface area at which you want the fluid
#: to leak.
deltaLeakageArea: float
Expand Down
39 changes: 25 additions & 14 deletions src/abaqus/Interaction/FluidExchangeActivationState.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from __future__ import annotations

from typing_extensions import Literal
from typing_extensions import Literal

from abqpy.decorators import abaqus_class_doc
from ..UtilityAndView.abaqusConstants import abaqusConstants as C

from ..UtilityAndView.abaqusConstants import Boolean
from ..UtilityAndView.abaqusConstants import abaqusConstants as C
from .InteractionState import InteractionState


Expand All @@ -30,36 +31,36 @@ class FluidExchangeActivationState(InteractionState):

#: A SymbolicConstant specifying the propagation state of the exchanges member. Possible values are UNSET, SET, UNCHANGED, and FREED.
exchangesState: Literal[C.UNSET, C.SET, C.UNCHANGED, C.FREED]

#: A String specifying the name of the FluidExchange object associated with this interaction.
exchanges: str

#: A SymbolicConstant specifying the propagation state of the amplitude member. Possible values are UNSET, SET, UNCHANGED, and FREED.
amplitudeState: Literal[C.UNSET, C.SET, C.UNCHANGED, C.FREED]

#: A String specifying the name of the Amplitude object associated with this interaction.
amplitude: str

#: A SymbolicConstant specifying the propagation state of the isBlockage member. Possible values are UNSET, SET, UNCHANGED, and FREED.
isBlockageState: Literal[C.UNSET, C.SET, C.UNCHANGED, C.FREED]

#: A Boolean specifying whether to consider vent and leakage area obstruction by contacted surfaces.
isBlockage: Boolean

#: A SymbolicConstant specifying the propagation state of the isOnlyOutflow member. Possible values are UNSET, SET, UNCHANGED, and FREED.
isOnlyOutflowState: Literal[C.UNSET, C.SET, C.UNCHANGED, C.FREED]

#: A Boolean specifying whether the flow of fluid is allowed only from the first fluid cavity to the second fluid cavity defined in the FluidExchange object.
isOnlyOutflow: Boolean

#: A SymbolicConstant specifying the propagation state of the deltaLeakageArea member. Possible values are UNSET, SET, UNCHANGED, and FREED.
deltaLeakageAreaState: Literal[C.UNSET, C.SET, C.UNCHANGED, C.FREED]

#: A Float specifying the ratio of the actual surface area over the initial surface area at which you want the fluid to leak.
deltaLeakageArea: float

#: A SymbolicConstant specifying the propagation state of the InteractionState object. Possible values are:
#:
#:
#: - NOT_YET_ACTIVE
#: - CREATED
#: - PROPAGATED
Expand All @@ -69,4 +70,14 @@ class FluidExchangeActivationState(InteractionState):
#: - TYPE_NOT_APPLICABLE
#: - INSTANCE_NOT_APPLICABLE
#: - BUILT_INTO_BASE_STATE
status: Literal[C.NOT_YET_ACTIVE, C.CREATED, C.PROPAGATED, C.MODIFIED, C.DEACTIVATED, C.NO_LONGER_ACTIVE, C.TYPE_NOT_APPLICABLE, C.INSTANCE_NOT_APPLICABLE, C.BUILT_INTO_BASE_STATE]
status: Literal[
C.NOT_YET_ACTIVE,
C.CREATED,
C.PROPAGATED,
C.MODIFIED,
C.DEACTIVATED,
C.NO_LONGER_ACTIVE,
C.TYPE_NOT_APPLICABLE,
C.INSTANCE_NOT_APPLICABLE,
C.BUILT_INTO_BASE_STATE,
]
9 changes: 4 additions & 5 deletions src/abaqus/Interaction/FluidInflatorActivation.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
from abqpy.decorators import abaqus_class_doc, abaqus_method_doc

from ..UtilityAndView.abaqusConstants import Boolean
from .Interaction import Interaction

from .FluidInflator import FluidInflator
from .Interaction import Interaction


@abaqus_class_doc
Expand Down Expand Up @@ -36,14 +35,14 @@ class FluidInflatorActivation(Interaction):

#: A String specifying the name of the step in which the FluidInflator object is created.
createStepName: str

#: A List specifying fluid inflators to be activated.
inflators: List[FluidInflator]

#: A String specifying the name of the amplitude curve defining a mapping between the inflation time and the actual
#: time.
inflationTimeAmplitude: str

#: A String specifying the name of the amplitude curve by which to modify the mass flow rate.
massFlowAmplitude: str

Expand Down
27 changes: 19 additions & 8 deletions src/abaqus/Interaction/FluidInflatorActivationState.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from __future__ import annotations

from typing_extensions import Literal
from typing_extensions import Literal

from abqpy.decorators import abaqus_class_doc

from ..UtilityAndView.abaqusConstants import abaqusConstants as C
from .InteractionState import InteractionState

Expand Down Expand Up @@ -30,23 +31,23 @@ class FluidInflatorActivationState(InteractionState):
#: A SymbolicConstant specifying the propagation state of the inflators member. Possible values are UNSET, SET,
#: UNCHANGED, and FREED.
inflatorsState: Literal[C.UNSET, C.SET, C.UNCHANGED, C.FREED]

#: A String specifying the name of the FluidInflator object associated with this interaction.
inflators: str

#: A SymbolicConstant specifying the propagation state of the inflationTimeAmplitude member. Possible values are
#: UNSET, SET, UNCHANGED, and FREED.
inflationTimeAmplitudeState: Literal[C.UNSET, C.SET, C.UNCHANGED, C.FREED]

#: A String specifying the name of the Amplitude object associated with this interaction.
inflationTimeAmplitude: str

#: A SymbolicConstant specifying the propagation state of the massFlowAmplitude member. Possible values are UNSET,
#: SET, UNCHANGED, and FREED.
massFlowAmplitudeState: Literal[C.UNSET, C.SET, C.UNCHANGED, C.FREED]

#: A SymbolicConstant specifying the propagation state of the InteractionState object. Possible values are:
#:
#:
#: - NOT_YET_ACTIVE
#: - CREATED
#: - PROPAGATED
Expand All @@ -56,4 +57,14 @@ class FluidInflatorActivationState(InteractionState):
#: - TYPE_NOT_APPLICABLE
#: - INSTANCE_NOT_APPLICABLE
#: - BUILT_INTO_BASE_STATE
status: Literal[C.NOT_YET_ACTIVE, C.CREATED, C.PROPAGATED, C.MODIFIED, C.DEACTIVATED, C.NO_LONGER_ACTIVE, C.TYPE_NOT_APPLICABLE, C.INSTANCE_NOT_APPLICABLE, C.BUILT_INTO_BASE_STATE]
status: Literal[
C.NOT_YET_ACTIVE,
C.CREATED,
C.PROPAGATED,
C.MODIFIED,
C.DEACTIVATED,
C.NO_LONGER_ACTIVE,
C.TYPE_NOT_APPLICABLE,
C.INSTANCE_NOT_APPLICABLE,
C.BUILT_INTO_BASE_STATE,
]
12 changes: 6 additions & 6 deletions src/abaqus/Interaction/InteractionModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

from typing import Sequence, Union

from typing_extensions import Literal, List
from .WearProperty import WearProperty
from typing_extensions import List, Literal

from abqpy.decorators import abaqus_class_doc, abaqus_method_doc
from .FluidInflatorActivation import FluidInflatorActivation
from .FluidExchangeActivation import FluidExchangeActivation

from ..BasicGeometry.ModelDot import ModelDot
from ..Datum.DatumAxis import DatumAxis
from ..Interaction.AcousticImpedance import AcousticImpedance
Expand Down Expand Up @@ -74,6 +73,8 @@
)
from ..UtilityAndView.abaqusConstants import abaqusConstants as C
from .ContactMassScalingExp import ContactMassScalingExp
from .FluidExchangeActivation import FluidExchangeActivation
from .FluidInflatorActivation import FluidInflatorActivation
from .InteractionContactControlModel import InteractionContactControlModel
from .InteractionContactInitializationModel import InteractionContactInitializationModel
from .InteractionContactStabilizationModel import InteractionContactStabilizationModel
Expand All @@ -84,6 +85,7 @@
from .SurfaceCrushTriggerAssignment import SurfaceCrushTriggerAssignment
from .SurfaceFrictionAssignment import SurfaceFrictionAssignment
from .SurfaceVertexCriteriaAssignment import SurfaceVertexCriteriaAssignment
from .WearProperty import WearProperty


@abaqus_class_doc
Expand Down Expand Up @@ -1509,8 +1511,6 @@ def FluidInflator(
createStepName: str,
cavity: str,
interactionProperty: str,
inflationTimeAmplitude: str = "",
massFlowAmplitude: str = "",
) -> FluidInflator:
"""This method creates a FluidInflator object.
Expand Down
2 changes: 1 addition & 1 deletion src/abaqus/Interaction/WearProperty.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from abqpy.decorators import abaqus_class_doc, abaqus_method_doc

from ..UtilityAndView.abaqusConstants import Boolean, OFF
from ..UtilityAndView.abaqusConstants import OFF, Boolean
from .InteractionProperty import InteractionProperty


Expand Down
6 changes: 3 additions & 3 deletions src/abaqus/Load/LoadModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -1621,21 +1621,21 @@ def RotationalBodyForce(
A Boolean specifying whether or not the effect of the load is centrifugal. The default
value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionchanged:: 2024
The **rotorDynamicloads** argument was added.
rotaryAcceleration
A Boolean specifying whether or not the effect of the load is rotary acceleration. The
default value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionchanged:: 2024
The **rotorDynamicloads** argument was added.
rotorDynamicloads
A Boolean specifying whether or not the effect of the load is rotordynamic. The default
value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionadded:: 2024
The **rotorDynamicloads** argument was added.
amplitude
Expand Down
16 changes: 8 additions & 8 deletions src/abaqus/Load/RotationalBodyForce.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ class RotationalBodyForce(Load):
#: .. versionchanged:: 2024
#: The **rotorDynamicloadsmust** argument was added.
rotaryAcceleration: Boolean = OFF

#: A Boolean specifying whether or not the effect of the load is rotordynamic. The default
#: value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
#: **rotorDynamicloads** must be specified and only one must have the value ON.
#:
#: .. versionadded:: 2024
#: The **rotorDynamicloadsmust** argument was added.
rotorDynamicloads: Boolean = OFF

#: A tuple of Floats specifying the first point on the axis of rotation for the load.
point1: tuple[float, ...] = ()

Expand Down Expand Up @@ -122,21 +122,21 @@ def __init__(
A Boolean specifying whether or not the effect of the load is centrifugal. The default
value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionchanged:: 2024
The **rotorDynamicloads** argument was added.
rotaryAcceleration
A Boolean specifying whether or not the effect of the load is rotary acceleration. The
default value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionchanged:: 2024
The **rotorDynamicloads** argument was added.
rotorDynamicloads
A Boolean specifying whether or not the effect of the load is rotordynamic. The default
value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionadded:: 2024
The **rotorDynamicloads** argument was added.
amplitude
Expand Down Expand Up @@ -177,21 +177,21 @@ def setValues(
A Boolean specifying whether or not the effect of the load is centrifugal. The default
value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionchanged:: 2024
The **rotorDynamicloads** argument was added.
rotaryAcceleration
A Boolean specifying whether or not the effect of the load is rotary acceleration. The
default value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionchanged:: 2024
The **rotorDynamicloads** argument was added.
rotorDynamicloads
A Boolean specifying whether or not the effect of the load is rotordynamic. The default
value is OFF. Note: At least one of **centrifugal** or **rotaryAcceleration** or
**rotorDynamicloads** must be specified and only one must have the value ON.
.. versionadded:: 2024
The **rotorDynamicloads** argument was added.
amplitude
Expand Down
4 changes: 2 additions & 2 deletions src/abaqus/PathAndProbe/FreeBody.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from typing_extensions import Literal, Tuple, Dict
from typing_extensions import Dict, Literal, Tuple

from abqpy.decorators import abaqus_class_doc, abaqus_method_doc

Expand Down Expand Up @@ -144,7 +144,7 @@ def FreeBodyFromNodesElements(
A FreeBody object.
"""
...

@abaqus_method_doc
def getFreeBodyData(
self,
Expand Down

0 comments on commit f6d616f

Please sign in to comment.