Merge branch 'master' into material-tests

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)

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
     # ------------
 

SRC/CMakeLists.txt

@@ -0,0 +1,22 @@
+
+add_subdirectory(domain)
+add_subdirectory(damage)
+add_subdirectory(actor)
+add_subdirectory(analysis)
+add_subdirectory(convergenceTest)
+add_subdirectory(coordTransformation)
+add_subdirectory(graph)
+add_subdirectory(handler)
+add_subdirectory(element)
+add_subdirectory(material)
+add_subdirectory(matrix)
+add_subdirectory(recorder)
+add_subdirectory(tagged)
+add_subdirectory(utility)
+
+
+#
+#add_subdirectory(utility)
+
+
+

SRC/Makefile

@@ -512,6 +512,7 @@ ELE_LIBS   =  $(FE)/element/Element.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumnNL2d.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn2dThermal.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn3d.o \
+	$(FE)/element/dispBeamColumn/DispBeamColumnNL3d.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumnWarping3d.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn3dThermal.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn2dWithSensitivity.o \
@@ -626,6 +627,8 @@ ELE_LIBS   =  $(FE)/element/Element.o \
 	$(FE)/element/PFEMElement/HigherOrder.o \
 	$(FE)/element/PFEMElement/Mesh.o \
 	$(FE)/element/PFEMElement/PFEMContact2D.o \
+	$(FE)/element/PFEMElement/BNode.o \
+	$(FE)/element/PFEMElement/BCell.o \
 	$(FE)/element/UWelements/SSPquad.o \
 	$(FE)/element/UWelements/SSPquadUP.o \
 	$(FE)/element/UWelements/SSPbrick.o \

SRC/actor/CMakeLists.txt

@@ -0,0 +1,13 @@
+add_library(actor "")
+
+add_subdirectory(address)
+add_subdirectory(channel)
+add_subdirectory(machineBroker)
+add_subdirectory(message)
+add_subdirectory(objectBroker)
+add_subdirectory(shadow)
+add_subdirectory(actor)
+
+
+
+

SRC/actor/actor/CMakeLists.txt

@@ -0,0 +1,10 @@
+target_sources(actor
+    PRIVATE
+      Actor.cpp
+      MovableObject.cpp
+    PUBLIC
+      Actor.h
+      MovableObject.h
+)
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))

SRC/actor/address/CMakeLists.txt

@@ -0,0 +1,27 @@
+target_sources(actor
+    PRIVATE
+      ChannelAddress.cpp
+    PUBLIC
+      ChannelAddress.h
+)
+
+
+if(PARALLEL_INTERPRETERS)
+target_sources(actor
+    PRIVATE
+      MPI_Address.cpp
+    PUBLIC
+      MPI_Address.h
+)
+elseif(PARALLEL)
+target_sources(actor
+    PRIVATE
+      MPI_Address.cpp
+    PUBLIC
+      MPI_Address.h
+)
+endif()
+
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+

SRC/actor/channel/CMakeLists.txt

@@ -0,0 +1,33 @@
+target_sources(actor
+    PRIVATE
+      Channel.cpp
+      HTTP.cpp
+      Socket.cpp
+      TCP_Socket.cpp
+      UDP_Socket.cpp      
+    PUBLIC
+      Channel.h
+      Socket.h
+      TCP_Socket.h
+      UDP_Socket.h      
+)
+
+
+if(PARALLEL_INTERPRETERS)
+target_sources(actor
+    PRIVATE
+      MPI_Channel.cpp
+    PUBLIC
+      MPI_Channel.h
+)
+elseif(PARALLEL)
+target_sources(actor
+    PRIVATE
+      MPI_Channel.cpp
+    PUBLIC
+      MPI_Channel.h
+)
+endif()
+
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))

SRC/actor/machineBroker/CMakeLists.txt

@@ -0,0 +1,26 @@
+target_sources(actor
+    PRIVATE
+      MachineBroker.cpp
+    PUBLIC
+      MachineBroker.h
+)
+
+
+if(PARALLEL_INTERPRETERS)
+  target_sources(actor
+    PRIVATE
+      MPI_Machine.cpp
+    PUBLIC
+      MPI_MachineBroker.h
+)
+elseif(PARALLEL)
+   target_sources(actor
+     PRIVATE
+       MPI_Machine.cpp
+     PUBLIC
+       MPI_MachineBroker.h
+)
+endif()
+
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))

SRC/actor/message/CMakeLists.txt

@@ -0,0 +1,8 @@
+target_sources(actor
+    PRIVATE
+      Message.cpp      
+    PUBLIC
+      Message.h
+)
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))

SRC/actor/objectBroker/CMakeLists.txt

@@ -0,0 +1,10 @@
+target_sources(actor
+    PRIVATE
+      FEM_ObjectBroker.cpp
+      FEM_ObjectBrokerAllClasses.cpp
+    PUBLIC
+      FEM_ObjectBroker.h
+      FEM_ObjectBrokerAllClasses.h
+)
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))

SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp

@@ -191,9 +191,7 @@
 #include "UWmaterials/PM4Sand.h"
 #include "UWmaterials/PM4Silt.h"
 #include "UWmaterials/InitialStateAnalysisWrapper.h"
-#if !_DLL
 #include "stressDensityModel/stressDensity.h"
-#endif
 #include "InitStressNDMaterial.h"
 
 // Fibers
@@ -343,7 +341,7 @@
 #include "EnvelopeNodeRecorder.h"
 #include "EnvelopeElementRecorder.h"
 #include "DriftRecorder.h"
-#include "MPCORecorder.h"
+//#include "MPCORecorder.h"
 #include "VTK_Recorder.h"
 #include "GmshRecorder.h"
 
@@ -1512,10 +1510,9 @@ FEM_ObjectBrokerAllClasses::getNewNDMaterial(int classTag)
   case ND_TAG_InitialStateAnalysisWrapper:
       return new InitialStateAnalysisWrapper(); 
 
-#if !_DLL
   case ND_TAG_stressDensity:
       return new stressDensity();
-#endif
+
   case ND_TAG_CycLiqCP3D:
       return new CycLiqCP3D(); 
 
@@ -1849,8 +1846,8 @@ FEM_ObjectBrokerAllClasses::getPtrNewRecorder(int classTag)
         case RECORDER_TAGS_GmshRecorder:
            return new GmshRecorder();
 
-        case RECORDER_TAGS_MPCORecorder:
-          return new MPCORecorder();
+	   //        case RECORDER_TAGS_MPCORecorder:
+	   //          return new MPCORecorder();
 
 	default:
 	     opserr << "FEM_ObjectBrokerAllClasses::getNewRecordr - ";

SRC/actor/shadow/CMakeLists.txt

@@ -0,0 +1,8 @@
+target_sources(actor
+    PRIVATE
+      Shadow.cpp      
+    PUBLIC
+      Shadow.h
+)
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))

SRC/analysis/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_library(analysis "")
+
+add_subdirectory(algorithm)
+add_subdirectory(numberer)
+add_subdirectory(dof_grp)
+add_subdirectory(fe_ele)
+add_subdirectory(handler)
+add_subdirectory(model)
+add_subdirectory(integrator)
+add_subdirectory(analysis)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+

SRC/analysis/algorithm/CMakeLists.txt

@@ -0,0 +1,13 @@
+
+target_sources(analysis
+    PRIVATE
+      SolutionAlgorithm.cpp
+    PUBLIC
+      SolutionAlgorithm.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(domainDecompAlgo)
+add_subdirectory(equiSolnAlgo)
+add_subdirectory(eigenAlgo)

SRC/analysis/algorithm/domainDecompAlgo/CMakeLists.txt

@@ -0,0 +1,8 @@
+target_sources(analysis
+    PRIVATE
+      DomainDecompAlgo.cpp
+    PUBLIC
+      DomainDecompAlgo.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))

SRC/analysis/algorithm/eigenAlgo/CMakeLists.txt

@@ -0,0 +1,9 @@
+#target_sources(analysis
+#    PRIVATE
+#
+#    PUBLIC
+#
+#)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+

SRC/analysis/algorithm/equiSolnAlgo/CMakeLists.txt

@@ -0,0 +1,40 @@
+target_sources(analysis
+    PRIVATE
+      EquiSolnAlgo.cpp 
+      Linear.cpp 
+      NewtonRaphson.cpp
+      ModifiedNewton.cpp 
+      NewtonLineSearch.cpp 
+      Broyden.cpp 
+      BFGS.cpp
+      KrylovNewton.cpp 
+      PeriodicNewton.cpp 
+      AcceleratedNewton.cpp
+      LineSearch.cpp 
+      InitialInterpolatedLineSearch.cpp 
+      NewtonHallM.cpp
+      SecantLineSearch.cpp 
+      RegulaFalsiLineSearch.cpp 
+      BisectionLineSearch.cpp
+    PUBLIC
+      EquiSolnAlgo.h 
+      Linear.h 
+      NewtonRaphson.h
+      ModifiedNewton.h 
+      NewtonLineSearch.h 
+      Broyden.h 
+      BFGS.h
+      KrylovNewton.h 
+      PeriodicNewton.h 
+      AcceleratedNewton.h
+      LineSearch.h 
+      InitialInterpolatedLineSearch.h 
+      NewtonHallM.h
+      SecantLineSearch.h 
+      RegulaFalsiLineSearch.h 
+      BisectionLineSearch.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(accelerator)

SRC/analysis/algorithm/equiSolnAlgo/accelerator/CMakeLists.txt

@@ -0,0 +1,29 @@
+target_sources(analysis
+    PRIVATE
+      Accelerator.cpp
+      MillerAccelerator.cpp 
+      naccel.f
+      RaphsonAccelerator.cpp 
+      PeriodicAccelerator.cpp 
+      KrylovAccelerator.cpp 
+      KrylovAccelerator2.cpp 
+      DifferenceAccelerator.cpp 
+      DifferenceAccelerator2.cpp
+      SecantAccelerator1.cpp 
+      SecantAccelerator2.cpp 
+      SecantAccelerator3.cpp
+    PUBLIC
+      Accelerator.h
+      MillerAccelerator.h 
+      RaphsonAccelerator.h 
+      PeriodicAccelerator.h 
+      KrylovAccelerator.h 
+      KrylovAccelerator2.h 
+      DifferenceAccelerator.h 
+      DifferenceAccelerator2.h
+      SecantAccelerator1.h 
+      SecantAccelerator2.h 
+      SecantAccelerator3.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))