Merge branch 'OpenSees:master' into master

SRC/Makefile

@@ -1065,6 +1065,7 @@ SECTION_LIBS = $(FE)/material/section/SectionForceDeformation.o \
 	$(FE)/material/section/integration/WideFlangeSectionIntegration.o \
 	$(FE)/material/section/integration/RCTBeamSectionIntegration.o \
 	$(FE)/material/section/integration/TubeSectionIntegration.o \
+	$(FE)/material/section/integration/HSSSectionIntegration.o \
 	$(FE)/material/section/repres/patch/Patch.o \
 	$(FE)/material/section/repres/patch/QuadPatch.o \
 	$(FE)/material/section/repres/patch/CircPatch.o \

SRC/classTags.h

@@ -340,6 +340,7 @@
 #define SECTION_INTEGRATION_TAG_RCCIRCULAR 5
 #define SECTION_INTEGRATION_TAG_RCTUNNEL 6
 #define SECTION_INTEGRATION_TAG_Tube 7
+#define SECTION_INTEGRATION_TAG_HSS 8
 
 #define ND_TAG_WrapperNDMaterial		9
 #define ND_TAG_ElasticIsotropic			10

SRC/interpreter/OpenSeesSectionCommands.cpp

@@ -47,6 +47,7 @@
 #include <ReinfBar.h>
 #include <TubeSectionIntegration.h>
 #include <WideFlangeSectionIntegration.h>
+#include <HSSSectionIntegration.h>
 #include <NDFiberSectionWarping2d.h>
 #include <RCSectionIntegration.h>
 #include <RCTBeamSectionIntegration.h>
@@ -91,6 +92,7 @@ void* OPS_Bidirectional();
 void* OPS_Elliptical2();
 void* OPS_Isolator2spring();
 void* OPS_FiberSection2dThermal();
+void* OPS_HSSSection();
 
 namespace {
     static FiberSection2d* theActiveFiberSection2d = 0;
@@ -1086,6 +1088,7 @@ namespace {
 	functionMap.insert(std::make_pair("ElasticWarpingShear", &OPS_ElasticWarpingShearSection2d));
 	functionMap.insert(std::make_pair("ElasticTube", &OPS_ElasticTubeSection3d));
 	functionMap.insert(std::make_pair("Tube", &OPS_TubeSection));
+	functionMap.insert(std::make_pair("HSS", &OPS_HSSSection));
 	functionMap.insert(std::make_pair("WFSection2d", &OPS_WFSection2d));	
 	functionMap.insert(std::make_pair("WSection2d", &OPS_WFSection2d));
 	functionMap.insert(std::make_pair("RCSection2d", &OPS_RCSection2d));

SRC/material/nD/J2BeamFiber2d.cpp

@@ -700,7 +700,7 @@ J2BeamFiber2d::setParameter(const char **argv, int argc,
     param.setValue(nu);
     return param.addObject(2, this);  
   }
-  else if (strcmp(argv[0],"sigmaY") == 0 || strcmp(argv[0],"fy") == 0) {
+  else if (strcmp(argv[0],"sigmaY") == 0 || strcmp(argv[0],"fy") == 0  || strcmp(argv[0],"Fy") == 0) {
     param.setValue(sigmaY);
     return param.addObject(5, this);
   }

SRC/material/nD/J2BeamFiber3d.cpp

@@ -759,7 +759,7 @@ J2BeamFiber3d::setParameter(const char **argv, int argc,
     param.setValue(nu);
     return param.addObject(2, this);  
   }
-  else if (strcmp(argv[0],"sigmaY") == 0 || strcmp(argv[0],"fy") == 0) {
+  else if (strcmp(argv[0],"sigmaY") == 0 || strcmp(argv[0],"fy") == 0  || strcmp(argv[0],"Fy") == 0) {
     param.setValue(sigmaY);
     return param.addObject(5, this);
   }

SRC/material/section/integration/CMakeLists.txt

@@ -13,6 +13,7 @@ target_sources(OPS_Material
     RCCircularSectionIntegration.cpp
     TubeSectionIntegration.cpp 
     RCTunnelSectionIntegration.cpp
+    HSSSectionIntegration.cpp    
     PUBLIC
     SectionIntegration.h 
     WideFlangeSectionIntegration.h 
@@ -21,6 +22,7 @@ target_sources(OPS_Material
     RCCircularSectionIntegration.h
     TubeSectionIntegration.h 
     RCTunnelSectionIntegration.h
+    HSSSectionIntegration.h    
 )
 
 target_include_directories(OPS_Material PUBLIC ${CMAKE_CURRENT_LIST_DIR})