Diff of /trunk/gadget/grower.cc

Parent Directory | Revision Log | Patch

	revision 4, Thu Apr 30 17:32:47 2015 UTC	revision 5, Sun May 10 12:04:01 2015 UTC
#	Line 107	Line 107
107	dummyfphi.resize(len, 0.0);	dummyfphi.resize(len, 0.0);
108	lgrowth = new Matrix[noareas];	lgrowth = new Matrix[noareas];
109	wgrowth = new Matrix[noareas];	wgrowth = new Matrix[noareas];
110	for (i = 0; i < noareas; i++) {	for (i = 0; i < noareas; i++) {
111	lgrowth[i] = *new Matrix(maxlengthgroupgrowth + 1, otherlen, 0.0);	lgrowth[i].Initialize(maxlengthgroupgrowth + 1, otherlen, 0.0);
112	wgrowth[i] = *new Matrix(maxlengthgroupgrowth + 1, otherlen, 0.0);	wgrowth[i].Initialize(maxlengthgroupgrowth + 1, otherlen, 0.0);
113		//        lgrowth[i] = new Matrix(maxlengthgroupgrowth + 1, otherlen, 0.0);
114		//        wgrowth[i] = new Matrix(maxlengthgroupgrowth + 1, otherlen, 0.0);
115	}	}
116	}	}
117
118	Grower::~Grower() {	Grower::~Grower() {
119	int i;	int i;
120	int size = sizeof(lgrowth)/sizeof(lgrowth[0]);	//int size = sizeof(lgrowth)/sizeof(lgrowth[0]);
121	for (i = 0; i < size; i++) {	int size = areas.Size();
122	delete &lgrowth[i];	//  for (i = 0; i < size; i++) {
123	delete &wgrowth[i];	//    delete (*lgrowth)[i];
124	}	//    delete (*wgrowth)[i];
125		//  }
126		delete[] lgrowth;
127		delete[] wgrowth;
128	delete CI;	delete CI;
129	delete LgrpDiv;	delete LgrpDiv;
130	delete growthcalc;	delete growthcalc;
131		if (vector_OK != 0)
132		delete[] meanlength_vectorPow;
133	}	}
134
135	void Grower::Print(ofstream& outfile) const {	void Grower::Print(ofstream& outfile) const {
#	Line 207	Line 213
213	for (i = 0; i < LgrpDiv->numLengthGroups(); i++)	for (i = 0; i < LgrpDiv->numLengthGroups(); i++)
214	numGrow[area][i].setToZero();	numGrow[area][i].setToZero();
215	}	}
216		if (vector_OK != 0)
217		{
218		delete[] meanlength_vectorPow;
219		vector_OK = 0;
220		}
221
222	switch (functionnumber) {	switch (functionnumber) {
223	case 1:	case 1:

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

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