Merge branch 'master' into chebyshev

zhuminjie · Jul 28, 2021 · 72d170e · 72d170e
2 parents 9e44b0f + 6082540
commit 72d170e
Show file tree

Hide file tree

Showing 326 changed files with 50,592 additions and 13,262 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ cmake-build-release
 
 # VSCode
 .vscode
+.clang-format
 
 # OTHER
 Makefile.def

diff --git a/EXAMPLES/ExamplePython/Example1.1.py b/EXAMPLES/ExamplePython/Example1.1.py
@@ -29,11 +29,7 @@
 # create ModelBuilder (with two-dimensions and 2 DOF/node)
 model("BasicBuilder", "-ndm",2, "-ndf",2)
 
-# set default units
-defaultUnits("-force", "kip", "-length", "in", "-time", "sec", "-temp", "F")
-
 # create nodes & add to Domain - command: node nodeId xCrd yCrd
-#node(1, 0.0,    0.0, "-disp",0.0,0.0, "-vel", 0.0,0.0, "-mass", 0.0,0.0)
 node(1, 0.0,    0.0)
 node(2, 144.0,  0.0)
 node(3, 168.0,  0.0)

diff --git a/EXAMPLES/ExampleScripts/Example1.1.tcl b/EXAMPLES/ExampleScripts/Example1.1.tcl
@@ -23,10 +23,11 @@
 # ------------------------------
 
 foreach eleType {truss corotTruss} {
-
+    
     # Create ModelBuilder (with two-dimensions and 2 DOF/node)
-    model BasicBuilder -ndm 2 -ndf 2
     wipe
+    model BasicBuilder -ndm 2 -ndf 2
+
     # Create nodes
     # ------------