Skip to content

Commit 33e91a4

Browse files
fmckennafmckenna
committed
Merge branch 'master' of github.com:OpenSees/OpenSees
2 parents e89241d + c84537e commit 33e91a4

18 files changed

+320
-81
lines changed

‎SRC/api/elementAPI_Dummy.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,24 @@ int OPS_GetIntInput(int *numData, int*data)
137137
return 0;
138138
}
139139

140+
extern "C"
141+
int OPS_SetIntOutput(int *numData, int*data, bool scalar)
142+
{
143+
return 0;
144+
}
145+
140146
extern "C"
141147
int OPS_GetDoubleInput(int *numData, double *data)
142148
{
143149
return 0;
144150
}
145151

152+
extern "C"
153+
int OPS_SetDoubleOutput(int *numData, double *data, bool scalar)
154+
{
155+
return 0;
156+
}
157+
146158

147159

148160
extern "C"

‎SRC/element/PFEMElement/BackgroundMesh.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,12 @@ int OPS_BgMesh() {
296296
}
297297
}
298298

299+
// bg mesh
300+
if (bgmesh.remesh() < 0) {
301+
opserr << "WARNING: failed to create background mesh\n";
302+
return -1;
303+
}
304+
299305
return 0;
300306
}
301307

‎SRC/element/TclElementCommands.cpp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ extern void *OPS_MasonPan12(void);
211211
extern void *OPS_MasonPan3D(void);
212212
extern void *OPS_BeamGT(void);
213213
extern void *OPS_BeamWithHinges(void);
214+
extern void *OPS_MixedBeamColumn2d(void);
215+
extern void *OPS_MixedBeamColumn3d(void);
214216

215217
extern void* OPS_DispBeamColumnAsym3dTcl(); //Xinlong Du
216218
extern void* OPS_MixedBeamColumnAsym3dTcl(); //Xinlong Du
@@ -1760,6 +1762,21 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
17601762

17611763
}
17621764
//Xinlong Du
1765+
1766+
else if (strcmp(argv[1], "mixedBeamColumn") == 0) {
1767+
Element* theEle = 0;
1768+
if (OPS_GetNDM() == 3)
1769+
theEle = (Element*)OPS_MixedBeamColumn3d();
1770+
if (OPS_GetNDM() == 2)
1771+
theEle = (Element*)OPS_MixedBeamColumn2d();
1772+
if (theEle != 0)
1773+
theElement = theEle;
1774+
else {
1775+
opserr << "TclElementCommand -- unable to create element of type : " << argv[1] << endln;
1776+
return TCL_ERROR;
1777+
}
1778+
1779+
}
17631780

17641781
else if ((strcmp(argv[1], "InertiaTruss") == 0)) {
17651782

‎SRC/element/twoNodeLink/TwoNodeLinkSection.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void* OPS_TwoNodeLinkSection()
104104
int doRayleigh = 0;
105105
double mass = 0.0;
106106
if (OPS_GetNumRemainingInputArgs() < 1) {
107-
return new TwoNodeLinkSection(idata[0], ndm, idata[1], idata[2], *theSection);
107+
return new TwoNodeLinkSection(idata[0], ndm, idata[1], idata[2], *theSection, y, x);
108108
}
109109

110110
while (OPS_GetNumRemainingInputArgs() > 0) {

‎SRC/material/nD/ElasticIsotropicMaterialThermal.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ OPS_ElasticIsotropicMaterialThermal(void)
6161
int numArgs = OPS_GetNumRemainingInputArgs();
6262

6363
if (numArgs < 3) {
64-
opserr << "Want: nDMaterial ElasticIsotropic $tag $E $V <$rho> <$alpha> <-cSoft/-sSoft> " << endln;
64+
opserr << "Want: nDMaterial ElasticIsotropicThermal $tag $E $V <$rho> <$alpha> <-cSoft/-sSoft> " << endln;
6565
return 0;
6666
}
6767

@@ -72,7 +72,7 @@ OPS_ElasticIsotropicMaterialThermal(void)
7272

7373
int numData = 1;
7474
if (OPS_GetInt(&numData, iData) != 0) {
75-
opserr << "WARNING invalid integer tag: nDMaterial EasticIsotropic \n";
75+
opserr << "WARNING invalid integer tag: nDMaterial ElasticIsotropicThermal \n";
7676
return 0;
7777
}
7878

@@ -82,7 +82,7 @@ OPS_ElasticIsotropicMaterialThermal(void)
8282
numData = 2;
8383

8484
if (OPS_GetDouble(&numData, dData) != 0) {
85-
opserr << "WARNING invalid data: nDMaterial EasticIsotropic : " << iData[0] << "\n";
85+
opserr << "WARNING invalid data: nDMaterial ElasticIsotropicThermal : " << iData[0] << "\n";
8686
return 0;
8787
}
8888

‎SRC/material/nD/ElasticOrthotropicMaterial.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ OPS_ElasticOrthotropicMaterial(void)
7878
numData = 9;
7979

8080
if (OPS_GetDouble(&numData, dData) != 0) {
81-
opserr << "WARNING invalid data: nDMaterial EasticIsotropic : " << iData[0] <<"\n";
81+
opserr << "WARNING invalid data: nDMaterial ElasticOrthotropic : " << iData[0] <<"\n";
8282
return 0;
8383
}
8484

‎SRC/material/nD/PlasticDamageConcrete3d.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ OPS_NewPlasticDamageConcrete3d(void)
5454

5555
int numData = 1;
5656
if (OPS_GetInt(&numData, iData) != 0) {
57-
opserr << "WARNING invalid integer tag: nDMaterial EasticIsotropic \n";
57+
opserr << "WARNING invalid integer tag: nDMaterial PlasticDamageConcrete3d \n";
5858
return 0;
5959
}
6060

6161
numData = numArgs - 1;;
6262
if (OPS_GetDouble(&numData, dData) != 0) {
63-
opserr << "WARNING invalid data: nDMaterial EasticIsotropic : " << iData[0] <<"\n";
63+
opserr << "WARNING invalid data: nDMaterial PlasticDamageConcrete3d : " << iData[0] <<"\n";
6464
return 0;
6565
}
6666

‎SRC/material/nD/PlasticDamageConcretePlaneStress.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ OPS_NewPlasticDamageConcretePlaneStress(void)
5959

6060
int numData = 1;
6161
if (OPS_GetInt(&numData, iData) != 0) {
62-
opserr << "WARNING invalid integer tag: nDMaterial EasticIsotropic \n";
62+
opserr << "WARNING invalid integer tag: nDMaterial PlasticDamageConcretePlaneStress \n";
6363
return 0;
6464
}
6565

6666
numData = numArgs - 1;;
6767
if (OPS_GetDouble(&numData, dData) != 0) {
68-
opserr << "WARNING invalid data: nDMaterial EasticIsotropic : " << iData[0] <<"\n";
68+
opserr << "WARNING invalid data: nDMaterial PlasticDamageConcretePlaneStress : " << iData[0] <<"\n";
6969
return 0;
7070
}
7171

‎SRC/material/nD/PlasticDamageConcretePlaneStressThermal.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ OPS_PlasticDamageConcretePlaneStressThermal(void)
6060

6161
int numData = 1;
6262
if (OPS_GetInt(&numData, iData) != 0) {
63-
opserr << "WARNING invalid integer tag: nDMaterial EasticIsotropic \n";
63+
opserr << "WARNING invalid integer tag: nDMaterial PlasticDamageConcretePlaneStressThermal \n";
6464
return 0;
6565
}
6666

6767
numData = numArgs - 1;;
6868
if (OPS_GetDouble(&numData, dData) != 0) {
69-
opserr << "WARNING invalid data: nDMaterial EasticIsotropic : " << iData[0] <<"\n";
69+
opserr << "WARNING invalid data: nDMaterial PlasticDamageConcretePlaneStressThermal : " << iData[0] <<"\n";
7070
return 0;
7171
}
7272

‎SRC/material/nD/matCMM/MaterialCMM.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ OPS_MaterialCMM(void)
6767

6868
int numData = 2;
6969
if (OPS_GetInt(&numData, iData) != 0) {
70-
opserr << "WARNING invalid integer tag: nDMaterial ElasticOrthotropic \n";
70+
opserr << "WARNING invalid integer tag: nDMaterial MaterialCMMc \n";
7171
return 0;
7272
}
7373

7474
numData = MaterialCMM_NumParameters;
7575

7676
if (OPS_GetDouble(&numData, dData) != 0) {
77-
opserr << "WARNING invalid data: nDMaterial EasticIsotropic : " << iData[0] <<"\n";
77+
opserr << "WARNING invalid data: nDMaterial MaterialCMMc : " << iData[0] <<"\n";
7878
return 0;
7979
}
8080

0 commit comments

Comments
 (0)