✨ 24.3.0

FemDesign.Core/Bars/Bar.cs

@@ -96,7 +96,19 @@ public Geometry.Edge Edge
         public BarType Type { get; set; }
 
         [XmlAttribute("stage")]
-        public int StageId { get; set; } = 1;
+        public int _stageId = 1;
+
+        [XmlIgnore]
+        public int StageId
+        {
+            get { return _stageId; }
+            set
+            {
+                _stageId = value;
+                if (this.BarPart != null)
+                    this.BarPart.StageId = value;
+            }
+        }
 
         [XmlElement("bar_part", Order = 1)]
         public BarPart _barPart; // bar_part_type

FemDesign.Core/Calculate/Analysis.cs

@@ -1,9 +1,10 @@
 // https://strusoft.com/
+using FemDesign.Shells;
 using System;
 using System.Collections.Generic;
-using System.Xml.Serialization;
+using System.ComponentModel;
 using System.Linq;
-using FemDesign.Shells;
+using System.Xml.Serialization;
 
 
 namespace FemDesign.Calculate
@@ -296,22 +297,19 @@ public bool ElemFine
                 this._elemFine = Convert.ToInt32(value);
             }
         }
-
+        
         [XmlAttribute("diaphragm")]
         public int _diaphragm;
         [XmlIgnore]
-        public int Diaphragm
+        public DiaphragmType Diaphragm
         {
             get
             {
-                return this._diaphragm;
+                return (DiaphragmType)this._diaphragm;
             }
             set
             {
-                if (value < 0 || value > 2)
-                    throw new ArgumentException($"Diaphragm is set to {value}. Value must be '0'= None , '1'= Rigid membrane or '2'= Fully rigid.");
-
-                this._diaphragm = value;
+                this._diaphragm = (int)value;
             }
         }
 
@@ -337,7 +335,14 @@ private Analysis()
         {
         }
 
-        public Analysis(Calculate.Stage stage = null, Stability stability = null, Imperfection imperfection = null, Comb comb = null, Freq freq = null, Footfall footfall = null, Bedding bedding = null, GroundAcc groundAcc = null, ExcitationForce exForce = null, PeriodicExcitation periodicEx = null, bool calcCase = false, bool calcCStage = false, bool calcImpf = false, bool calcComb = false, bool calcGMax = false, bool calcStab = false, bool calcFreq = false, bool calcSeis = false, bool calcFootfall = false, bool calcBedding = false, bool calcGroundAcc = false, bool calcExForce = false, bool calcPeriodicEx = false, bool calcDesign = false, bool elemFine = true, int diaphragm = 0, bool peakSmoothing = false)
+        [Obsolete("Use Analysis(..., DiaphragmType diaphragm, ...) instead. This constructor will be removed in the next version.")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Analysis(Calculate.Stage stage = null, Stability stability = null, Imperfection imperfection = null, Comb comb = null, Freq freq = null, Footfall footfall = null, Bedding bedding = null, GroundAcc groundAcc = null, ExcitationForce exForce = null, PeriodicExcitation periodicEx = null, bool calcCase = false, bool calcCStage = false, bool calcImpf = false, bool calcComb = false, bool calcGMax = false, bool calcStab = false, bool calcFreq = false, bool calcSeis = false, bool calcFootfall = false, bool calcBedding = false, bool calcGroundAcc = false, bool calcExForce = false, bool calcPeriodicEx = false, bool calcDesign = false, bool elemFine = true, int diaphragm = 0, bool peakSmoothing = false) 
+            : this(stage, stability, imperfection, comb, freq, footfall, bedding, groundAcc, exForce, periodicEx, calcCase, calcCStage, calcImpf, calcComb, calcGMax, calcStab, calcFreq, calcSeis, calcFootfall, calcBedding, calcGroundAcc, calcExForce, calcPeriodicEx, calcDesign, elemFine, (DiaphragmType)diaphragm, peakSmoothing)
+        {
+        }
+
+        public Analysis(Calculate.Stage stage = null, Stability stability = null, Imperfection imperfection = null, Comb comb = null, Freq freq = null, Footfall footfall = null, Bedding bedding = null, GroundAcc groundAcc = null, ExcitationForce exForce = null, PeriodicExcitation periodicEx = null, bool calcCase = false, bool calcCStage = false, bool calcImpf = false, bool calcComb = false, bool calcGMax = false, bool calcStab = false, bool calcFreq = false, bool calcSeis = false, bool calcFootfall = false, bool calcBedding = false, bool calcGroundAcc = false, bool calcExForce = false, bool calcPeriodicEx = false, bool calcDesign = false, bool elemFine = true, DiaphragmType diaphragm = DiaphragmType.None, bool peakSmoothing = false)
         {
             this.Stage = stage;
             this.Comb = comb;
@@ -411,7 +416,7 @@ private void _validateAnalysisSettings()
         public static Analysis StaticAnalysis(Comb comb = null, bool calcCase = true, bool calccomb = true)
         {
             comb = comb ?? Comb.Default();
-            return new Analysis(comb: comb, calcCase: calcCase, calcComb: calccomb);
+            return new Analysis(comb: comb, calcCase: calcCase, calcComb: calccomb, diaphragm: DiaphragmType.None);
         }
 
 
@@ -428,7 +433,7 @@ public static Analysis StaticAnalysis(Comb comb = null, bool calcCase = true, bo
         public static Analysis Eigenfrequencies(int numShapes = 3, int maxSturm = 0, bool x = true, bool y = true, bool z = true, double top = -0.01)
         {
             var freqSettings = new Freq(numShapes, maxSturm, x, y, z, top);
-            return new Analysis(freq: freqSettings, calcFreq: true);
+            return new Analysis(freq: freqSettings, calcFreq: true, diaphragm: DiaphragmType.None);
         }
 
         /// <summary>
@@ -446,7 +451,17 @@ public static Analysis Eigenfrequencies(int numShapes = 3, int maxSturm = 0, boo
         public static Analysis Eigenfrequencies(int numShapes = 3, int autoIteration = 0, ShapeNormalisation shapeNormalisation = ShapeNormalisation.Unit, int maxSturm = 0, bool x = true, bool y = true, bool z = true, double top = -0.01)
         {
             var freqSettings = new Freq(numShapes, autoIteration, shapeNormalisation, x, y, z, maxSturm, top);
-            return new Analysis(freq: freqSettings, calcFreq: true);
+            return new Analysis(freq: freqSettings, calcFreq: true, diaphragm: DiaphragmType.None);
+        }
+
+        /// <summary>
+        /// Define an eigenfrequencies analysis.
+        /// </summary>
+        /// <param name="freqSettings"></param>
+        /// <returns></returns>
+        public static Analysis Eigenfrequencies(Freq freqSettings)
+        {
+            return new Analysis(freq: freqSettings, calcFreq: true, diaphragm: DiaphragmType.None);
         }
 
         /// <summary>
@@ -467,7 +482,7 @@ public static Analysis Eigenfrequencies(int numShapes = 3, int autoIteration = 0
         public static Analysis GroundAcceleration(bool levelAccSpectra = true, double deltaT = 0.2, double tEnd = 5.0, double q = 1.0, bool timeHistory = true, int step = 5, double lastMoment = 20.0, IntegrationSchemeMethod method = IntegrationSchemeMethod.Newmark, double alpha = 0.5, double beta = 0.25, double dmpFactor = 5.0)
         {
             GroundAcc grAccSettings = new GroundAcc(levelAccSpectra, deltaT, tEnd, q, timeHistory, step, lastMoment, method, alpha, beta, dmpFactor);
-            return new Analysis(groundAcc: grAccSettings, calcGroundAcc: true);
+            return new Analysis(groundAcc: grAccSettings, calcGroundAcc: true, diaphragm: DiaphragmType.None);
         }
 
         /// <summary>
@@ -483,7 +498,7 @@ public static Analysis GroundAcceleration(bool levelAccSpectra = true, double de
         public static Analysis ExcitationForce(int step = 5, double lastMoment = 20.0, IntegrationSchemeMethod method = IntegrationSchemeMethod.Newmark, double alpha = 0.5, double beta = 0.25, double dmpFactor = 5.0)
         {
             ExcitationForce grAccSettings = new ExcitationForce(step, lastMoment, method, alpha, beta, dmpFactor);
-            return new Analysis(exForce: grAccSettings, calcExForce: true);
+            return new Analysis(exForce: grAccSettings, calcExForce: true, diaphragm: DiaphragmType.None);
         }
 
         /// <summary>
@@ -499,7 +514,7 @@ public static Analysis ExcitationForce(int step = 5, double lastMoment = 20.0, I
         public static Analysis PeriodicExcitation(double deltaT = 0.01, double timeEnd = 5.0, DampingType dmpType = DampingType.Rayleigh, double alpha = 0.5, double beta = 0.25, double dmpFactor = 5.0)
         {
             PeriodicExcitation perExSettings = new PeriodicExcitation(deltaT, timeEnd, dmpType, alpha, beta, dmpFactor);
-            return new Analysis(periodicEx: perExSettings, calcPeriodicEx: true);
+            return new Analysis(periodicEx: perExSettings, calcPeriodicEx: true, diaphragm: DiaphragmType.None);
         }
 
         /// <summary>
@@ -511,13 +526,13 @@ public static Analysis PeriodicExcitation(double deltaT = 0.01, double timeEnd =
         public static Analysis ConstructionStages(bool ghost = false)
         {
             var stage = ghost ? Stage.GhostMethod() : Stage.TrackingMethod();
-            return new Analysis(stage: stage, calcCStage: true);
+            return new Analysis(stage: stage, calcCStage: true, diaphragm: DiaphragmType.None);
         }
 
         // TODO (missing calculation parameters in .fdscript)
         private static Analysis FootFall(Footfall footfall)
         {
-            var analisys = new Analysis(footfall: footfall, calcFootfall: true);
+            var analisys = new Analysis(footfall: footfall, calcFootfall: true, diaphragm: DiaphragmType.None);
             throw new NotImplementedException();
         }
 

FemDesign.Core/Calculate/Config/ConcreteDesignConfiguration.cs

@@ -52,29 +52,39 @@ public enum CalculationMethod
         [XmlAttribute("fReopeningCracks")]
         public bool ReopeningCracks { get; set; }  = false;
 
+        /// <summary>
+        /// Use upper limit for Eq. 7.11
+        /// </summary>
+        [XmlAttribute("fUseUpperLimitForEq711")]
+        public bool UseUpperLimitForEq711 { get; set; } = false;
+
 
-        private ConcreteDesignConfig()
+        /// <summary>
+        /// Concrete design configuration
+        /// </summary>
+        public ConcreteDesignConfig()
         {
 
         }
 
-        public ConcreteDesignConfig(CalculationMethod secondOrder, bool crackQuasiPermanent = true, bool crackFrequent = false, bool crackCharacteristic = false, bool reopeningCracks = false)
+        public ConcreteDesignConfig(CalculationMethod secondOrder, bool crackQuasiPermanent = true, bool crackFrequent = false, bool crackCharacteristic = false, bool reopeningCracks = false, bool useUpperLimitForEq711 = false)
         {
             SecondOrderCalculationMethod = secondOrder;
             CrackWidthQuasiPermanent = crackQuasiPermanent;
             CrackWidthFrequent = crackFrequent;
             CrackWidthCharacteristic = crackCharacteristic;
             ReopeningCracks = reopeningCracks;
+            UseUpperLimitForEq711 = useUpperLimitForEq711;
         }
 
-        public static ConcreteDesignConfig NominalStiffness(bool crackQuasiPermanent = true, bool crackFrequent = false, bool crackCharacteristic = false)
+        public static ConcreteDesignConfig NominalStiffness(bool crackQuasiPermanent = true, bool crackFrequent = false, bool crackCharacteristic = false, bool useUpperLimitForEq711 = false)
         {
-            return new ConcreteDesignConfig(CalculationMethod.NominalStiffness, crackQuasiPermanent, crackFrequent, crackCharacteristic);
+            return new ConcreteDesignConfig(CalculationMethod.NominalStiffness, crackQuasiPermanent, crackFrequent, crackCharacteristic, useUpperLimitForEq711: useUpperLimitForEq711);
         }
 
-        public static ConcreteDesignConfig NominalCurvature(bool crackQuasiPermanent = true, bool crackFrequent = false, bool crackCharacteristic = false)
+        public static ConcreteDesignConfig NominalCurvature(bool crackQuasiPermanent = true, bool crackFrequent = false, bool crackCharacteristic = false, bool useUpperLimitForEq711 = false)
         {
-            return new ConcreteDesignConfig(CalculationMethod.NominalCurvature, crackQuasiPermanent, crackFrequent, crackCharacteristic);
+            return new ConcreteDesignConfig(CalculationMethod.NominalCurvature, crackQuasiPermanent, crackFrequent, crackCharacteristic, useUpperLimitForEq711: useUpperLimitForEq711);
         }
 
     }

FemDesign.Core/Calculate/DiaphragmType.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FemDesign.Calculate
+{
+    public enum DiaphragmType
+    {
+        None = 0,
+        RigidMembrane = 1,
+        FullyRigid = 2
+    }
+}

FemDesign.Core/FemDesign.Core.csproj

@@ -77,6 +77,7 @@
     <Compile Include="Calculate\Config\SteelBarCalculationParameters.cs" />
     <Compile Include="Calculate\Config\SteelBarDesignParameters.cs" />
     <Compile Include="Calculate\Config\SteelDesignConfiguration.cs" />
+    <Compile Include="Calculate\DiaphragmType.cs" />
     <Compile Include="Calculate\ExcitationForce.cs" />
     <Compile Include="Calculate\GroundAcc.cs" />
     <Compile Include="Calculate\Imperfection.cs" />
@@ -143,6 +144,7 @@
     <Compile Include="Stage\SFactorType.cs" />
     <Compile Include="StruSoft\Interop\StruXml\Data\CaselessLoads.cs" />
     <Compile Include="StruSoft\Interop\StruXml\Data\FD 23.00.001 Strusoft.cs" />
+    <Compile Include="StruSoft\Interop\StruXml\Data\FEM-Design 24.00.005.cs" />
     <Compile Include="StruSoft\Interop\StruXml\Data\Layer_type.cs" />
     <Compile Include="StruSoft\Interop\StruXml\Data\Vehicle_lib_type.cs" />
     <Compile Include="Releases\RigidityDataType0.cs" />

FemDesign.Core/FemDesignConnection.cs

@@ -361,50 +361,73 @@ public void RunAnalysis(Analysis analysis)
             string logfile = OutputFileHelper.GetLogfilePath(OutputDir);
             FdScript script;
 
-            if (analysis.Comb != null)
+            if(analysis.CalcCase || analysis.CalcComb)
             {
-                if(analysis.Comb.CombItem.Any(CombItem => CombItem.CombName != null) || analysis.Comb.CombItem.Count() == 0)
+                if (analysis.Comb == null) analysis.Comb = Comb.Default();
+                var analysis_static = Analysis.StaticAnalysis(analysis.Comb, analysis.CalcCase, analysis.CalcComb);
+
+                if (analysis_static.Comb.CombItem.Any(CombItem => CombItem.CombName != null) || analysis_static.Comb.CombItem.Count() == 0)
                 {
-                    analysis.SetCombAnalysis(this);
+                    analysis_static.SetCombAnalysis(this);
                 }
                 script = new FdScript(
                     logfile,
                     new CmdUser(CmdUserModule.RESMODE),
-                    new CmdCalculation(analysis));
-                this.RunScript(script, "RunAnalysis");
-
+                    new CmdCalculation(analysis_static));
+                this.RunScript(script, "RunStaticAnalysis");
             }
 
             if (analysis.Stability != null)
             {
-                analysis.SetStabilityAnalysis(this);
+                var statbility_analysis = analysis.DeepClone();
+                statbility_analysis.SetStabilityAnalysis(this);
+
                 script = new FdScript(
                     logfile,
                     new CmdUser(CmdUserModule.RESMODE),
-                    new CmdCalculation(analysis));
-                this.RunScript(script, "RunAnalysis");
+                    new CmdCalculation(statbility_analysis));
+                this.RunScript(script, "RunStabilityAnalysis");
             }
 
             if (analysis.Imperfection != null)
             {
-                analysis.SetImperfectionAnalysis(this);
+                var imperfection_analysis = analysis.DeepClone();
+                imperfection_analysis.SetImperfectionAnalysis(this);
+
                 script = new FdScript(
                     logfile,
                     new CmdUser(CmdUserModule.RESMODE),
                     new CmdCalculation(analysis));
-                this.RunScript(script, "RunAnalysis");
+                this.RunScript(script, "RunImperfectionAnalysis");
+            }
+
+            if (analysis.CalcFreq)
+            {
+                if (analysis.Freq == null) analysis.Freq = Freq.Default();
+                var freq_analysis = Analysis.Eigenfrequencies(analysis.Freq);
+
+                script = new FdScript(
+                    logfile,
+                    new CmdUser(CmdUserModule.RESMODE),
+                    new CmdCalculation(freq_analysis));
+                this.RunScript(script, "RunFreqAnalysis");
             }
 
-            if (analysis.Freq != null || analysis.Footfall != null || analysis.PeriodicEx != null || analysis.ExForce != null || analysis.GroundAcc != null)
+            // it requires a refactor
+            if (analysis.Footfall != null || analysis.PeriodicEx != null || analysis.ExForce != null || analysis.GroundAcc != null)
             {
+                analysis.CalcCase = false;
+                analysis.CalcComb = false;
+                analysis.CalcFreq = false;
+                analysis.CalcImpf = false;
+                analysis.CalcStab = false;
+
                 script = new FdScript(
                     logfile,
                     new CmdUser(CmdUserModule.RESMODE),
                     new CmdCalculation(analysis));
                 this.RunScript(script, "RunAnalysis");
             }
-
-
         }
 
         /// <summary>

FemDesign.Core/Loads/Load cases/LoadCase.cs

@@ -36,9 +36,23 @@ public string Name
         }
         [XmlAttribute("type")]
         public LoadCaseType Type { get; set; } // loadcasetype_type
+
         [XmlAttribute("duration_class")]
-        public LoadCaseDuration DurationClass { get; set; } // loadcasedurationtype
-
+        public LoadCaseDuration _durationClass; // loadcasedurationtype
+
+        [XmlIgnore]
+        public LoadCaseDuration DurationClass // loadcasedurationtype
+        { 
+            get => _durationClass;
+            set
+            {
+                if(Type == LoadCaseType.Diaphragm && value != LoadCaseDuration.ShortTerm)
+                    throw new ArgumentException("Diaphragm load cases must have ShortTerm duration class!");
+                else
+                    _durationClass = value;
+            }
+        }
+
         /// <summary>
         /// Parameterless constructor for serialization.
         /// </summary>