Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xiaodong-Ji-THU
Xiaodong-Ji-THU committed Jul 31, 2021
2 parents cc4dcd4 + 1233e77 commit 5921f8c
Show file tree
Hide file tree
Showing 74 changed files with 14,864 additions and 1,611 deletions.
13 changes: 11 additions & 2 deletions SRC/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ REMO_LIBS = $(FE)/element/nonlinearBeamColumn/matrixutil/MatrixUtil.o \
$(FE)/element/forceBeamColumn/TrapezoidalBeamIntegration.o \
$(FE)/element/forceBeamColumn/FixedLocationBeamIntegration.o \
$(FE)/element/forceBeamColumn/LowOrderBeamIntegration.o \
$(FE)/element/forceBeamColumn/ChebyshevBeamIntegration.o \
$(FE)/coordTransformation/CrdTransf.o \
$(FE)/coordTransformation/LinearCrdTransf2d.o \
$(FE)/coordTransformation/PDeltaCrdTransf2d.o \
Expand Down Expand Up @@ -653,7 +654,10 @@ ELE_LIBS = $(FE)/element/Element.o \
$(FE)/element/PML/PML3D.o \
$(FE)/element/PML/pml_2d.o \
$(FE)/element/PML/PML2D.o \
$(FE)/element/RockingBC/RockingBC.o
$(FE)/element/RockingBC/RockingBC.o \
$(FE)/element/masonry/MasonPan12.o \
$(FE)/element/masonry/MasonPan3D.o \
$(FE)/element/masonry/BeamGT.o

# $(FE)/material/nD/Damage2p.o \
# $(FE)/material/nD/Damage2p3D.o \
Expand Down Expand Up @@ -813,6 +817,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 \
Expand Down Expand Up @@ -850,6 +855,11 @@ MATERIAL_LIBS = $(FE)/material/Material.o \
$(FE)/material/uniaxial/unloading/TakedaUnloadingRule.o \
$(FE)/material/uniaxial/unloading/EnergyUnloadingRule.o \
$(FE)/material/uniaxial/unloading/KarsanUnloadingRule.o \
$(FE)/material/uniaxial/Masonry.o \
$(FE)/material/uniaxial/Masonryt.o \
$(FE)/material/uniaxial/Trilinwpd.o \
$(FE)/material/uniaxial/Trilinwp.o \
$(FE)/material/uniaxial/Trilinwp2.o \
$(FE)/material/nD/NDMaterial.o \
$(FE)/material/nD/PlaneStressLayeredMaterial.o \
$(FE)/material/nD/PlaneStressRebarMaterial.o \
Expand Down Expand Up @@ -1022,7 +1032,6 @@ SECTION_LIBS = $(FE)/material/section/SectionForceDeformation.o \
$(FE)/material/section/LayeredShellFiberSectionThermal.o \
$(FE)/material/section/FiberSection3dThermal.o \
$(FE)/material/section/MembranePlateFiberSectionThermal.o \
$(FE)/material/section/FiberSectionGJThermal.o \
$(FE)/material/section/FiberSection3d.o \
$(FE)/material/section/FiberSectionWarping3d.o \
$(FE)/material/section/FiberSectionAsym3d.o \
Expand Down
10 changes: 9 additions & 1 deletion SRC/classTags.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,11 @@
#define MAT_TAG_PlateBearingConnectionThermal 215
#define MAT_TAG_ASD_SMA_3K 216

#define MAT_TAG_Masonry 217
#define MAT_TAG_Masonryt 218
#define MAT_TAG_Trilinwp 219
#define MAT_TAG_Trilinwp2 220
#define MAT_TAG_Trilinwpd 221

#define MAT_TAG_FedeasMaterial 1000
#define MAT_TAG_FedeasBond1 1001
Expand Down Expand Up @@ -780,7 +785,10 @@
#define ELE_TAG_BeamColumn2DwLHNMYS_Damage 211
#define ELE_TAG_MVLEM_3D 212 // Kristijan Kolozvari
#define ELE_TAG_SFI_MVLEM_3D 213 // Kristijan Kolozvari
#define ELE_TAG_InertiaTruss 214 //Added by Xiaodong Ji, Yuhao Cheng, Yue Yu
#define ELE_TAG_BeamGT 214
#define ELE_TAG_MasonPan12 215
#define ELE_TAG_MasonPan3D 216
#define ELE_TAG_InertiaTruss 217 //Added by Xiaodong Ji, Yuhao Cheng, Yue Yu
#define ELE_TAG_ExternalElement 99990


Expand Down
2 changes: 2 additions & 0 deletions SRC/element/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ all: $(OBJS)
@$(CD) $(FE)/element/absorbentBoundaries; $(MAKE);
@$(CD) $(FE)/element/gradientInelasticBeamColumn; $(MAKE);
@$(CD) $(FE)/element/RockingBC; $(MAKE);
@$(CD) $(FE)/element/masonry; $(MAKE);

# Miscellaneous
tidy:
Expand Down Expand Up @@ -100,6 +101,7 @@ spotless: clean
@$(CD) $(FE)/element/absorbentBoundaries; $(MAKE) wipe;
@$(CD) $(FE)/element/gradientInelasticBeamColumn; $(MAKE) wipe;
@$(CD) $(FE)/element/RockingBC; $(MAKE) wipe;
@$(CD) $(FE)/element/masonry; $(MAKE) wipe;

wipe: spotless

Expand Down
52 changes: 51 additions & 1 deletion SRC/element/TclElementCommands.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,10 @@ extern void *OPS_RJWatsonEQS3d(void);
//extern void* OPS_GradientInelasticBeamColumn2d();
//extern void* OPS_GradientInelasticBeamColumn3d();
extern void *OPS_RockingBC(void);

extern void* OPS_LehighJoint2d(void);
extern void *OPS_MasonPan12(void);
extern void *OPS_MasonPan3D(void);
extern void *OPS_BeamGT(void);

extern void* OPS_DispBeamColumnAsym3dTcl(); //Xinlong Du
extern void* OPS_MixedBeamColumnAsym3dTcl(); //Xinlong Du
Expand Down Expand Up @@ -288,6 +290,18 @@ extern int
TclModelBuilder_addForceBeamColumn(ClientData, Tcl_Interp *, int, TCL_Char **,
Domain*, TclModelBuilder *);

extern int
TclModelBuilder_addMasonPan12(ClientData , Tcl_Interp *, int argc,
TCL_Char **argv, Domain*, TclModelBuilder *);

extern int
TclModelBuilder_addMasonPan3D(ClientData , Tcl_Interp *, int argc,
TCL_Char **argv, Domain*, TclModelBuilder *);

extern int
TclModelBuilder_addBeamGT(ClientData , Tcl_Interp *, int argc,
TCL_Char **argv, Domain*, TclModelBuilder *);

// NM
extern int
TclModelBuilder_addBeamColumnJoint(ClientData, Tcl_Interp *, int, TCL_Char **, Domain*, int);
Expand Down Expand Up @@ -780,6 +794,42 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
opserr << "TclElementCommand -- unable to create element of type : " << argv[1] << endln;
return TCL_ERROR;
}
}

else if ((strcmp(argv[1], "MasonPan12") == 0)) {

void *theEle = OPS_MasonPan12();

if (theEle != 0)
theElement = (Element *)theEle;
else {
opserr << "TclElementCommand -- unable to create element of type : " << argv[1] << endln;
return TCL_ERROR;
}
}
else if ((strcmp(argv[1], "MasonPan3D") == 0)) {

void *theEle = OPS_MasonPan3D();

if (theEle != 0)
theElement = (Element *)theEle;
else {
opserr << "TclElementCommand -- unable to create element of type : " << argv[1] << endln;
return TCL_ERROR;
}

}
else if ((strcmp(argv[1], "BeamGT") == 0)) {

void *theEle = OPS_BeamGT();

if (theEle != 0)
theElement = (Element *)theEle;
else {
opserr << "TclElementCommand -- unable to create element of type : " << argv[1] << endln;
return TCL_ERROR;
}


} else if ((strcmp(argv[1],"MultiFP2d") == 0) || (strcmp(argv[1],"MultiFPB2d") == 0)){

Expand Down
14 changes: 0 additions & 14 deletions SRC/element/dispBeamColumn/DispBeamColumnAsym3d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ void* OPS_DispBeamColumnAsym3dTcl() {
double dData2[2]; //input of ys and zs
dData2[0] = 0.0;
dData2[1] = 0.0;
int sDataLength = 40;
//char* sData = new char[sDataLength];
//char* sData2 = new char[sDataLength];
int numData;

// Check the number of dimensions
Expand Down Expand Up @@ -217,10 +214,6 @@ void* OPS_DispBeamColumnAsym3dTcl() {
// Loop through remaining arguments to get optional input
while (OPS_GetNumRemainingInputArgs() > 0) {
const char *sData = OPS_GetString();
//if (OPS_GetStringCopy(&sData) != 0) {
// opserr << "WARNING invalid input";
// return 0;
//}

if (strcmp(sData, "-cMass") == 0) {
cmass = 1;
Expand All @@ -236,10 +229,6 @@ void* OPS_DispBeamColumnAsym3dTcl() {
}
else if (strcmp(sData, "-integration") == 0) {
const char *sData2 = OPS_GetString();
//if (OPS_GetStringCopy(&sData2) != 0) {
// opserr << "WARNING invalid input, want: -integration $intType";
// return 0;
//}

if (strcmp(sData2, "Lobatto") == 0) {
beamIntegr = new LobattoBeamIntegration();
Expand Down Expand Up @@ -273,8 +262,6 @@ void* OPS_DispBeamColumnAsym3dTcl() {
opserr << "WARNING invalid integration type, element: " << eleTag;
return 0;
}
delete [] sData2;

}
else if (strcmp(sData, "-shearCenter") == 0) {
// Get the coordinates of shear center w.r.t centroid
Expand All @@ -287,7 +274,6 @@ void* OPS_DispBeamColumnAsym3dTcl() {
else {
opserr << "WARNING unknown option " << sData << "\n";
}
delete [] sData;
}

// Set the beam integration object if not in options
Expand Down
Loading

0 comments on commit 5921f8c

Please sign in to comment.