Diff of /trunk/gadget/stockmemberfunctions.cc

Parent Directory | Revision Log | Patch

	revision 3, Thu Apr 30 12:52:16 2015 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);
	//  ofstream outfile;
	//            outfile.open("aaa", ios::out);
	//            grower->getLengthIncrease_(area).Print(outfile);
	//          int a;
	//          cout << "3-----------------" << endl;
	//          cin >> a;
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
106	grower->implementGrowth(area, LgrpDiv);	grower->implementGrowth(area, LgrpDiv);
107	//FIXME	if (doesmature && maturity->isMaturationStep(TimeInfo))
108	//    if (doesmature && maturity->isMaturationStep(TimeInfo))	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area), maturity, area);
109	//      Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area), maturity, area);	else
110	//    else	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area));
	//      Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area));
111
112	} else {	} else {
113	//New weights at length are calculated	//New weights at length are calculated
	//        ofstream outfile1;
	//                    outfile1.open("aaa", ios::out);
	//                    grower->getLengthIncrease_(area).Print(outfile1);
	//                  cout << "4-----------------" << endl;
	//                  cin >> a;
114	grower->implementGrowth(area, tmpPopulation[inarea], LgrpDiv);	grower->implementGrowth(area, tmpPopulation[inarea], LgrpDiv);
	//    ofstream outfile2;
	//                outfile2.open("aaa", ios::out);
	//                grower->getLengthIncrease_(area).Print(outfile2);
	//              cout << "5-----------------" << endl;
	//              cin >> a;
115	if (doesmature && maturity->isMaturationStep(TimeInfo))	if (doesmature && maturity->isMaturationStep(TimeInfo))
116	{	{
117	//FIXME//      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));
	//Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area));
121	}	}
122
123	if (istagged && tagAlkeys.numTagExperiments() > 0) { //FIXME	if (istagged && tagAlkeys.numTagExperiments() > 0) {
124	//    if (doesmature && maturity->isMaturationStep(TimeInfo))	if (doesmature && maturity->isMaturationStep(TimeInfo))
125	//      tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea], maturity, area);	tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea], maturity, area);
126	//    else	else
127	//      tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea]);	tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea]);
128	}	}
129
130

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

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