Merge pull request #204 from Deltares/feature/d-serie-2024-1

Feature/d-serie-2024-1

docs/user/setup.rst

@@ -125,7 +125,7 @@ At the moment that version number is:
 
 * D-Settlement **23.2**
 * D-Foundations **23.1**
-* D-SheetPiling **23.1**
+* D-SheetPiling **24.1**
 * D-Stability **2024.01**
 * D-Geo Flow **2024.01**
 

geolib/models/dsheetpiling/calculation_options.py

@@ -13,7 +13,9 @@
     PartialFactorSetCUR,
     PartialFactorSetEC,
     PartialFactorSetEC7NADBE,
+    RiskClassEC7BE,
     PartialFactorSetEC7NADNL,
+    AssessmentTypeEC7NL,
     PartialFactorSetVerifyEC,
     VerifyType,
 )
@@ -46,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.
 
     """
 
@@ -54,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(
@@ -104,8 +108,8 @@ class OverallStabilityCalculationOptions(CalculationOptions):
     stability_ec7_nl_partial_factor_set: PartialFactorSetEC7NADNL = (
         PartialFactorSetEC7NADNL.RC0
     )
-    stability_ec7_be_partial_factor_set: PartialFactorSetEC7NADBE = (
-        PartialFactorSetEC7NADBE.SET1
+    overall_stability_ec7_be_partial_factor_set: PartialFactorSetEC7NADBE = (
+        PartialFactorSetEC7NADBE.RC1SET1
     )
     stability_cur_partial_factor_set: PartialFactorSetCUR = PartialFactorSetCUR.CLASSI
     stability_export: bool = False
@@ -148,7 +152,8 @@ class VerifyCalculationOptions(CalculationOptions):
      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_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.
-     nb_method: Select method of calculation according to CUR 166 design procedure
+     ec7_be_method: Select method of calculation for EC7 BE
+     ec7_be_overall_risk_class: Select risk class
      cur_method: Select method of calculation according to CUR 166 design procedure
      cur_overall_partial_factor_set: Select partial factor set
      cur_overall_anchor_factor: multiplication factor for the anchor stiffness
@@ -166,7 +171,8 @@ 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_be_overall_stability: bool = False
-    nb_method: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
+    ec7_be_method: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
+    ec7_be_overall_risk_class: RiskClassEC7BE = RiskClassEC7BE.RC2
     cur_method: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
     cur_overall_partial_factor_set: PartialFactorSetCUR = PartialFactorSetCUR.CLASSI
     cur_overall_anchor_factor: Annotated[float, Field(ge=0.001, le=1000)] = 1
@@ -194,7 +200,7 @@ class DesignSheetpilingLengthCalculationOptions(CalculationOptions):
      design_eurocode_partial_factor_set: Select partial factor set
      design_partial_factor_set_ec7_nad_nl: Select partial factor set
      design_ec7_nl_method: Select method of calculation according to CUR 166 design procedure
-     design_partial_factor_set_ec7_nad_be: Select partial factor set
+     design_ec7_be_partial_factor_set: Select partial factor set
      design_ec7_be_method: Select method of calculation according to CUR 166 design procedure
      design_partial_factor_set: Select partial factor set
      design_cur_method: Select method of calculation according to CUR 166 design procedure
@@ -213,8 +219,8 @@ class DesignSheetpilingLengthCalculationOptions(CalculationOptions):
     design_ec7_nl_method: PartialFactorCalculationType = (
         PartialFactorCalculationType.METHODA
     )
-    design_partial_factor_set_ec7_nad_be: PartialFactorSetEC7NADBE = (
-        PartialFactorSetEC7NADBE.SET1
+    design_ec7_be_partial_factor_set: PartialFactorSetEC7NADBE = (
+        PartialFactorSetEC7NADBE.RC1SET1
     )
     design_ec7_be_method: PartialFactorCalculationType = (
         PartialFactorCalculationType.METHODA

geolib/models/dsheetpiling/internal.py

@@ -37,8 +37,12 @@
     PartialFactorsCurI,
     PartialFactorsCurIi,
     PartialFactorsCurIii,
-    PartialFactorsEc7BESet1,
-    PartialFactorsEc7BESet2,
+    PartialFactorsEc7BE1Set1,
+    PartialFactorsEc7BE1Set2,
+    PartialFactorsEc7BE2Set1,
+    PartialFactorsEc7BE2Set2,
+    PartialFactorsEc7BE3Set1,
+    PartialFactorsEc7BE3Set2,
     PartialFactorsEc7Nl0,
     PartialFactorsEc7Nl1,
     PartialFactorsEc7Nl2,
@@ -69,7 +73,9 @@
     PartialFactorSetCUR,
     PartialFactorSetEC,
     PartialFactorSetEC7NADBE,
+    RiskClassEC7BE,
     PartialFactorSetEC7NADNL,
+    AssessmentTypeEC7NL,
     PartialFactorSetVerifyEC,
     PassiveSide,
     SheetPilingElementMaterialType,
@@ -249,8 +255,8 @@ class CalculationOptions(DSeriesStructure):
     )
     designec7nlmethod: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
     designec7bmethod: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
-    designpartialfactorsetec7nadbe: PartialFactorSetEC7NADBE = (
-        PartialFactorSetEC7NADBE.SET1
+    designec7bepartialfactorset: PartialFactorSetEC7NADBE = (
+        PartialFactorSetEC7NADBE.RC1SET1
     )
     designec7bemethod: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
     designpartialfactorset: PartialFactorSetCUR = PartialFactorSetCUR.CLASSI
@@ -263,8 +269,10 @@ class CalculationOptions(DSeriesStructure):
     ec7nloverallpartialfactorset: PartialFactorSetEC7NADNL = PartialFactorSetEC7NADNL.RC0
     ec7nloverallanchorfactor: Annotated[float, Field(ge=0.001, le=1000)] = 1
     ec7nadnloverallstability: bool = False
+    ec7nlassessmenttype: AssessmentTypeEC7NL = AssessmentTypeEC7NL.NewConstruction
     ec7beoverallstability: bool = False
     ec7bemethod: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
+    ec7beoverallriskclass: RiskClassEC7BE = RiskClassEC7BE.RC2
     nbmethod: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
     curmethod: PartialFactorCalculationType = PartialFactorCalculationType.METHODA
     curoverallpartialfactorset: PartialFactorSetCUR = PartialFactorSetCUR.CLASSI
@@ -280,8 +288,8 @@ class CalculationOptions(DSeriesStructure):
     stabilityec7nlpartialfactorset: PartialFactorSetEC7NADNL = (
         PartialFactorSetEC7NADNL.RC0
     )
-    stabilityec7bepartialfactorset: PartialFactorSetEC7NADBE = (
-        PartialFactorSetEC7NADBE.SET1
+    overallstabilityec7bepartialfactorset: PartialFactorSetEC7NADBE = (
+        PartialFactorSetEC7NADBE.RC1SET1
     )
     stabilitycurpartialfactorset: PartialFactorSetCUR = PartialFactorSetCUR.CLASSI
 
@@ -298,8 +306,12 @@ class CalculationOptions(DSeriesStructure):
     partial_factors_ec7_nl_1: PartialFactorsEc7Nl1 = PartialFactorsEc7Nl1()
     partial_factors_ec7_nl_2: PartialFactorsEc7Nl2 = PartialFactorsEc7Nl2()
     partial_factors_ec7_nl_3: PartialFactorsEc7Nl3 = PartialFactorsEc7Nl3()
-    partial_factors_ec7_be_set1: PartialFactorsEc7BESet1 = PartialFactorsEc7BESet1()
-    partial_factors_ec7_be_set2: PartialFactorsEc7BESet2 = PartialFactorsEc7BESet2()
+    partial_factors_ec7_be_1_set1: PartialFactorsEc7BE1Set1 = PartialFactorsEc7BE1Set1()
+    partial_factors_ec7_be_1_set2: PartialFactorsEc7BE1Set2 = PartialFactorsEc7BE1Set2()
+    partial_factors_ec7_be_2_set1: PartialFactorsEc7BE2Set1 = PartialFactorsEc7BE2Set1()
+    partial_factors_ec7_be_2_set2: PartialFactorsEc7BE2Set2 = PartialFactorsEc7BE2Set2()
+    partial_factors_ec7_be_3_set1: PartialFactorsEc7BE3Set1 = PartialFactorsEc7BE3Set1()
+    partial_factors_ec7_be_3_set2: PartialFactorsEc7BE3Set2 = PartialFactorsEc7BE3Set2()
     partial_factors_cur_i: PartialFactorsCurI = PartialFactorsCurI()
     partial_factors_cur_ii: PartialFactorsCurIi = PartialFactorsCurIi()
     partial_factors_cur_iii: PartialFactorsCurIii = PartialFactorsCurIii()
@@ -534,6 +546,7 @@ class StageOptions(DSeriesInlineMappedProperties):
     stageverify: int = 0
     stageanchorfactor: Annotated[float, Field(ge=0.001, le=1000)] = 1
     stagepartialfactorsetec7nadnl: PartialFactorSetEC7NADNL = PartialFactorSetEC7NADNL.RC0
+    stageriskclassec7nadbe: RiskClassEC7BE = RiskClassEC7BE.RC2
     stageverifyec7nadnl: int = 0
     stageanchorfactorec7nadnl: Annotated[float, Field(ge=0.001, le=1000)] = 1
     stageverifyec7nadbe: int = 0
@@ -1355,7 +1368,9 @@ def parse_text(cls, text):
     anchors_and_struts_resume: Optional[str] = None
     supports_resume: Optional[str] = None
     maximum_anchor_force: Optional[str] = None
+    maximum_anchor_force_be_set_1: Optional[str] = None
     maximum_summary_results: Optional[str] = None
+    maximum_summary_results_be_set_1: Optional[str] = None
     warnings: Optional[str] = None
     errors: Optional[str] = None