Adding class tags to TDConcrete models

zhuminjie · Oct 4, 2021 · 7ecabd2 · 7ecabd2
1 parent ec812d9
commit 7ecabd2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/SRC/classTags.h b/SRC/classTags.h
@@ -237,6 +237,10 @@
 #define MAT_TAG_Trilinwp 221
 #define MAT_TAG_Trilinwp2 222
 #define MAT_TAG_Trilinwpd 223
+#define MAT_TAG_TDConcrete 224
+#define MAT_TAG_TDConcreteEXP 225
+#define MAT_TAG_TDConcreteMC10 226
+#define MAT_TAG_TDConcreteMC10NL 227
 
 #define MAT_TAG_FedeasMaterial    1000
 #define MAT_TAG_FedeasBond1       1001

diff --git a/SRC/material/uniaxial/TDConcrete.cpp b/SRC/material/uniaxial/TDConcrete.cpp
@@ -143,7 +143,7 @@ using namespace std; //Added by AMK for debugging
 
 
 TDConcrete::TDConcrete(int tag, double _fc, double _ft, double _Ec, double _beta, double _age, double _epsshu, double _epssha, double _tcr, double _epscru, double _epscra, double _epscrd, double _tcast): 
-  UniaxialMaterial(tag, 0), //Changed by AMK (from MAT_TAG_Concrete02 to 0)
+  UniaxialMaterial(tag, MAT_TAG_TDConcrete),
   fc(_fc), ft(_ft), Ec(_Ec), beta(_beta), age(_age), epsshu(_epsshu), epssha(_epssha), tcr(_tcr), epscru(_epscru), epscra(_epscra), epscrd(_epscrd), tcast(_tcast)
 {
   ecminP = 0.0;
@@ -183,7 +183,7 @@ TDConcrete::TDConcrete(int tag, double _fc, double _ft, double _Ec, double _beta
 }
 
 TDConcrete::TDConcrete(void):
-  UniaxialMaterial(0, 0) //Changed by AMK (from MAT_TAG_Concrete02 to 0)
+  UniaxialMaterial(0, MAT_TAG_TDConcrete)
 {
 
 }

diff --git a/SRC/material/uniaxial/TDConcreteEXP.cpp b/SRC/material/uniaxial/TDConcreteEXP.cpp
@@ -143,7 +143,7 @@ using namespace std; //Added by AMK for debugging
 
 
 TDConcreteEXP::TDConcreteEXP(int tag, double _fc, double _ft, double _Ec, double _beta, double _age, double _epsshu, double _epssha, double _tcr, double _epscru, double _sigCr, double _epscra, double _epscrd, double _tcast): 
-  UniaxialMaterial(tag, 0), //Changed by AMK (from MAT_TAG_Concrete02 to 0)
+  UniaxialMaterial(tag, MAT_TAG_TDConcreteEXP),
   fc(_fc), ft(_ft), Ec(_Ec), beta(_beta), age(_age), epsshu(_epsshu), epssha(_epssha), tcr(_tcr), epscru(_epscru), sigCr(_sigCr), epscra(_epscra), epscrd(_epscrd), tcast(_tcast)
 {
   ecminP = 0.0;
@@ -181,7 +181,7 @@ TDConcreteEXP::TDConcreteEXP(int tag, double _fc, double _ft, double _Ec, double
 }
 
 TDConcreteEXP::TDConcreteEXP(void):
-  UniaxialMaterial(0, 0) //Changed by AMK (from MAT_TAG_Concrete02 to 0)
+  UniaxialMaterial(0, MAT_TAG_TDConcreteEXP)
 {
 
 }

diff --git a/SRC/material/uniaxial/TDConcreteMC10.cpp b/SRC/material/uniaxial/TDConcreteMC10.cpp
@@ -143,7 +143,7 @@ using namespace std; //Added by AMK for debugging
 
 
 TDConcreteMC10::TDConcreteMC10(int tag, double _fc, double _ft, double _Ec, double _Ecm, double _beta, double _age, double _epsba, double _epsbb, double _epsda, double _epsdb, double _phiba, double _phibb, double _phida, double _phidb, double _tcast, double _cem): 
-  UniaxialMaterial(tag, 0), //Changed by ntosic (from TDConcrete by AMK)
+  UniaxialMaterial(tag, MAT_TAG_TDConcreteMC10),
   fc(_fc), ft(_ft), Ec(_Ec), Ecm(_Ecm), beta(_beta), age(_age), epsba(_epsba), epsbb(_epsbb), epsda(_epsda), epsdb(_epsdb), phiba(_phiba), phibb(_phibb), phida(_phida), phidb(_phidb), tcast(_tcast), cem(_cem)
 {
   ecminP = 0.0;
@@ -189,7 +189,7 @@ TDConcreteMC10::TDConcreteMC10(int tag, double _fc, double _ft, double _Ec, doub
 }
 
 TDConcreteMC10::TDConcreteMC10(void):
-  UniaxialMaterial(0, 0) //Changed by AMK (from MAT_TAG_Concrete02 to 0)
+  UniaxialMaterial(0, MAT_TAG_TDConcreteMC10)
 {
 
 }

diff --git a/SRC/material/uniaxial/TDConcreteMC10NL.cpp b/SRC/material/uniaxial/TDConcreteMC10NL.cpp
@@ -144,7 +144,7 @@ using namespace std; //Added by AMK for debugging
 
 
 TDConcreteMC10NL::TDConcreteMC10NL(int tag, double _fc, double _fcu, double _epscu, double _ft, double _Ec, double _Ecm, double _beta, double _age, double _epsba, double _epsbb, double _epsda, double _epsdb, double _phiba, double _phibb, double _phida, double _phidb, double _tcast, double _cem): 
-  UniaxialMaterial(tag, 0), //Changed by ntosic (from TDConcrete by AMK)
+  UniaxialMaterial(tag, MAT_TAG_TDConcreteMC10NL),
   fc(_fc), fcu(_fcu), epscu(_epscu), ft(_ft), Ec(_Ec), Ecm(_Ecm), beta(_beta), age(_age), epsba(_epsba), epsbb(_epsbb), epsda(_epsda), epsdb(_epsdb), phiba(_phiba), phibb(_phibb), phida(_phida), phidb(_phidb), tcast(_tcast), cem(_cem)
 {
   ecminP = 0.0;
@@ -193,7 +193,7 @@ TDConcreteMC10NL::TDConcreteMC10NL(int tag, double _fc, double _fcu, double _eps
 }
 
 TDConcreteMC10NL::TDConcreteMC10NL(void):
-  UniaxialMaterial(0, 0) //Changed by AMK (from MAT_TAG_Concrete02 to 0)
+  UniaxialMaterial(0, MAT_TAG_TDConcreteMC10NL)
 {
 
 }