Skip to content

Commit

Permalink
MSH-4827 Adapted to review: argument Assessment type moved to Calcula…
Browse files Browse the repository at this point in the history
…tion Options and descriptive comment improved
  • Loading branch information
VirginieTrompille committed Aug 20, 2024
1 parent 766621d commit 57c4b54
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions geolib/models/dsheetpiling/calculation_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class CalculationOptions(BaseDataClass, metaclass=ABCMeta):
calc_minor_nodes_on: Select either the faster, classic, coarse element determination (False) of active and passive pressures, or the more accurate fine element determination(True).
calc_reduce_deltas: Set on True for reduction of the wall friction angles according to CUR 166 for the calculation of the passive earth pressure coefficients of Culmann method.
input_calculation_type: select the type of calculation that is going to be performed.
ec7_nl_assessment_type: Select the assessment type for a calculation with EC7-NL. This option is used only by the GUI in User Defined Partial Factors window.
"""

Expand All @@ -56,6 +57,7 @@ class CalculationOptions(BaseDataClass, metaclass=ABCMeta):
calc_reduce_deltas: bool = False # editable if C,phi, delta is selected
input_calculation_type: CalculationType = CalculationType.STANDARD
is_vibration_calculation: bool = False
ec7_nl_assessment_type: AssessmentTypeEC7NL = AssessmentTypeEC7NL.NewConstruction

@property
def calculation_properties(
Expand Down Expand Up @@ -149,7 +151,6 @@ class VerifyCalculationOptions(CalculationOptions):
ec7_nl_overall_partial_factor_set: Select partial factor set
ec7_nl_overall_anchor_factor: multiplication factor for the anchor stiffness
ec7_nad_nl_overall_stability: Set to True to perform an overall stability calculation using modified values for soil properties (cohesion, friction angle and unit weight) depending on the Design approach chosen for all stages.
ec7_nl_assessment_type: Select assessment type
ec7_be_overall_stability: Set to True to perform an overall stability calculation using modified values for soil properties (cohesion, friction angle and unit weight) depending on the Design approach chosen for all stages.
ec7_be_method: Select method of calculation for EC7 BE
ec7_be_overall_risk_class: Select risk class
Expand All @@ -169,7 +170,6 @@ class VerifyCalculationOptions(CalculationOptions):
)
ec7_nl_overall_anchor_factor: Annotated[float, Field(ge=0.001, le=1000)] = 1
ec7_nad_nl_overall_stability: bool = False
ec7_nl_assessment_type: AssessmentTypeEC7NL = AssessmentTypeEC7NL.NewConstruction
ec7_be_overall_stability: bool = False
ec7_be_method: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
ec7_be_overall_risk_class: RiskClassEC7BE = RiskClassEC7BE.RC2
Expand Down

0 comments on commit 57c4b54

Please sign in to comment.