Diff of /trunk/gadget/stockmemberfunctions.cc

Parent Directory | Revision Log | Patch

	revision 1, Mon Feb 10 17:09:07 2014 UTC	revision 4, Thu Apr 30 17:32:47 2015 UTC
#	Line 100	Line 100
100	((StockPredator*)predator)->getMaxConsumption(area));	((StockPredator*)predator)->getMaxConsumption(area));
101	else	else
102	grower->calcGrowth(area, Area, TimeInfo);	grower->calcGrowth(area, Area, TimeInfo);
103	int inarea = this->areaNum(area);	int inarea = this->areaNum(area);
104	if (grower->getFixedWeights()) {	if (grower->getFixedWeights()) {
105	//Weights at length are fixed to the value in the input file	//Weights at length are fixed to the value in the input file
#	Line 114	Line 113
113	//New weights at length are calculated	//New weights at length are calculated
114	grower->implementGrowth(area, tmpPopulation[inarea], LgrpDiv);	grower->implementGrowth(area, tmpPopulation[inarea], LgrpDiv);
115	if (doesmature && maturity->isMaturationStep(TimeInfo))	if (doesmature && maturity->isMaturationStep(TimeInfo))
116		{
117	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area), maturity, area);	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area), maturity, area);
118		}
119	else	else
120	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area));	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area));
121	}	}
#	Line 125	Line 126
126	else	else
127	tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea]);	tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea]);
128	}	}
129
130
131	}	}
132
133	//-----------------------------------------------------------------------	//-----------------------------------------------------------------------

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.1   changed lines   Added in v.4

---

root@forge.cesga.es	ViewVC Help
Powered by ViewVC 1.0.0