FEM-Design 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

{FEM_Design-0.0.4.dist-info → FEM_Design-0.0.6.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: FEM-Design
-Version: 0.0.4
+Version: 0.0.6
 Summary: The FEM-Design API package
 Author-email: FEM-Design <femdesign.api@strusoft.com>
-Maintainer-email: Marco Pellegrino <marco.pellegrino@strusoft.com>
+Maintainer-email: Marco Pellegrino <marco.pellegrino@strusoft.com>, Illyés Zoltán <sinnach@strusoft.hu>
 Project-URL: Homepage, https://femdesign-api-docs.onstrusoft.com
 Project-URL: Repository, https://github.com/strusoft/femdesign-api
 Project-URL: Issues, https://github.com/strusoft/femdesign-api/issues
@@ -48,18 +48,22 @@ pipe = FemDesignConnection()
 try:
     pipe.SetVerbosity(Verbosity.SCRIPT_LOG_LINES)
     pipe.Open(r"simple_beam.str")
+
+    static_analysis = Analysis.StaticAnalysis()
+    pipe.RunAnalysis(static_analysis)
+
     pipe.RunAnalysis(Analysis.FrequencyAnalysis(num_shapes=5))
-    pipe.Save(r"simple_beam_out.str")
-    pipe.GenerateListTables(bsc_file=r"quantity-estimation-steel.bsc",
-                            csv_file=r"quantity-estimation-steel.csv")
+    pipe.Save(r"simple_beam_out_2.str")
+
     pipe.Exit()
 except Exception as err:
     pipe.KillProgramIfExists()
     raise err
 ```
 
-A wider list of examples can be found in [example](https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Examples/Python).
+A wider list of examples can be found in [example](https://github.com/strusoft/femdesign-api/tree/master/FemDesign.Python/examples)
 
 ## Documentation
 
+
 https://femdesign-api-docs.onstrusoft.com/docs/intro

FEM_Design-0.0.6.dist-info/RECORD

@@ -0,0 +1,14 @@
+femdesign/__init__.py,sha256=PJqnani1chSiNWvU3DUkDaWDW0nP5lbHflTmezZLso4,17
+femdesign/comunication.py,sha256=dMn8a2idGtVTG3tO2YnJw-6jk9_cJHd5DKWv9lR0s8M,15896
+femdesign/database.py,sha256=lHu5mIVtYw1s6tILOoLdNsLmI6IqGP-zwBlXI4ZKX2s,2113
+femdesign/calculate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+femdesign/calculate/analysis.py,sha256=ETQzTj3pKvF1SzfQMDw4d1ObH0MxFNtX2qJcQ4sRfck,16068
+femdesign/calculate/command.py,sha256=DHh2Oa_-la3RJTAWXOaePxvUTadF3xRHfH5BVvPFaTo,14241
+femdesign/calculate/fdscript.py,sha256=m7L-j1kfW3UJ-eeR9ouPSsZGugeuuBNI8WuY4zRtHYk,2708
+femdesign/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+femdesign/utilities/filehelper.py,sha256=ocztMNTePr-bUpquY8DAI1s4BHptlhnMzwYOMrDbB_8,1528
+FEM_Design-0.0.6.dist-info/LICENSE,sha256=C1trwjHDz-8nu89CQ5_3BXEJiOrsl1tJJqtEzEi_dA0,1086
+FEM_Design-0.0.6.dist-info/METADATA,sha256=nDoBVoJGH9Zl_PYxMe6_sLF7ii-pbX_w5tgn_1W7-g8,3062
+FEM_Design-0.0.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+FEM_Design-0.0.6.dist-info/top_level.txt,sha256=QcarGV2EBCVqig6Yj3dB5-Q8Mi-eXtEEhUyRKWIP21I,10
+FEM_Design-0.0.6.dist-info/RECORD,,

femdesign/__init__.py

@@ -0,0 +1 @@
+version = "0.0.6"

femdesign/calculate/analysis.py

@@ -304,7 +304,7 @@ class Analysis:
                  elemfine : bool = True,
                  diaphragm : bool = False,
                  peaksmoothings : bool = False,
-                 comb : CombSettings = None,
+                 combSettings : CombSettings = None,
                  stage : Stage = None,
                  freq : Freq = None,
                  footfall : Footfall = None,
@@ -334,7 +334,7 @@ class Analysis:
         self.peaksmoothings = peaksmoothings
         
         self.stage = stage
-        self.comb = comb
+        self.comb = combSettings
         self.freq = freq
         self.footfall = footfall
         #self.bedding = bedding
@@ -388,8 +388,12 @@ class Analysis:
         return analysis
 
     @classmethod
-    def StaticAnalysis(cls, comb : CombSettings = CombSettings.Default(), calcCase : bool = True, calcComb : bool = True):
-        return cls(calcCase = calcCase, calcComb = calcComb, comb = comb)
+    def StaticAnalysis(cls, calcCase : bool = True, calcComb : bool = True):
+        return cls(calcCase = calcCase, calcComb = calcComb)
+    
+    def SetCombinations(self, combSettings : CombSettings, combitems : list[CombItem]):
+        self.comb = combSettings
+        self.comb.combitems = combitems
     
     @classmethod
     def FrequencyAnalysis(cls, num_shapes : int = 5, auto_iter : int = 0, max_sturm : int = 0, norm_unit : Freq.ShapeNormalization  = Freq.ShapeNormalization.MassMatrix, x : bool = True, y : bool = True, z : bool = True, top : bool = -0.01):
@@ -397,8 +401,20 @@ class Analysis:
         return cls(calcFreq = True, freq = freq)
     
     @classmethod
-    def FootfallAnalysis(cls, footfall : Footfall, calcFootfall : bool = True):
-        return cls(calcFootfall = calcFootfall, footfall = footfall)
+    def FootfallAnalysis(cls, footfall : Footfall):
+        return cls(calcFootfall = True, footfall = footfall)
+
+    @classmethod
+    def GroundAcceleration(cls, thgroundacc : ThGroundAcc):
+        return cls(calcThGrounAcc = True, thgroundacc = thgroundacc)
+    
+    @classmethod
+    def ExcitationForce(cls, thexforce : ThExForce):
+        return cls(calcThExforce = True, thexforce = thexforce)
+    
+    @classmethod
+    def PeriodicExcitation(cls, periodicexc : PeriodicExc):
+        return cls(calcPeriodicExc = True, periodicexc = periodicexc)
 
 # class Bedding:
 #     def __init__(self, Ldcomb="a", Meshprep=0, Stiff_X=0.5, Stiff_Y=0.5):

femdesign/calculate/command.py

@@ -406,7 +406,7 @@ class CmdListGen:
             raise ValueError("outfile must have suffix .csv")
 
         if not outfile:
-            outfile = pathlib.Path(self.bscfile).with_suffix(".csv")
+            outfile = pathlib.Path(bscfile).with_suffix(".csv")
 
         if not os.path.exists(os.path.dirname(os.path.abspath(outfile))):
             os.makedirs(os.path.dirname(os.path.abspath(outfile)))

femdesign/comunication.py

@@ -12,6 +12,7 @@ import win32file
 import win32pipe
 
 import os
+import shutil
 
 """
 FEM - Design usage with pipe
@@ -98,7 +99,7 @@ def GetElapsedTime(start_time):
 
 class _FdConnect:
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    def __exit__(self):
         self.Detach()
         self.ClosePipe()
 
@@ -302,9 +303,11 @@ class FemDesignConnection(_FdConnect):
                  pipe_name : str ="FdPipe1",
                  verbose : Verbosity = Verbosity.SCRIPT_LOG_LINES,
                  output_dir : str = None,
-                 minimized : bool = False,):
+                 minimized : bool = False,
+                 delete_dir : bool = True):
         super().__init__(pipe_name)
 
+        self.delete_dir = delete_dir
         self._output_dir = output_dir
 
         os.environ["FD_NOLOGO"] = "1"
@@ -315,6 +318,14 @@ class FemDesignConnection(_FdConnect):
         self.Start(fd_path)
         self.LogLevel(verbose)
 
+    def __exit__(self):
+        super().__exit__()
+        if(self.delete_dir):
+            try:
+                shutil.rmtree(os.path.join(self.output_dir, "scripts"))
+            except:
+                pass
+
     @property
     def output_dir(self):
         if self._output_dir == None:
@@ -452,3 +463,6 @@ class FemDesignConnection(_FdConnect):
     def Disconnect(self):
         super().Detach()
         win32pipe.DisconnectNamedPipe(self.pipe_send)
+
+    def Close(self):
+        self.__exit__()

FEM_Design-0.0.4.dist-info/RECORD

@@ -1,14 +0,0 @@
-femdesign/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-femdesign/comunication.py,sha256=K3f3jIa3cVpSeyiSdpEDMz__7X2_LeGpqEhdcDoJImI,15564
-femdesign/database.py,sha256=lHu5mIVtYw1s6tILOoLdNsLmI6IqGP-zwBlXI4ZKX2s,2113
-femdesign/calculate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-femdesign/calculate/analysis.py,sha256=EbwJTOa4ZNYsfoVvAEYKCEsOJ91L7G-SphfiCc6XEqE,15527
-femdesign/calculate/command.py,sha256=_TYMNJJHkxaSV0fDBqCHrAN5uI_Pz593qqsOa9B_Ddo,14246
-femdesign/calculate/fdscript.py,sha256=m7L-j1kfW3UJ-eeR9ouPSsZGugeuuBNI8WuY4zRtHYk,2708
-femdesign/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-femdesign/utilities/filehelper.py,sha256=ocztMNTePr-bUpquY8DAI1s4BHptlhnMzwYOMrDbB_8,1528
-FEM_Design-0.0.4.dist-info/LICENSE,sha256=C1trwjHDz-8nu89CQ5_3BXEJiOrsl1tJJqtEzEi_dA0,1086
-FEM_Design-0.0.4.dist-info/METADATA,sha256=w0dMM7-WA2vobOFaaxNddwua1g8QvpWY9bDfSJj18zg,3070
-FEM_Design-0.0.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-FEM_Design-0.0.4.dist-info/top_level.txt,sha256=QcarGV2EBCVqig6Yj3dB5-Q8Mi-eXtEEhUyRKWIP21I,10
-FEM_Design-0.0.4.dist-info/RECORD,,