Skip to content
This repository has been archived by the owner on Jan 4, 2023. It is now read-only.

Updating to match master #2

Merged
merged 43 commits into from
May 28, 2020
Merged

Updating to match master #2

merged 43 commits into from
May 28, 2020

Conversation

u-anurag
Copy link
Owner

No description provided.

@u-anurag u-anurag merged commit 2a0bf6b into u-anurag:master May 28, 2020
u-anurag pushed a commit that referenced this pull request Oct 17, 2021
534919c Merge pull request #579 from ambaker1/nodeBounds_fix
65d7a9f Merge pull request #576 from msalehi2004/master
5d72514 Merge branch 'master' of https://github.com/OpenSees/OpenSees
22d51bf fmk - addng a bunch of CMakeLists files
4fad6da Update OpenSeesSectionCommands.cpp
2026914 Merge pull request #582 from mhscott/warping
50aa94d Moving OPS_Section commands around
6a88078 Update DispBeamColumn3d.h
8c02c63 Update DispBeamColumn3d.cpp
5c925e6 Merge branch 'master' of https://github.com/OpenSees/OpenSees
21ae8c7 fmk - removing _DLL
4d900ad Update MultiYieldSurfaceClay.cpp
4d4e0c2 fmk - removing _DLL
2693815 fmk - removing _DLL
93393ef Merge branch 'master' of https://github.com/OpenSees/OpenSees
df8580b fmk - removing _DLL
3014b3c Update AxialCurve.cpp
6d6b39f fmk - removing _DLL
e9bf81f fmk - removing _DLL
219fa7b fmk - removing _DLL
1f2b5c1 Update SteelBRB.cpp
4657a66 Update SteelBRB.h
642d818 fmk - removing ifdef _DLL
00047cf Merge branch 'master' of https://github.com/OpenSees/OpenSees
1558509 fmk - removing ifdef _DLL
4fb19bf Update Matrix.cpp
50b3bd1 Update Matrix.h
f18966d Update Element.h
f852166 Update DispBeamColumn3d.h
3758ce5 Update ForceBeamColumn3d.h
891cde5 Update ForceBeamColumn2d.h
e7eca1c Update DispBeamColumn2d.h
4793de2 Merge pull request #580 from mhscott/linethickness
4079c3d S. Mazzoni - Changing line thickness to 2
63b56c6 Performance improvement
ec4c62d Update Domain.cpp
41f1824 Merge pull request #578 from aschellenberg74/master
7ac3620 updated Win32 project files
870b542 updated Win64 project files
9bcf76c Fixed bug with nodeBounds
54aacb5 Update packages.cpp
5deb8c2 fmk - one further elementAPI file needing fixed
5b20cd8 fmk - remoivng tcl code from elementAPI.h
3a982c2 fmk - removing ifndef PML
ef3f5e5 Update LayeredShellFiberSectionThermal.cpp
371ceda Update TclModelBuilderSectionCommand.cpp
1386af4 Update LayeredShellFiberSection.cpp
896468f Small Correction
7576bb3 Merge pull request #561 from ambaker1/ndm_ndf
260d79e Merge branch 'master' of https://github.com/OpenSees/OpenSees
700bec1 fmk - adding new Makefile for CentOSS from Ben Pietras, University of Manchester, UK
fcd3f9f Merge pull request #2 from OpenSees/master
d196a00 Merge branch 'master' into ndm_ndf
a76674d Merge pull request #563 from ambaker1/sp_mp_query
09327c5 Merge branch 'master' into ndm_ndf
d135888 Merge pull request #560 from ambaker1/eleType
5344d77 Merge pull request #569 from kasiz/setnodepressure
d0d286d Added setNodePressure Command
b37a5af Added setNodePressure Command
63a49a0 Added setNodePressure Command
ca623c8 Merge pull request #568 from mhscott/elliptical
948282a Updating section commands
24b1cdc interpreter/OpenSeesSectionCommands.cpp
c3211ec Merge pull request #567 from zhuminjie/pc
ea533d8 Update PythonWrapper.cpp
0eb869d add pc command
97ebde2 Renamed ndm and ndf to getNDM and getNDF
7dd9e35 Update commands.cpp
aa3df2c Merge pull request #522 from MassimoPetracca/fix-mpco-opensees-sp
3f258c3 Merge pull request #559 from mckee107/fix_DomainPartitioner-partition
7a62499 Update commands.cpp
677ec39 Utility commands for SP and MP constraints
22f2e92 fmk - fixing Makefile
3f3b78c Added eleType, utility to get element class
5935189 Added ndm and ndf
2b72e80 Correct PartitionedDomain::partition
2f55bfc Update FiberSectionWarping3d.cpp
bb472d1 Merge pull request #558 from mhscott/warping
48c50ed Modifying files for U.Sydney warping elements
2037175 Adding new files for U.Sydney warping elements
d8d359f Merge pull request #557 from longchen-geo/master
25509bd Update PlateRebarMaterial.cpp
952458a Update OpenSeesElementCommands.cpp
a91f72c Update OpenSeesElementCommands.cpp
7c765a4 Update OpenSeesElementCommands.cpp
852d9aa Update OpenSeesCommands.cpp
27dd5cc Update commands.cpp
73f5f2f Merge pull request #554 from u-anurag/master
88845c2 Merge pull request #553 from kkolozvari/master
2c8f405 Merge pull request #4 from u-anurag/u-anurag-patch-ShellNLDKGQ_Block2D
7769dbd Adding ShellNLDKGQ to the Block2D command
0e40b03 Update OpenSees.vcxproj
8b3f0d5 Add SFI-MVLEM-3D
909ce34 Merge pull request #3 from OpenSees/master
efd7d7b Merge pull request #550 from mhscott/basicForce3d
9be3f40 Adding basicForce and basicStiffness as recorder options
6cc028a Merge pull request #549 from vavgen/master
384b53b Reimported VS files
886a98f Removed comment
361c069 Removed preprocessor directives
a0bb10c Merge pull request #1 from OpenSees/master
9539cd7 Create RockingBC.h
7d91397 Update Makefile
2579dbe fmk - updating version to 3.3.0
a0d95b4 fmk - subtracting 1 from lapack, adding some CMakeList files while here
da92d06 fmk - fixing conflict
3da68c8 fmk - fixing eof char
dcd4814 Merge pull request #511 from ambaker1/EPPGap_Fix
22293c6 Update EPPGapMaterial.cpp
b7988b7 fmk - adding another element option LHSNMYS_Damage
1f8c29f fmk - bug fix, fixing dt
b59f26c Merge pull request #525 from ambaker1/node_numbers
742e48b Merge branch 'master' into node_numbers
0980685 Merge pull request #546 from kkolozvari/master
2ecd5be MVLEM_3D implementation
0064cc7 Update OpenSeesMiscCommands.cpp
05ceb4b Add bounding surface correction to PM4Silt and remove a limit on Cdz
8d45998 Merge pull request #544 from mhscott/stringElementRecorder
ffefaa6 Merge branch 'master' into stringElementRecorder
cb882a6 Merge pull request #543 from zhuminjie/master
87b1412 GetStringFromAll: if an input is a string, copy it to buffer
0e4c8b8 Update RockingBC.cpp
dcd0066 Merge pull request #542 from mckee107/Update_Makefile
d55309d Casting character string
f18f5fa Update Makefile.incl for RockingBC
b3a8c75 More clean-up
e556957 Changes to fix seg fault
8b6319e Merge pull request #541 from mhscott/shellNLDKGT-py
8990257 Adding ShellNLDKGT to Python interpreter
bf46291 Merge pull request #538 from mhscott/hysteretic-poly-vs
13b6cd7 Adding HystreticPoly to M$ project file
f1513ab Merge branch 'master' of https://github.com/OpenSees/OpenSees
4111a2a fmk - new class tags
364087f Merge pull request #534 from mhscott/initStrain
05edac4 Using local strain in updateParameter
64ec9b5 Merge pull request #533 from mhscott/hysteretic-poly-makefile
e8e8a06 Adding HystereticPoly to Makefiles
9f0f28f Merge pull request #499 from salsessa/master
f95663c Merge pull request #513 from mfasil10/patch-1
cd29132 Merge pull request #530 from mhscott/initStrain
abc55d0 Adding epsInit as parameter
d09472a Update NewtonRaphson.cpp
586468b Merge branch 'master' of https://github.com/ambaker1/OpenSees into node_numbers h
f24246e Merge branch 'master' of https://github.com/ambaker1/OpenSees into node_numbers
11218e9 Corrected order of polygon nodes
38e0db0 Updated higher-order polygon displays
9a84fdd three-node triangle displays
cb6787b Added or updated quad element displays
935417c Update N4BiaxialTruss.cpp
f7ee626 Updated MVLEM element displays
c1083c0 Update FourNodeTetrahedron.cpp
79a4f5d Updated cube displays
ebff2ee Update SSPbrick.cpp
6f2dbfa Added 20_8_BrickUP display
205db0f Updated frictionBearing displays
cde2cdd Updated joint display methods
beebdff Added or updated 2-node element displays
f5b901b Update Renderer.cpp
a8d6c04 Added getDisplayRots method to get display rotations
178209d Update TclRecorderCommands.cpp
3febadf Merge pull request #527 from mhscott/stringElementRecorder
2d8e8c1 Adding OPS_GetStringFromAll to Tcl API
df12f62 Merge branch 'master' into stringElementRecorder
3cae99c fmk - fixing merge
86e8109 fmk - updating makefile for PML
360861c Merge pull request #521 from talledodiego/testSection
5bc9011 Merge pull request #517 from talledodiego/openseespy-MPCO-recorder
d785fd3 Merge pull request #516 from mhscott/stringElementRecorder
43a8d03 Merge pull request #526 from OpenSees/revert-487-linearTS
83c5833 Revert "Adding start time to linear time series"
cbe6a7f Fixed improper display of node numbers, and node display coordinates for mode shapes
b27cc13 Update commands.cpp
03638b1 remove an old workaround for a bug that has been fixed recently
08659af Merge pull request #523 from mhscott/cbdi3d
1dd12dd Accounting for member loads in 3D CBDI formulation
707e390 Merge branch 'master' into cbdi3d
c640c8c last fixes
d4d9803 Merge branch 'master' of git://github.com/OpenSees/OpenSees
5bc8e4e Update LowOrderBeamIntegration.cpp
0860617 use a serializer
fa03bf9 improvements to testSection
3e07dc9 corrected lower-case
2684f81 Update Example1.1.tcl
cb2769e Merge branch 'master' of git://github.com/OpenSees/OpenSees
b5db520 Merge branch 'master' of git://github.com/OpenSees/OpenSees into stringElementRecorder
1e9bc37 Update PenaltyMP_FE.cpp
b9020e3 Merge pull request #519 from jpcoding/patch-3
82bcdf4 typo correction
f1a3103 adding MPCO recorder on openseespy
61361b0 Calling OPS_GetStringFromAll() to make strings for setResponse and setParameter
b8b6742 Merge branch 'master' of git://github.com/OpenSees/OpenSees
f0e657a Merge branch 'master' of git://github.com/OpenSees/OpenSees
9710ada Update LeadRubberX.cpp
7b3395e Changes to make EPPGap more robust
e006beb Merge branch 'master' of git://github.com/OpenSees/OpenSees
0058c5a Merge branch 'master' of https://github.com/mhscott/OpenSees
c170643 Merge branch 'master' of https://github.com/OpenSees/OpenSees
9626356 fmk - updating Makefile
db4b571 Update HystereticPoly.cpp
14cb13b Add files via upload
9468b4b Add files via upload
e3a985a Update FEM_ObjectBrokerAllClasses.cpp
7773aab Update FEM_ObjectBrokerAllClasses.cpp
53a28d1 Update OpenSeesUniaxialMaterialCommands.cpp
123e813 Update TclModelBuilderUniaxialMaterialCommand.cpp
8330ed7 Update classTags.h
1b9d63d Merge branch 'master' into cbdi3d
b5989dd Merge branch 'master' into cbdi3d
a57437a Merge branch 'master' into cbdi3d
f57e9ec Merge branch 'master' into cbdi3d
0f52efc Merge branch 'master' into cbdi3d
6b18275 Merge branch 'master' into cbdi3d
cdb3bed Merge branch 'master' into cbdi3d
9f062ca Merge branch 'master' of git://github.com/OpenSees/OpenSees into cbdi3d
8f1eed3 Merge branch 'master' into cbdi3d
35d2277 Starting to work on member loads
e2021a0 Formatting changes
6d61a3b Merge pull request #13 from OpenSees/master
e40f1fc Merge pull request #12 from OpenSees/master
42d74c9 Merge pull request #2 from OpenSees/master
5b3e3b1 Merge pull request #1 from OpenSees/master
d0292aa Add bounding surface correction for PM4Sand model.
0aec74f add bounding surface correction for elastoplastic stage
37230d1 Adding bounding surface correction.

git-subtree-dir: opensees
git-subtree-split: 534919c
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants