Merge pull request OpenSees#1417 from buceaxll/master

An asynchronous parallel double-stage friction-metallic damper
MassimoPetracca · May 21, 2024 · 9d9382d · 9d9382d
2 parents d0dc0d3 + 721a227
commit 9d9382d
Show file tree

Hide file tree

Showing 7 changed files with 724 additions and 6 deletions.
diff --git a/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp b/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
@@ -108,6 +108,9 @@
 #include "HookGap.h"
 #include "ViscousMaterial.h"
 #include "ViscousDamper.h"
+#include "APDVFD.h"
+#include "APDMD.h"
+#include "APDFMD.h"
 #include "BilinearOilDamper.h"
 #include "ContinuumUniaxial.h"
 #include "PathIndependentMaterial.h"
@@ -1851,6 +1854,15 @@ FEM_ObjectBrokerAllClasses::getNewUniaxialMaterial(int classTag)
 	case MAT_TAG_ViscousDamper:
 		return new ViscousDamper();
 
+        case MAT_TAG_APDVFD:
+		return new APDVFD();
+
+	case MAT_TAG_APDMD:
+		return new APDMD();
+
+	case MAT_TAG_APDFMD:
+		return new APDFMD();
+
 	case MAT_TAG_BilinearOilDamper:
 	    return new BilinearOilDamper();
 

diff --git a/SRC/classTags.h b/SRC/classTags.h
@@ -308,7 +308,9 @@
 #define MAT_TAG_BoucWenInfill  6666    // Stefano Sirotti 09-Feb-2022 [email protected]
 
 #define MAT_TAG_GMG_CyclicReinforcedConcrete    9999    // Rasool Ghorbani
-
+#define MAT_TAG_APDVFD                          711
+#define MAT_TAG_APDMD                           712
+#define MAT_TAG_APDFMD                          713
 
 // GNG material - J.Cook UCanterbury
 #define MAT_TAG_GNG 7001

diff --git a/SRC/interpreter/OpenSeesUniaxialMaterialCommands.cpp b/SRC/interpreter/OpenSeesUniaxialMaterialCommands.cpp
@@ -275,7 +275,9 @@ void *OPS_Trilinwp2(void);
 void *OPS_Masonryt(void);
 
 void* OPS_Ratchet(void); // Yi Xiao
-
+void* OPS_APDVFD(void);
+void* OPS_APDMD(void);
+void* OPS_APDFMD(void);
 namespace {
 
 static UniaxialMaterial* theTestingUniaxialMaterial = 0;
@@ -615,6 +617,12 @@ static int setUpUniaxialMaterials(void) {
       std::make_pair("CoulombDamper", &OPS_CoulombDamperMaterial));
   uniaxialMaterialsMap.insert(std::make_pair(
 	  "GMG_CyclicReinforcedConcrete", &OPS_GMG_CyclicReinforcedConcrete));
+  uniaxialMaterialsMap.insert(
+      std::make_pair("APDVFD", &OPS_APDVFD));
+  uniaxialMaterialsMap.insert(
+      std::make_pair("APDMD", &OPS_APDMD));
+  uniaxialMaterialsMap.insert(
+      std::make_pair("APDFMD", &OPS_APDFMD));
   uniaxialMaterialsMap.insert(
       std::make_pair("Hertzdamp", &OPS_Hertzdamp));
   uniaxialMaterialsMap.insert(