Backup

Author: david-liska

examples/high_level_functions_demos/addon_concrete_design.js

@@ -1,5 +1,5 @@
 /*
-Bug 105918 - missing APi support for NTC (Ultimate configurations, Serviceability configurations)
+EN Ultimate configuration is for both standards, both EN and NTC one
 */
 
 include("../../includes/Tools/high_level_functions_support.js");
@@ -68,12 +68,16 @@ if (RFEM) {
 switch (general.current_standard_for_concrete_design)
 {
     case general.NATIONAL_ANNEX_AND_EDITION_EN_1992_CEN_2014_11:
+    case general.NATIONAL_ANNEX_AND_EDITION_NTC_2018_01_CONCRETE_DESIGN:
     /****************************************************************** Ultimate configuration ***************************************************************************/
+        /*
+        EN Ultimate configuration is for both standards, both EN and NTC one
+        */
         if (RFEM) {
-            var ultimateConfiguration = new ConcreteDesignUltimateConfigurationEN(undefined, [surfaceList[0].no], [memberList[0].GetNo()], [nodes[31].no, nodes[32].no], "Ultimate configuration (EN)");
+            var ultimateConfiguration = new ConcreteDesignUltimateConfigurationEN(undefined, [surfaceList[0].no], [memberList[0].GetNo()], [nodes[31].no, nodes[32].no], "Ultimate configuration (" + GetConcreteDesignCurrentCodeOfStandard() + ")");
         }
         else {
-            var ultimateConfiguration = new ConcreteDesignUltimateConfigurationEN(undefined, undefined, [memberList[0].GetNo()], undefined, "Ultimate configuration (EN)");
+            var ultimateConfiguration = new ConcreteDesignUltimateConfigurationEN(undefined, undefined, [memberList[0].GetNo()], undefined, "Ultimate configuration (" + GetConcreteDesignCurrentCodeOfStandard() + ")");
         }
         ultimateConfiguration.SetName("Ultimate conf.");
         ultimateConfiguration.SetMembers_ConsiderInternalForces(false, undefined, true, false, false, false);
@@ -128,10 +132,10 @@ switch (general.current_standard_for_concrete_design)
         }
     /****************************************************************** Serviceability configuration ***********************************************************************/
         if (RFEM) {
-            var serviceabilityConfiguration = new ConcreteDesignServiceabilityConfigurationEN(undefined, [surfaceList[1].no], [memberList[1].GetNo()], "Serviceability configuration (EN)");
+            var serviceabilityConfiguration = new ConcreteDesignServiceabilityConfigurationEN(undefined, [surfaceList[1].no], [memberList[1].GetNo()], "Serviceability configuration (" + GetConcreteDesignCurrentCodeOfStandard() + ")");
         }
         else {
-            var serviceabilityConfiguration = new ConcreteDesignServiceabilityConfigurationEN(undefined, undefined, [memberList[1].GetNo()], "Serviceability configuration (EN)");
+            var serviceabilityConfiguration = new ConcreteDesignServiceabilityConfigurationEN(undefined, undefined, [memberList[1].GetNo()], "Serviceability configuration (" + GetConcreteDesignCurrentCodeOfStandard() + ")");
         }
         serviceabilityConfiguration.SetName("Serviceability conf.");
         serviceabilityConfiguration.SetStressAnaLysis(true, false);
@@ -312,9 +316,6 @@ switch (general.current_standard_for_concrete_design)
         serviceabilityConfiguration.SetCrackWidthAnalysis(0.000201, 0.000202, 0.000203, 0.000204);
         serviceabilityConfiguration.SetDeflectionAnalysis(true, 121, 122, false, undefined, undefined, 0.70);
         break;
-    case general.NATIONAL_ANNEX_AND_EDITION_NTC_2018_01_CONCRETE_DESIGN:
-        // No API support, bug 105918
-        break;
     default:
         ASSERT(false, "Unknown code of standard");
 }

includes/AddOns/ConcreteDesign/ConcreteDesignSupport.js

@@ -160,7 +160,7 @@ function SetConcreteDesignMembersRequiredLongitudinalReinforcement (addon_settin
 };
 
 function GetConcreteDesignPropertyMemberReinforcementDiameterForPreliminaryDesign(diameter_type) {
-    if (IsConcreteDesignCurrentCodeOfStandard("EN")) {
+    if (IsConcreteDesignCurrentCodeOfStandard("EN") || IsConcreteDesignCurrentCodeOfStandard("NTC")) {
         return EnumValueFromJSHLFTypeName(
             diameter_type,
             "diameter",
@@ -207,7 +207,7 @@ function GetConcreteDesignPropertyMemberReinforcementDiameterForPreliminaryDesig
 }
 
 function GetConcreteDesignPropertyMemberReinforcementLayout(layout_type) {
-    if (IsConcreteDesignCurrentCodeOfStandard("EN")) {
+    if (IsConcreteDesignCurrentCodeOfStandard("EN") || IsConcreteDesignCurrentCodeOfStandard("NTC")) {
         return EnumValueFromJSHLFTypeName(
             layout_type,
             "layout",
@@ -360,7 +360,7 @@ function SetConcreteDesignStabilityRequiredReinforcement (addon_settings,
 }
 
 function GetConcreteDesignStabilityReinforcementLayout(reinforcement_layout_type) {
-    if (IsConcreteDesignCurrentCodeOfStandard("EN")) {
+    if (IsConcreteDesignCurrentCodeOfStandard("EN") || IsConcreteDesignCurrentCodeOfStandard("NTC")) {
         return EnumValueFromJSHLFTypeName(
             reinforcement_layout_type,
             "reinforcement layout",
@@ -599,7 +599,7 @@ function SetConcreteDesignSurfacesMainCompressionReinforcementDirectionType(addo
 }
 
 function GetConcreteDesignSurfacesReinforcementDefinedDirectionType(direction_type) {
-    if (IsConcreteDesignCurrentCodeOfStandard("EN")) {
+    if (IsConcreteDesignCurrentCodeOfStandard("EN") || IsConcreteDesignCurrentCodeOfStandard("NTC")) {
         return EnumValueFromJSHLFTypeName(
             direction_type,
             "direction",
@@ -725,7 +725,7 @@ function SetConcreteDesignNeutralAxisDepthLimitation (addon_settings,
     property_consider_neutral_axis_depth_limitation,
     property_value_of_neutral_axis_depth_limitation_user_value) {
     ASSERT(members.count() > 0, "There must exist at least one member in project");
-    if (IsConcreteDesignCurrentCodeOfStandard("EN")) {
+    if (IsConcreteDesignCurrentCodeOfStandard("EN") || IsConcreteDesignCurrentCodeOfStandard("NTC")) {
         ;   // Only user-defined value set
     }
     else if (IsConcreteDesignCurrentCodeOfStandard("ACI")) {
@@ -774,7 +774,7 @@ function SetConcreteDesignNeutralAxisDepthLimitation (addon_settings,
     }
     if (typeof property_value_of_neutral_axis_depth_limitation_user_value !== "undefined") {
         ASSERT(addon_settings_type === "member" ? addon_settings.property_member_consider_neutral_axis_depth_limitation : addon_settings.property_surface_consider_neutral_axis_depth_limitation, "Consider depth limitation of neutral axis acc. to 9.3.3.1 must be on");
-        if (!IsConcreteDesignCurrentCodeOfStandard("EN")) {
+        if (!IsConcreteDesignCurrentCodeOfStandard("EN") && !IsConcreteDesignCurrentCodeOfStandard("NTC")) {
             if (typeof property_value_of_neutral_axis_depth_limitation_user_value === "string") {
                 ASSERT(property_value_of_neutral_axis_depth_limitation_user_value === "AUTOMATICALLY", "Value of neutral axis depth limitation must equal ti AUTOMATICALLY");
                 if (addon_settings_type === "member") {
@@ -986,7 +986,7 @@ function SetConcreteDesignPunchingAdditionalParameters (addon_settings,
 };
 
 function GetConcreteDesignPunchingDirectionForceType(direction_type) {
-    if (IsConcreteDesignCurrentCodeOfStandard("EN")) {
+    if (IsConcreteDesignCurrentCodeOfStandard("EN") || IsConcreteDesignCurrentCodeOfStandard("NTC")) {
         return EnumValueFromJSHLFTypeName(
             direction_type,
             "punching direction force",

includes/AddOns/ConcreteDesign/ServiceabilityConfigurationEN.js

@@ -1,5 +1,9 @@
 include("../../Tools/high_level_functions_support.js");
 
+/*
+EN Serviceability configuration is for both standards, both EN and NTC one
+*/
+
 function ConcreteDesignServiceabilityConfigurationEN (no,
     surfaces_no,
     members_no,

includes/AddOns/ConcreteDesign/UltimateConfigurationEN.js

@@ -1,5 +1,9 @@
 include("../../Tools/high_level_functions_support.js");
 
+/*
+EN Ultimate configuration is for both standards, both EN and NTC one
+*/
+
 /*
 Bug?: this.addon.settings_member_ec2.property_fatigue_design_time_of_start_of_cyclic_loading_on_concrete cannot be set
 */