--- trunk/gadget/growermemberfunctions.cc 2015/04/29 12:55:30 2 +++ trunk/gadget/growermemberfunctions.cc 2015/04/30 17:32:47 4 @@ -58,7 +58,7 @@ part4[j] = part4[j - 1] * (j - 1 + alpha); for (j = 0; j <= maxlengthgroupgrowth; j++) - (*_lgrowth)[j][lgroup] = part1[j] * part2[j] * tmppart3 * part4[j]; + (*lgrowth)[j][lgroup] = part1[j] * part2[j] * tmppart3 * part4[j]; switch (functionnumber) { case 1: @@ -72,24 +72,24 @@ meanw = 0.0; tmpweight = (NumberInArea[lgroup].W * tmpPower * Lengths->dl()) / Lengths->meanLength(lgroup); for (j = 0; j <= maxlengthgroupgrowth; j++) { - (*_wgrowth)[j][lgroup] = tmpweight * j; - meanw += (*_wgrowth)[j][lgroup] * (*_lgrowth)[j][lgroup]; + (*wgrowth)[j][lgroup] = tmpweight * j; + meanw += (*wgrowth)[j][lgroup] * (*lgrowth)[j][lgroup]; } tmpweight = interpWeightGrowth[inarea][lgroup] - meanw; for (j = 0; j <= maxlengthgroupgrowth; j++) { - aux = (*_wgrowth)[j][lgroup]; - (*_wgrowth)[j][lgroup] = aux + tmpweight; + aux = (*wgrowth)[j][lgroup]; + (*wgrowth)[j][lgroup] = aux + tmpweight; } break; case 8: case 10: case 11: pow_L = meanlength_vectorPow[lgroup]; - if (lgroup != numLenGr) //FIXME ?? + if (lgroup != numLenGr) //FIXME for (lgroup = 0; ¿¿¿lgroup < numLenGr????; lgroup++) for (j = 1; j <= maxlengthgroupgrowth; j++) - (*_wgrowth)[j][lgroup] = tmpMult * (meanlength_vectorPow[lgroup + j] - pow_L); + (*wgrowth)[j][lgroup] = tmpMult * (meanlength_vectorPow[lgroup + j] - pow_L); break; default: handle.logMessage(LOGFAIL, "Error in grower - unrecognised growth function", functionnumber); @@ -123,6 +123,6 @@ part4[j] = part4[j - 1] * (j - 1 + alpha); for (j = 0; j <= maxlengthgroupgrowth; j++) - (_lgrowth[inarea])[j][lgroup] = part1[j] * part2[j] * tmppart3 * part4[j]; + (lgrowth[inarea])[j][lgroup] = part1[j] * part2[j] * tmppart3 * part4[j]; } }