Merge pull request imeg#1 from OpenSees/master

Update
OpenSeesHouse · Dec 4, 2020 · 9be0c7e · 9be0c7e
2 parents 5f3bfa2 + f236e2d
commit 9be0c7e
Show file tree

Hide file tree

Showing 377 changed files with 40,694 additions and 15,258 deletions.
diff --git a/.gitignore b/.gitignore
@@ -79,3 +79,4 @@ SRC/interpreter/pythonInterpreter
 SRC/interpreter/tclInterpreter
 SRC/interpreter/openseespy
 SRC/interpreter/openseestcl
+bin
diff --git a/DEVELOPER/core/classTags.h b/DEVELOPER/core/classTags.h
@@ -718,6 +718,9 @@
 #define ELE_TAG_PFEMElement2DQuasi        187
 #define ELE_TAG_MINI                      188
 #define ELE_TAG_PFEMElement3DBubble       189
+#define ELE_TAG_NineNodeQuad              207
+#define ELE_TAG_EightNodeQuad             208
+#define ELE_TAG_SixNodeTri                209
 
 #define FRN_TAG_Coulomb            1
 #define FRN_TAG_VelDependent       2

diff --git a/EXAMPLES/DeveloperTestScripts/ZeroLengthImpact3D_test.tcl b/EXAMPLES/DeveloperTestScripts/ZeroLengthImpact3D_test.tcl
@@ -20,7 +20,7 @@
 #  x      (y=0.0)         x      (y=10.0)         x      (y=10.0)         x      (y=20.0)
 #  |                      |                      |                      |
 #  02--------05           12--------15           22--------25           32--------35
-#  | master1 |            | master1 |            |  slave1 |            |  slave1 | 
+#  | primary1 |            | primary1 |            |  secondary1 |            |  secondary1 | 
 #  01--------04---> z     11--------14---> z     21--------24---> z     31--------34---> z
 
 
@@ -66,8 +66,8 @@ fix 05 1 1 1;
 nDMaterial ElasticIsotropic 1 29000.0 0.3; #steel
 
 #element stdBrick $eleTag $node1 $node2 $node3 $node4 $node5 $node6 $node7 $node8 $matTag
-element stdBrick 1 12 11 01 02 15 14 04 05 1;#master1
-element stdBrick 2 32 31 21 22 35 34 24 25 1;#slave1
+element stdBrick 1 12 11 01 02 15 14 04 05 1;#primary1
+element stdBrick 2 32 31 21 22 35 34 24 25 1;#secondary1
 
 
 
@@ -184,4 +184,4 @@ if {$ok != 0} {
 if {$success == 1.0} {
                         puts "SUCCESS: enjoy!"
             }
-
+
diff --git a/EXAMPLES/ExamplePython/Example5.1.py b/EXAMPLES/ExamplePython/Example5.1.py
@@ -66,7 +66,7 @@
 node(17,  bx/2.0, -by/2.0, 3.0*h) 
 node(18, -bx/2.0, -by/2.0, 3.0*h)
 
-# Master nodes for rigid diaphragm
+# Retained nodes for rigid diaphragm
 #        tag   X    Y    Z 
 node( 9,  0.0, 0.0,     h)
 node(14,  0.0, 0.0, 2.0*h)
@@ -80,12 +80,12 @@
 fix(4, 1, 1, 1, 1, 1, 1)
 
 # Define rigid diaphragm multi-point constraints
-#              normalDir master slaves
+#              normalDir retained constrained
 rigidDiaphragm(3,  9,  5,  6,  7,  8)
 rigidDiaphragm(3, 14, 10, 11, 12, 13)
 rigidDiaphragm(3, 19, 15, 16, 17, 18)
 
-# Constraints for rigid diaphragm master nodes
+# Constraints for rigid diaphragm retained nodes
 #      tag DX DY DZ RX RY RZ
 fix( 9, 0, 0, 1, 1, 1, 0)
 fix(14, 0, 0, 1, 1, 1, 0)
@@ -199,13 +199,13 @@
 # 10% of column capacity
 p = 0.1*fc*h*h
 
-# Mass lumped at master nodes
+# Mass lumped at retained nodes
 m = (4.0*p)/g
 
-# Rotary inertia of floor about master node
+# Rotary inertia of floor about retained node
 i = m*(bx*bx + by*by)/12.0
 
-# Set mass at the master nodes
+# Set mass at the retained nodes
 #        tag MX MY MZ   RX   RY   RZ
 mass( 9, m, m, 0.0, 0.0, 0.0, i)
 mass(14, m, m, 0.0, 0.0, 0.0, i)

diff --git a/EXAMPLES/ExamplePython/bending_quad9n.py b/EXAMPLES/ExamplePython/bending_quad9n.py
@@ -0,0 +1,52 @@
+import openseespy.opensees as ops
+# import opensees as ops
+
+ops.wipe()
+
+ops.model('basic', '-ndm', 2, '-ndf', 2)
+
+L = 5.
+H = 1.
+
+thk = 0.01
+
+P = 100.
+E = 200.e6
+nu = 0.3
+
+ops.nDMaterial('ElasticIsotropic', 1, E, nu)
+
+ops.node(1, 0., 0.)
+ops.node(2, 5., 0.)
+ops.node(3, 5., 1.)
+ops.node(4, 0., 1.)
+ops.node(5, 2.5, 0.)
+ops.node(6, 5., .5)
+ops.node(7, 2.5, 1.)
+ops.node(8, 0., .5)
+ops.node(9, 2.5, .5)  # comment for quad8n element
+
+ops.element('quad9n', 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, thk, 'PlaneStress', 1)
+# ops.element('quad8n', 1, 1, 2, 3, 4, 5, 6, 7, 8, thk, 'PlaneStress', 1)
+
+ops.fix(1, 1, 1)
+ops.fix(4, 1, 0)
+ops.fix(8, 1, 0)
+
+ops.timeSeries('Linear', 1)
+ops.pattern('Plain', 1, 1)
+ops.load(2, P, 0.)
+ops.load(3, -P, 0.)
+
+ops.analysis('Static')
+
+ops.analyze(1)
+
+ops.printModel()
+
+# verification:
+# tip vertical displacement (node 2 and 3) = 0.0075
+# bottom Gauss Point stress_xx = 46475.8
+# bottom extrem stress_xx (extrapolated) = 60000.0
+
+exit()
diff --git a/EXAMPLES/ExamplePython/bending_tri6n.py b/EXAMPLES/ExamplePython/bending_tri6n.py
@@ -0,0 +1,56 @@
+import openseespy.opensees as ops
+# import opensees as ops
+
+ops.wipe()
+
+ops.model('basic', '-ndm', 2, '-ndf', 2)
+
+L = 5.
+H = 1.
+
+thk = 0.01
+
+P = 100.
+E = 200.e6
+nu = 0.3
+
+ops.nDMaterial('ElasticIsotropic', 1, E, nu)
+
+ops.node(1, 0., 0.)
+ops.node(2, 5., 0.)
+ops.node(3, 5., 1.)
+ops.node(4, 0., 1.)
+ops.node(5, 2.5, 0.)
+ops.node(6, 5., .5)
+ops.node(7, 2.5, 1.)
+ops.node(8, 0., .5)
+ops.node(9, 2.5, .5)  # comment for quad8n element
+
+ops.element('tri6n', 1, 1, 2, 3, 5, 6, 9, thk, 'PlaneStress', 1)
+ops.element('tri6n', 2, 1, 3, 4, 9, 7, 8, thk, 'PlaneStress', 1)
+
+ops.fix(1, 1, 1)
+ops.fix(4, 1, 0)
+ops.fix(8, 1, 0)
+
+ops.timeSeries('Linear', 1)
+ops.pattern('Plain', 1, 1)
+ops.load(2, P, 0.)
+ops.load(3, -P, 0.)
+
+ops.analysis('Static')
+
+ops.analyze(1)
+
+ops.printModel()
+
+stressAtNodes_ele1 = ops.eleResponse(1, 'stressAtNodes')
+
+print(f'\nTip vertical displacement (node 2) is {ops.nodeDisp(2, 2):.4f}')
+print(f'Stress sigma_xx at node 1 is {stressAtNodes_ele1[0]:.1f}')
+
+# verification:
+# tip vertical displacement (node 2 and 3) = 0.0075
+# bottom extreme stress_xx (extrapolated) = 60000.0
+
+exit()
diff --git a/EXAMPLES/ExampleScripts/Example5.1.tcl b/EXAMPLES/ExampleScripts/Example5.1.tcl
@@ -37,7 +37,7 @@ node 16  [expr  $bx/2] [expr  $by/2] [expr 3*$h]
 node 17  [expr  $bx/2] [expr -$by/2] [expr 3*$h] 
 node 18  [expr -$bx/2] [expr -$by/2] [expr 3*$h]
 
-# Master nodes for rigid diaphragm
+# Retained nodes for rigid diaphragm
 #    tag X Y          Z 
 node  9  0 0         $h 
 node 14  0 0 [expr 2*$h]
@@ -51,12 +51,12 @@ fix  3   1  1  1  1  1  1
 fix  4   1  1  1  1  1  1
 
 # Define rigid diaphragm multi-point constraints
-#               normalDir  master     slaves
+#               normalDir  retained constrained
 rigidDiaphragm     3          9     5  6  7  8
 rigidDiaphragm     3         14    10 11 12 13
 rigidDiaphragm     3         19    15 16 17 18
 
-# Constraints for rigid diaphragm master nodes
+# Constraints for rigid diaphragm retained nodes
 #   tag DX DY DZ RX RY RZ
 fix  9   0  0  1  1  1  0
 fix 14   0  0  1  1  1  0
@@ -174,14 +174,14 @@ element nonlinearBeamColumn  24 18  15   $np  $beamSec     2
 # 10% of column capacity
 set p [expr 0.1*$fc*$h*$h]
 
-# Mass lumped at master nodes
+# Mass lumped at retained nodes
 set g 386.4;            # Gravitational constant
 set m [expr (4.0*$p)/$g]
 
-# Rotary inertia of floor about master node
+# Rotary inertia of floor about retained node
 set i [expr $m*($bx*$bx+$by*$by)/12.0]
 
-# Set mass at the master nodes
+# Set mass at the retained nodes
 #    tag MX MY MZ RX RY RZ
 mass  9  $m $m  0  0  0 $i
 mass 14  $m $m  0  0  0 $i

diff --git a/EXAMPLES/ExampleScripts/RigidFrame3D.tcl b/EXAMPLES/ExampleScripts/RigidFrame3D.tcl
@@ -64,24 +64,24 @@ fix 2  1  1  1  1  1  1
 fix 3  1  1  1  1  1  1
 fix 4  1  1  1  1  1  1
 
-# Mass lumped at master node
+# Mass lumped at retained node
 set m [expr ($dl+$ll)*$bx*$by/$g]
 
-# Rotary inertia of floor about master node
+# Rotary inertia of floor about retained node
 set i [expr $m*($bx^2+$by^2)/12.0]
 
-# Master nodes for rigid diaphragm
+# Retained nodes for rigid diaphragm
 node  9 0 0         $h  -mass $m $m 0 0 0 $i
 node 14 0 0 [expr 2*$h] -mass $m $m 0 0 0 $i
 node 19 0 0 [expr 3*$h] -mass $m $m 0 0 0 $i
 
 # Define rigid diaphragm constraints
-#               normalDir  master     slaves
+#               normalDir  retained     constrained
 rigidDiaphragm     3         9      5  6  7  8
 rigidDiaphragm     3        14     10 11 12 13
 rigidDiaphragm     3        19     15 16 17 18
 
-# Constraints for rigid diaphragm master nodes
+# Constraints for rigid diaphragm retained nodes
 fix  9  0 0 1 1 1 0
 fix 14  0 0 1 1 1 0
 fix 19  0 0 1 1 1 0

diff --git a/EXAMPLES/ExampleScripts/bending_quad9n.tcl b/EXAMPLES/ExampleScripts/bending_quad9n.tcl
@@ -0,0 +1,48 @@
+model Basic -ndm 2 -ndf 2
+
+set thk 0.01
+set L 5.0
+set H 1.0
+
+set P 100.
+set E 200.e6
+set nu 0.3
+
+node 1 0. 0.
+node 2 5. 0.
+node 3 5. 1.
+node 4 0. 1.
+node 5 2.5 0.
+node 6 5. .5
+node 7 2.5 1.
+node 8 0. .5
+# node 9 2.5 .5; # comment for quad8n element
+
+nDMaterial ElasticIsotropic 1 $E $nu
+
+# element quad9n 1 1 2 3 4 5 6 7 8 9 $thk "PlaneStress" 1
+element quad8n 1 1 2 3 4 5 6 7 8 $thk "PlaneStress" 1
+
+fix 1 1 1
+fix 4 1 0
+fix 8 1 0
+
+timeSeries Linear 1
+
+pattern Plain 1 1 {
+	load 2 $P 0.
+	load 3 -$P 0.
+}
+
+analysis Static
+
+analyze 1
+
+print
+
+# verification:
+# tip vertical displacement (node 2 and 3) = 0.0075
+# bottom Gauss Point stress_xx = 46475.8
+# bottom extrem stress_xx (extrapolated) = 60000.0
+
+exit
diff --git a/EXAMPLES/ExamplesForTesting/PyTzSimple1GenForTesting.ops b/EXAMPLES/ExamplesForTesting/PyTzSimple1GenForTesting.ops
@@ -1,5 +1,5 @@
 ######################################################################
-# Master file for py pushover analysis to illustrate PySimple1Gen
+# Main file for py pushover analysis to illustrate PySimple1Gen
 # command
 #
 # Created by Scott Brandenberg, April 30, 2004.

diff --git a/EXAMPLES/ExamplesForTesting/Test.Example5.1.ops b/EXAMPLES/ExamplesForTesting/Test.Example5.1.ops
@@ -37,7 +37,7 @@ node 16  [expr  $bx/2] [expr  $by/2] [expr 3*$h]
 node 17  [expr  $bx/2] [expr -$by/2] [expr 3*$h] 
 node 18  [expr -$bx/2] [expr -$by/2] [expr 3*$h]
 
-# Master nodes for rigid diaphragm
+# Retained nodes for rigid diaphragm
 #    tag X Y          Z 
 node  9  0 0         $h 
 node 14  0 0 [expr 2*$h]
@@ -51,12 +51,12 @@ fix  3   1  1  1  1  1  1
 fix  4   1  1  1  1  1  1
 
 # Define rigid diaphragm multi-point constraints
-#               normalDir  master     slaves
+#               normalDir  retained     constrained
 rigidDiaphragm     3          9     5  6  7  8
 rigidDiaphragm     3         14    10 11 12 13
 rigidDiaphragm     3         19    15 16 17 18
 
-# Constraints for rigid diaphragm master nodes
+# Constraints for rigid diaphragm retained nodes
 #   tag DX DY DZ RX RY RZ
 fix  9   0  0  1  1  1  0
 fix 14   0  0  1  1  1  0
@@ -182,14 +182,14 @@ element nonlinearBeamColumn  24 18  15   $np  $beamSec     2
 # 10% of column capacity
 set p [expr 0.1*$fc*$h*$h]
 
-# Mass lumped at master nodes
+# Mass lumped at retained nodes
 set g 386.4;            # Gravitational constant
 set m [expr (4*$p)/$g]
 
-# Rotary inertia of floor about master node
+# Rotary inertia of floor about retained node
 set i [expr $m*($bx*$bx+$by*$by)/12.0]
 
-# Set mass at the master nodes
+# Set mass at the retained nodes
 #    tag MX MY MZ RX RY RZ
 mass  9  $m $m  0  0  0 $i
 mass 14  $m $m  0  0  0 $i

diff --git a/EXAMPLES/ExamplesForTesting/Test.RigidFrame3D.ops b/EXAMPLES/ExamplesForTesting/Test.RigidFrame3D.ops
@@ -64,24 +64,24 @@ fix 2  1  1  1  1  1  1
 fix 3  1  1  1  1  1  1
 fix 4  1  1  1  1  1  1
 
-# Mass lumped at master node
+# Mass lumped at retained node
 set m [expr ($dl+$ll)*$bx*$by/$g]
 
-# Rotary inertia of floor about master node
+# Rotary inertia of floor about retained node
 set i [expr $m*($bx^2+$by^2)/12.0]
 
-# Master nodes for rigid diaphragm
+# Retained nodes for rigid diaphragm
 node  9 0 0         $h  -mass $m $m 0 0 0 $i
 node 14 0 0 [expr 2*$h] -mass $m $m 0 0 0 $i
 node 19 0 0 [expr 3*$h] -mass $m $m 0 0 0 $i
 
 # Define rigid diaphragm constraints
-#               normalDir  master     slaves
+#               normalDir  retained     constrained
 rigidDiaphragm     3         9      5  6  7  8
 rigidDiaphragm     3        14     10 11 12 13
 rigidDiaphragm     3        19     15 16 17 18
 
-# Constraints for rigid diaphragm master nodes
+# Constraints for rigid diaphragm retained nodes
 fix  9  0 0 1 1 1 0
 fix 14  0 0 1 1 1 0
 fix 19  0 0 1 1 1 0