From ae56ad392418e7aab7f6dfe105f8fdc48d32ce69 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:30:10 +0000 Subject: [PATCH] [typing] Fix typing error about data arrays (backport #5732) (#5746) Co-authored-by: Hailin Wang Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] --- src/abaqus/Adaptivity/RemeshingRule.py | 2 +- src/abaqus/Adaptivity/RuleResult.py | 2 +- src/abaqus/Amplitude/BaselineCorrection.py | 2 +- src/abaqus/Amplitude/Correlation.py | 2 +- .../Amplitude/EquallySpacedAmplitude.py | 2 +- src/abaqus/Amplitude/PeriodicAmplitude.py | 2 +- src/abaqus/Amplitude/PsdDefinition.py | 2 +- src/abaqus/Amplitude/SmoothStepAmplitude.py | 2 +- src/abaqus/Amplitude/SpectrumAmplitude.py | 2 +- src/abaqus/Amplitude/TabularAmplitude.py | 2 +- src/abaqus/Annotation/Arrow.py | 34 ++++++++++++++++--- src/abaqus/Annotation/Text.py | 34 ++++++++++++++++--- src/abaqus/BasicGeometry/Cell.py | 6 ++-- src/abaqus/BasicGeometry/Edge.py | 6 ++-- src/abaqus/BasicGeometry/Face.py | 6 ++-- src/abaqus/BasicGeometry/IgnoredEdge.py | 2 +- src/abaqus/BasicGeometry/IgnoredVertex.py | 2 +- .../BeamSectionProfile/ArbitraryProfile.py | 2 +- .../BoundaryCondition/SubmodelBCState.py | 2 +- .../BoundaryCondition/TemperatureBCState.py | 2 +- src/abaqus/Calibration/DataSet.py | 2 +- src/abaqus/Canvas/ViewportBase.py | 8 ++--- src/abaqus/Connector/CDCTerm.py | 6 ++-- src/abaqus/Connector/ConnectorDamage.py | 10 +++--- src/abaqus/Connector/ConnectorDamping.py | 6 ++-- src/abaqus/Connector/ConnectorElasticity.py | 6 ++-- src/abaqus/Connector/ConnectorFailure.py | 2 +- src/abaqus/Connector/ConnectorFriction.py | 4 +-- src/abaqus/Connector/ConnectorLock.py | 2 +- src/abaqus/Connector/ConnectorPlasticity.py | 6 ++-- src/abaqus/Connector/ConnectorStop.py | 2 +- src/abaqus/Connector/TangentialBehavior.py | 2 +- src/abaqus/Datum/DatumAxis.py | 4 +-- src/abaqus/Datum/DatumPlane.py | 4 +-- src/abaqus/Datum/DatumPoint.py | 2 +- .../DisplayGroup/LeafFromElementLabels.py | 2 +- .../DisplayGroup/LeafFromElementSets.py | 2 +- .../DisplayGroup/LeafFromModelElemLabels.py | 2 +- .../DisplayGroup/LeafFromModelNodeLabels.py | 2 +- src/abaqus/DisplayGroup/LeafFromNodeLabels.py | 2 +- src/abaqus/DisplayGroup/LeafFromNodeSets.py | 2 +- .../DisplayGroup/LeafFromPartInstance.py | 2 +- .../DisplayGroup/LeafFromSurfaceSets.py | 2 +- .../DisplayOptions/AssemblyDisplayOptions.py | 2 +- .../EngineeringFeature/AssembledFastener.py | 4 +-- .../EngineeringFeature/ContourIntegral.py | 4 +-- .../EngineeringFeature/DiscreteFastener.py | 2 +- .../EngineeringFeature/HeatCapacitance.py | 2 +- .../EngineeringFeature/PointFastener.py | 6 ++-- src/abaqus/EngineeringFeature/XFEMCrack.py | 10 +++--- src/abaqus/Field/DataTable.py | 4 +-- src/abaqus/Field/DiscreteField.py | 2 +- src/abaqus/Field/MappedField.py | 4 +-- src/abaqus/InputFileParser/InputFile.py | 4 +-- src/abaqus/InputFileParser/Keyword.py | 6 ++-- .../Interaction/AcousticImpedanceProp.py | 2 +- src/abaqus/Interaction/ActuatorSensor.py | 2 +- src/abaqus/Interaction/ActuatorSensorProp.py | 4 +-- src/abaqus/Interaction/CavityRadiation.py | 8 ++--- src/abaqus/Interaction/CavityRadiationProp.py | 2 +- .../Interaction/CavityRadiationState.py | 2 +- src/abaqus/Interaction/CohesiveBehavior.py | 2 +- src/abaqus/Interaction/ContactDamage.py | 4 +-- .../Interaction/ContactTangentialBehavior.py | 2 +- src/abaqus/Interaction/FilmConditionProp.py | 2 +- src/abaqus/Interaction/FluidCavityProperty.py | 6 ++-- .../Interaction/FluidExchangeProperty.py | 2 +- src/abaqus/Interaction/FractureCriterion.py | 2 +- .../Interaction/GapElectricalConductance.py | 4 +-- src/abaqus/Interaction/NormalBehavior.py | 2 +- .../Interaction/PressurePenetrationState.py | 4 +-- src/abaqus/Interaction/Radiation.py | 2 +- src/abaqus/Interaction/ThermalConductance.py | 4 +-- src/abaqus/Job/Coexecution.py | 7 ++-- src/abaqus/Job/Job.py | 2 +- src/abaqus/Job/JobFromInputFile.py | 2 +- src/abaqus/Job/ModelJob.py | 2 +- src/abaqus/Load/CoriolisForce.py | 4 +-- src/abaqus/Load/InertiaReliefState.py | 3 +- src/abaqus/Load/RotationalBodyForce.py | 4 +-- src/abaqus/Load/SubstructureLoadState.py | 2 +- .../DamageInitiation.py | 2 +- src/abaqus/Material/Ratios.py | 2 +- src/abaqus/Material/TestData/MullinsEffect.py | 2 +- src/abaqus/Odb/AnalyticSurface.py | 2 +- src/abaqus/Odb/AnalyticSurfaceSegment.py | 2 +- src/abaqus/Odb/BeamOrientation.py | 2 +- src/abaqus/Odb/FieldBulkData.py | 14 ++++---- src/abaqus/Odb/FieldOutput.py | 2 +- src/abaqus/Odb/FieldValue.py | 12 +++---- src/abaqus/Odb/OdbDatumCsys.py | 8 ++--- src/abaqus/Odb/OdbMeshElement.py | 4 +-- src/abaqus/Odb/OdbMeshNode.py | 2 +- src/abaqus/Odb/OdbPretensionSection.py | 2 +- src/abaqus/Odb/OdbSet.py | 2 +- src/abaqus/Odb/OdbStepBase.py | 8 ++--- src/abaqus/Odb/SectorDefinition.py | 2 +- src/abaqus/OdbDisplay/ContourOptions.py | 2 +- src/abaqus/OdbDisplay/OdbDisplay.py | 10 +++--- src/abaqus/OdbDisplay/ViewCut.py | 6 ++-- .../CombinedTermDesignResponse.py | 4 +-- .../Optimization/ShapeRotationalSymmetry.py | 2 +- src/abaqus/PathAndProbe/CurrentProbeValues.py | 4 +-- src/abaqus/PathAndProbe/NodeQuery.py | 2 +- .../PathAndProbe/SelectedProbeValues.py | 4 +-- src/abaqus/PlotOptions/BasicOptions.py | 4 +-- .../PlotOptions/OdbContactDiagnostics.py | 2 +- src/abaqus/PredefinedField/FieldState.py | 2 +- src/abaqus/PredefinedField/IMARegion.py | 2 +- .../PredefinedField/KinematicHardening.py | 8 ++--- .../PredefinedField/TemperatureState.py | 15 ++++---- src/abaqus/PredefinedField/Velocity.py | 4 +-- src/abaqus/Property/MaterialOrientation.py | 4 +-- src/abaqus/Region/Surface.py | 2 +- src/abaqus/Section/BeamSection.py | 4 +-- src/abaqus/Section/GeneralStiffnessSection.py | 6 ++-- .../ConstrainedSketchGeometry.py | 2 +- .../ConstrainedSketchVertex.py | 2 +- .../StepOutput/FieldOutputRequestState.py | 2 +- .../StepOutput/HistoryOutputRequestState.py | 2 +- src/abaqus/StepOutput/TimePoint.py | 2 +- src/abaqus/UtilityAndView/View.py | 2 +- src/abaqus/XY/AxisData.py | 4 +-- src/abaqus/XY/Chart.py | 2 +- src/abaqus/XY/XYPlotBase.py | 2 +- 125 files changed, 280 insertions(+), 225 deletions(-) diff --git a/src/abaqus/Adaptivity/RemeshingRule.py b/src/abaqus/Adaptivity/RemeshingRule.py index f661bebbf4..c58cad0d3f 100644 --- a/src/abaqus/Adaptivity/RemeshingRule.py +++ b/src/abaqus/Adaptivity/RemeshingRule.py @@ -41,7 +41,7 @@ class RemeshingRule: #: A sequence of Strings specifying the output request variables that Abaqus will use as #: error indicators. - variables: tuple + variables: tuple[str, ...] = () #: A String specifying a descriptive string for this rule. The default value is an empty #: string. diff --git a/src/abaqus/Adaptivity/RuleResult.py b/src/abaqus/Adaptivity/RuleResult.py index c51417e829..1cd7ea4a85 100644 --- a/src/abaqus/Adaptivity/RuleResult.py +++ b/src/abaqus/Adaptivity/RuleResult.py @@ -37,7 +37,7 @@ class RuleResult: #: A sequence of Strings specifying the error indicator variables that have satisfied the #: Remeshing Rule. - satisfiedVars: tuple = () + satisfiedVars: tuple[str, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Amplitude/BaselineCorrection.py b/src/abaqus/Amplitude/BaselineCorrection.py index df5fdf87ac..1e7cf433b1 100644 --- a/src/abaqus/Amplitude/BaselineCorrection.py +++ b/src/abaqus/Amplitude/BaselineCorrection.py @@ -24,7 +24,7 @@ class BaselineCorrection: #: A sequence of Floats specifying the correction time interval end points. Possible values #: are positive and monotonically increasing Floats. The default value is an empty #: sequence. - intervals: tuple = () + intervals: tuple[float, ...] = () @abaqus_method_doc def __init__(self, intervals: tuple = ()): diff --git a/src/abaqus/Amplitude/Correlation.py b/src/abaqus/Amplitude/Correlation.py index 96306512ee..700af2e2fc 100644 --- a/src/abaqus/Amplitude/Correlation.py +++ b/src/abaqus/Amplitude/Correlation.py @@ -29,7 +29,7 @@ class Correlation(Amplitude): #: A tuple of tuples of Floats specifying the real and imaginary part of the scaling #: factor. If **approach** = MOVING_NOISE, then **data** represents the noise velocity components #: 1, 2, and 3. - data: float | None = None + data: tuple[tuple[float, ...], ...] = () #: A SymbolicConstant specifying the time span of the amplitude. Possible values are STEP #: and TOTAL. The default value is STEP. diff --git a/src/abaqus/Amplitude/EquallySpacedAmplitude.py b/src/abaqus/Amplitude/EquallySpacedAmplitude.py index 9e5d4417fb..118f15e9cc 100644 --- a/src/abaqus/Amplitude/EquallySpacedAmplitude.py +++ b/src/abaqus/Amplitude/EquallySpacedAmplitude.py @@ -41,7 +41,7 @@ class EquallySpacedAmplitude(Amplitude): fixedInterval: float #: A sequence of Floats specifying the amplitude values. - data: tuple + data: tuple[float, ...] = () #: A Float specifying the time at which the first amplitude data are given. Possible values #: are non-negative numbers. The default value is 0.0. diff --git a/src/abaqus/Amplitude/PeriodicAmplitude.py b/src/abaqus/Amplitude/PeriodicAmplitude.py index cbd3e4ca8b..73a7807e65 100644 --- a/src/abaqus/Amplitude/PeriodicAmplitude.py +++ b/src/abaqus/Amplitude/PeriodicAmplitude.py @@ -40,7 +40,7 @@ class PeriodicAmplitude(Amplitude): a_0: float #: A sequence of pairs of Floats specifying AiAi and BiBi pairs. - data: tuple + data: tuple[tuple[float, float], ...] = () #: A SymbolicConstant specifying the time span of the amplitude. Possible values are STEP #: and TOTAL. The default value is STEP. diff --git a/src/abaqus/Amplitude/PsdDefinition.py b/src/abaqus/Amplitude/PsdDefinition.py index 9808b5aa63..c7d73b2c29 100644 --- a/src/abaqus/Amplitude/PsdDefinition.py +++ b/src/abaqus/Amplitude/PsdDefinition.py @@ -33,7 +33,7 @@ class PsdDefinition(Amplitude): #: A sequence of sequences of Floats specifying the real part of the frequency function, #: the imaginary part of the frequency function, and the frequency or frequency band number #: values, depending on the value of **unitType**. - data: tuple + data: tuple[tuple[float, ...], ...] = () #: A SymbolicConstant specifying the type of units for specifying the frequency function. #: FORCE implies power units. BASE implies gravity used to define base motion. DB implies diff --git a/src/abaqus/Amplitude/SmoothStepAmplitude.py b/src/abaqus/Amplitude/SmoothStepAmplitude.py index 1cab5fdb89..93842d0273 100644 --- a/src/abaqus/Amplitude/SmoothStepAmplitude.py +++ b/src/abaqus/Amplitude/SmoothStepAmplitude.py @@ -32,7 +32,7 @@ class SmoothStepAmplitude(Amplitude): #: A sequence of pairs of Floats specifying time/frequency and amplitude pairs. Possible #: values for time/frequency are positive numbers. - data: tuple + data: tuple[tuple[float, float], ...] = () #: A SymbolicConstant specifying the time span of the amplitude. Possible values are STEP #: and TOTAL. The default value is STEP. diff --git a/src/abaqus/Amplitude/SpectrumAmplitude.py b/src/abaqus/Amplitude/SpectrumAmplitude.py index 81d31ddb78..06430584ce 100644 --- a/src/abaqus/Amplitude/SpectrumAmplitude.py +++ b/src/abaqus/Amplitude/SpectrumAmplitude.py @@ -45,7 +45,7 @@ class SpectrumAmplitude(Amplitude): #: A sequence of sequences of Floats specifying the magnitude, frequency, and damping #: values. - data: tuple + data: tuple[tuple[float, ...], ...] = () #: A SymbolicConstant specifying the units used for specifying the spectrum. Possible #: values are DISPLACEMENT, VELOCITY, ACCELERATION, and GRAVITY. The default value is diff --git a/src/abaqus/Amplitude/TabularAmplitude.py b/src/abaqus/Amplitude/TabularAmplitude.py index bc719d40cc..54f1eac522 100644 --- a/src/abaqus/Amplitude/TabularAmplitude.py +++ b/src/abaqus/Amplitude/TabularAmplitude.py @@ -38,7 +38,7 @@ class TabularAmplitude(Amplitude): #: A sequence of pairs of Floats specifying time/frequency and amplitude pairs. Possible #: values for time/frequency are positive numbers. - data: Sequence[Sequence[float]] + data: tuple[tuple[float, float], ...] = () #: The SymbolicConstant SOLVER_DEFAULT or a Float specifying the degree of smoothing. #: Possible float values are between 0 and 0.5. If **smooth** = SOLVER_DEFAULT, the default diff --git a/src/abaqus/Annotation/Arrow.py b/src/abaqus/Annotation/Arrow.py index a12bae039d..bbdddd6ee0 100644 --- a/src/abaqus/Annotation/Arrow.py +++ b/src/abaqus/Annotation/Arrow.py @@ -61,7 +61,20 @@ class Arrow(Annotation, _OptionsBase): #: - TOP_RIGHT #: #: The default value is BOTTOM_LEFT. - startAnchor: Union[SymbolicConstant, float] = BOTTOM_LEFT + startAnchor: Union[ + Literal[ + C.CENTER_RIGHT, + C.TOP_CENTER, + C.BOTTOM_RIGHT, + C.BOTTOM_LEFT, + C.CENTER, + C.TOP_RIGHT, + C.CENTER_LEFT, + C.TOP_LEFT, + C.BOTTOM_CENTER, + ], + tuple[float, ...], + ] = BOTTOM_LEFT #: A SymbolicConstant or a sequence of Floats specifying a point. A sequence of two Floats #: specifies the **X** and **Y** coordinates as percentages of the viewport width and height. @@ -80,7 +93,20 @@ class Arrow(Annotation, _OptionsBase): #: - TOP_RIGHT #: #: The default value is BOTTOM_LEFT. - endAnchor: Union[SymbolicConstant, float] = BOTTOM_LEFT + endAnchor: Union[ + Literal[ + C.CENTER_RIGHT, + C.TOP_CENTER, + C.BOTTOM_RIGHT, + C.BOTTOM_LEFT, + C.CENTER, + C.TOP_RIGHT, + C.CENTER_LEFT, + C.TOP_LEFT, + C.BOTTOM_CENTER, + ], + tuple[float, ...], + ] = BOTTOM_LEFT #: A SymbolicConstant specifying the style of the start head. Possible values are: #: @@ -150,7 +176,7 @@ def __init__( C.TOP_LEFT, C.BOTTOM_CENTER, ], - float, + tuple[float, ...], ] = BOTTOM_LEFT, endAnchor: Union[ Literal[ @@ -164,7 +190,7 @@ def __init__( C.TOP_LEFT, C.BOTTOM_CENTER, ], - float, + tuple[float, ...], ] = BOTTOM_LEFT, startHeadStyle: Literal[ C.FILLED_DIAMOND, diff --git a/src/abaqus/Annotation/Text.py b/src/abaqus/Annotation/Text.py index aa8dc1dbdd..1ca8e17931 100644 --- a/src/abaqus/Annotation/Text.py +++ b/src/abaqus/Annotation/Text.py @@ -66,7 +66,20 @@ class Text(Annotation, _OptionsBase): #: - TOP_RIGHT #: #: The default value is BOTTOM_LEFT. - anchor: Union[SymbolicConstant, float] = BOTTOM_LEFT + anchor: Union[ + Literal[ + C.CENTER_RIGHT, + C.TOP_CENTER, + C.BOTTOM_RIGHT, + C.BOTTOM_LEFT, + C.CENTER, + C.TOP_RIGHT, + C.CENTER_LEFT, + C.TOP_LEFT, + C.BOTTOM_CENTER, + ], + tuple[float, ...], + ] = BOTTOM_LEFT #: A SymbolicConstant or a sequence of Floats specifying a point. The sequence of two #: Floats specifies the **X** and **Y** coordinates of the reference point of the Text @@ -84,7 +97,20 @@ class Text(Annotation, _OptionsBase): #: - TOP_RIGHT #: #: The default value is BOTTOM_LEFT. - referencePoint: Union[SymbolicConstant, float] = BOTTOM_LEFT + referencePoint: Union[ + Literal[ + C.CENTER_RIGHT, + C.TOP_CENTER, + C.BOTTOM_RIGHT, + C.BOTTOM_LEFT, + C.CENTER, + C.TOP_RIGHT, + C.CENTER_LEFT, + C.TOP_LEFT, + C.BOTTOM_CENTER, + ], + tuple[float, ...], + ] = BOTTOM_LEFT #: A Float specifying the amount of rotation in degrees about **referencePoint**. The default #: value is 0.0. @@ -132,7 +158,7 @@ def __init__( C.TOP_LEFT, C.BOTTOM_CENTER, ], - float, + tuple[float, ...], ] = BOTTOM_LEFT, referencePoint: Union[ Literal[ @@ -146,7 +172,7 @@ def __init__( C.TOP_LEFT, C.BOTTOM_CENTER, ], - float, + tuple[float, ...], ] = BOTTOM_LEFT, rotationAngle: float = 0.0, color: str = "White", diff --git a/src/abaqus/BasicGeometry/Cell.py b/src/abaqus/BasicGeometry/Cell.py index 62adb3eb3b..3fa52211f0 100644 --- a/src/abaqus/BasicGeometry/Cell.py +++ b/src/abaqus/BasicGeometry/Cell.py @@ -37,14 +37,14 @@ class Cell: #: A tuple of Floats specifying the **X**, **Y**, and **Z** coordinates of a point located on #: the cell. - pointOn: float | None = None + pointOn: tuple[float, ...] = () #: A tuple of Floats specifying the name of the feature that created this cell. - featureName: float | None = None + featureName: tuple[float, ...] = () #: A tuple of Floats specifying the name of the part instance for this cell (if #: applicable). - instanceName: float | None = None + instanceName: tuple[float, ...] = () @abaqus_method_doc def getSize(self, printResults: Boolean = True): diff --git a/src/abaqus/BasicGeometry/Edge.py b/src/abaqus/BasicGeometry/Edge.py index 65b2c91d62..ffaa884c6d 100644 --- a/src/abaqus/BasicGeometry/Edge.py +++ b/src/abaqus/BasicGeometry/Edge.py @@ -57,14 +57,14 @@ class Edge: #: A tuple of Floats specifying the **X**, **Y**, and **Z** coordinates of a point located on #: the edge. - pointOn: float | None = None + pointOn: tuple[float, ...] = () #: A tuple of Floats specifying the name of the feature that created this edge. - featureName: float | None = None + featureName: tuple[float, ...] = () #: A tuple of Floats specifying the name of the part instance for this edge (if #: applicable). - instanceName: float | None = None + instanceName: tuple[float, ...] = () @abaqus_method_doc def isTangentFlipped(self) -> Boolean: diff --git a/src/abaqus/BasicGeometry/Face.py b/src/abaqus/BasicGeometry/Face.py index 05dd00d57a..5f6433c824 100644 --- a/src/abaqus/BasicGeometry/Face.py +++ b/src/abaqus/BasicGeometry/Face.py @@ -62,14 +62,14 @@ class Face: #: specifies the **X**, **Y**, and **Z** coordinates of a point located on the face and the #: **X**, **Y**, and **Z** components of the normal to the face.For a face of a solid **pointOn** #: specifies the **X**, **Y**, and **Z** coordinates of a point located on the face. - pointOn: float | None = None + pointOn: tuple[tuple[float, ...], ...] = () #: A tuple of Floats specifying the name of the feature that created this face. - featureName: float | None = None + featureName: tuple[float, ...] = () #: A tuple of Floats specifying the name of the part instance for this face (if #: applicable). - instanceName: float | None = None + instanceName: tuple[float, ...] = () @abaqus_method_doc def getCentroid(self) -> Sequence[float]: diff --git a/src/abaqus/BasicGeometry/IgnoredEdge.py b/src/abaqus/BasicGeometry/IgnoredEdge.py index 2b635ebd1d..4c7657c87d 100644 --- a/src/abaqus/BasicGeometry/IgnoredEdge.py +++ b/src/abaqus/BasicGeometry/IgnoredEdge.py @@ -23,7 +23,7 @@ class IgnoredEdge: #: A tuple of Floats specifying the **X**, **Y**, and **Z** coordinates of a point located on #: the edge. - pointOn: float | None = None + pointOn: tuple[float, ...] = () @abaqus_method_doc def getSize(self, printResults: bool = True): diff --git a/src/abaqus/BasicGeometry/IgnoredVertex.py b/src/abaqus/BasicGeometry/IgnoredVertex.py index 6028cb3a89..368eb6138a 100644 --- a/src/abaqus/BasicGeometry/IgnoredVertex.py +++ b/src/abaqus/BasicGeometry/IgnoredVertex.py @@ -22,4 +22,4 @@ class IgnoredVertex: index: int | None = None #: A tuple of Floats specifying the **X**, **Y**, and **Z** coordinates of the vertex. - pointOn: float | None = None + pointOn: tuple[float, ...] = () diff --git a/src/abaqus/BeamSectionProfile/ArbitraryProfile.py b/src/abaqus/BeamSectionProfile/ArbitraryProfile.py index 0683872fb4..db5729f0f0 100644 --- a/src/abaqus/BeamSectionProfile/ArbitraryProfile.py +++ b/src/abaqus/BeamSectionProfile/ArbitraryProfile.py @@ -39,7 +39,7 @@ class ArbitraryProfile(Profile): name: str #: A sequence of sequences of Floats specifying the items described below. - table: tuple + table: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__(self, name: str, table: tuple): diff --git a/src/abaqus/BoundaryCondition/SubmodelBCState.py b/src/abaqus/BoundaryCondition/SubmodelBCState.py index cceec74cc4..b2f76b75b9 100644 --- a/src/abaqus/BoundaryCondition/SubmodelBCState.py +++ b/src/abaqus/BoundaryCondition/SubmodelBCState.py @@ -66,7 +66,7 @@ class SubmodelBCState(BoundaryConditionState): #: A tuple of Ints specifying the degrees of freedom to which the boundary condition is #: applied. - dof: int | None = None + dof: tuple[int, ...] = () #: A SymbolicConstant specifying the propagation state of the amplitude reference. Possible #: values are UNSET, SET, UNCHANGED, FREED, and MODIFIED. diff --git a/src/abaqus/BoundaryCondition/TemperatureBCState.py b/src/abaqus/BoundaryCondition/TemperatureBCState.py index fe9f36accd..1e1b48c0b2 100644 --- a/src/abaqus/BoundaryCondition/TemperatureBCState.py +++ b/src/abaqus/BoundaryCondition/TemperatureBCState.py @@ -37,7 +37,7 @@ class TemperatureBCState(BoundaryConditionState): #: A tuple of Ints specifying the degrees of freedom to which the boundary condition is #: applied. - dof: int | None = None + dof: tuple[int, ...] = () #: A SymbolicConstant specifying the propagation state of the amplitude reference. Possible #: values are UNSET, SET, UNCHANGED, FREED, and MODIFIED. diff --git a/src/abaqus/Calibration/DataSet.py b/src/abaqus/Calibration/DataSet.py index a4b0deac44..377ff88371 100644 --- a/src/abaqus/Calibration/DataSet.py +++ b/src/abaqus/Calibration/DataSet.py @@ -19,7 +19,7 @@ class DataSet: #: A sequence of pairs of Floats specifying data set type pairs. Possible values are for #: stress/strain, force/displacement, or transverse strain/axial strain pairs. - data: tuple = () + data: tuple[tuple[float, float], ...] = () #: A String specifying the type of the new dataset. Values can be "STRESS/STRAIN", #: "FORCE/DISPLACEMENT", or "AXIALSTRAIN/TRANSVERSESTRAIN". The default value is diff --git a/src/abaqus/Canvas/ViewportBase.py b/src/abaqus/Canvas/ViewportBase.py index e1623d344d..84049dbb49 100644 --- a/src/abaqus/Canvas/ViewportBase.py +++ b/src/abaqus/Canvas/ViewportBase.py @@ -316,18 +316,18 @@ class ViewportBase(_OptionsBase): #: A tuple of Strings specifying the names of layers that will be displayed in the viewport #: when **displayMode** = OVERLAY. - visibleLayers: tuple = () + visibleLayers: tuple[str, ...] = () #: A pair of Floats specifying the **X** and **Y** coordinates in millimeters in the canvas #: coordinate system of the lower left corner of the current viewport, regardless of the #: value of **windowState**. - currentOrigin: Sequence[float] = () + currentOrigin: tuple[float, float] = (0.0, 0.0) #: A pair of Floats specifying the **X** and **Y** coordinates in millimeters of the lower #: left corner of the current viewport from a coordinate system having its origin in the #: lower left corner of the drawing area. This origin refers to the viewport location when #: **windowState** =MINIMIZED. - iconOrigin: Sequence[float] = () + iconOrigin: tuple[float, float] = (0.0, 0.0) #: A LightOptions object. lightOptions: LightOptions = LightOptions() @@ -346,7 +346,7 @@ class ViewportBase(_OptionsBase): #: A tuple of Strings specifying keys to the session.drawings repository. The default value #: is an empty sequence. - drawings: tuple = () + drawings: tuple[str, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Connector/CDCTerm.py b/src/abaqus/Connector/CDCTerm.py index 0dc1f73a6e..30b173769d 100644 --- a/src/abaqus/Connector/CDCTerm.py +++ b/src/abaqus/Connector/CDCTerm.py @@ -47,7 +47,7 @@ class CDCTerm: #: available components can be specified if the DerivedComponent object is being referenced #: by a Potential object. This is not the case if the DerivedComponent object is referenced #: by a ConnectorFriction object directly. The default value is an empty sequence. - intrinsicComponents: tuple + intrinsicComponents: tuple[int, ...] = () #: A sequence of sequences of Floats specifying components numbers and temperature and #: field values. Each sequence of the table data specifies:The first intrinsic component @@ -56,7 +56,7 @@ class CDCTerm: #: number.Etc.If applicable, the temperature value.If applicable, the value of the first #: field variable.If applicable, the value of the second field variable.Etc.The default #: value is an empty sequence. - table: tuple + table: tuple[tuple[float, ...], ...] = () #: A SymbolicConstant specifying the method for combining contributing terms: square root #: of a sum of the squares, direct sum, or Macauley sum. Possible values are RSS, SUM, and @@ -81,7 +81,7 @@ class CDCTerm: #: component definition. Possible values are 1 ≤ **indepComponents** ≤ 6. Only available #: components can be specified. The **indepComponents** argument applies only if #: **localDependency** = ON. The default value is an empty sequence. - indepComponents: tuple = () + indepComponents: tuple[int, ...] = () #: A Boolean specifying whether the table data depend on temperature. The default value is #: OFF. diff --git a/src/abaqus/Connector/ConnectorDamage.py b/src/abaqus/Connector/ConnectorDamage.py index d2b22054a3..28583e6fcc 100644 --- a/src/abaqus/Connector/ConnectorDamage.py +++ b/src/abaqus/Connector/ConnectorDamage.py @@ -1,7 +1,5 @@ from __future__ import annotations -from typing import Sequence - from typing_extensions import Literal from abqpy.decorators import abaqus_class_doc, abaqus_method_doc @@ -209,24 +207,24 @@ class ConnectorDamage(ConnectorBehaviorOption): #: A sequence of sequences of Floats specifying the initiation properties. The default #: value is an empty sequence.Items in the **initiationTable** data are described below. - initiationTable: Sequence[Sequence[float]] = () + initiationTable: tuple[tuple[float, ...], ...] = () #: A sequence of sequences of Floats specifying the evolution properties. The default value #: is an empty sequence.Items in the **evolutionTable** data are described below. This #: argument is only applicable if **evolution** = ON. - evolutionTable: tuple = () + evolutionTable: tuple[tuple[float, ...], ...] = () #: A sequence of Ints specifying the components of relative motion that will be damaged. #: Possible values are 1 ≤ **components** ≤ 6. Only available components can be specified. #: This argument is applicable only if **evolution** = ON and **useAffected** = ON. The default #: value is an empty sequence. - affectedComponents: Sequence[int] = () + affectedComponents: tuple[int, ...] = () #: A sequence of Ints specifying the components of relative motion for which the behavior #: is defined. Possible values are 1 ≤ **components** ≤ 6. Only available components can be #: specified. This argument can be specified only if **coupling** = UNCOUPLED. The default #: value is an empty sequence. - components: tuple = () + components: tuple[int, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Connector/ConnectorDamping.py b/src/abaqus/Connector/ConnectorDamping.py index 8cacca34a3..94459efb99 100644 --- a/src/abaqus/Connector/ConnectorDamping.py +++ b/src/abaqus/Connector/ConnectorDamping.py @@ -109,19 +109,19 @@ class ConnectorDamping(ConnectorBehaviorOption): #: A sequence of sequences of Floats specifying damping properties. Items in the table data #: are described below. The default value is an empty sequence. - table: tuple = () + table: tuple[tuple[float, ...], ...] = () #: A sequence of Ints specifying the list of independent components that are included in #: the definition of the connector damping data. This argument is applicable only if #: **behavior** = NONLINEAR and **coupling** = COUPLED_POSITION or COUPLED_MOTION. When this #: argument is applicable, at least one value must be specified. Only available components #: can be specified. The default value is an empty sequence. - independentComponents: tuple = () + independentComponents: tuple[int, ...] = () #: A sequence of Ints specifying the components of relative motion for which the behavior #: is defined. Possible values are 1 ≤ **components** ≤ 6. Only available components can be #: specified. The default value is an empty sequence. - components: tuple = () + components: tuple[int, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Connector/ConnectorElasticity.py b/src/abaqus/Connector/ConnectorElasticity.py index c9eb2e3963..f10bd58a9c 100644 --- a/src/abaqus/Connector/ConnectorElasticity.py +++ b/src/abaqus/Connector/ConnectorElasticity.py @@ -109,19 +109,19 @@ class ConnectorElasticity(ConnectorBehaviorOption): #: A sequence of sequences of Floats specifying elasticity properties. Items in the table #: data are described below. This argument is not applicable if **behavior** = RIGID. The #: default value is an empty sequence. - table: tuple = () + table: tuple[tuple[float, ...], ...] = () #: A sequence of Ints specifying the list of independent components that are included in #: the definition of the connector elasticity data. This argument is applicable only if #: **behavior** = NONLINEAR and **coupling** = COUPLED_POSITION or COUPLED_MOTION. If this argument #: is applicable, at least one value must be specified. Only available components can be #: specified. The default value is an empty sequence. - independentComponents: tuple = () + independentComponents: tuple[int, ...] = () #: A sequence of Ints specifying the components of relative motion for which the behavior #: is defined. Possible values are 1 ≤ **components** ≤ 6. Only available components can be #: specified. The default value is an empty sequence. - components: tuple = () + components: tuple[int, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Connector/ConnectorFailure.py b/src/abaqus/Connector/ConnectorFailure.py index ae192bcf11..b34ad501ef 100644 --- a/src/abaqus/Connector/ConnectorFailure.py +++ b/src/abaqus/Connector/ConnectorFailure.py @@ -53,7 +53,7 @@ class ConnectorFailure(ConnectorBehaviorOption): #: A sequence of Ints specifying the components of relative motion for which the behavior #: is defined. Possible values are 1 ≤ **components** ≤ 6. Only available components can be #: specified. The default value is an empty sequence. - components: tuple = () + components: tuple[int, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Connector/ConnectorFriction.py b/src/abaqus/Connector/ConnectorFriction.py index 0e52abce33..47d62c5dce 100644 --- a/src/abaqus/Connector/ConnectorFriction.py +++ b/src/abaqus/Connector/ConnectorFriction.py @@ -147,14 +147,14 @@ class ConnectorFriction(ConnectorBehaviorOption): #: specified by **tangentDirection**, if the data depend on accumulated slip.Temperature, if #: the data depend on temperature.Value of the first field variable, if the data depend on #: field variables.Value of the second field variable.Etc. - table: tuple = () + table: tuple[tuple[float, ...], ...] = () #: A sequence of Ints specifying the independent components. Possible values are 1 ≤ #: **independentComponents** ≤ 6. In addition, each independent component value must be #: unique. The **independentComponents** argument applies only if #: **frictionModel** = USER_CUSTOMIZED. Only available components can be specified. The default #: value is an empty sequence. - independentComponents: tuple = () + independentComponents: tuple[int, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Connector/ConnectorLock.py b/src/abaqus/Connector/ConnectorLock.py index 4736cd9232..5527147593 100644 --- a/src/abaqus/Connector/ConnectorLock.py +++ b/src/abaqus/Connector/ConnectorLock.py @@ -54,7 +54,7 @@ class ConnectorLock(ConnectorBehaviorOption): #: A sequence of Ints specifying the components of relative motion for which the behavior #: is defined. Possible values are 1 ≤ **components** ≤ 6. Only available components can be #: specified. The default value is an empty sequence. - components: tuple = () + components: tuple[int, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Connector/ConnectorPlasticity.py b/src/abaqus/Connector/ConnectorPlasticity.py index fec515947b..d10cd1204b 100644 --- a/src/abaqus/Connector/ConnectorPlasticity.py +++ b/src/abaqus/Connector/ConnectorPlasticity.py @@ -155,18 +155,18 @@ class ConnectorPlasticity(ConnectorBehaviorOption): #: A sequence of sequences of Floats specifying isotropic plasticity properties. Items in #: the **isotropicTable** data are described below. This argument is applicable only if #: **isotropic** = ON. The default value is an empty sequence. - isotropicTable: tuple = () + isotropicTable: tuple[tuple[float, ...], ...] = () #: A sequence of sequences of Floats specifying kinematic plasticity properties. Items in #: the **kinematicTable** data are described below. This argument is applicable only if #: **kinematic** = ON. The default value is an empty sequence. - kinematicTable: tuple = () + kinematicTable: tuple[tuple[float, ...], ...] = () #: A sequence of Ints specifying the components of relative motion for which the behavior #: is defined. Possible values are 1 ≤ **components** ≤ 6. Only available components can be #: specified. This argument can be specified only if **coupling** = UNCOUPLED. The default #: value is an empty sequence. - components: tuple = () + components: tuple[int, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Connector/ConnectorStop.py b/src/abaqus/Connector/ConnectorStop.py index 06ee893fa3..16065b7419 100644 --- a/src/abaqus/Connector/ConnectorStop.py +++ b/src/abaqus/Connector/ConnectorStop.py @@ -34,7 +34,7 @@ class ConnectorStop(ConnectorBehaviorOption): #: A sequence of Ints specifying the components of relative motion for which the behavior #: is defined. Possible values are 1 ≤ **components** ≤ 6. Only available components can be #: specified. The default value is an empty sequence. - components: tuple = () + components: tuple[int, ...] = () @abaqus_method_doc def __init__(self, minMotion: float | None = None, maxMotion: float | None = None, components: tuple = ()): diff --git a/src/abaqus/Connector/TangentialBehavior.py b/src/abaqus/Connector/TangentialBehavior.py index 03598ceb62..cc804fcc4f 100644 --- a/src/abaqus/Connector/TangentialBehavior.py +++ b/src/abaqus/Connector/TangentialBehavior.py @@ -96,7 +96,7 @@ class TangentialBehavior: #: A sequence of sequences of Floats specifying the tangential properties. Items in the #: table data are described below. The default value is an empty sequence. - table: tuple = () + table: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Datum/DatumAxis.py b/src/abaqus/Datum/DatumAxis.py index 9321a0ffeb..c17e7ed3d9 100644 --- a/src/abaqus/Datum/DatumAxis.py +++ b/src/abaqus/Datum/DatumAxis.py @@ -24,8 +24,8 @@ class DatumAxis(Datum): #: A tuple of Floats specifying the **X**, **Y**, and **Z** coordinates of a point located on #: the datum. - pointOn: float | None = None + pointOn: tuple[float, ...] = () #: A tuple of Floats specifying a sequence of three Floats specifying the direction of the #: axis. - direction: tuple = () + direction: tuple[float, ...] = () diff --git a/src/abaqus/Datum/DatumPlane.py b/src/abaqus/Datum/DatumPlane.py index 761082ab62..851a806fb1 100644 --- a/src/abaqus/Datum/DatumPlane.py +++ b/src/abaqus/Datum/DatumPlane.py @@ -24,7 +24,7 @@ class DatumPlane(Datum): #: A tuple of Floats specifying the **X**, **Y**, and **Z** coordinates of a point located on #: the datum. - pointOn: float | None = None + pointOn: tuple[float, ...] = () #: A tuple of Floats specifying a sequence of three Floats specifying the normal. - normal: tuple = () + normal: tuple[float, ...] = () diff --git a/src/abaqus/Datum/DatumPoint.py b/src/abaqus/Datum/DatumPoint.py index a75578bee8..e39b4147bf 100644 --- a/src/abaqus/Datum/DatumPoint.py +++ b/src/abaqus/Datum/DatumPoint.py @@ -24,4 +24,4 @@ class DatumPoint(Datum): #: A tuple of Floats specifying the **X**, **Y**, and **Z** coordinates of a point located on #: the datum. - pointOn: float | None = None + pointOn: tuple[float, ...] = () diff --git a/src/abaqus/DisplayGroup/LeafFromElementLabels.py b/src/abaqus/DisplayGroup/LeafFromElementLabels.py index 74b938fd8a..411f337f0a 100644 --- a/src/abaqus/DisplayGroup/LeafFromElementLabels.py +++ b/src/abaqus/DisplayGroup/LeafFromElementLabels.py @@ -30,7 +30,7 @@ class LeafFromElementLabels(Leaf): #: can be any of the following:An Int specifying a single element label; for example, `1`.A #: String specifying a single element label; for example, `'7'`.A String specifying a #: sequence of element labels; for example, `'3:5'` and `'3:15:3'`. - elementLabels: tuple + elementLabels: tuple[str, ...] = () @abaqus_method_doc def __init__(self, partInstanceName: str, elementLabels: tuple): diff --git a/src/abaqus/DisplayGroup/LeafFromElementSets.py b/src/abaqus/DisplayGroup/LeafFromElementSets.py index ec1f9c8c7b..3902d1d351 100644 --- a/src/abaqus/DisplayGroup/LeafFromElementSets.py +++ b/src/abaqus/DisplayGroup/LeafFromElementSets.py @@ -25,7 +25,7 @@ class LeafFromElementSets(Leaf): #: A sequence of Strings specifying element sets or a String specifying a single element #: set. - elementSets: tuple + elementSets: tuple[str, ...] = () @abaqus_method_doc def __init__(self, elementSets: tuple): diff --git a/src/abaqus/DisplayGroup/LeafFromModelElemLabels.py b/src/abaqus/DisplayGroup/LeafFromModelElemLabels.py index b55b4ced4d..21caaebb32 100644 --- a/src/abaqus/DisplayGroup/LeafFromModelElemLabels.py +++ b/src/abaqus/DisplayGroup/LeafFromModelElemLabels.py @@ -30,7 +30,7 @@ class LeafFromModelElemLabels(Leaf): #: expressions can be any of the following:An Int specifying a single element label; for #: example, `1`.A String specifying a single element label; for example, `'7'`.A String #: specifying a sequence of element labels; for example, `'3:5'` and `'3:15:3'`. - elementLabels: tuple + elementLabels: tuple[str, ...] = () @abaqus_method_doc def __init__(self, elementLabels: tuple): diff --git a/src/abaqus/DisplayGroup/LeafFromModelNodeLabels.py b/src/abaqus/DisplayGroup/LeafFromModelNodeLabels.py index b9087c3aef..03ee99bc6e 100644 --- a/src/abaqus/DisplayGroup/LeafFromModelNodeLabels.py +++ b/src/abaqus/DisplayGroup/LeafFromModelNodeLabels.py @@ -30,7 +30,7 @@ class LeafFromModelNodeLabels(Leaf): #: can be any of the following:An Int specifying a single node label; for example, `1`.A #: String specifying a single node label; for example, `'7'`.A String specifying a sequence #: of node labels; for example, `'3:5'` and `'3:15:3'`. - nodeLabels: tuple + nodeLabels: tuple[str, ...] = () @abaqus_method_doc def __init__(self, nodeLabels: tuple): diff --git a/src/abaqus/DisplayGroup/LeafFromNodeLabels.py b/src/abaqus/DisplayGroup/LeafFromNodeLabels.py index 4019f06b40..20bab99db8 100644 --- a/src/abaqus/DisplayGroup/LeafFromNodeLabels.py +++ b/src/abaqus/DisplayGroup/LeafFromNodeLabels.py @@ -30,7 +30,7 @@ class LeafFromNodeLabels(Leaf): #: be any of the following:An Int specifying a single node label; for example, `1`.A String #: specifying a single node label; for example, `'7'`.A String specifying a sequence of #: node labels; for example, `'3:5'` and `'3:15:3'`. - nodeLabels: tuple + nodeLabels: tuple[str, ...] = () @abaqus_method_doc def __init__(self, partInstanceName: str, nodeLabels: tuple): diff --git a/src/abaqus/DisplayGroup/LeafFromNodeSets.py b/src/abaqus/DisplayGroup/LeafFromNodeSets.py index 40f708d497..53e84ac252 100644 --- a/src/abaqus/DisplayGroup/LeafFromNodeSets.py +++ b/src/abaqus/DisplayGroup/LeafFromNodeSets.py @@ -24,7 +24,7 @@ class LeafFromNodeSets(Leaf): leafType: SymbolicConstant #: A sequence of Strings specifying node sets or a String specifying a single node set. - nodeSets: tuple + nodeSets: tuple[str, ...] = () @abaqus_method_doc def __init__(self, nodeSets: tuple): diff --git a/src/abaqus/DisplayGroup/LeafFromPartInstance.py b/src/abaqus/DisplayGroup/LeafFromPartInstance.py index f69abbda76..e9c1eedc92 100644 --- a/src/abaqus/DisplayGroup/LeafFromPartInstance.py +++ b/src/abaqus/DisplayGroup/LeafFromPartInstance.py @@ -24,7 +24,7 @@ class LeafFromPartInstance(Leaf): leafType: SymbolicConstant #: A sequence of Strings specifying the names of the part instances. - partInstanceName: tuple + partInstanceName: tuple[str, ...] = () @abaqus_method_doc def __init__(self, partInstanceName: tuple): diff --git a/src/abaqus/DisplayGroup/LeafFromSurfaceSets.py b/src/abaqus/DisplayGroup/LeafFromSurfaceSets.py index 47d89cb4ab..f117ede61a 100644 --- a/src/abaqus/DisplayGroup/LeafFromSurfaceSets.py +++ b/src/abaqus/DisplayGroup/LeafFromSurfaceSets.py @@ -25,7 +25,7 @@ class LeafFromSurfaceSets(Leaf): #: A sequence of Strings specifying surface sets, or a String specifying a single surface #: set. - surfaceSets: tuple + surfaceSets: tuple[str, ...] = () @abaqus_method_doc def __init__(self, surfaceSets: tuple): diff --git a/src/abaqus/DisplayOptions/AssemblyDisplayOptions.py b/src/abaqus/DisplayOptions/AssemblyDisplayOptions.py index c7b43d981d..580fc1fc02 100644 --- a/src/abaqus/DisplayOptions/AssemblyDisplayOptions.py +++ b/src/abaqus/DisplayOptions/AssemblyDisplayOptions.py @@ -153,7 +153,7 @@ class AssemblyDisplayOptions: #: A tuple of Strings specifying the names of the part instances that are visible in the #: viewport. The default value is an empty sequence. - visibleInstances: tuple = () + visibleInstances: tuple[str, ...] = () #: A String specifying the step for which objects are to be displayed. Possible values are #: any valid step name. The default value is "Initial". diff --git a/src/abaqus/EngineeringFeature/AssembledFastener.py b/src/abaqus/EngineeringFeature/AssembledFastener.py index 7ce246602d..7231778c22 100644 --- a/src/abaqus/EngineeringFeature/AssembledFastener.py +++ b/src/abaqus/EngineeringFeature/AssembledFastener.py @@ -44,11 +44,11 @@ class AssembledFastener(Fastener): #: A sequence of Strings specifying the names of the template model surfaces that are #: referenced by tie or coupling constraints. - templateSurfaces: tuple + templateSurfaces: tuple[str, ...] = () #: A sequence of Strings specifying the names of the master model surfaces that will be #: substituted for the template model constraint surfaces. - assignedSurfaces: tuple + assignedSurfaces: tuple[str, ...] = () #: A String specifying the name of the property prefix string. This string will be #: prepended to every property name as it is copied to the master model from the template diff --git a/src/abaqus/EngineeringFeature/ContourIntegral.py b/src/abaqus/EngineeringFeature/ContourIntegral.py index 3755f2ef21..ce28985238 100644 --- a/src/abaqus/EngineeringFeature/ContourIntegral.py +++ b/src/abaqus/EngineeringFeature/ContourIntegral.py @@ -70,14 +70,14 @@ class ContourIntegral(Crack): #: the crack normal direction. Each point is defined by a tuple of two or three coordinates #: indicating its position. This argument is required only when #: **extensionDirectionMethod** = CRACK_NORMAL. The default value is an empty sequence. - crackNormal: tuple = () + crackNormal: tuple[tuple[float, ...], ...] = () #: A sequence of sequences of sequences of Floats specifying the vectors that indicate the #: set of crack extension directions. Each vector is described by a tuple of two points, #: and each point is described by a tuple of two or three coordinates indicating its #: position. This argument is required only when **extensionDirectionMethod** = Q_VECTORS. The #: default value is an empty sequence. - qVectors: tuple = () + qVectors: tuple[tuple[float, ...], ...] = () #: A Float specifying the position of the midside node along the edges of the second-order #: elements that radiate from the crack tip. Possible values are 0.0 < **midNodeParameter** diff --git a/src/abaqus/EngineeringFeature/DiscreteFastener.py b/src/abaqus/EngineeringFeature/DiscreteFastener.py index bf7d764492..a898432ae6 100644 --- a/src/abaqus/EngineeringFeature/DiscreteFastener.py +++ b/src/abaqus/EngineeringFeature/DiscreteFastener.py @@ -74,7 +74,7 @@ class DiscreteFastener(Fastener): #: decreasing, quadratic polynomial decreasing, and cubic polynomial monotonic decreasing #: weight distributions. Possible values are UNIFORM, LINEAR, QUADRATIC, and CUBIC. The #: default value is UNIFORM. - weightingMethod: SymbolicConstant = UNIFORM + weightingMethod: Literal[C.QUADRATIC, C.UNIFORM, C.CUBIC, C.LINEAR] = UNIFORM #: None or a DatumCsys object specifying the local coordinate system of fastener couplings. #: If **localCsys** = None, couplings are defined in the global coordinate system. When this diff --git a/src/abaqus/EngineeringFeature/HeatCapacitance.py b/src/abaqus/EngineeringFeature/HeatCapacitance.py index fc56475921..b8d1a02b1f 100644 --- a/src/abaqus/EngineeringFeature/HeatCapacitance.py +++ b/src/abaqus/EngineeringFeature/HeatCapacitance.py @@ -44,7 +44,7 @@ class HeatCapacitance(Inertia): #: A sequence of sequences of Floats specifying heat capacitance properties. The items in #: the table data are described below. - table: tuple + table: tuple[tuple[float, ...], ...] = () #: A Boolean specifying whether the data depend on temperature. The default value is OFF. temperatureDependency: Boolean = OFF diff --git a/src/abaqus/EngineeringFeature/PointFastener.py b/src/abaqus/EngineeringFeature/PointFastener.py index 403f0d5285..79d7012283 100644 --- a/src/abaqus/EngineeringFeature/PointFastener.py +++ b/src/abaqus/EngineeringFeature/PointFastener.py @@ -63,7 +63,7 @@ class PointFastener(Fastener): directionVector: tuple | None = None #: A RegionArray object specifying surfaces to be fastened. The default value is MODEL. - targetSurfaces: RegionArray = MODEL + targetSurfaces: RegionArray | SymbolicConstant = MODEL #: A Boolean specifying whether to constrain rotational displacement component about the #: 1-direction. The default value is ON. @@ -181,7 +181,7 @@ def __init__( region: Region, physicalRadius: float, directionVector: tuple | None = None, - targetSurfaces: RegionArray = MODEL, + targetSurfaces: RegionArray | SymbolicConstant = MODEL, ur1: Boolean = ON, ur2: Boolean = ON, ur3: Boolean = ON, @@ -327,7 +327,7 @@ def __init__( def setValues( self, directionVector: tuple | None = None, - targetSurfaces: RegionArray = MODEL, + targetSurfaces: RegionArray | SymbolicConstant = MODEL, ur1: Boolean = ON, ur2: Boolean = ON, ur3: Boolean = ON, diff --git a/src/abaqus/EngineeringFeature/XFEMCrack.py b/src/abaqus/EngineeringFeature/XFEMCrack.py index 982faeee81..179a5c1e5a 100644 --- a/src/abaqus/EngineeringFeature/XFEMCrack.py +++ b/src/abaqus/EngineeringFeature/XFEMCrack.py @@ -56,25 +56,25 @@ class XFEMCrack(Crack): #: A sequence of Ints specifying the labels of the elements that are intersected by the #: initial crack location. This argument is used only by the input file reader. - elemId: tuple = () + elemId: tuple[int, ...] = () #: A sequence of Ints specifying the position of a node in the corresponding element #: connectivity. This argument is used only by the input file reader. - nodeId: tuple = () + nodeId: tuple[int, ...] = () #: A sequence of Ints specifying the values indicating the inclusion/exclusion of the #: **crackFrontDist** values. A zero value indicates that **crackFrontDist** is not specified #: for the ith pair **elemId** and *nodeId*. This argument is used only by the input file #: reader. - hasCrackFront: tuple = () + hasCrackFront: tuple[int, ...] = () #: A sequence of Floats specifying the values of the first signed distance function. This #: argument is used by the input file reader. - crackPlaneDist: tuple = () + crackPlaneDist: tuple[float, ...] = () #: A sequence of Floats specifying the values of the second signed distance function. This #: argument is used only by the input file reader. - crackFrontDist: tuple = () + crackFrontDist: tuple[float, ...] = () #: An integer specifying the number of element layers around the crack location, to which #: the crack domain is shrunk. diff --git a/src/abaqus/Field/DataTable.py b/src/abaqus/Field/DataTable.py index 336ce195bd..98fb95bf75 100644 --- a/src/abaqus/Field/DataTable.py +++ b/src/abaqus/Field/DataTable.py @@ -25,7 +25,7 @@ class DataTable: instanceName: str = "" #: A tuple of Ints specifying the domain node, element or integration point identifiers. - domain: int | None = None + domain: tuple[int, ...] = () #: A tuple of Floats specifying the data within the domain. - table: float | None = None + table: tuple[float, ...] = () diff --git a/src/abaqus/Field/DiscreteField.py b/src/abaqus/Field/DiscreteField.py index 1aed0adb8f..fa4131d86b 100644 --- a/src/abaqus/Field/DiscreteField.py +++ b/src/abaqus/Field/DiscreteField.py @@ -36,7 +36,7 @@ class DiscreteField(Field): name: str #: A sequence of Floats specifying a sequence of floats specifying the default values. - defaultValues: tuple + defaultValues: tuple[float, ...] = () #: A SymbolicConstant or an Int specifying the type of data represented by this discrete #: field. Possible values are SCALAR, ORIENTATION, and PRESCRIBEDCONDITION_DOF. diff --git a/src/abaqus/Field/MappedField.py b/src/abaqus/Field/MappedField.py index 81902d2401..2373f7d2de 100644 --- a/src/abaqus/Field/MappedField.py +++ b/src/abaqus/Field/MappedField.py @@ -97,12 +97,12 @@ class MappedField(AnalyticalField): #: A tuple of tuples of Floats specifying the point cloud source data of grid format. The #: default value is an empty sequence. - gridPointData: tuple = () + gridPointData: tuple[tuple[float, ...], ...] = () #: A tuple of tuples of Floats specifying the point cloud source data of XYZ format. Each #: data item is defining the XYZ coordinates of a point and its field value. The default #: value is an empty sequence. - xyzPointData: tuple = () + xyzPointData: tuple[tuple[float, ...], ...] = () #: An OdbMeshRegionData object specifying the external source data from ODB mesh region. odbMeshRegionData: OdbMeshRegionData = OdbMeshRegionData("", "") diff --git a/src/abaqus/InputFileParser/InputFile.py b/src/abaqus/InputFileParser/InputFile.py index eea7b154a4..d3d9940ca4 100644 --- a/src/abaqus/InputFileParser/InputFile.py +++ b/src/abaqus/InputFileParser/InputFile.py @@ -24,11 +24,11 @@ class InputFile: #: A sequence of Strings specifying any additional input files included in the specified #: input file. - includes: tuple = () + includes: tuple[str, ...] = () #: A sequence of Strings for input files included in the specified input file that could #: not be located. - missingIncludes: tuple = () + missingIncludes: tuple[str, ...] = () @abaqus_method_doc def __init__(self, file: str, directory: str = ""): diff --git a/src/abaqus/InputFileParser/Keyword.py b/src/abaqus/InputFileParser/Keyword.py index 424aac7052..3023af8911 100644 --- a/src/abaqus/InputFileParser/Keyword.py +++ b/src/abaqus/InputFileParser/Keyword.py @@ -2,6 +2,8 @@ from abqpy.decorators import abaqus_class_doc +from .AbaqusNDarray import AbaqusNDarray + @abaqus_class_doc class Keyword: @@ -25,10 +27,10 @@ class Keyword: #: the data is suitable and if the InputFile.parse() method was called with the option #: usePyArray=True. In cases where large amounts of numerical data (i.e., large node #: arrays) are expected, it is recommended that you use the option usePyArray=True. - data: tuple = () + data: tuple[tuple[float, ...], ...] | AbaqusNDarray = () #: A KeywordSequence specifying the suboptions of the keyword. suboptions: str = "" #: A sequence of Strings specifying the comments. - comments: tuple = () + comments: tuple[str, ...] = () diff --git a/src/abaqus/Interaction/AcousticImpedanceProp.py b/src/abaqus/Interaction/AcousticImpedanceProp.py index c4d3ab715b..955c8e8327 100644 --- a/src/abaqus/Interaction/AcousticImpedanceProp.py +++ b/src/abaqus/Interaction/AcousticImpedanceProp.py @@ -38,7 +38,7 @@ class AcousticImpedanceProp(ContactProperty): #: depend on frequency.If **tableType** = ADMITTANCE, each sequence of the table data #: specifies:The real part of the complex admittance.The imaginary part of the complex #: admittance.Frequency, if the data depend on frequency. - table: tuple + table: tuple[tuple[float, ...], ...] = () #: A Boolean specifying whether the **table** data depend on frequency. The default value is #: OFF. diff --git a/src/abaqus/Interaction/ActuatorSensor.py b/src/abaqus/Interaction/ActuatorSensor.py index e619df2208..406e91b453 100644 --- a/src/abaqus/Interaction/ActuatorSensor.py +++ b/src/abaqus/Interaction/ActuatorSensor.py @@ -57,7 +57,7 @@ class ActuatorSensor(Interaction): dof: str #: A sequence of Floats specifying the initial values of the solution-dependent variables. - solutionDepVars: tuple + solutionDepVars: tuple[float, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/ActuatorSensorProp.py b/src/abaqus/Interaction/ActuatorSensorProp.py index ac8da6d1b2..920416bb92 100644 --- a/src/abaqus/Interaction/ActuatorSensorProp.py +++ b/src/abaqus/Interaction/ActuatorSensorProp.py @@ -26,11 +26,11 @@ class ActuatorSensorProp(ContactProperty): #: A sequence of Floats specifying the PROPS array used by user subroutine UEL. The default #: value is an empty sequence. - realProperties: tuple = () + realProperties: tuple[float, ...] = () #: A sequence of Ints specifying the JPROPS array used by user subroutine UEL. The default #: value is an empty sequence. - integerProperties: tuple = () + integerProperties: tuple[int, ...] = () @abaqus_method_doc def __init__(self, name: str, realProperties: tuple = (), integerProperties: tuple = ()): diff --git a/src/abaqus/Interaction/CavityRadiation.py b/src/abaqus/Interaction/CavityRadiation.py index 8d579b7f29..6fc6d7a7b8 100644 --- a/src/abaqus/Interaction/CavityRadiation.py +++ b/src/abaqus/Interaction/CavityRadiation.py @@ -117,7 +117,7 @@ class CavityRadiation(Interaction): #: A tuple of Strings specifying the names of the Cavity Radiation properties containing #: the surface emissivity data. One name per specified surface. The emissivity data is #: ignored when **surfaceReflection** = OFF. - surfaceEmissivities: tuple = () + surfaceEmissivities: tuple[str, ...] = () #: A ModelDot object specifying the rotation axis point. This argument applies only when #: **cyclicSymmetry** = ON. @@ -135,19 +135,19 @@ class CavityRadiation(Interaction): #: periodic distance for the first periodic symmetry. Each point is defined by a tuple of #: three coordinates indicating its position. This argument applies only when #: **periodicSymmetries** is greater than zero. The default value is an empty sequence. - periodicDistance_1: tuple = () + periodicDistance_1: tuple[tuple[float, ...], ...] = () #: A tuple of tuples of Floats specifying the two points of the vector that describes the #: periodic distance for the second periodic symmetry. Each point is defined by a tuple of #: three coordinates indicating its position. This argument applies only when #: **periodicSymmetries** is greater than one. The default value is an empty sequence. - periodicDistance_2: tuple = () + periodicDistance_2: tuple[tuple[float, ...], ...] = () #: A tuple of tuples of Floats specifying the two points of the vector that describes the #: periodic distance for the third periodic symmetry. Each point is defined by a tuple of #: three coordinates indicating its position. This argument applies only when #: **periodicSymmetries** = 3. The default value is an empty sequence. - periodicDistance_3: tuple = () + periodicDistance_3: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/CavityRadiationProp.py b/src/abaqus/Interaction/CavityRadiationProp.py index 32e6b6e654..5a2f445771 100644 --- a/src/abaqus/Interaction/CavityRadiationProp.py +++ b/src/abaqus/Interaction/CavityRadiationProp.py @@ -35,7 +35,7 @@ class CavityRadiationProp(ContactProperty): #: A sequence of sequences of Floats specifying the following:The emissivity, #: ϵϵ.Temperature, if the data depend on temperature.Value of the first field variable, if #: the data depend on field variables.Value of the second field variable.Etc. - property: tuple = () + property: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/CavityRadiationState.py b/src/abaqus/Interaction/CavityRadiationState.py index b76bbd7af6..35600e572e 100644 --- a/src/abaqus/Interaction/CavityRadiationState.py +++ b/src/abaqus/Interaction/CavityRadiationState.py @@ -61,7 +61,7 @@ class CavityRadiationState(InteractionState): viewfactorAccuracyTolState: SymbolicConstant #: A tuple of Strings specifying the surfaces that provide blocking inside the cavity. - blockingSurfaces: tuple = () + blockingSurfaces: tuple[str, ...] = () #: A SymbolicConstant specifying the propagation state of the InteractionState object. #: Possible values diff --git a/src/abaqus/Interaction/CohesiveBehavior.py b/src/abaqus/Interaction/CohesiveBehavior.py index b1ba8316fe..9bd00e7d95 100644 --- a/src/abaqus/Interaction/CohesiveBehavior.py +++ b/src/abaqus/Interaction/CohesiveBehavior.py @@ -82,7 +82,7 @@ class CohesiveBehavior: #: A sequence of sequences of Floats specifying the traction-separation coefficients. The #: items in the table data are described below. This argument is valid only for #: **defaultPenalties** = OFF. - table: tuple = () + table: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/ContactDamage.py b/src/abaqus/Interaction/ContactDamage.py index 0e51daa746..f5979735ff 100644 --- a/src/abaqus/Interaction/ContactDamage.py +++ b/src/abaqus/Interaction/ContactDamage.py @@ -216,12 +216,12 @@ class ContactDamage: #: A tuple of tuples of Floats specifying the values defining the damage initiation. The #: items in the table data are described below. - initTable: float | None = None + initTable: tuple[tuple[float, ...], ...] = () #: A tuple of tuples of Floats specifying the values defining the damage evolution. The #: items in the table data are described below. This argument is valid only when #: **useEvolution** = ON. - evolTable: float | None = None + evolTable: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/ContactTangentialBehavior.py b/src/abaqus/Interaction/ContactTangentialBehavior.py index 9ebe6bb46f..6a0fed092c 100644 --- a/src/abaqus/Interaction/ContactTangentialBehavior.py +++ b/src/abaqus/Interaction/ContactTangentialBehavior.py @@ -110,7 +110,7 @@ class ContactTangentialBehavior: #: A tuple of tuples of Floats specifying tangential behavior. The items in the table data #: are described below. - table: float | None = None + table: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/FilmConditionProp.py b/src/abaqus/Interaction/FilmConditionProp.py index 480d71c617..667792814e 100644 --- a/src/abaqus/Interaction/FilmConditionProp.py +++ b/src/abaqus/Interaction/FilmConditionProp.py @@ -39,7 +39,7 @@ class FilmConditionProp(ContactProperty): #: - Value of the first field variable, if the data depend on field variables. #: - Value of the second field variable. #: - Etc. - property: tuple = () + property: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/FluidCavityProperty.py b/src/abaqus/Interaction/FluidCavityProperty.py index 3708047956..4e7e2a0329 100644 --- a/src/abaqus/Interaction/FluidCavityProperty.py +++ b/src/abaqus/Interaction/FluidCavityProperty.py @@ -81,7 +81,7 @@ class FluidCavityProperty(ContactProperty): #: - Value of the first field variable, if the data depend on field variables. #: - Value of the second field variable. #: - Etc. - expansionTable: tuple = () + expansionTable: tuple[tuple[float, ...], ...] = () #: A Boolean specifying whether fluid bulk modulus values will be defined. This argument is #: applicable only when **definition** = HYDRAULIC. The default value is OFF. @@ -106,7 +106,7 @@ class FluidCavityProperty(ContactProperty): #: - Value of the first field variable, if the data depend on field variables. #: - Value of the second field variable. #: - Etc. - bulkModulusTable: tuple = () + bulkModulusTable: tuple[tuple[float, ...], ...] = () #: A Boolean specifying whether molar heat capacity values will be defined. This argument #: is applicable only when **definition** = PNEUMATIC. The default value is OFF. @@ -147,7 +147,7 @@ class FluidCavityProperty(ContactProperty): #: - Value of the first field variable, if the data depend on field variables. #: - Value of the second field variable. #: - Etc. - capacityTable: tuple = () + capacityTable: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/FluidExchangeProperty.py b/src/abaqus/Interaction/FluidExchangeProperty.py index 0d95435a39..32e15b537b 100644 --- a/src/abaqus/Interaction/FluidExchangeProperty.py +++ b/src/abaqus/Interaction/FluidExchangeProperty.py @@ -83,7 +83,7 @@ class FluidExchangeProperty(ContactProperty): #: - The value of the first field variable, if the data depend on field variables. #: - The value of the second field variable. #: - Etc. - dataTable: tuple + dataTable: tuple[tuple[float, ...], ...] = () #: A SymbolicConstant specifying the type of fluid exchange property to be defined. #: Possible values are BULK_VISCOSITY, MASS_FLUX, MASS_RATE_LEAK, VOL_FLUX, and diff --git a/src/abaqus/Interaction/FractureCriterion.py b/src/abaqus/Interaction/FractureCriterion.py index c8fc774db6..00aa6d8fba 100644 --- a/src/abaqus/Interaction/FractureCriterion.py +++ b/src/abaqus/Interaction/FractureCriterion.py @@ -90,7 +90,7 @@ class FractureCriterion: #: A sequence of sequences of Floats specifying the value defining the fracture criterion. #: The items in the table data are described below. - initTable: tuple + initTable: tuple[tuple[float, ...], ...] = () #: A SymbolicConstant specifying the type of data used to define the fracture criterion. #: Possible values are VCCT and ENHANCED VCCT. The default value is VCCT. diff --git a/src/abaqus/Interaction/GapElectricalConductance.py b/src/abaqus/Interaction/GapElectricalConductance.py index 232dbc8fa8..32b97bb20a 100644 --- a/src/abaqus/Interaction/GapElectricalConductance.py +++ b/src/abaqus/Interaction/GapElectricalConductance.py @@ -63,7 +63,7 @@ class GapElectricalConductance: #: A sequence of sequences of Floats specifying clearance dependency data. The items in the #: table data are described below. - clearanceDepTable: tuple = () + clearanceDepTable: tuple[tuple[float, ...], ...] = () #: A Boolean specifying whether to use temperature-dependent data with pressure dependency. #: The default value is OFF. @@ -75,7 +75,7 @@ class GapElectricalConductance: #: A sequence of sequences of Floats specifying pressure dependency data. The items in the #: table data are described below. - pressureDepTable: tuple = () + pressureDepTable: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Interaction/NormalBehavior.py b/src/abaqus/Interaction/NormalBehavior.py index e1ffed9acd..d56d748c08 100644 --- a/src/abaqus/Interaction/NormalBehavior.py +++ b/src/abaqus/Interaction/NormalBehavior.py @@ -65,7 +65,7 @@ class NormalBehavior: #: A sequence of sequences of Floats specifying the normal behavior properties. This #: argument is valid only for **pressureOverclosure** = EXPONENTIAL or TABULAR. The items in #: the table data are described below. - table: tuple = () + table: tuple[tuple[float, ...], ...] = () #: A SymbolicConstant specifying the method for enforcement of the contact constraint. #: Possible values are DEFAULT, AUGMENTED_LAGRANGE, PENALTY, and DIRECT. The default value diff --git a/src/abaqus/Interaction/PressurePenetrationState.py b/src/abaqus/Interaction/PressurePenetrationState.py index b64d8ca8b4..cfd4c8ac8f 100644 --- a/src/abaqus/Interaction/PressurePenetrationState.py +++ b/src/abaqus/Interaction/PressurePenetrationState.py @@ -48,7 +48,7 @@ class PressurePenetrationState(InteractionState): #: A tuple of Floats specifying the fluid pressure magnitude. For steady state dynamic #: analyses, a tuple of Complexes specifying the fluid pressure magnitude. - penetrationPressure: float | None = None + penetrationPressure: tuple[float, ...] = () #: A String specifying the name of the amplitude reference. The String is empty if the load #: has no amplitude reference. @@ -56,7 +56,7 @@ class PressurePenetrationState(InteractionState): #: A tuple of Floats specifying the critical contact pressure below which fluid penetration #: starts to occur. - criticalPressure: float | None = None + criticalPressure: tuple[float, ...] = () #: A SymbolicConstant specifying the propagation state of the InteractionState object. #: Possible values are: diff --git a/src/abaqus/Interaction/Radiation.py b/src/abaqus/Interaction/Radiation.py index 84246399b9..3eef6a318c 100644 --- a/src/abaqus/Interaction/Radiation.py +++ b/src/abaqus/Interaction/Radiation.py @@ -26,7 +26,7 @@ class Radiation: #: A sequence of sequences of Floats specifying the following:Effective viewfactor, FF.Gap #: clearance, dd. - table: tuple + table: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__(self, masterEmissivity: float, slaveEmissivity: float, table: tuple): diff --git a/src/abaqus/Interaction/ThermalConductance.py b/src/abaqus/Interaction/ThermalConductance.py index 546abb4a31..912eb8fa63 100644 --- a/src/abaqus/Interaction/ThermalConductance.py +++ b/src/abaqus/Interaction/ThermalConductance.py @@ -69,7 +69,7 @@ class ThermalConductance: #: A sequence of sequences of Floats specifying clearance dependency data. The items in the #: table data are described below. - clearanceDepTable: tuple = () + clearanceDepTable: tuple[tuple[float, ...], ...] = () #: A Boolean specifying whether to use temperature-dependent data with pressure dependency. #: The default value is OFF. @@ -85,7 +85,7 @@ class ThermalConductance: #: A sequence of sequences of Floats specifying pressure dependency data. The items in the #: table data are described below. - pressureDepTable: tuple = () + pressureDepTable: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Job/Coexecution.py b/src/abaqus/Job/Coexecution.py index 3737059d2b..8793c5b588 100644 --- a/src/abaqus/Job/Coexecution.py +++ b/src/abaqus/Job/Coexecution.py @@ -75,8 +75,11 @@ class Coexecution: #: A repository of Job objects specifying the jobs that comprise this co-execution. jobs: dict[str, Job] = {} - #: A tuple of Strings specifying the names of the slave models for the co-execution. - slaveModels: tuple = () + #: A tuple of Strings specifying the names of the secondary models for the co-execution. + #: + #: .. versionchanged:: 2022 + #: The ``slaveModels`` attribute was changed to ``secondaryModels``. + slaveModels: tuple[str, ...] = () #: A tuple of SymbolicConstants specifying the analysis product types of the slave #: models for the co-execution. The default value is an empty sequence. diff --git a/src/abaqus/Job/Job.py b/src/abaqus/Job/Job.py index a086618862..125767d34b 100644 --- a/src/abaqus/Job/Job.py +++ b/src/abaqus/Job/Job.py @@ -140,7 +140,7 @@ class Job: messages: MessageArray = [] #: A tuple of Strings specifying the environment variables and their values. - environment: tuple = () + environment: tuple[str, ...] = () #: A SymbolicConstant specifying the type of license type being used in the case of the #: DSLS SimUnit license model. Possible values are DEFAULT, TOKEN, and CREDIT. The default diff --git a/src/abaqus/Job/JobFromInputFile.py b/src/abaqus/Job/JobFromInputFile.py index 3355de67d4..433af85313 100644 --- a/src/abaqus/Job/JobFromInputFile.py +++ b/src/abaqus/Job/JobFromInputFile.py @@ -50,7 +50,7 @@ class JobFromInputFile(Job): messages: MessageArray = [] #: A tuple of Strings specifying the environment variables and their values. - environment: tuple = () + environment: tuple[str, ...] = () #: A String specifying the name of the new job. The name must be a valid Abaqus/CAE object #: name. diff --git a/src/abaqus/Job/ModelJob.py b/src/abaqus/Job/ModelJob.py index 633d501344..369624022f 100644 --- a/src/abaqus/Job/ModelJob.py +++ b/src/abaqus/Job/ModelJob.py @@ -157,7 +157,7 @@ class ModelJob(Job): messages: MessageArray = [] #: A tuple of Strings specifying the environment variables and their values. - environment: tuple = () + environment: tuple[str, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Load/CoriolisForce.py b/src/abaqus/Load/CoriolisForce.py index 2147441217..592a1886f0 100644 --- a/src/abaqus/Load/CoriolisForce.py +++ b/src/abaqus/Load/CoriolisForce.py @@ -30,10 +30,10 @@ class CoriolisForce(Load): distributionType: SymbolicConstant = UNIFORM #: A tuple of Floats specifying the first point on the axis of rotation for the load. - point1: float | None = None + point1: tuple[float, ...] = () #: A tuple of Floats specifying the second point on the axis of rotation for the load. - point2: float | None = None + point2: tuple[float, ...] = () #: A String specifying the name of the AnalyticalField object associated with this load. #: The **field** argument applies only when **distributionType** = FIELD. The default value is an diff --git a/src/abaqus/Load/InertiaReliefState.py b/src/abaqus/Load/InertiaReliefState.py index a1f4888f8a..46d29e26f4 100644 --- a/src/abaqus/Load/InertiaReliefState.py +++ b/src/abaqus/Load/InertiaReliefState.py @@ -88,10 +88,11 @@ class InertiaReliefState(LoadState): #: A tuple of Floats specifying the point about which rotations are defined. The point can #: be specified only for certain combinations of free directions. The **referencePoint** #: argument can be one of the following: + #: #: - The **X**, **Y** and **Z** coordinates of a fixed rotation point. #: - A point on the rotation axis. #: - A point on the symmetry line. - referencePoint: float | None = None + referencePoint: tuple[float, ...] = () #: A SymbolicConstant specifying the propagation state of the **amplitude** member. Possible #: values are UNSET, SET, UNCHANGED, and FREED. diff --git a/src/abaqus/Load/RotationalBodyForce.py b/src/abaqus/Load/RotationalBodyForce.py index eed3c4f7b2..9178e262c4 100644 --- a/src/abaqus/Load/RotationalBodyForce.py +++ b/src/abaqus/Load/RotationalBodyForce.py @@ -46,10 +46,10 @@ class RotationalBodyForce(Load): rotaryAcceleration: Boolean = OFF #: A tuple of Floats specifying the first point on the axis of rotation for the load. - point1: float | None = None + point1: tuple[float, ...] = () #: A tuple of Floats specifying the second point on the axis of rotation for the load. - point2: float | None = None + point2: tuple[float, ...] = () #: A String specifying the name of the AnalyticalField object associated with this load. #: The **field** argument applies only when **distributionType** = FIELD. The default value is an diff --git a/src/abaqus/Load/SubstructureLoadState.py b/src/abaqus/Load/SubstructureLoadState.py index 582182d599..08b2525d87 100644 --- a/src/abaqus/Load/SubstructureLoadState.py +++ b/src/abaqus/Load/SubstructureLoadState.py @@ -25,7 +25,7 @@ class SubstructureLoadState(LoadState): """ #: A tuple of strings specifying the names of the load cases to be activated. - loadCaseNames: tuple = () + loadCaseNames: tuple[str, ...] = () #: A Float or a Complex specifying the load magnitude. magnitude: float | None = None diff --git a/src/abaqus/Material/ProgressiveDamageFailure/DamageInitiation.py b/src/abaqus/Material/ProgressiveDamageFailure/DamageInitiation.py index 500c38cab1..da79dc623a 100644 --- a/src/abaqus/Material/ProgressiveDamageFailure/DamageInitiation.py +++ b/src/abaqus/Material/ProgressiveDamageFailure/DamageInitiation.py @@ -236,7 +236,7 @@ class DamageInitiation: direction: SymbolicConstant = NMORI #: A tuple of tuples of Floats specifying the items described in the "Table data" section. - table: float | None = None + table: tuple[tuple[float, ...], ...] = () #: A DamageEvolution object. damageEvolution: DamageEvolution | None = None diff --git a/src/abaqus/Material/Ratios.py b/src/abaqus/Material/Ratios.py index 65c5447995..d35adb22ba 100644 --- a/src/abaqus/Material/Ratios.py +++ b/src/abaqus/Material/Ratios.py @@ -35,7 +35,7 @@ class Ratios: """ #: A sequence of sequences of Floats specifying the items described below. - table: tuple + table: tuple[tuple[float, ...], ...] = () #: A Boolean specifying whether the data depend on temperature. The default value is OFF. temperatureDependency: Boolean = OFF diff --git a/src/abaqus/Material/TestData/MullinsEffect.py b/src/abaqus/Material/TestData/MullinsEffect.py index b9948c35d4..3fc784e9e8 100644 --- a/src/abaqus/Material/TestData/MullinsEffect.py +++ b/src/abaqus/Material/TestData/MullinsEffect.py @@ -37,7 +37,7 @@ class MullinsEffect: #: A tuple of tuples of Floats specifying the items described below. The default value is #: an empty sequence. - table: tuple = () + table: tuple[tuple[float, ...], ...] = () #: A UniaxialTestDataArray object. uniaxialTests: UniaxialTestDataArray = [] diff --git a/src/abaqus/Odb/AnalyticSurface.py b/src/abaqus/Odb/AnalyticSurface.py index 0f446545b4..92958c4003 100644 --- a/src/abaqus/Odb/AnalyticSurface.py +++ b/src/abaqus/Odb/AnalyticSurface.py @@ -37,4 +37,4 @@ class AnalyticSurface: #: A tuple of tuples of Floats specifying the global coordinates of points representing the #: local coordinate system, if used. - localCoordData: float | None = None + localCoordData: tuple[tuple[float, ...], ...] = () diff --git a/src/abaqus/Odb/AnalyticSurfaceSegment.py b/src/abaqus/Odb/AnalyticSurfaceSegment.py index 030b198b6a..720e9da22d 100644 --- a/src/abaqus/Odb/AnalyticSurfaceSegment.py +++ b/src/abaqus/Odb/AnalyticSurfaceSegment.py @@ -31,7 +31,7 @@ class AnalyticSurfaceSegment: #: point. If **type** = PARABOLA, the first row contains coordinates of the middle point and #: the second row contains coordinates of the end point. If **type** = START or **type** = LINE, a #: single row contains coordinates of the start/end point. - data: tuple + data: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__(self, type: Literal[C.CIRCLE, C.START, C.LINE, C.PARABOLA], data: tuple): diff --git a/src/abaqus/Odb/BeamOrientation.py b/src/abaqus/Odb/BeamOrientation.py index 79fa00ad1c..faa46827af 100644 --- a/src/abaqus/Odb/BeamOrientation.py +++ b/src/abaqus/Odb/BeamOrientation.py @@ -29,4 +29,4 @@ class BeamOrientation: #: A tuple of Floats specifying direction cosines of the n1-direction of the beam #: cross-section. - vector: float | None = None + vector: tuple[float, ...] = () diff --git a/src/abaqus/Odb/FieldBulkData.py b/src/abaqus/Odb/FieldBulkData.py index 46f08c9b9d..903c6de273 100644 --- a/src/abaqus/Odb/FieldBulkData.py +++ b/src/abaqus/Odb/FieldBulkData.py @@ -46,35 +46,35 @@ class FieldBulkData: #: A sequence of Ints specifying the element labels of the elements in the block. #: **elementLabels** is valid only if **position** = INTEGRATION_POINT, CENTROID, ELEMENT_NODAL, #: or ELEMENT_FACE. - elementLabels: tuple = () + elementLabels: tuple[int, ...] = () #: A sequence of Ints specifying the node labels of the nodes in the block. **nodelabels** is #: valid only if **position** = ELEMENT_NODAL or NODAL. - nodeLabels: tuple = () + nodeLabels: tuple[int, ...] = () #: A sequence of Strings specifying the component labels. - componentLabels: tuple = () + componentLabels: tuple[str, ...] = () #: A sequence of Ints specifying the integration points in the elements in the block. #: **integrationPoints** is available only if **position** = INTEGRATION_POINT. - integrationPoints: tuple = () + integrationPoints: tuple[int, ...] = () #: A tuple of Floats specifying data in the form described by **type**. If **type** = TENSOR or #: VECTOR, **data** is a sequence containing the components for each element or node in the #: block. If the underlying data are in double precision, an exception will be thrown. - data: tuple = () + data: tuple[float, ...] = () #: A tuple of Floats specifying data in the form described by **type**. If **type** = TENSOR or #: VECTOR, **conjugateData** is a sequence containing the imaginary part of the components #: for each element or node in the block. If the underlying data are in double precision, #: an exception will be thrown. - conjugateData: tuple = () + conjugateData: tuple[float, ...] = () #: A sequence of Floats specifying the calculated von Mises stress at each output location #: in the block of element data, or NULL. The value is valid only when the #: **validInvariants** member includes MISES; otherwise, the value is indeterminate. #: Conjugate data will be ignored in invariant calculation. - mises: tuple = () + mises: tuple[float, ...] = () #: A pointer to an array of Floats specifying the quaternion representing the local #: coordinate system (the rotation from global to local) at each output location. The diff --git a/src/abaqus/Odb/FieldOutput.py b/src/abaqus/Odb/FieldOutput.py index 6570b6b242..90949943d2 100644 --- a/src/abaqus/Odb/FieldOutput.py +++ b/src/abaqus/Odb/FieldOutput.py @@ -64,7 +64,7 @@ class FieldOutput: #: the suffixes ('11', '22', '33', '12', '13', '23'). If **type** = VECTOR, the default value #: is **name** with the suffixes ('1', '2', '3'). If **type** = SCALAR, the default value is an #: empty sequence. - componentLabels: tuple = () + componentLabels: tuple[str, ...] = () #: A sequence of SymbolicConstants specifying which invariants should be calculated for #: this field. An empty sequence indicates that no invariants are valid for this field. diff --git a/src/abaqus/Odb/FieldValue.py b/src/abaqus/Odb/FieldValue.py index fd75343427..4eac897785 100644 --- a/src/abaqus/Odb/FieldValue.py +++ b/src/abaqus/Odb/FieldValue.py @@ -130,7 +130,7 @@ class FieldValue: #: VECTOR data for connector element outputs. For connector element outputs the rotation is #: from local to global. If the underlying data are in double precision, an exception will #: be thrown. - localCoordSystem: tuple = () + localCoordSystem: tuple[tuple[float, ...], ...] = () #: A tuple of tuples of Floats specifying the 3 x 3 matrix of Doubles specifying the #: direction cosines of the local coordinate system (the rotation from global to local). @@ -139,24 +139,24 @@ class FieldValue: #: for VECTOR data for connector element outputs. For connector element outputs the #: rotation is from local to global. If the underlying data are in single precision, an #: exception will be thrown. - localCoordSystemDouble: tuple = () + localCoordSystemDouble: tuple[tuple[float, ...], ...] = () #: A tuple of Floats specifying data in the form described by **type**. If **type** = TENSOR or #: VECTOR, **data** is a sequence containing the components. If the underlying data are in #: double precision an exception will be thrown. - data: tuple = () + data: tuple[float, ...] = () #: A tuple of Floats specifying data in the form described by **type**. If **type** = TENSOR or #: VECTOR, **data** is a sequence containing the components. If the underlying data are in #: single precision, an exception will be thrown. - dataDouble: tuple = () + dataDouble: tuple[float, ...] = () #: A tuple of Floats specifying data in the form described by **type**. If **type** = TENSOR or #: VECTOR, **conjugateData** is a sequence containing the components. If the underlying data #: are in double precision, an exception will be thrown. - conjugateData: tuple = () + conjugateData: tuple[float, ...] = () #: A tuple of Floats specifying data in the form described by **type**. If **type** = TENSOR or #: VECTOR, **conjugateData** is a sequence containing the components. If the underlying data #: are in single precision, an exception will be thrown. - conjugateDataDouble: tuple = () + conjugateDataDouble: tuple[float, ...] = () diff --git a/src/abaqus/Odb/OdbDatumCsys.py b/src/abaqus/Odb/OdbDatumCsys.py index 5e4971aaad..f6ce7f9d00 100644 --- a/src/abaqus/Odb/OdbDatumCsys.py +++ b/src/abaqus/Odb/OdbDatumCsys.py @@ -32,16 +32,16 @@ class OdbDatumCsys: #: A tuple of Floats specifying the coordinates of the origin of the datum coordinate #: system. - origin: float | None = None + origin: tuple[float, ...] = () #: A tuple of Floats specifying a point on the **X** axis. - xAxis: float | None = None + xAxis: tuple[float, ...] = () #: A tuple of Floats specifying a point on the **Y** axis. - yAxis: float | None = None + yAxis: tuple[float, ...] = () #: A tuple of Floats specifying a point on the **Z** axis. - zAxis: float | None = None + zAxis: tuple[float, ...] = () @abaqus_method_doc def DatumCsysByThreePoints( diff --git a/src/abaqus/Odb/OdbMeshElement.py b/src/abaqus/Odb/OdbMeshElement.py index 1a34f0583e..e3db5455e6 100644 --- a/src/abaqus/Odb/OdbMeshElement.py +++ b/src/abaqus/Odb/OdbMeshElement.py @@ -49,10 +49,10 @@ class OdbMeshElement: #: node cannot be ascertained. This is a limitation. It is important to note the difference #: with MeshElement object of MDB where the connectivity is node indices instead of node #: labels. - connectivity: int | None = None + connectivity: tuple[int, ...] = () #: A tuple of Strings specifying the instance names for nodes in the element connectivity. - instanceNames: tuple = () + instanceNames: tuple[str, ...] = () #: A String specifying the instance name. instanceName: str = "" diff --git a/src/abaqus/Odb/OdbMeshNode.py b/src/abaqus/Odb/OdbMeshNode.py index a1f4d2aadd..5e38b29ab0 100644 --- a/src/abaqus/Odb/OdbMeshNode.py +++ b/src/abaqus/Odb/OdbMeshNode.py @@ -30,4 +30,4 @@ class OdbMeshNode: #: A tuple of Floats specifying the nodal coordinates in the global Cartesian coordinate #: system. - coordinates: float | None = None + coordinates: tuple[float, ...] = () diff --git a/src/abaqus/Odb/OdbPretensionSection.py b/src/abaqus/Odb/OdbPretensionSection.py index b0c67bb00a..6723fcf44a 100644 --- a/src/abaqus/Odb/OdbPretensionSection.py +++ b/src/abaqus/Odb/OdbPretensionSection.py @@ -27,4 +27,4 @@ class OdbPretensionSection: surface: OdbSet = OdbSet("set", ()) #: A tuple of Floats specifying the components of the normal to the pretension section. - normal: float | None = None + normal: tuple[float, ...] = () diff --git a/src/abaqus/Odb/OdbSet.py b/src/abaqus/Odb/OdbSet.py index efcf687773..552036d9fe 100644 --- a/src/abaqus/Odb/OdbSet.py +++ b/src/abaqus/Odb/OdbSet.py @@ -38,7 +38,7 @@ class OdbSet: #: A tuple of Strings specifying the namespaces for the nodes, elements, and faces; None if #: the set is on a Part or an OdbInstance object. - instanceNames: tuple = () + instanceNames: tuple[str, ...] = () #: An OdbMeshNodeArray object specifying the nodes of an OdbSet. If a set spans more than #: one part instance, this member is a sequence of sequences for each part instance. diff --git a/src/abaqus/Odb/OdbStepBase.py b/src/abaqus/Odb/OdbStepBase.py index 6e71be15e0..894d4c9ec3 100644 --- a/src/abaqus/Odb/OdbStepBase.py +++ b/src/abaqus/Odb/OdbStepBase.py @@ -50,23 +50,23 @@ class OdbStepBase: loadCases: dict[str, OdbLoadCase] = {} #: A tuple of Floats specifying the coordinates of the center of mass. - massCenter: float | None = None + massCenter: tuple[float, ...] = () #: A tuple of Floats specifying the moments and products of inertia about the center of #: mass. For 3-D models inertia quantities are written in the following order: I(XX), #: I(YY), I(ZZ), I(XY), I(XZ), and I(YZ). For 2-D models only I(ZZ) and I(XY) are #: outputted. - inertiaAboutCenter: float | None = None + inertiaAboutCenter: tuple[float, ...] = () #: A tuple of Floats specifying the moments and products of inertia about the origin of the #: global coordinate system. For 3-D models inertia quantities are written in the following #: order: I(XX), I(YY), I(ZZ), I(XY), I(XZ), and I(YZ). For 2-D models only I(ZZ) and I(XY) #: are outputted. - inertiaAboutOrigin: float | None = None + inertiaAboutOrigin: tuple[float, ...] = () #: A tuple of Floats specifying the coordinates of the center of mass of the acoustic #: media. - acousticMassCenter: float | None = None + acousticMassCenter: tuple[float, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Odb/SectorDefinition.py b/src/abaqus/Odb/SectorDefinition.py index 12ae70ff81..7b15843c74 100644 --- a/src/abaqus/Odb/SectorDefinition.py +++ b/src/abaqus/Odb/SectorDefinition.py @@ -20,4 +20,4 @@ class SectorDefinition: #: A tuple of tuples of Floats specifying the coordinates of two points on the axis of #: symmetry. - symmetryAxis: float | None = None + symmetryAxis: tuple[tuple[float, ...], ...] = () diff --git a/src/abaqus/OdbDisplay/ContourOptions.py b/src/abaqus/OdbDisplay/ContourOptions.py index 64679f99e8..216b5021cf 100644 --- a/src/abaqus/OdbDisplay/ContourOptions.py +++ b/src/abaqus/OdbDisplay/ContourOptions.py @@ -137,7 +137,7 @@ class ContourOptions(DGContourOptions): reversedContourLegendRange: Boolean = OFF #: A tuple of Floats specifying the interval values when **intervalType** = USER_DEFINED. - intervalValues: float | None = None + intervalValues: tuple[float, ...] = () #: A SymbolicConstant specifying the contour rendering method. Possible values are #: TEXTURE_MAPPED and TESSELLATED. The default value is TEXTURE_MAPPED. diff --git a/src/abaqus/OdbDisplay/OdbDisplay.py b/src/abaqus/OdbDisplay/OdbDisplay.py index 4698690b6d..c9adaf232d 100644 --- a/src/abaqus/OdbDisplay/OdbDisplay.py +++ b/src/abaqus/OdbDisplay/OdbDisplay.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Sequence, Union, overload +from typing import Union, overload from typing_extensions import Literal @@ -88,7 +88,7 @@ class OdbDisplay: #: defined. #: - **element10**: A sequence of machine readable strings encoding the currently active #: frame numbers. - fieldSteps: tuple = () + fieldSteps: tuple[str, ...] = () #: An OdbFieldVarList object. fieldVariables: OdbFieldVarList = OdbFieldVarList() @@ -151,7 +151,7 @@ class OdbDisplay: #: A tuple of Strings specifying the step label and the frame label when the current step #: is user defined. Alternatively, **fieldFrame** maybe specified as a pair of Ints with the #: step index and the frame index, when the current step is defined in the analysis. - fieldFrame: Sequence[str] = () + fieldFrame: tuple[str, ...] = () #: A tuple specifying variables. #: Each item in the sequence consists of a tuple containing the following elements: @@ -248,10 +248,10 @@ class OdbDisplay: statusInsideRange: SymbolicConstant #: A tuple of Floats specifying a Float value for the minimum status range value. - statusMinimum: float | None = None + statusMinimum: tuple[float, ...] = () #: A tuple of Floats specifying a Float value for the maximum status range value. - statusMaximum: float | None = None + statusMaximum: tuple[float, ...] = () #: A tuple of SymbolicConstants specifying a Boolean to specify if elements are to be #: removed based on the status variable diff --git a/src/abaqus/OdbDisplay/ViewCut.py b/src/abaqus/OdbDisplay/ViewCut.py index 8dce484711..ba054286d7 100644 --- a/src/abaqus/OdbDisplay/ViewCut.py +++ b/src/abaqus/OdbDisplay/ViewCut.py @@ -92,14 +92,14 @@ class ViewCut: #: SymbolicConstant defining this normal axis, when the cut is defined by the **csysName** #: argument. Possible values are AXIS_1, AXIS_2, AXIS_3. This axis is not required if the #: cut **shape** is CYLINDER, SPHERE or ISOSURFACE. - normal: Union[SymbolicConstant, float] + normal: Union[SymbolicConstant, tuple[float, ...]] = () #: A sequence of three Floats specifying the X-, Y-, and Z-coordinates of the second axis #: of the plane defining the cut, when the plane is defined using the **origin** argument or #: a SymbolicConstant defining this second axis, when the cut is defined by the **csysName** #: argument. Possible values are AXIS_1, AXIS_2, AXIS_3. This axis is used to rotate the #: plane cut. It is not required if the cut **shape** is CYLINDER, SPHERE or ISOSURFACE. - axis2: Union[SymbolicConstant, float] + axis2: Union[SymbolicConstant, tuple[tuple[float, float, float], ...]] = () #: A String specifying the name of the DatumCsys object to be used to define the cut. This #: name is not required if the cut **shape** is ISOSURFACE or if the cut is defined by the @@ -111,7 +111,7 @@ class ViewCut: #: SymbolicConstant defining this cylinder axis, when the cut is defined by the **csysName** #: argument. Possible values are AXIS_1, AXIS_2, AXIS_3. This axis is not required if the #: cut **shape** is PLANE, SPHERE, or ISOSURFACE. - cylinderAxis: Union[SymbolicConstant, float] + cylinderAxis: Union[SymbolicConstant, tuple[float, ...]] = () #: A Boolean specifying whether the cut will follow the deformation or be static. The #: default value is OFF. diff --git a/src/abaqus/Optimization/CombinedTermDesignResponse.py b/src/abaqus/Optimization/CombinedTermDesignResponse.py index 8d79bf06a0..ec2d6c9245 100644 --- a/src/abaqus/Optimization/CombinedTermDesignResponse.py +++ b/src/abaqus/Optimization/CombinedTermDesignResponse.py @@ -25,7 +25,7 @@ class CombinedTermDesignResponse(DesignResponse): name: str #: A sequence of Strings specifying the names of the design responses to combine. - terms: tuple + terms: tuple[str, ...] = () #: None or a sequence of Floats specifying the maximum radius of influence used when #: **method** is FILTER. The default value is None. @@ -87,7 +87,7 @@ class CombinedTermDesignResponse(DesignResponse): #: A sequence of Floats specifying the weights to apply to the list of design responses #: used when **method** is WEIGHTED_ADD. The default value is an empty sequence. - weights: tuple = () + weights: tuple[float, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Optimization/ShapeRotationalSymmetry.py b/src/abaqus/Optimization/ShapeRotationalSymmetry.py index d88d2a5594..23de1d1b02 100644 --- a/src/abaqus/Optimization/ShapeRotationalSymmetry.py +++ b/src/abaqus/Optimization/ShapeRotationalSymmetry.py @@ -58,7 +58,7 @@ class ShapeRotationalSymmetry(GeometricRestriction): #: A tuple of Floats representing the coordinates of a start point of the rotational #: symmetry. - startPoint: float | None = None + startPoint: tuple[float, ...] = () #: A Float specifying the geometric tolerance in the 1-direction. The default value is #: 0.01. diff --git a/src/abaqus/PathAndProbe/CurrentProbeValues.py b/src/abaqus/PathAndProbe/CurrentProbeValues.py index d64b155f3a..198b7c8cd1 100644 --- a/src/abaqus/PathAndProbe/CurrentProbeValues.py +++ b/src/abaqus/PathAndProbe/CurrentProbeValues.py @@ -1,7 +1,5 @@ from __future__ import annotations -from typing import Sequence - from abqpy.decorators import abaqus_class_doc @@ -19,4 +17,4 @@ class CurrentProbeValues: #: A tuple of Floats specifying the values obtained while probing. These values are updated #: constantly as the user moves the mouse over the object being probed. - values: Sequence[float] | None = None + values: tuple[float, ...] = () diff --git a/src/abaqus/PathAndProbe/NodeQuery.py b/src/abaqus/PathAndProbe/NodeQuery.py index 197e92aa51..c6cb38e114 100644 --- a/src/abaqus/PathAndProbe/NodeQuery.py +++ b/src/abaqus/PathAndProbe/NodeQuery.py @@ -21,4 +21,4 @@ class NodeQuery: #: A tuple of Floats specifying the **X**, **Y**, and **Z** coordinates of the most recently #: queried node. - nodePos: float | None = None + nodePos: tuple[float, ...] = () diff --git a/src/abaqus/PathAndProbe/SelectedProbeValues.py b/src/abaqus/PathAndProbe/SelectedProbeValues.py index 41101cf635..3beb50e180 100644 --- a/src/abaqus/PathAndProbe/SelectedProbeValues.py +++ b/src/abaqus/PathAndProbe/SelectedProbeValues.py @@ -25,7 +25,7 @@ class SelectedProbeValues: fieldOutputAvailable: Boolean = OFF #: A tuple of tuples of Floats specifying the selected probe values. - values: float | None = None + values: tuple[tuple[float, ...], ...] = () #: A tuple of Floats specifying the last sequence of the **values** member. - lastValues: tuple = () + lastValues: tuple[float, ...] = () diff --git a/src/abaqus/PlotOptions/BasicOptions.py b/src/abaqus/PlotOptions/BasicOptions.py index 0f2aa6e668..4f7420a7b9 100644 --- a/src/abaqus/PlotOptions/BasicOptions.py +++ b/src/abaqus/PlotOptions/BasicOptions.py @@ -422,12 +422,12 @@ class BasicOptions(_CopyOptionsBase): #: A tuple of Ints specifying which sectors to display when #: **sectorSelectionType** = SELECT_BY_NUMBER. Possible values are 1 ≤ **selectedSectorNumbers** #: ≤ the number of sectors. The default value is (1). - selectedSectorNumbers: Sequence[int] | None = None + selectedSectorNumbers: tuple[int, ...] = () #: A tuple of Strings specifying either element set or display group names (depending on #: the value of regionBoundaries) defining the averaging region boundaries. The default #: value is an empty sequence. - userRegions: tuple = () + userRegions: tuple[str, ...] = () @abaqus_method_doc def setValues( diff --git a/src/abaqus/PlotOptions/OdbContactDiagnostics.py b/src/abaqus/PlotOptions/OdbContactDiagnostics.py index 89fb081c8c..1a6d7dd1c2 100644 --- a/src/abaqus/PlotOptions/OdbContactDiagnostics.py +++ b/src/abaqus/PlotOptions/OdbContactDiagnostics.py @@ -25,7 +25,7 @@ class OdbContactDiagnostics: #: A sequence of strings specifying the nature of each of the contact pair. This attribute #: is read-only. - detailStrings: tuple = () + detailStrings: tuple[str, ...] = () #: A string specifying the type of contact initialization. This attribute is read-only. type: str = "" diff --git a/src/abaqus/PredefinedField/FieldState.py b/src/abaqus/PredefinedField/FieldState.py index 896ca2a763..b233ba1f19 100644 --- a/src/abaqus/PredefinedField/FieldState.py +++ b/src/abaqus/PredefinedField/FieldState.py @@ -103,7 +103,7 @@ class FieldState(PredefinedFieldState): #: the N2 direction. #: - If **crossSectionDistribution** = POINTS_THROUGH_SECTION, **magnitudes** is a sequence of #: Doubles specifying the field at each point. - magnitudes: tuple = () + magnitudes: tuple[float, ...] = () #: A SymbolicConstant specifying the propagation state of the PredefinedFieldState object. #: Possible values are: diff --git a/src/abaqus/PredefinedField/IMARegion.py b/src/abaqus/PredefinedField/IMARegion.py index 6488861cde..bfccce00ee 100644 --- a/src/abaqus/PredefinedField/IMARegion.py +++ b/src/abaqus/PredefinedField/IMARegion.py @@ -24,4 +24,4 @@ class IMARegion: #: A tuple of Floats specifying the volume fractions, per material instance name. The #: length of the tuple corresponds to the number of material instance names, as established #: by the assigned Eulerian section. - fractionList: float | None = None + fractionList: tuple[float, ...] = () diff --git a/src/abaqus/PredefinedField/KinematicHardening.py b/src/abaqus/PredefinedField/KinematicHardening.py index 835ce8a799..f5b428d7ff 100644 --- a/src/abaqus/PredefinedField/KinematicHardening.py +++ b/src/abaqus/PredefinedField/KinematicHardening.py @@ -45,15 +45,15 @@ class KinematicHardening(PredefinedField): numBackStress: int = 1 #: A sequence of Floats specifying the initial equivalent Plastic strain. - equivPlasticStrain: tuple = () + equivPlasticStrain: tuple[float, ...] = () #: A sequence of sequences of Floats specifying the initial backstress tensor for kinematic #: hardening models. The default value is an empty sequence. - backStress: tuple = () + backStress: tuple[tuple[float, ...], ...] = () #: A sequence of Ints specifying section point numbers. This argument is valid only when #: **definition** = SECTION_PTS. - sectPtNum: tuple = () + sectPtNum: tuple[int, ...] = () #: A SymbolicConstant specifying different types of kinematic hardening. Possible values #: are KINEMATIC_HARDENING, CRUSHABLE_FOAM, REBAR, SECTION_PTS, and USER_DEFINED. The @@ -62,7 +62,7 @@ class KinematicHardening(PredefinedField): #: A sequence of Strings specifying rebar layer names. This argument is valid only when #: **definition** = REBAR. - rebarLayerNames: tuple = () + rebarLayerNames: tuple[str, ...] = () #: A SymbolicConstant specifying whether the load is uniform. Possible values are MAGNITUDE #: and ANALYTICAL_FIELD. The default value is MAGNITUDE. diff --git a/src/abaqus/PredefinedField/TemperatureState.py b/src/abaqus/PredefinedField/TemperatureState.py index 9776c87708..80a18e623b 100644 --- a/src/abaqus/PredefinedField/TemperatureState.py +++ b/src/abaqus/PredefinedField/TemperatureState.py @@ -93,17 +93,18 @@ class TemperatureState(PredefinedFieldState): #: A tuple of Floats specifying the temperature values when **distributionType** = UNIFORM or #: **distributionType** = FIELD. The value of the **magnitudes** argument is a function of the #: **crossSectionDistribution** argument, as shown in the following list: + #: #: - If **crossSectionDistribution** = CONSTANT_THROUGH_THICKNESS then **magnitudes** is a Double - #: specifying the temperature. + #: specifying the temperature. #: - If **crossSectionDistribution** = GRADIENTS_THROUGH_SHELL_CS then **magnitudes** is a - #: sequence of Doubles specifying the mean value and the gradient in the thickness - #: direction. + #: sequence of Doubles specifying the mean value and the gradient in the thickness + #: direction. #: - If **crossSectionDistribution** = GRADIENTS_THROUGH_BEAM_CS then **magnitudes** is a - #: sequence of Doubles specifying the mean value, the gradient in the N1 direction, and the - #: gradient in the N2 direction. + #: sequence of Doubles specifying the mean value, the gradient in the N1 direction, and the + #: gradient in the N2 direction. #: - If **crossSectionDistribution** = POINTS_THROUGH_SECTION then **magnitudes** is a sequence - #: of Doubles specifying the temperature at each point. - magnitudes: tuple = () + #: of Doubles specifying the temperature at each point. + magnitudes: tuple[float, ...] = () #: A SymbolicConstant specifying the propagation state of the PredefinedFieldState object. #: Possible values are: diff --git a/src/abaqus/PredefinedField/Velocity.py b/src/abaqus/PredefinedField/Velocity.py index 55b85d1208..95d237fc12 100644 --- a/src/abaqus/PredefinedField/Velocity.py +++ b/src/abaqus/PredefinedField/Velocity.py @@ -46,11 +46,11 @@ class Velocity(PredefinedField): #: A sequence of Floats specifying the *X-*, *Y-*, and **Z** coordinates of the starting #: point of the axis about which **omega** is defined. - axisBegin: tuple + axisBegin: tuple[float, ...] = () #: A sequence of Floats specifying the *X-*, *Y-*, and **Z** coordinates of the end point of #: the axis about which **omega** is defined. - axisEnd: tuple + axisEnd: tuple[float, ...] = () #: A String specifying the name of the AnalyticalField object associated with this #: predefined field. The **field** argument applies only when diff --git a/src/abaqus/Property/MaterialOrientation.py b/src/abaqus/Property/MaterialOrientation.py index 05e0a15027..ca9f13dd23 100644 --- a/src/abaqus/Property/MaterialOrientation.py +++ b/src/abaqus/Property/MaterialOrientation.py @@ -106,7 +106,7 @@ class MaterialOrientation: #: A sequence of Floats specifying the vector that defines the direction of the normal axis #: of the discrete orientation. - normalAxisVector: tuple = () + normalAxisVector: tuple[float, ...] = () #: A SymbolicConstant specifying the axis that is defined by the primary axis direction for #: a discrete orientation. Possible values are AXIS_1, AXIS_2, and AXIS_3. The default @@ -132,7 +132,7 @@ class MaterialOrientation: #: A sequence of Floats specifying the vector that defines the direction of the primary #: axis of the discrete orientation. - primaryAxisVector: tuple = () + primaryAxisVector: tuple[float, ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Region/Surface.py b/src/abaqus/Region/Surface.py index 88798105b4..6fbe02a256 100644 --- a/src/abaqus/Region/Surface.py +++ b/src/abaqus/Region/Surface.py @@ -55,7 +55,7 @@ class Surface(Region): #: A tuple of Ints specifying the instances. This member is not applicable for a Surface #: object on an output database. - instances: int | None = None + instances: tuple[int, ...] = () @overload @abaqus_method_doc diff --git a/src/abaqus/Section/BeamSection.py b/src/abaqus/Section/BeamSection.py index 7f61546d00..2d50d849dc 100644 --- a/src/abaqus/Section/BeamSection.py +++ b/src/abaqus/Section/BeamSection.py @@ -149,11 +149,11 @@ class BeamSection(Section): #: A sequence of sequences of Floats specifying the items described below. The default #: value is an empty sequence. - table: tuple = () + table: tuple[tuple[float, ...], ...] = () #: A sequence of pairs of Floats specifying the positions at which output is requested. The #: default value is an empty sequence. - outputPts: tuple = () + outputPts: tuple[tuple[float, float], ...] = () #: A pair of Floats specifying the **X - Y** coordinates of the centroid. The default value is #: (0.0, 0.0). diff --git a/src/abaqus/Section/GeneralStiffnessSection.py b/src/abaqus/Section/GeneralStiffnessSection.py index 0fac182227..078df92029 100644 --- a/src/abaqus/Section/GeneralStiffnessSection.py +++ b/src/abaqus/Section/GeneralStiffnessSection.py @@ -40,7 +40,7 @@ class GeneralStiffnessSection(ShellSection): #: A sequence of Floats specifying the stiffness matrix for the section in the order D11, #: D12, D22, D13, D23, D33, ...., D66. Twenty-one entries must be given. - stiffnessMatrix: tuple + stiffnessMatrix: tuple[float, ...] = () #: None or a Float specifying the reference temperature for thermal expansion. The default #: value is None. @@ -78,12 +78,12 @@ class GeneralStiffnessSection(ShellSection): #: A sequence of Floats specifying the generalized stress values caused by a unit #: temperature rise. Six entries must be given if the value of **applyThermalStress** is set #: to True. The default value is (""). - thermalStresses: tuple = () + thermalStresses: tuple[float, ...] = () #: A sequence of sequences of Floats specifying the scaling factors for given temperatures #: and/or field data. Each row should contain (Y, alpha, T, F1,...,Fn). The default value #: is an empty sequence. - scalingData: tuple = () + scalingData: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__( diff --git a/src/abaqus/Sketcher/ConstrainedSketchGeometry/ConstrainedSketchGeometry.py b/src/abaqus/Sketcher/ConstrainedSketchGeometry/ConstrainedSketchGeometry.py index b35a4b1434..8d946c0b37 100644 --- a/src/abaqus/Sketcher/ConstrainedSketchGeometry/ConstrainedSketchGeometry.py +++ b/src/abaqus/Sketcher/ConstrainedSketchGeometry/ConstrainedSketchGeometry.py @@ -31,4 +31,4 @@ class ConstrainedSketchGeometry: #: A tuple of Floats specifying the **X** and*Y*-coordinates of a point located on the #: geometry. - pointOn: float | None = None + pointOn: tuple[float, ...] = () diff --git a/src/abaqus/Sketcher/ConstrainedSketchVertex/ConstrainedSketchVertex.py b/src/abaqus/Sketcher/ConstrainedSketchVertex/ConstrainedSketchVertex.py index 2a5bf97e5c..75e5338fd4 100644 --- a/src/abaqus/Sketcher/ConstrainedSketchVertex/ConstrainedSketchVertex.py +++ b/src/abaqus/Sketcher/ConstrainedSketchVertex/ConstrainedSketchVertex.py @@ -18,7 +18,7 @@ class ConstrainedSketchVertex: """ #: A tuple of Floats specifying the*X*-, **Y**, and **Z** coordinates of the sketch vertex. - coords: float | None = None + coords: tuple[float, ...] = () @abaqus_method_doc def Spot(self, point: Sequence[float]): diff --git a/src/abaqus/StepOutput/FieldOutputRequestState.py b/src/abaqus/StepOutput/FieldOutputRequestState.py index 2f18b51247..0ea21c96e6 100644 --- a/src/abaqus/StepOutput/FieldOutputRequestState.py +++ b/src/abaqus/StepOutput/FieldOutputRequestState.py @@ -79,7 +79,7 @@ class FieldOutputRequestState: #: A tuple of Strings specifying output request variable or component names, or the #: SymbolicConstant PRESELECT or ALL. PRESELECT represents all default output variables for #: the given step. ALL represents all valid output variables. - variables: SymbolicConstant + variables: tuple[str, ...] | SymbolicConstant = () #: The SymbolicConstant ALL or a tuple of Ints specifying a list of eigenmodes for which #: output is desired. The default value is ALL. diff --git a/src/abaqus/StepOutput/HistoryOutputRequestState.py b/src/abaqus/StepOutput/HistoryOutputRequestState.py index 7cdea4e5c6..6a72674bb6 100644 --- a/src/abaqus/StepOutput/HistoryOutputRequestState.py +++ b/src/abaqus/StepOutput/HistoryOutputRequestState.py @@ -65,7 +65,7 @@ class HistoryOutputRequestState: #: A tuple of Strings specifying output request variable or component names, or the #: SymbolicConstant PRESELECT or ALL. PRESELECT represents all default output variables for #: the given step. ALL represents all valid output variables. - variables: SymbolicConstant + variables: tuple[str, ...] | SymbolicConstant = () #: The SymbolicConstant ALL or a tuple of Ints specifying a list of eigenmodes for which #: output is desired. The default value is ALL. diff --git a/src/abaqus/StepOutput/TimePoint.py b/src/abaqus/StepOutput/TimePoint.py index e04887f8c6..fd1d523bc1 100644 --- a/src/abaqus/StepOutput/TimePoint.py +++ b/src/abaqus/StepOutput/TimePoint.py @@ -24,7 +24,7 @@ class TimePoint: #: A sequence of sequences of Floats specifying time points at which data are written to #: the output database or restart files. - points: tuple + points: tuple[tuple[float, ...], ...] = () @abaqus_method_doc def __init__(self, name: str, points: tuple): diff --git a/src/abaqus/UtilityAndView/View.py b/src/abaqus/UtilityAndView/View.py index 48fe539b51..aad326a1d5 100644 --- a/src/abaqus/UtilityAndView/View.py +++ b/src/abaqus/UtilityAndView/View.py @@ -38,7 +38,7 @@ class View: #: A tuple of Floats specifying a transformation matrix used to position the contents of #: the Layer within a viewport. - layerTransform: float | None = None + layerTransform: tuple[float, ...] = () #: A String specifying the name of the view (also used as the repository key). Possible #: values are 'Front', 'Back', 'Top', 'Bottom', 'Left', 'Right', 'Iso', 'User-1', 'User-2', diff --git a/src/abaqus/XY/AxisData.py b/src/abaqus/XY/AxisData.py index a6aa911efa..6a9a21a4b5 100644 --- a/src/abaqus/XY/AxisData.py +++ b/src/abaqus/XY/AxisData.py @@ -138,10 +138,10 @@ class AxisData: quantityType: QuantityType = QuantityType() #: A tuple of Floats specifying the read-only major tick values shown. - tickValues: float | None = None + tickValues: tuple[float, ...] = () #: A tuple of Strings specifying the read-only major tick labels shown. - tickLabels: tuple = () + tickLabels: tuple[str, ...] = () #: A String specifying the system title. The system title is based on the **quantityType** of #: the axis and associated curves. diff --git a/src/abaqus/XY/Chart.py b/src/abaqus/XY/Chart.py index 0191b2096d..6cc0d5ebbc 100644 --- a/src/abaqus/XY/Chart.py +++ b/src/abaqus/XY/Chart.py @@ -88,7 +88,7 @@ class Chart: #: A tuple of Floats specifying a transformation matrix used to scale or pan along the axes #: of the Chart. - transform: float | None = None + transform: tuple[float, ...] = () @abaqus_method_doc def autoColor(self, lines: Boolean = OFF, symbols: Boolean = OFF): diff --git a/src/abaqus/XY/XYPlotBase.py b/src/abaqus/XY/XYPlotBase.py index 2bbc710ad2..e5d10d9fe8 100644 --- a/src/abaqus/XY/XYPlotBase.py +++ b/src/abaqus/XY/XYPlotBase.py @@ -35,7 +35,7 @@ class XYPlotBase: #: A tuple of Floats specifying a transformation matrix used to scale or pan along the axes #: of the active Chart object of this XYPlot. - transform: float | None = None + transform: tuple[float, ...] = () @abaqus_method_doc def __init__(self, name: str):