Merge branch 'smaMaterial' into sectionSetResponse

SRC/Makefile

@@ -816,6 +816,7 @@ MATERIAL_LIBS   =  $(FE)/material/Material.o \
 	$(FE)/material/uniaxial/ImpactMaterial.o \
 	$(FE)/material/uniaxial/SteelBRB.o \
 	$(FE)/material/uniaxial/GNGMaterial.o \
+	$(FE)/material/uniaxial/SMAMaterial.o \
 	$(FE)/material/uniaxial/SelfCenteringMaterial.o \
 	$(FE)/material/uniaxial/SPSW02.o \
 	$(FE)/material/uniaxial/TDConcrete.o \

SRC/interpreter/OpenSeesUniaxialMaterialCommands.cpp

@@ -176,6 +176,7 @@ void* OPS_IMKBilin();
 void* OPS_IMKPinching();
 void* OPS_IMKPeakOriented();
 void* OPS_SLModel();
+void* OPS_SMAMaterial();
 
 void* OPS_ArctangentBackbone();
 void* OPS_BilinearBackbone();
@@ -346,6 +347,7 @@ namespace {
 	uniaxialMaterialsMap.insert(std::make_pair("IMKPinching", &OPS_IMKPinching));
 	uniaxialMaterialsMap.insert(std::make_pair("IMKPeakOriented", &OPS_IMKPeakOriented));
 	uniaxialMaterialsMap.insert(std::make_pair("SLModel", &OPS_SLModel));
+	uniaxialMaterialsMap.insert(std::make_pair("SMA", &OPS_SMAMaterial));	
 	uniaxialMaterialsMap.insert(std::make_pair("HystereticPoly", &OPS_HystereticPoly)); // Salvatore Sessa 14-Jan-2021 Mail: salvatore.sessa2@unina.it
 
 	return 0;

SRC/material/uniaxial/Makefile

@@ -135,6 +135,7 @@ OBJS       = UniaxialMaterial.o \
 	PlateBearingConnectionThermal.o \
 	DegradingPinchedBW.o \
 	HystereticPoly.o \
+	SMAMaterial.o \
 	Masonry.o \
 	Masonryt.o \
 	Trilinwpd.o \

SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp

@@ -71,13 +71,12 @@ extern "C" int OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * inter
 #include <AxialSp.h>
 #include <AxialSpHD.h>
 
+#include <SMAMaterial.h>     // Davide Fugazza
 #include <Masonry.h>
 #include <Trilinwp.h>
 #include <Trilinwp2.h>
 #include <Masonryt.h>
 
-// #include <SMAMaterial.h>     // Davide Fugazza
-
 #include <Vector.h>
 #include <string.h>
 
@@ -177,6 +176,7 @@ extern void *OPS_ElasticPowerFunc(void);
 extern void *OPS_UVCuniaxial(void);
 extern void *OPS_DegradingPinchedBW(void);
 extern void *OPS_SLModel(void);
+extern void *OPS_SMAMaterial(void);
 extern void* OPS_HystereticPoly(void); // Salvatore Sessa 14-Jan-2021 Mail: salvatore.sessa2@unina.it
 extern void *OPS_Masonry(void);
 extern void *OPS_Trilinwp(void);
@@ -2480,67 +2480,13 @@ TclModelBuilderUniaxialMaterialCommand (ClientData clientData, Tcl_Interp *inter
 	}
     }
 
-    /*
     else if (strcmp(argv[1],"SMA") == 0) {
-      
-      if (argc < 9) {
-	opserr << "Warning insufficient arguments\n";
-	printCommand(argc,argv);
-	opserr << "Want: uniaxialMaterialSMA  tag  E  eps_L  sig_AS_s  sig_AS_f  sig_SA_s  sig_SA_f" << endln;
-	
-	return TCL_ERROR;
-      }
-      
-      int tag;
-      double E, eps_L, sig_AS_s, sig_AS_f, sig_SA_s, sig_SA_f;
-      
-      if (Tcl_GetInt(interp,argv[2], &tag) != TCL_OK){
-	opserr << "warning invalid uniaxialMaterial SMA tag" << endln;
-	return TCL_ERROR;
-      }
-      
-      if (Tcl_GetDouble(interp,argv[3], &E) != TCL_OK){
-	opserr << "warning invalid E\n";
-	opserr << "uniaxialMaterial SMA: " << tag << endln;
-	return TCL_ERROR;
-      }
-      
-      if (Tcl_GetDouble(interp,argv[4], &eps_L) != TCL_OK){
-	opserr << "warning invalid eps_L\n";
-	opserr << "uniaxialMaterial SMA: " << tag << endln;
-	return TCL_ERROR;
-      }
-      
-      if (Tcl_GetDouble(interp,argv[5], &sig_AS_s) != TCL_OK){
-	opserr << "warning invalid sig_AS_s\n";
-	opserr << "uniaxialMaterial SMA: " << tag << endln;
-	return TCL_ERROR;
-      }
-      
-      if (Tcl_GetDouble(interp,argv[6], &sig_AS_f) != TCL_OK){
-	opserr << "warning invalid sig_AS_f\n";
-	opserr << "uniaxialMaterial SMA: " << tag << endln;
-	return TCL_ERROR;
-      }
-      
-      if (Tcl_GetDouble(interp,argv[7], &sig_SA_s) != TCL_OK){
-	opserr << "warning invalid sig_SA_s\n";
-	opserr << "uniaxialMaterial SMA: " << tag << endln;
-	return TCL_ERROR;
-      }
-      
-      if (Tcl_GetDouble(interp,argv[8], &sig_SA_f) != TCL_OK){
-	opserr << "warning invalid sig_SA_f\n";
-	opserr << "uniaxialMaterial SMA: " << tag << endln;
-	return TCL_ERROR;
-      }
-      
-      // Parsing was successful, allocate the material
-      
-      theMaterial = new SMAMaterial(tag, E, eps_L, sig_AS_s, sig_AS_f, sig_SA_s, sig_SA_f);
-      
+      void *theMat = OPS_SMAMaterial();
+      if (theMat != 0)
+        theMaterial = (UniaxialMaterial *)theMat;
+      else
+        return TCL_ERROR;      
     }
-    */
 
     else if (strcmp(argv[1],"ECC01") == 0) {
       if (argc < 16) {