midas-civil 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of midas-civil might be problematic. Click here for more details.
- midas_civil/__init__.py +1 -1
- midas_civil/_section/__init__.py +20 -22
- midas_civil/_section/_compositeSS.py +4 -4
- midas_civil/_section/_dbSecSS.py +2 -2
- midas_civil/_section/_pscSS.py +6 -6
- midas_civil/_section/_unSupp.py +2 -2
- {midas_civil-1.0.5.dist-info → midas_civil-1.0.7.dist-info}/METADATA +1 -1
- {midas_civil-1.0.5.dist-info → midas_civil-1.0.7.dist-info}/RECORD +11 -11
- {midas_civil-1.0.5.dist-info → midas_civil-1.0.7.dist-info}/WHEEL +0 -0
- {midas_civil-1.0.5.dist-info → midas_civil-1.0.7.dist-info}/licenses/LICENSE +0 -0
- {midas_civil-1.0.5.dist-info → midas_civil-1.0.7.dist-info}/top_level.txt +0 -0
midas_civil/__init__.py
CHANGED
midas_civil/_section/__init__.py
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
from ._pscSS import SS_PSC_12CELL,SS_PSC_I,SS_PSC_Value
|
|
4
|
-
from ._dbSecSS import SS_DBUSER
|
|
1
|
+
from ._pscSS import _SS_PSC_12CELL,_SS_PSC_I,_SS_PSC_Value
|
|
2
|
+
from ._dbSecSS import _SS_DBUSER
|
|
5
3
|
from ._offsetSS import Offset
|
|
6
|
-
from ._unSupp import
|
|
7
|
-
from ._compositeSS import
|
|
4
|
+
from ._unSupp import _SS_UNSUPP,_SS_STD_DB
|
|
5
|
+
from ._compositeSS import _SS_COMP_PSC_I,_SS_COMP_STEEL_I_TYPE1
|
|
8
6
|
|
|
9
7
|
from midas_civil import MidasAPI
|
|
10
8
|
|
|
@@ -74,21 +72,21 @@ def _JS2OBJ(id,js):
|
|
|
74
72
|
|
|
75
73
|
|
|
76
74
|
if type == 'DBUSER':
|
|
77
|
-
if js['SECT_BEFORE']['DATATYPE'] ==2: obj =
|
|
78
|
-
else: obj =
|
|
75
|
+
if js['SECT_BEFORE']['DATATYPE'] ==2: obj = _SS_DBUSER._objectify(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
76
|
+
else: obj = _SS_STD_DB(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
79
77
|
|
|
80
78
|
elif type == 'PSC' :
|
|
81
|
-
if shape in ['1CEL','2CEL']: obj =
|
|
82
|
-
elif shape in ['PSCI']: obj =
|
|
83
|
-
elif shape in ['VALU']: obj =
|
|
84
|
-
else: obj =
|
|
79
|
+
if shape in ['1CEL','2CEL']: obj = _SS_PSC_12CELL._objectify(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
80
|
+
elif shape in ['PSCI']: obj = _SS_PSC_I._objectify(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
81
|
+
elif shape in ['VALU']: obj = _SS_PSC_Value._objectify(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
82
|
+
else: obj = _SS_UNSUPP(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
85
83
|
|
|
86
84
|
elif type == 'COMPOSITE':
|
|
87
|
-
if shape in ['CI']: obj =
|
|
88
|
-
elif shape in ['I']: obj =
|
|
89
|
-
else: obj =
|
|
85
|
+
if shape in ['CI']: obj = _SS_COMP_PSC_I._objectify(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
86
|
+
elif shape in ['I']: obj = _SS_COMP_STEEL_I_TYPE1._objectify(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
87
|
+
else: obj = _SS_UNSUPP(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
90
88
|
else :
|
|
91
|
-
obj =
|
|
89
|
+
obj = _SS_UNSUPP(id,name,type,shape,offset,uShear,u7DOF,js)
|
|
92
90
|
|
|
93
91
|
|
|
94
92
|
_SectionADD(obj)
|
|
@@ -144,7 +142,7 @@ class Section:
|
|
|
144
142
|
@staticmethod
|
|
145
143
|
def DBUSER(Name='',Shape='',parameters:list=[],Offset=Offset(),useShear=True,use7Dof=False,id:int=0):
|
|
146
144
|
args = locals()
|
|
147
|
-
sect_Obj =
|
|
145
|
+
sect_Obj = _SS_DBUSER(**args)
|
|
148
146
|
_SectionADD(sect_Obj)
|
|
149
147
|
return sect_Obj
|
|
150
148
|
|
|
@@ -158,7 +156,7 @@ class Section:
|
|
|
158
156
|
BI1=0,BI11=0,BI12=0,BI21=0,BI3=0,BI31=0,BI32=0,BI4=0,
|
|
159
157
|
Offset:Offset=Offset.CC(),useShear=True,use7Dof=False,id:int=0):
|
|
160
158
|
args = locals()
|
|
161
|
-
sect_Obj =
|
|
159
|
+
sect_Obj = _SS_PSC_12CELL(**args)
|
|
162
160
|
_SectionADD(sect_Obj)
|
|
163
161
|
return sect_Obj
|
|
164
162
|
|
|
@@ -172,7 +170,7 @@ class Section:
|
|
|
172
170
|
Offset:Offset=Offset.CC(),useShear=True,use7Dof=False,id:int=0):
|
|
173
171
|
|
|
174
172
|
args = locals()
|
|
175
|
-
sect_Obj =
|
|
173
|
+
sect_Obj = _SS_COMP_PSC_I(**args)
|
|
176
174
|
|
|
177
175
|
_SectionADD(sect_Obj)
|
|
178
176
|
return sect_Obj
|
|
@@ -183,7 +181,7 @@ class Section:
|
|
|
183
181
|
Offset:Offset=Offset.CC(),useShear=True,use7Dof=False,id:int=0):
|
|
184
182
|
|
|
185
183
|
args = locals()
|
|
186
|
-
sect_Obj =
|
|
184
|
+
sect_Obj = _SS_PSC_Value(**args)
|
|
187
185
|
|
|
188
186
|
_SectionADD(sect_Obj)
|
|
189
187
|
return sect_Obj
|
|
@@ -203,7 +201,7 @@ class Section:
|
|
|
203
201
|
Offset:Offset=Offset.CC(),useShear=True,use7Dof=False,id:int=0):
|
|
204
202
|
|
|
205
203
|
args = locals()
|
|
206
|
-
sect_Obj =
|
|
204
|
+
sect_Obj = _SS_COMP_PSC_I(**args)
|
|
207
205
|
|
|
208
206
|
_SectionADD(sect_Obj)
|
|
209
207
|
return sect_Obj
|
|
@@ -214,7 +212,7 @@ class Section:
|
|
|
214
212
|
Offset:Offset=Offset.CC(),useShear=True,use7Dof=False,id:int=0):
|
|
215
213
|
|
|
216
214
|
args = locals()
|
|
217
|
-
sect_Obj =
|
|
215
|
+
sect_Obj = _SS_COMP_STEEL_I_TYPE1(**args)
|
|
218
216
|
|
|
219
217
|
_SectionADD(sect_Obj)
|
|
220
218
|
return sect_Obj
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
from ._offsetSS import Offset
|
|
2
2
|
from ._offsetSS import _common
|
|
3
3
|
|
|
4
|
-
class
|
|
4
|
+
class _SS_COMP_PSC_I(_common):
|
|
5
5
|
|
|
6
6
|
""" Create Standard USER DEFINED sections"""
|
|
7
7
|
|
|
@@ -178,7 +178,7 @@ class SS_COMP_PSC_I(_common):
|
|
|
178
178
|
except: e2 = 0
|
|
179
179
|
|
|
180
180
|
|
|
181
|
-
return
|
|
181
|
+
return _SS_COMP_PSC_I(name,False,joint,
|
|
182
182
|
slab[0],slab[1],slab[2],
|
|
183
183
|
vA[0],
|
|
184
184
|
vA[1],vA[2],vA[3],vA[4],vA[5],vA[6],vA[7],vA[8],vA[9],
|
|
@@ -190,7 +190,7 @@ class SS_COMP_PSC_I(_common):
|
|
|
190
190
|
offset,uShear,u7DOF,id)
|
|
191
191
|
|
|
192
192
|
|
|
193
|
-
class
|
|
193
|
+
class _SS_COMP_STEEL_I_TYPE1(_common):
|
|
194
194
|
|
|
195
195
|
""" Create Standard USER DEFINED sections"""
|
|
196
196
|
|
|
@@ -275,7 +275,7 @@ class SS_COMP_STEEL_I_TYPE1(_common):
|
|
|
275
275
|
except: e2 = 0
|
|
276
276
|
|
|
277
277
|
|
|
278
|
-
return
|
|
278
|
+
return _SS_COMP_STEEL_I_TYPE1(name,
|
|
279
279
|
slab[0],slab[1],slab[2],
|
|
280
280
|
vS[0],vS[2],vS[3],vS[1],vS[4],vS[5],
|
|
281
281
|
secti['MATL_ELAST'],secti['MATL_DENS'],secti['MATL_POIS_S'],secti['MATL_POIS_C'],secti['MATL_THERMAL'],
|
midas_civil/_section/_dbSecSS.py
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
from ._offsetSS import Offset
|
|
2
2
|
from ._offsetSS import _common
|
|
3
3
|
|
|
4
|
-
class
|
|
4
|
+
class _SS_DBUSER(_common):
|
|
5
5
|
|
|
6
6
|
""" Create Standard USER DEFINED sections"""
|
|
7
7
|
|
|
@@ -40,4 +40,4 @@ class SS_DBUSER(_common):
|
|
|
40
40
|
|
|
41
41
|
@staticmethod
|
|
42
42
|
def _objectify(id,name,type,shape,offset,uShear,u7DOF,js):
|
|
43
|
-
return
|
|
43
|
+
return _SS_DBUSER(name,shape,js['SECT_BEFORE']['SECT_I']['vSIZE'],offset,uShear,u7DOF,id)
|
midas_civil/_section/_pscSS.py
CHANGED
|
@@ -3,7 +3,7 @@ from ._offsetSS import _common
|
|
|
3
3
|
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
class
|
|
6
|
+
class _SS_PSC_12CELL(_common):
|
|
7
7
|
def __init__(self,Name='',Shape='1CEL',Joint=[0,0,0,0,0,0,0,0],
|
|
8
8
|
HO1=0,HO2=0,HO21=0,HO22=0,HO3=0,HO31=0,
|
|
9
9
|
BO1=0,BO11=0,BO12=0,BO2=0,BO21=0,BO3=0,
|
|
@@ -107,7 +107,7 @@ class SS_PSC_12CELL(_common):
|
|
|
107
107
|
vC = js['SECT_BEFORE']['SECT_I']['vSIZE_PSC_C']
|
|
108
108
|
vD = js['SECT_BEFORE']['SECT_I']['vSIZE_PSC_D']
|
|
109
109
|
joint = js['SECT_BEFORE']['JOINT']
|
|
110
|
-
return
|
|
110
|
+
return _SS_PSC_12CELL(name,shape,joint,
|
|
111
111
|
vA[0],vA[1],vA[2],vA[3],vA[4],vA[5],
|
|
112
112
|
vB[0],vB[1],vB[2],vB[3],vB[4],vB[5],
|
|
113
113
|
vC[0],vC[1],vC[2],vC[3],vC[4],vC[5],vC[6],vC[7],vC[8],vC[9],
|
|
@@ -122,7 +122,7 @@ class SS_PSC_12CELL(_common):
|
|
|
122
122
|
|
|
123
123
|
|
|
124
124
|
|
|
125
|
-
class
|
|
125
|
+
class _SS_PSC_I(_common):
|
|
126
126
|
def __init__(self,Name='',Symm = True,Joint=[0,0,0,0,0,0,0,0,0],
|
|
127
127
|
H1=0,
|
|
128
128
|
HL1=0,HL2=0,HL21=0,HL22=0,HL3=0,HL4=0,HL41=0,HL42=0,HL5=0,
|
|
@@ -261,7 +261,7 @@ class SS_PSC_I(_common):
|
|
|
261
261
|
vC = js['SECT_BEFORE']['SECT_I']['vSIZE_PSC_C']
|
|
262
262
|
vD = js['SECT_BEFORE']['SECT_I']['vSIZE_PSC_D']
|
|
263
263
|
joint = js['SECT_BEFORE']['JOINT']
|
|
264
|
-
return
|
|
264
|
+
return _SS_PSC_I(name,symm,joint,
|
|
265
265
|
vA[0],
|
|
266
266
|
vA[1],vA[2],vA[3],vA[4],vA[5],vA[6],vA[7],vA[8],vA[9],
|
|
267
267
|
vB[0],vB[1],vB[2],vB[3],vB[4],vB[5],vB[6],
|
|
@@ -300,7 +300,7 @@ def _poly_dir(poly,rot='CCW'):
|
|
|
300
300
|
|
|
301
301
|
|
|
302
302
|
|
|
303
|
-
class
|
|
303
|
+
class _SS_PSC_Value(_common):
|
|
304
304
|
def __init__(self,Name:str,
|
|
305
305
|
OuterPolygon:list,InnerPolygon:list=[],
|
|
306
306
|
Offset:Offset=Offset.CC(),useShear=True,use7Dof=False,id:int=0):
|
|
@@ -422,4 +422,4 @@ class SS_PSC_Value(_common):
|
|
|
422
422
|
h_pt.append([pt['X'],pt['Y']])
|
|
423
423
|
inner_pt.append(h_pt)
|
|
424
424
|
|
|
425
|
-
return
|
|
425
|
+
return _SS_PSC_Value(name,outer_pt,inner_pt,offset,uShear,u7DOF,id)
|
midas_civil/_section/_unSupp.py
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
from ._offsetSS import _common
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
class
|
|
4
|
+
class _SS_UNSUPP(_common):
|
|
5
5
|
|
|
6
6
|
""" Store Unsupported section"""
|
|
7
7
|
|
|
@@ -29,7 +29,7 @@ class SS_UNSUPP(_common):
|
|
|
29
29
|
js['SECT_BEFORE']['USE_WARPING_EFFECT'] = sect.USE7DOF
|
|
30
30
|
return js
|
|
31
31
|
|
|
32
|
-
class
|
|
32
|
+
class _SS_STD_DB(_common):
|
|
33
33
|
|
|
34
34
|
""" Store Unsupported section"""
|
|
35
35
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
midas_civil/__init__.py,sha256=
|
|
1
|
+
midas_civil/__init__.py,sha256=_KjbkXkwosQGJ9F1iVunbSg2lKNftP9ICCK4FKYqYHY,1114
|
|
2
2
|
midas_civil/_analysiscontrol.py,sha256=r2zp7fdC_m-WfO7KSXU4SzVjOgLWg4Wm0djl7X1ioZo,24456
|
|
3
3
|
midas_civil/_boundary.py,sha256=s5mgZIc1b0-P7AdWuaPAQ5cIbHL5CR1YRKJA7KE4W_U,32958
|
|
4
4
|
midas_civil/_construction.py,sha256=q9C3gGdvky5t7jCDzd6lBRv6pm8cMycI91xfkgDV37Y,40673
|
|
@@ -20,14 +20,14 @@ midas_civil/_tendon.py,sha256=mXNJeLikFsBpgn8u9fED2qx9oqnKh3XtIpYwp3moEfk,33395
|
|
|
20
20
|
midas_civil/_thickness.py,sha256=4xQsLA3Q_gIGCwLc_glFmiErdWdQUSwhlEhJ_IPJseA,3248
|
|
21
21
|
midas_civil/_utils.py,sha256=GR9cj-mgRPmtwmgqEj4JeEjMlRS6zmvhcxFV5IHbpRk,2708
|
|
22
22
|
midas_civil/_view.py,sha256=o7rkfoQzmgAb3dT0ujPIQLVwVlveo3rMRIbZU1UosZo,849
|
|
23
|
-
midas_civil/_section/__init__.py,sha256=
|
|
24
|
-
midas_civil/_section/_compositeSS.py,sha256=
|
|
25
|
-
midas_civil/_section/_dbSecSS.py,sha256=
|
|
23
|
+
midas_civil/_section/__init__.py,sha256=hKAAxFx3aubS6VoKvWDb9qPF4P-v98ON6MNUDVCbeyY,13483
|
|
24
|
+
midas_civil/_section/_compositeSS.py,sha256=mrHOkjHkbuVOLAd1dGEiLruyqmye_mv9H99UJIdWdiQ,9942
|
|
25
|
+
midas_civil/_section/_dbSecSS.py,sha256=J597m31ZN91BKnO77oDBSSnPYCL6p2ULzwGto_vQxAE,1446
|
|
26
26
|
midas_civil/_section/_offsetSS.py,sha256=kHjwp_PCeBKWqYKoQCy0s4d8O5Gb0Vk6e1MWMOGxql4,1377
|
|
27
|
-
midas_civil/_section/_pscSS.py,sha256=
|
|
28
|
-
midas_civil/_section/_unSupp.py,sha256=
|
|
29
|
-
midas_civil-1.0.
|
|
30
|
-
midas_civil-1.0.
|
|
31
|
-
midas_civil-1.0.
|
|
32
|
-
midas_civil-1.0.
|
|
33
|
-
midas_civil-1.0.
|
|
27
|
+
midas_civil/_section/_pscSS.py,sha256=PnXR5lJNKYtp8MyFddJlW45CYCRSG6SpA-zojDl4DnE,14254
|
|
28
|
+
midas_civil/_section/_unSupp.py,sha256=46A_a5CzDpQM7bqglkFzIvq6VG7Lj9J6qflY3nwZlqI,1674
|
|
29
|
+
midas_civil-1.0.7.dist-info/licenses/LICENSE,sha256=zrL4RwZC4rb-by_ZHKXwKdIwcs6ATy59TPZ9HxPHCrs,1071
|
|
30
|
+
midas_civil-1.0.7.dist-info/METADATA,sha256=jNF5IcPDPL9YP_r24YTv2yQavK774RCOpSBUKF79HDY,2085
|
|
31
|
+
midas_civil-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
32
|
+
midas_civil-1.0.7.dist-info/top_level.txt,sha256=_NFmrlN5V9OxJ-PAO4s_om8OA8uupXho3QqZcSsnbuI,12
|
|
33
|
+
midas_civil-1.0.7.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|