fix partial uniform load for python

zhuminjie · Jul 24, 2020 · ddbd3e3 · ddbd3e3
1 parent 16b5363
commit ddbd3e3
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/SRC/interpreter/OpenSeesPatternCommands.cpp b/SRC/interpreter/OpenSeesPatternCommands.cpp
@@ -279,21 +279,22 @@ int OPS_ElementalLoad()
 	strcmp(type,"beamUniform") == 0) {
 
 	if (ndm == 2) {
-	    // wt, wa, aL, bL
-	    double data[4] = {0.0, 0.0, 0.0, 1.0};
+	    // wta, waa, aL, bL, wtb, wab
+        double data[6] = {0.0, 0.0, 0.0, 1.0, 0.0, 0.0};
 	    int numdata = OPS_GetNumRemainingInputArgs();
 	    if (numdata < 1) {
-		opserr<<"WARNING eleLoad - beamUniform want Wy <Wx>\n";
+		opserr<<"WARNING eleLoad - beamUniform want Wya <Wxa> <aL> <bL> <Wyb> <Wxb>\n";
 		return -1;
 	    }
-	    if (numdata > 4) numdata = 4;
+	    // if (numdata > 4) numdata = 4;
+	    if (numdata > 6) numdata = 6;
 	    if (OPS_GetDoubleInput(&numdata, data) < 0) {
 		opserr<<"WARNING eleLoad - invalid value for beamUniform\n";
 		return -1;
 	    }
 	    for (int i=0; i<theEleTags.Size(); i++) {
-		if (data[2] > 0.0 || data[3] < 1.0)
-		    theLoad = new Beam2dPartialUniformLoad(eleLoadTag, data[0], data[1], data[2], data[3], theEleTags(i));
+		if (data[2] > 0.0 || data[3] < 1.0 || data[0] != data[4] || data[1] != data[5])
+		    theLoad = new Beam2dPartialUniformLoad(eleLoadTag, data[0], data[1], data[2], data[3], data[4], data[5], theEleTags(i));
 		else
 		    theLoad = new Beam2dUniformLoad(eleLoadTag, data[0], data[1], theEleTags(i));