Merge pull request OpenSees#1721 from mhscott/mpco-recorder

Mpco recorder

Author: mhscott

SRC/element/twoNodeLink/TwoNodeLinkSection.cpp

@@ -1034,9 +1034,31 @@ Response* TwoNodeLinkSection::setResponse(const char **argv, int argc,
     }
     // material output
     else if (strcmp(argv[0],"section") == 0)  {
-        if (argc > 1)  {
-	  theResponse =  theSection->setResponse(&argv[1], argc-1, output);
-        }
+      if (argc > 1)  {
+	// we need at least one more argument otherwise 
+	// there is no need to forward this call to the material
+	if (argc > 2) {
+	  // if we have 2 or more extra arguments, the first one 
+	  // could be an integer. In this case we check to see if it is the section id
+	  // (only 1 in this case)
+	  int sectionNum = atoi(argv[1]);
+	  if (sectionNum == 0) {
+	    // if it is not a number we forward the call to the section as usual
+	    theResponse = theSection->setResponse(&argv[1], argc - 1, output);
+	  }
+	  else {
+	    // it is a number. Now we have to make sure it is within the allowed range
+	    // for this element (in this case it can only be 1)
+	    if (sectionNum == 1) {
+	      theResponse = theSection->setResponse(&argv[2], argc - 2, output);
+	    }
+	  }
+	}
+	else {
+	  // otherwise forward it as usual
+	  theResponse = theSection->setResponse(&argv[1], argc - 1, output);
+	}	  
+      }
     }
 
     if (strcmp(argv[0],"xaxis") == 0) {

SRC/recorder/MPCORecorder.cpp

@@ -3870,6 +3870,8 @@ namespace mpco {
 					elem_class_tag == ELE_TAG_ZeroLengthContact3D ||
 					elem_class_tag == ELE_TAG_ZeroLengthContactASDimplex ||
 					elem_class_tag == ELE_Tag_ZeroLengthImpact3D ||
+					// ./twoNodeLink
+					elem_class_tag == ELE_TAG_TwoNodeLinkSection ||
 					// ./elasticBeamColumn
 					elem_class_tag == ELE_TAG_ElasticBeam2d ||
 					elem_class_tag == ELE_TAG_ElasticBeam3d ||
@@ -3915,7 +3917,10 @@ namespace mpco {
 					elem_class_tag == ELE_TAG_ForceBeamColumn2d || /* <- OK! this one defines everything ! good job*/
 					elem_class_tag == ELE_TAG_ForceBeamColumn3d || /* <- OK! this one defines everything ! good job*/
 					elem_class_tag == ELE_TAG_ForceBeamColumnCBDI2d || /* <- OK! this one defines everything ! good job*/
-					elem_class_tag == ELE_TAG_ForceBeamColumnWarping2d /* <- OK! this one defines everything ! good job*/
+					elem_class_tag == ELE_TAG_ForceBeamColumnWarping2d || /* <- OK! this one defines everything ! good job*/
+					// ./mixedBeamColumn
+					elem_class_tag == ELE_TAG_MixedBeamColumn2d ||
+					elem_class_tag == ELE_TAG_MixedBeamColumn3d
 					) {
 					geom_type = ElementGeometryType::Line_2N;
 					int_type = ElementIntegrationRuleType::CustomIntegrationRule;