Merge pull request #114 from audunarn/dev

Dev
audunarn · Mar 28, 2022 · bca0a00 · bca0a00
2 parents 7588fc4 + b590568
commit bca0a00
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/ANYstructure_local/optimize.py b/ANYstructure_local/optimize.py
@@ -607,7 +607,7 @@ def any_constraints_all(x,obj,lat_press,init_weight,side='p',chk=(True,True,True
             puls_uf = PULSrun.get_puls_line_results(x_id)["Buckling strength"]["Actual usage Factor"][0]
         elif calc_object[0].Plate.get_puls_method() == 'ultimate':
             puls_uf = PULSrun.get_puls_line_results(x_id)["Ultimate capacity"]["Actual usage Factor"][0]
-        if type(puls_uf) == str:
+        if type(puls_uf) == str or puls_uf is None:
             return False, 'PULS', x, all_checks
         all_checks[8] = puls_uf/PULSrun.puls_acceptance
         if puls_uf/PULSrun.puls_acceptance >= 1:
@@ -1026,16 +1026,16 @@ def stress_scaling(sigma_old,t_old,t_new, fdwn = 1, fup = 0.5):
 
     if t_new <= t_old: #decreasing the thickness
         sigma_new = sigma_old*(t_old/(t_old-fdwn*abs((t_old-t_new))))
-        assert sigma_new >= sigma_old, 'ERROR no stress increase: \n' \
-                                      't_old '+str(t_old)+' sigma_old '+str(sigma_old)+ \
-                                      '\nt_new '+str(t_new)+' sigma_new '+str(sigma_new)
+        # assert sigma_new >= sigma_old, 'ERROR no stress increase: \n' \
+        #                               't_old '+str(t_old)+' sigma_old '+str(sigma_old)+ \
+        #                               '\nt_new '+str(t_new)+' sigma_new '+str(sigma_new)
 
     else: #increasing the thickness
 
         sigma_new = sigma_old*(t_old/(t_old+fup*abs((t_old-t_new))))
-        assert sigma_new <= sigma_old, 'ERROR no stress reduction: \n' \
-                                      't_old '+str(t_old)+' sigma_old '+str(sigma_old)+ \
-                                      '\nt_new '+str(t_new)+' sigma_new '+str(sigma_new)
+        # assert sigma_new <= sigma_old, 'ERROR no stress reduction: \n' \
+        #                               't_old '+str(t_old)+' sigma_old '+str(sigma_old)+ \
+        #                               '\nt_new '+str(t_new)+' sigma_new '+str(sigma_new)
     return sigma_new
 
 def stress_scaling_area(sigma_old,a_old,a_new, fdwn = 1, fup = 0.5):

diff --git a/ANYstructure_local/optimize_window.py b/ANYstructure_local/optimize_window.py
@@ -845,6 +845,7 @@ def update_running_time(self,*args):
 
         if [self._new_check_buckling_ml_cl.get(),self._new_check_buckling_puls.get(),
             self._new_check_buckling.get()].count(True) > 1:
+            tk.messagebox.showerror('You can only select one buckling type. Reselect.')
             if self._new_check_buckling_puls.get():
                 self._new_check_buckling_puls.set(False)
             if self._new_check_buckling_ml_cl.get():

diff --git a/README.md b/README.md
@@ -2,7 +2,9 @@
 ANYstructure is the ultimate steel structure design tool for plate fields and cylinders! 
 Weight optimization for all structures with machine learning capabilities. 
 Calculations are based on DNV standards and rules.
-
+### What's new in 4.2 ###
+* Bug fixing.
+* Ukraininan theme.
 ### What's new in 4.0 ###
 * Cylinder design and optimization!
 * Flat plate prescriptive buckling improved. Girder calculation added.

diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@ def readme():
     name='ANYstructure',  # Required
     url = 'https://github.com/audunarn/ANYstructure',
     entry_points={"console_scripts": ['ANYstructure = ANYstructure_local.__main__:main']},
-    version=4.0,  # Required
+    version=4.2,  # Required
     license='MIT',
     description='A plate field optimization tool for offshore structures calculated according to DNVGL standards',
     long_description = readme(),