--- trunk/gadget/stockmemberfunctions.cc 2014/02/10 17:09:07 1 +++ trunk/gadget/stockmemberfunctions.cc 2015/04/29 12:55:30 2 @@ -100,31 +100,52 @@ ((StockPredator*)predator)->getMaxConsumption(area)); else grower->calcGrowth(area, Area, TimeInfo); - +// ofstream outfile; +// outfile.open("aaa", ios::out); +// grower->getLengthIncrease_(area).Print(outfile); +// int a; +// cout << "3-----------------" << endl; +// cin >> a; int inarea = this->areaNum(area); if (grower->getFixedWeights()) { //Weights at length are fixed to the value in the input file grower->implementGrowth(area, LgrpDiv); - if (doesmature && maturity->isMaturationStep(TimeInfo)) - Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area), maturity, area); - else - Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area)); + //FIXME +// if (doesmature && maturity->isMaturationStep(TimeInfo)) +// Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area), maturity, area); +// else +// Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area)); } else { //New weights at length are calculated +// ofstream outfile1; +// outfile1.open("aaa", ios::out); +// grower->getLengthIncrease_(area).Print(outfile1); +// cout << "4-----------------" << endl; +// cin >> a; grower->implementGrowth(area, tmpPopulation[inarea], LgrpDiv); +// ofstream outfile2; +// outfile2.open("aaa", ios::out); +// grower->getLengthIncrease_(area).Print(outfile2); +// cout << "5-----------------" << endl; +// cin >> a; if (doesmature && maturity->isMaturationStep(TimeInfo)) - Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area), maturity, area); + { + //FIXME// Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area), maturity, area); + } else - Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area)); + Alkeys[inarea].Grow(grower->getLengthIncrease_(area), grower->getWeightIncrease_(area)); + //Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area)); } - if (istagged && tagAlkeys.numTagExperiments() > 0) { - if (doesmature && maturity->isMaturationStep(TimeInfo)) - tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea], maturity, area); - else - tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea]); + if (istagged && tagAlkeys.numTagExperiments() > 0) { //FIXME +// if (doesmature && maturity->isMaturationStep(TimeInfo)) +// tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea], maturity, area); +// else +// tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea]); } + + } //-----------------------------------------------------------------------