Diff of /trunk/gadget/stockmemberfunctions.cc

Parent Directory | Revision Log | Patch

	revision 1, Mon Feb 10 17:09:07 2014 UTC	revision 2, Wed Apr 29 12:55:30 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		//  ofstream outfile;
104		//            outfile.open("aaa", ios::out);
105		//            grower->getLengthIncrease_(area).Print(outfile);
106		//          int a;
107		//          cout << "3-----------------" << endl;
108		//          cin >> a;
109	int inarea = this->areaNum(area);	int inarea = this->areaNum(area);
110	if (grower->getFixedWeights()) {	if (grower->getFixedWeights()) {
111	//Weights at length are fixed to the value in the input file	//Weights at length are fixed to the value in the input file
112	grower->implementGrowth(area, LgrpDiv);	grower->implementGrowth(area, LgrpDiv);
113	if (doesmature && maturity->isMaturationStep(TimeInfo))	//FIXME
114	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area), maturity, area);	//    if (doesmature && maturity->isMaturationStep(TimeInfo))
115	else	//      Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area), maturity, area);
116	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area));	//    else
117		//      Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeight(area));
118
119	} else {	} else {
120	//New weights at length are calculated	//New weights at length are calculated
121		//        ofstream outfile1;
122		//                    outfile1.open("aaa", ios::out);
123		//                    grower->getLengthIncrease_(area).Print(outfile1);
124		//                  cout << "4-----------------" << endl;
125		//                  cin >> a;
126	grower->implementGrowth(area, tmpPopulation[inarea], LgrpDiv);	grower->implementGrowth(area, tmpPopulation[inarea], LgrpDiv);
127		//    ofstream outfile2;
128		//                outfile2.open("aaa", ios::out);
129		//                grower->getLengthIncrease_(area).Print(outfile2);
130		//              cout << "5-----------------" << endl;
131		//              cin >> a;
132	if (doesmature && maturity->isMaturationStep(TimeInfo))	if (doesmature && maturity->isMaturationStep(TimeInfo))
133	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area), maturity, area);	{
134		//FIXME//      Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area), maturity, area);
135		}
136	else	else
137	Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area));	Alkeys[inarea].Grow(grower->getLengthIncrease_(area), grower->getWeightIncrease_(area));
138		//Alkeys[inarea].Grow(grower->getLengthIncrease(area), grower->getWeightIncrease(area));
139	}	}
140
141	if (istagged && tagAlkeys.numTagExperiments() > 0) {	if (istagged && tagAlkeys.numTagExperiments() > 0) { //FIXME
142	if (doesmature && maturity->isMaturationStep(TimeInfo))	//    if (doesmature && maturity->isMaturationStep(TimeInfo))
143	tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea], maturity, area);	//      tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea], maturity, area);
144	else	//    else
145	tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea]);	//      tagAlkeys[inarea].Grow(grower->getLengthIncrease(area), Alkeys[inarea]);
146	}	}
147
148
149	}	}
150
151	//-----------------------------------------------------------------------	//-----------------------------------------------------------------------

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

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