Skip to content

Commit

Permalink
Merge pull request OpenSees#1449 from MassimoPetracca/asd-concrete-1d
Browse files Browse the repository at this point in the history
Adding ASDConcrete1D uniaxial material
  • Loading branch information
mhscott authored Jul 16, 2024
2 parents 3b6fffb + cdb0c53 commit 8b6cae2
Show file tree
Hide file tree
Showing 14 changed files with 2,033 additions and 3 deletions.
1 change: 1 addition & 0 deletions SRC/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@ MATERIAL_LIBS = $(FE)/material/Material.o \
$(FE)/material/uniaxial/FlagShapeMaterial.o \
$(FE)/material/uniaxial/Neoprene.o \
$(FE)/material/uniaxial/ASD_SMA_3K.o \
$(FE)/material/uniaxial/ASDConcrete1DMaterial.o \
$(FE)/material/uniaxial/Concrete01.o \
$(FE)/material/uniaxial/Concrete02.o \
$(FE)/material/uniaxial/Concrete02IS.o \
Expand Down
4 changes: 4 additions & 0 deletions SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
#include "MultiplierMaterial.h"
#include "TensionOnlyMaterial.h"
#include "ASD_SMA_3K.h"
#include "ASDConcrete1DMaterial.h"
#include "Concrete01.h"
#include "Concrete01WithSITC.h"
#include "Concrete02.h"
Expand Down Expand Up @@ -1698,6 +1699,9 @@ FEM_ObjectBrokerAllClasses::getNewUniaxialMaterial(int classTag)
case MAT_TAG_ASD_SMA_3K:
return new ASD_SMA_3K();

case MAT_TAG_ASDConcrete1DMaterial:
return new ASDConcrete1DMaterial();

case MAT_TAG_Concrete01:
return new Concrete01();

Expand Down
1 change: 1 addition & 0 deletions SRC/classTags.h
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@
#define MAT_TAG_CoulombDamperMaterial 228
#define MAT_TAG_FlagShapeMaterial 229
#define MAT_TAG_CreepMaterial 230
#define MAT_TAG_ASDConcrete1DMaterial 231

#define MAT_TAG_FedeasMaterial 1000
#define MAT_TAG_FedeasBond1 1001
Expand Down
3 changes: 3 additions & 0 deletions SRC/interpreter/OpenSeesUniaxialMaterialCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ void* OPS_Pinching4Material();
void* OPS_ECC01();
void* OPS_SelfCenteringMaterial();
void* OPS_ASD_SMA_3K();
void* OPS_ASDConcrete1DMaterial();
void* OPS_ViscousMaterial();
void* OPS_BoucWenMaterial();
void* OPS_BoucWenOriginal();
Expand Down Expand Up @@ -453,6 +454,8 @@ static int setUpUniaxialMaterials(void) {
"SelfCentering", &OPS_SelfCenteringMaterial));
uniaxialMaterialsMap.insert(
std::make_pair("ASD_SMA_3K", &OPS_ASD_SMA_3K));
uniaxialMaterialsMap.insert(
std::make_pair("ASDConcrete1D", &OPS_ASDConcrete1DMaterial));
uniaxialMaterialsMap.insert(
std::make_pair("Viscous", &OPS_ViscousMaterial));
uniaxialMaterialsMap.insert(
Expand Down
4 changes: 1 addition & 3 deletions SRC/material/nD/ASDConcrete3DMaterial.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@

// Massimo Petracca - ASDEA Software, Italy
//
// A Generic Orthotropic Material Wrapper that can convert any
// nonlinear isotropic material into an orthotropic one by means of tensor
// mapping
// A Simple and robust plastic-damage model for concrete and masonry
//

#ifndef ASDConcrete3DMaterial_h
Expand Down
Loading

0 comments on commit 8b6cae2

Please sign in to comment.