Merge pull request #1 from OpenSees/master

Merge upstream
zhuminjie · Apr 28, 2021 · 0c3ec9c · 0c3ec9c
2 parents 71e56fe + 7576bb3
commit 0c3ec9c
Show file tree

Hide file tree

Showing 376 changed files with 47,780 additions and 14,859 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,11 +48,12 @@ obj
 .idea
 cmake-build-debug
 cmake-build-release
-CMakeLists.txt
+#CMakeLists.txt
 .dropbox.attr
 
 # VSCode
 .vscode
+.clang-format
 
 # OTHER
 Makefile.def
@@ -79,3 +80,13 @@ SRC/interpreter/pythonInterpreter
 SRC/interpreter/tclInterpreter
 SRC/interpreter/openseespy
 SRC/interpreter/openseestcl
+filip
+PML
+CPlaneStrain.h
+CPlaneStress.h
+CPlaneStress2d.h
+CThreeDimensional.h
+Concrete.h
+forumat.for
+build
+bin
diff --git a/EXAMPLES/ExampleScripts/Example1.1.tcl b/EXAMPLES/ExampleScripts/Example1.1.tcl
@@ -88,8 +88,8 @@ foreach eleType {truss corotTruss} {
 # Create the integration scheme, the LoadControl scheme using steps of 1.0
 integrator LoadControl 1.0
 
-# Create the solution algorithm, a Linear algorithm is created
-algorithm Linear
+# Create the solution algorithm, a Newton algorithm is created
+algorithm Newton
 
 # create the analysis object 
 analysis Static 
@@ -122,4 +122,4 @@ analyze 1
 print node 4
 print ele
 
-}
+}