geometry.cpp 62.5 KB
Newer Older
Kirill Terekhov's avatar
Kirill Terekhov committed
1
2
#include "inmost.h"
#if defined(USE_MESH)
Kirill Terekhov's avatar
Kirill Terekhov committed
3
#include <deque>
Kirill Terekhov's avatar
Kirill Terekhov committed
4
using namespace std;
Kirill Terekhov's avatar
Kirill Terekhov committed
5

Kirill Terekhov's avatar
Kirill Terekhov committed
6
7
8
9
10
const std::string normal_name = "PROTECTED_GEOM_UTIL_NORMAL";
const std::string measure_name = "PROTECTED_GEOM_UTIL_MEASURE";
const std::string centroid_name = "PROTECTED_GEOM_UTIL_CENTROID";
const std::string barycenter_name = "PROTECTED_GEOM_UTIL_BARYCENTER";

Kirill Terekhov's avatar
Kirill Terekhov committed
11
12
namespace INMOST
{
Kirill Terekhov's avatar
Kirill Terekhov committed
13
14
15
16
17
18
19
20
21
22
	typedef struct orient_face_t
	{
		Edge bridge;
		Node first;
		Face face;
		orient_face_t(Edge _bridge, Node _first, Face _face)
		:bridge(_bridge),first(_first),face(_face)
		{
		}
	} orient_face;
Kirill Terekhov's avatar
Kirill Terekhov committed
23

Kirill Terekhov's avatar
Kirill Terekhov committed
24
25
26
27
28
29
	__INLINE static void vec_diff(const Storage::real * vecin1, const Storage::real * vecin2, Storage::real * vecout, unsigned int size)
	{
		for(unsigned int i = 0; i < size; i++)
			vecout[i] = vecin1[i] - vecin2[i];
	}
	
Kirill Terekhov's avatar
Kirill Terekhov committed
30
31
32
33
34
35
36
	__INLINE static void vec_diff(const Storage::real_array & vecin1,const Storage::real_array & vecin2, Storage::real * vecout, unsigned int size)
	{
		for(unsigned int i = 0; i < size; i++)
			vecout[i] = vecin1[i] - vecin2[i];
	}
	
	
Kirill Terekhov's avatar
Kirill Terekhov committed
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
	__INLINE static void vec_cross_product(const Storage::real * vecin1, const Storage::real * vecin2, Storage::real * vecout)
	{
		Storage::real temp[3];
		temp[0] = vecin1[1]*vecin2[2] - vecin1[2]*vecin2[1];
		temp[1] = vecin1[2]*vecin2[0] - vecin1[0]*vecin2[2];
		temp[2] = vecin1[0]*vecin2[1] - vecin1[1]*vecin2[0];
		vecout[0] = temp[0];
		vecout[1] = temp[1];
		vecout[2] = temp[2];
	}
	
	__INLINE static Storage::real vec_dot_product(const Storage::real * vecin1,const Storage::real * vecin2, unsigned int size)
	{
		Storage::real ret = 0;
		for(unsigned int i = 0; i < size; i++)
			ret += vecin1[i]*vecin2[i];
		return ret;
	}
	
	__INLINE static Storage::real vec_len2(const Storage::real * vecin, unsigned int size)
	{
		return vec_dot_product(vecin,vecin,size);
	}
	
	__INLINE static Storage::real vec_len(const Storage::real * vecin, unsigned int size)
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
63
		return ::sqrt(vec_len2(vecin,size));
Kirill Terekhov's avatar
Kirill Terekhov committed
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
	}
	
	__INLINE static Storage::real det3d(Storage::real a, Storage::real b, Storage::real c,
	                         Storage::real d, Storage::real e, Storage::real f,
	                         Storage::real g, Storage::real h, Storage::real i ) 
	{
		return a*e*i - c*e*g + b*f*g - a*f*h + c*d*h - b*d*i;
	}
	
	__INLINE static Storage::real det3v(const Storage::real * x,const Storage::real * y,const Storage::real * z) 
	{
		return det3d(x[0], x[1], x[2],  y[0], y[1], y[2],  z[0], z[1], z[2]);
	}
	
	__INLINE static Storage::real det4v(const Storage::real * w, const Storage::real * x, const Storage::real * y, const Storage::real * z) 
	{
		return det3d(x[0]-w[0], x[1]-w[1], x[2]-w[2],  y[0]-w[0], y[1]-w[1], y[2]-w[2],  z[0]-w[0], z[1]-w[1], z[2]-w[2]);
	}	
	
	
	__INLINE static Storage::real vec_normalize(Storage::real * vecin, unsigned int size)
	{
		Storage::real len = 0;
		for(unsigned int i = 0; i < size; i++)
			len += vecin[i]*vecin[i];
Kirill Terekhov's avatar
Kirill Terekhov committed
89
		len = ::sqrt(len);
Kirill Terekhov's avatar
Kirill Terekhov committed
90
91
92
93
94
95
		for(unsigned int i = 0; i < size; i++)
			vecin[i] /= len;
		return len;
	}
	
	
Kirill Terekhov's avatar
Kirill Terekhov committed
96
	ElementArray<Cell> Cell::NeighbouringCells() const
Kirill Terekhov's avatar
Kirill Terekhov committed
97
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
98
99
100
		ElementArray<Cell> ret(GetMeshLink());
		ElementArray<Face> faces = getFaces();
		for(ElementArray<Face>::iterator f = faces.begin(); f != faces.end(); f++)
Kirill Terekhov's avatar
Kirill Terekhov committed
101
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
102
103
			Cell c = Neighbour(f->self());
			if( c.isValid() ) ret.push_back(c);
Kirill Terekhov's avatar
Kirill Terekhov committed
104
105
106
107
108
		}
		return ret;
	}
	
	
Kirill Terekhov's avatar
Kirill Terekhov committed
109
	Cell Cell::Neighbour(Face f) const
Kirill Terekhov's avatar
Kirill Terekhov committed
110
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
111
112
		Cell b = f->BackCell();
		if( b == self() )
Kirill Terekhov's avatar
Kirill Terekhov committed
113
114
115
			return f->FrontCell();
		return b;
	}
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152

	bool Face::Inside(const Storage::real * point) const
	{
		Mesh * mesh = GetMeshLink();
		integer dim = mesh->GetDimensions();
		if(dim < 3)
		{
			// TODO check that point lies on edge?
			return false;
		}
		real eps = mesh->GetEpsilon();
		real nrm[3], cnt[3], dx[3], y[3], e1[3], e2[3];

		UnitNormal(nrm);
		Centroid(cnt);
		vec_diff(cnt, point, dx, dim);
		real r_v = vec_dot_product(nrm, dx, dim);
		if(fabs(r_v) > eps)	return false;	// point is too far from the face plane
		y[0] = point[0] + r_v * nrm[0];
		y[1] = point[1] + r_v * nrm[1];
		y[2] = point[2] + r_v * nrm[2];
		vec_diff(y,cnt,e1,dim);
		if(vec_len(e1,dim) < eps)	return true;	// point is near the face centroid

		real ylen = vec_normalize(e1,dim);
		vec_cross_product(nrm,e1,e2);
		vec_normalize(e2,dim);
		{
			integer mdim = 2;
			Storage::real data[9][3];
			memset(data,0,sizeof(Storage::real)*9*3);
			//Centroid(data[0]);
			data[3][0] = ylen;
			data[3][1] = 0;
			data[3][2] = 0;
			ElementArray<Node> nodes = getNodes();
			real r;
Ruslan Yanbarisov's avatar
Ruslan Yanbarisov committed
153
			real dx1[3], y1[3], chk_eq[3];
154
155
156
157
158
			for(int i = 0; i < static_cast<int>(nodes.size()); i++)
			{
				int j = (i+1)%nodes.size();
				
				nodes[i].Centroid(data[1]);
Ruslan Yanbarisov's avatar
Ruslan Yanbarisov committed
159
160
161
162
163

				vec_diff(point, data[1], chk_eq, dim);
				if(vec_len(chk_eq, dim) < eps)
					return true;

164
165
166
167
168
169
170
171
172
173
174
				vec_diff(cnt,data[1],dx1,dim);
				r = vec_dot_product(nrm,dx1,dim);
				y1[0] = data[1][0] + r*nrm[0];
				y1[1] = data[1][1] + r*nrm[1];
				y1[2] = data[1][2] + r*nrm[2];
				vec_diff(y1,cnt,y1,dim);
				data[1][0] = vec_dot_product(e1,y1,dim);
				data[1][1] = vec_dot_product(e2,y1,dim);
				data[1][2] = 0;
				
				nodes[j].Centroid(data[2]);
Ruslan Yanbarisov's avatar
Ruslan Yanbarisov committed
175
				vec_diff(point, data[2], chk_eq, dim);
176
177
178
179
180
181
182
183
184
185
186
187
188
				vec_diff(cnt,data[2],dx1,dim);
				r = vec_dot_product(nrm,dx1,dim);
				y1[0] = data[2][0] + r*nrm[0];
				y1[1] = data[2][1] + r*nrm[1];
				y1[2] = data[2][2] + r*nrm[2];
				vec_diff(y1,cnt,y1,dim);
				data[2][0] = vec_dot_product(e1,y1,dim);
				data[2][1] = vec_dot_product(e2,y1,dim);
				data[2][2] = 0;
				
				//vec_diff(data[3],cnt,    data[3],mdim);
				vec_diff(data[3],data[1],data[4],mdim);
				vec_diff(data[3],data[2],data[5],mdim);
Ruslan Yanbarisov's avatar
Ruslan Yanbarisov committed
189
190
				vec_normalize(data[4], mdim);
				vec_normalize(data[5], mdim);
191
192
193
194
				vec_cross_product(data[3],data[4],data[6]);
				vec_cross_product(data[4],data[5],data[7]);
				vec_cross_product(data[5],data[3],data[8]);
				
Ruslan Yanbarisov's avatar
Ruslan Yanbarisov committed
195
196
197
				if( vec_dot_product(data[6],data[7],dim) >= -eps &&
				   vec_dot_product(data[7],data[8],dim) >= -eps &&
				   vec_dot_product(data[8],data[6],dim) >= -eps )
198
199
200
201
202
203
204
					return true; //inside one of the triangles
			}
			return false;
		}

		return false;
	}
Kirill Terekhov's avatar
Kirill Terekhov committed
205
	
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
206
	bool Cell::Inside(const Storage::real * point) const//check for 2d case
Kirill Terekhov's avatar
Kirill Terekhov committed
207
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
208
		Mesh * mesh = GetMeshLink();
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
209
210
211
		integer dim = GetElementDimension();
		if( dim == 3 )
		{
212
213
214
215
			// Check faces first
			ElementArray<Face> faces = getFaces();
			for(int i = 0; i < faces.size(); i++)
				if(faces[i].Inside(point))	return true;
Kirill Terekhov's avatar
Kirill Terekhov committed
216
217
218
219
220
221
222
223
224
225
226
			/*
			tiny_map<HandleType,real,16> hits;
			real ray[3];
			ray[0] = rand()/(real)RAND_MAX;
			ray[1] = rand()/(real)RAND_MAX;
			ray[2] = rand()/(real)RAND_MAX;
			CastRay(point,ray,hits);
			if( hits.size()%2 == 0 ) return false;
			return true;
			 */
			assert(mesh->GetDimensions() == 3);
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
227
228
229
			integer vp = 0;
			integer vm = 0;
			integer vz = 0;
Kirill Terekhov's avatar
Kirill Terekhov committed
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
			real eps = mesh->GetEpsilon();
			real c,d, fcnt[3];
			real_array v1,v2;
			ElementArray<Face> data = getFaces();
			Face cur = data[0];
			MarkerType mrk = mesh->CreatePrivateMarker();
			MarkerType rev = mesh->CreatePrivateMarker(); //reverse orientation
			data.SetPrivateMarker(mrk); //0-th face orientation is default
			cur->RemPrivateMarker(mrk);
			Node n1,n2; //to retrive edge
			bool reverse = false; //reverse orientation in considered face
			std::deque< orient_face > stack; //edge and first node and face for visiting
			//todo: can do faster by retriving edges and going over their nodes
			//should not use FindSharedAdjacency
			ElementArray<Edge> edges = cur->getEdges();
			do
			{
				//figure out starting node order
				if( edges[0]->getBeg() == edges[1]->getBeg() ||
				   edges[0]->getBeg() == edges[1]->getEnd() )
				{
					n1 = edges[0]->getEnd();
					n2 = edges[0]->getBeg();
				}
				else
				{
					n1 = edges[0]->getBeg();
					n2 = edges[0]->getEnd();
				}
				//schedule unvisited adjacent faces
				for(unsigned j = 0; j < edges.size(); j++)
				{
					//schedule face adjacent to considered edge
					ElementArray<Face> adjacent = edges[j]->getFaces(mrk);
					assert(adjacent.size() <= 1);
					if( !adjacent.empty() && adjacent[0].GetPrivateMarker(mrk))
					{
						adjacent.RemPrivateMarker(mrk);
						stack.push_back(orient_face(edges[j],reverse ? n2 : n1,adjacent[0]));
					}
					//update edge nodes
					n1 = n2; //current end is new begin
					//find new end
					if( n2 == edges[(j+1)%edges.size()]->getBeg() )
						n2 = edges[(j+1)%edges.size()]->getEnd();
					else
						n2 = edges[(j+1)%edges.size()]->getBeg();
				}
				if( stack.empty() ) break;
				//get entry from stack
				orient_face r = stack.front();
				//remove face from stack
				stack.pop_front();
				//retrive edges for new face
				edges = r.face->getEdges();
				reverse = false;
				//figure out starting node order
				if( edges[0]->getBeg() == edges[1]->getBeg() ||
				   edges[0]->getBeg() == edges[1]->getEnd() )
				{
					n1 = edges[0]->getEnd();
					n2 = edges[0]->getBeg();
				}
				else
				{
					n1 = edges[0]->getBeg();
					n2 = edges[0]->getEnd();
				}
				//find out common edge orientation
				for(unsigned j = 0; j < edges.size(); j++)
				{
					if( edges[j] == r.bridge ) //found the edge
					{
						//reverse ordering on this face
						if( r.first == n1 )
						{
							r.face->SetPrivateMarker(rev);
							reverse = true;
						}
						break;
					}
					//update edge nodes
					n1 = n2; //current end is new begin
					//find new end
					if( n2 == edges[(j+1)%edges.size()]->getBeg() )
						n2 = edges[(j+1)%edges.size()]->getEnd();
					else
						n2 = edges[(j+1)%edges.size()]->getBeg();
				}
			} while(true);
			data.RemPrivateMarker(mrk);
			mesh->ReleasePrivateMarker(mrk);
			for(ElementArray<Face>::size_type f = 0; f < data.size(); f++)
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
323
324
			{
				d = 0.0;
Kirill Terekhov's avatar
Kirill Terekhov committed
325
326
327
328
329
330
331
332
333
334
335
336
337
				data[f]->Centroid(fcnt);
				ElementArray<Node> nodes = data[f]->getNodes();
				v1 = nodes[0].Coords();
				for (ElementArray<Node>::size_type i=0; i<nodes.size(); i++)
				{
					v2 = nodes[(i+1)%nodes.size()].Coords();
					d += c = det4v(point, fcnt, v1.data(), v2.data());
					v1.swap(v2);
				}
				//if(!data[f]->FaceOrientedOutside(self()))
				if( data[f]->GetPrivateMarker(rev) )
					c = -1.0;
				else
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
338
					c = 1.0;
Kirill Terekhov's avatar
Kirill Terekhov committed
339
340
341
342
343
				if(c*d > eps)
					vp++;
				else if(c*d < -eps)
					vm++;
				else
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
344
345
					vz++;
			}
Kirill Terekhov's avatar
Kirill Terekhov committed
346
347
			data.RemPrivateMarker(rev);
			mesh->ReleasePrivateMarker(rev);
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
348
			if(vp*vm > 0) return false;
Kirill Terekhov's avatar
Kirill Terekhov committed
349
			else if( vz == 0 ) return true;
Kirill Terekhov's avatar
Kirill Terekhov committed
350
			else return true;
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
351
352
		}
		else
Kirill Terekhov's avatar
Kirill Terekhov committed
353
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
354
			int mdim = mesh->GetDimensions();
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
355
356
357
358
359
360
361
362
			assert(mdim <= 3);
			Storage::real data[9][3];
			if( mdim < 3 )
			{
				memset(data,0,sizeof(Storage::real)*9*3);
			}
			Centroid(data[0]);
			ElementArray<Node> nodes = getNodes();
Kirill Terekhov's avatar
Kirill Terekhov committed
363
			for(int i = 0; i < static_cast<int>(nodes.size()); i++)
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
364
365
366
367
368
369
370
371
372
373
			{
				int j = (i+1)%nodes.size();
				nodes[i].Centroid(data[1]);
				nodes[j].Centroid(data[2]);
				vec_diff(point,data[0],data[3],mdim);
				vec_diff(point,data[1],data[4],mdim);
				vec_diff(point,data[2],data[5],mdim);
				vec_cross_product(data[3],data[4],data[6]);
				vec_cross_product(data[4],data[5],data[7]);
				vec_cross_product(data[5],data[3],data[8]);
Kirill Terekhov's avatar
Kirill Terekhov committed
374
				
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
375
				if( vec_dot_product(data[6],data[7],mdim) >= 0 &&
Kirill Terekhov's avatar
Kirill Terekhov committed
376
377
				   vec_dot_product(data[7],data[8],mdim) >= 0 &&
				   vec_dot_product(data[6],data[8],mdim) >= 0 )
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
378
379
380
					return true; //inside one of the triangles
			}
			return false;
Kirill Terekhov's avatar
Kirill Terekhov committed
381
382
383
384
		}
	}
	
	
Kirill Terekhov's avatar
Kirill Terekhov committed
385
	void Face::UnitNormal(real * nrm) const
Kirill Terekhov's avatar
Kirill Terekhov committed
386
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
387
388
389
		Mesh * m = GetMeshLink();
		m->GetGeometricData(GetHandle(),NORMAL,nrm); 
		integer dim = m->GetDimensions();
Kirill Terekhov's avatar
Kirill Terekhov committed
390
		real    l   = ::sqrt(vec_dot_product(nrm,nrm,dim)); 
Kirill Terekhov's avatar
Kirill Terekhov committed
391
		if(::fabs(l) > m->GetEpsilon()) 
Kirill Terekhov's avatar
Kirill Terekhov committed
392
393
		{
			for(integer i = 0; i < dim; i++) 
Kirill Terekhov's avatar
Kirill Terekhov committed
394
				nrm[i] /= l; 
Kirill Terekhov's avatar
Kirill Terekhov committed
395
		}
Kirill Terekhov's avatar
Kirill Terekhov committed
396
397
	}
	
Kirill Terekhov's avatar
Kirill Terekhov committed
398
	void Face::OrientedNormal(Cell c, Storage::real * nrm) const
Kirill Terekhov's avatar
Kirill Terekhov committed
399
400
	{
		Normal(nrm); 
Kirill Terekhov's avatar
Kirill Terekhov committed
401
402
403
404
		if( !FaceOrientedOutside(c) )
		{
			integer dim = GetMeshLink()->GetDimensions();
			for(integer i = 0; i < dim; i++) 
Kirill Terekhov's avatar
Kirill Terekhov committed
405
				nrm[i] = -nrm[i];
Kirill Terekhov's avatar
Kirill Terekhov committed
406
		}
Kirill Terekhov's avatar
Kirill Terekhov committed
407
408
409
	}
	
	
Kirill Terekhov's avatar
Kirill Terekhov committed
410
	void Face::OrientedUnitNormal(Cell c, Storage::real * nrm) const
Kirill Terekhov's avatar
Kirill Terekhov committed
411
412
413
	{
		UnitNormal(nrm); 
		if( !FaceOrientedOutside(c) ) 
Kirill Terekhov's avatar
Kirill Terekhov committed
414
415
416
		{
			integer dim = GetMeshLink()->GetDimensions();
			for(integer i = 0; i < dim; i++) 
Kirill Terekhov's avatar
Kirill Terekhov committed
417
				nrm[i] = -nrm[i];
Kirill Terekhov's avatar
Kirill Terekhov committed
418
		}
Kirill Terekhov's avatar
Kirill Terekhov committed
419
420
421
422
	}
	
	
	
Kirill Terekhov's avatar
Kirill Terekhov committed
423
	bool Mesh::TestClosure(const HandleType * elements, integer num) const
Kirill Terekhov's avatar
Kirill Terekhov committed
424
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
425
426
427
		integer i;
		tiny_map<HandleType,int,64> e_visit;
		tiny_map<HandleType,int,64>::iterator it;
Kirill Terekhov's avatar
Kirill Terekhov committed
428
429
430
431
		if( !HideMarker() )
		{
			for(i = 0; i < num; i++)
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
432
433
434
				Element::adj_type const & lc = LowConn(elements[i]);
				for(Element::adj_type::size_type jt = 0; jt < lc.size(); jt++)
					e_visit[lc[jt]]++;
Kirill Terekhov's avatar
Kirill Terekhov committed
435
436
437
438
			}
		}
		else
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
439
			for(i = 0; i < num; i++) if( !GetMarker(elements[i],HideMarker()) )
Kirill Terekhov's avatar
Kirill Terekhov committed
440
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
441
442
443
444
445
446
				Element::adj_type const & lc = LowConn(elements[i]);
				for(Element::adj_type::size_type jt = 0; jt < lc.size(); jt++) 
				{
					if( !GetMarker(lc[jt],HideMarker()) ) 
						e_visit[lc[jt]]++;
				}
Kirill Terekhov's avatar
Kirill Terekhov committed
447
448
449
450
451
452
453
			}
		}
		for(it = e_visit.begin(); it != e_visit.end(); it++)
			if( it->second != 2 ) return false;
		return true;
	}
	
454
	Element::GeometricType Mesh::ComputeGeometricType(ElementType etype, const HandleType * lc, INMOST_DATA_ENUM_TYPE size)
Kirill Terekhov's avatar
Kirill Terekhov committed
455
456
	{
		Element::GeometricType ret = Element::Unset;
457
458
459
460
		INMOST_DATA_ENUM_TYPE s = 0;
		if( isMeshModified() )
			s = Mesh::Count(lc,size,HideMarker());
		else s = size;
Kirill Terekhov's avatar
Kirill Terekhov committed
461
		int dmax = -1, dmin = 4;
Kirill Terekhov's avatar
Kirill Terekhov committed
462
463
464
465
466
467
468
469
470
471
472
		if( s == 0 && etype != NODE) return ret;
		switch(etype)
		{
			case NODE: ret = Element::Vertex; break;
			case EDGE:
				if( s == 1 )
					ret = Element::Vertex;
				else if( s == 2 )
					ret = Element::Line;
				break;
			case FACE:
473
				for (INMOST_DATA_ENUM_TYPE k = 0; k < size; ++k) if( !Hidden(lc[k]) )
Kirill Terekhov's avatar
Kirill Terekhov committed
474
475
476
477
478
479
480
				{
					int d = Element::GetGeometricDimension(GetGeometricType(lc[k]));
					if (dmax < d) dmax = d;
					if (dmin > d) dmin = d;
				}
				if (dmax != dmin)
				{
Kirill Terekhov's avatar
Kirill Terekhov committed
481
					ret = Element::MultiLine;
Kirill Terekhov's avatar
Kirill Terekhov committed
482
483
				}
				else if( dmax == 0 )
Kirill Terekhov's avatar
Kirill Terekhov committed
484
485
486
487
488
				{ 
					ret = Element::Line;
				}
				else
				{
489
					if( !GetTopologyCheck(NEED_TEST_CLOSURE) || TestClosure(lc,size) )
Kirill Terekhov's avatar
Kirill Terekhov committed
490
491
492
493
494
495
496
497
498
499
500
501
					{
						if( s == 3 )
							ret = Element::Tri;
						else if( s == 4 )
							ret = Element::Quad;
						else
							ret = Element::Polygon;
					}
					else ret = Element::MultiLine;
				}
				break;
			case CELL:
502
				for (INMOST_DATA_ENUM_TYPE k = 0; k < size; ++k) if( !Hidden(lc[k]) )
Kirill Terekhov's avatar
Kirill Terekhov committed
503
504
505
506
507
508
509
510
511
512
				{
					int d = Element::GetGeometricDimension(GetGeometricType(lc[k]));
					if (dmax < d) dmax = d;
					if (dmin > d) dmin = d;
				}
				if (dmax != dmin)
				{
					ret = Element::MultiPolygon;
				}
				else if(  dmax == 1 )
Kirill Terekhov's avatar
Kirill Terekhov committed
513
				{
514
					if( !GetTopologyCheck(NEED_TEST_CLOSURE) || TestClosure(lc,size) )
Kirill Terekhov's avatar
Kirill Terekhov committed
515
516
517
518
519
520
521
522
523
524
525
526
					{
						if( s == 3 )
							ret = Element::Tri;
						else if( s == 4 )
							ret = Element::Quad;
						else
							ret = Element::Polygon;
					}
					else ret = Element::MultiLine;
				}
				else 
				{
527
					if( !GetTopologyCheck(NEED_TEST_CLOSURE) ||  TestClosure(lc,size) )
Kirill Terekhov's avatar
Kirill Terekhov committed
528
					{
529
530
531
532
533
						// for simple cells there is no more then one common edge
						// otherwise the cell should be treated as polyhedron
						bool check = true;
						MarkerType common = CreatePrivateMarker();
						for(INMOST_DATA_ENUM_TYPE i = 0; i < s; ++i)
Kirill Terekhov's avatar
Kirill Terekhov committed
534
						{
535
536
537
538
539
540
541
542
543
544
545
							const Element::adj_type & ilc = LowConn(lc[i]); // access edges of the i-th face
							for(INMOST_DATA_ENUM_TYPE r = 0; r < ilc.size(); ++r ) SetPrivateMarker(ilc[r],common);
							for(INMOST_DATA_ENUM_TYPE j = i+1; j < s; ++j )
							{
								const Element::adj_type & jlc = LowConn(lc[j]); // access edges of the j-th face
								int cnt = 0;
								for(INMOST_DATA_ENUM_TYPE r = 0; r < jlc.size(); ++r )
									if( GetPrivateMarker(jlc[r],common) ) cnt++;
								if( cnt > 1 ) check = false;
							}
							for(INMOST_DATA_ENUM_TYPE r = 0; r < ilc.size(); ++r ) RemPrivateMarker(ilc[r],common);
Kirill Terekhov's avatar
Kirill Terekhov committed
546
						}
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
						ReleasePrivateMarker(common);
						if( check )
						{
							//test c_faces closure, if no closure, set as MultiPolygon
							INMOST_DATA_ENUM_TYPE quads = 0,tris = 0,i;
							for(i = 0; i < size; i++) if( !Hidden(lc[i]) )
							{
								if( GetGeometricType(lc[i]) == Element::Tri )
									tris++;
								else if( GetGeometricType(lc[i]) == Element::Quad )
									quads++;
							}
							if( tris == 4 && s == 4 )
								ret = Element::Tet;
							else if( quads == 6 && s == 6 )
								ret = Element::Hex;
							else if( tris == 4 && quads == 1 && s == tris+quads)
								ret = Element::Pyramid;
							else if( quads == 3 && tris == 2 && s == tris+quads)
								ret = Element::Prism;
							else
								ret = Element::Polyhedron;
						}
						else ret = Element::Polyhedron;
Kirill Terekhov's avatar
Kirill Terekhov committed
571
572
573
574
575
576
577
578
579
					}
					else ret = Element::MultiPolygon;
				}
				break;
			case ESET: ret = Element::Set; break;
		}
		return ret;
	}

Kirill Terekhov's avatar
Kirill Terekhov committed
580
	Storage::real Edge::Length() const 
Kirill Terekhov's avatar
Kirill Terekhov committed
581
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
		Storage::real ret; 
		GetMeshLink()->GetGeometricData(GetHandle(),MEASURE,&ret); 
		return ret;
	}

	Storage::real Face::Area() const 
	{
		real ret; 
		GetMeshLink()->GetGeometricData(GetHandle(),MEASURE,&ret); 
		return ret;
	}
	void Face::Normal(real * nrm) const 
	{
		GetMeshLink()->GetGeometricData(GetHandle(),NORMAL,nrm);
	}

	Storage::real Cell::Volume() const 
	{
		real ret; 
		GetMeshLink()->GetGeometricData(GetHandle(),MEASURE,&ret); 
		return ret;
	}

	void Element::ComputeGeometricType() const
	{
		GetMeshLink()->ComputeGeometricType(GetHandle());
Kirill Terekhov's avatar
Kirill Terekhov committed
608
609
	}
	
Kirill Terekhov's avatar
Kirill Terekhov committed
610
611
612
613
614
615
616
	void Mesh::ComputeGeometricType(HandleType h) 
	{
		SetGeometricType(h,Element::Unset);
		Element::adj_type const & lc = LowConn(h);
		if( !lc.empty() )
			SetGeometricType(h,ComputeGeometricType(GetHandleElementType(h),lc.data(),static_cast<integer>(lc.size())));
	}
Kirill Terekhov's avatar
Kirill Terekhov committed
617
	
Kirill Terekhov's avatar
Kirill Terekhov committed
618
	void Mesh::RecomputeGeometricData(HandleType e)
Kirill Terekhov's avatar
Kirill Terekhov committed
619
620
621
622
623
	{
		//static std::map<Element *, int> numfixes;
		GeometricData d ;
		for(d = CENTROID; d <= NORMAL; d++) // first compute centroids and normals 
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
624
			if( HaveGeometricData(d,GetHandleElementType(e)) ) //compute centroid first
Kirill Terekhov's avatar
Kirill Terekhov committed
625
626
			{
				Tag t = GetGeometricTag(d);
Kirill Terekhov's avatar
Kirill Terekhov committed
627
628
				Storage::real * a = static_cast<Storage::real *>(MGetDenseLink(e,t));
				HideGeometricData(d,GetHandleElementType(e));
Kirill Terekhov's avatar
Kirill Terekhov committed
629
				GetGeometricData(e,d,a);
Kirill Terekhov's avatar
Kirill Terekhov committed
630
				ShowGeometricData(d,GetHandleElementType(e));
Kirill Terekhov's avatar
Kirill Terekhov committed
631
632
633
634
			}
		}


Kirill Terekhov's avatar
Kirill Terekhov committed
635
		if( GetHandleElementType(e) == CELL && HaveGeometricData(ORIENTATION,FACE)) //then correct the normal
Kirill Terekhov's avatar
Kirill Terekhov committed
636
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
637
638
639
			Element::adj_type & lc = LowConn(e);
			for(Element::adj_type::iterator it = lc.begin(); it != lc.end(); ++it)
				if( !GetMarker(*it,HideMarker()) && HighConn(*it).size() == 1 )
Kirill Terekhov's avatar
Kirill Terekhov committed
640
				{
Kirill Terekhov's avatar
Kirill Terekhov committed
641
					Face(this,*it)->FixNormalOrientation();
Kirill Terekhov's avatar
Kirill Terekhov committed
642
643
644
645
				}
		}
		for(d = MEASURE; d <= BARYCENTER; d++) // compute the rest
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
646
			if( HaveGeometricData(d,GetHandleElementType(e)) )
Kirill Terekhov's avatar
Kirill Terekhov committed
647
648
			{
				Tag t = GetGeometricTag(d);
Kirill Terekhov's avatar
Kirill Terekhov committed
649
650
				Storage::real * a = static_cast<Storage::real *>(MGetDenseLink(e,t));
				HideGeometricData(d,GetHandleElementType(e));
Kirill Terekhov's avatar
Kirill Terekhov committed
651
				GetGeometricData(e,d,a);
Kirill Terekhov's avatar
Kirill Terekhov committed
652
				ShowGeometricData(d,GetHandleElementType(e));
Kirill Terekhov's avatar
Kirill Terekhov committed
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
			}
		}
	}
	
	
	void Mesh::RemoveGeometricData(GeomParam table)
	{
		for(GeomParam::iterator it = table.begin(); it != table.end(); ++it)
		{
			if( it->first == MEASURE    ) 
			{
				if(measure_tag.isValid())    
					measure_tag    = DeleteTag(measure_tag   ,it->second);
				for(ElementType etype = EDGE; etype <= CELL; etype = etype << 1) if( etype & it->second) HideGeometricData(MEASURE,etype);
			}
			if( it->first == CENTROID   ) 
			{
				if(centroid_tag.isValid())   
					centroid_tag   = DeleteTag(centroid_tag  ,it->second);
				for(ElementType etype = EDGE; etype <= CELL; etype = etype << 1) if( etype & it->second) HideGeometricData(CENTROID,etype);
			}
			if( it->first == BARYCENTER ) 
			{
				if(barycenter_tag.isValid()) 
					barycenter_tag = DeleteTag(barycenter_tag,it->second);
				for(ElementType etype = EDGE; etype <= CELL; etype = etype << 1) if( etype & it->second) HideGeometricData(BARYCENTER,etype);
			}
			if( it->first == NORMAL     ) 
			{
				if(normal_tag.isValid())
					normal_tag     = DeleteTag(normal_tag    ,it->second);
				for(ElementType etype = FACE; etype <= CELL; etype = etype << 1) if( etype & it->second) HideGeometricData(NORMAL,etype);
			}
			if( it->first == ORIENTATION) 
				if( FACE & it->second) HideGeometricData(ORIENTATION,FACE);
		}
	}
	
	void Mesh::RestoreGeometricTags()
	{
		for(GeometricData gtype = MEASURE; gtype <= NORMAL; gtype++)
		{
			bool restore = false;
696
			for(ElementType etype = EDGE; etype <= CELL && !restore; etype = NextElementType(etype))
Kirill Terekhov's avatar
Kirill Terekhov committed
697
698
699
700
701
702
				if( HaveGeometricData(gtype,etype) )
					restore = true;
			if( restore )
			{
				switch(gtype)
				{
Kirill Terekhov's avatar
Kirill Terekhov committed
703
704
705
706
				case MEASURE:       measure_tag = GetTag(measure_name);    break;
				case CENTROID:     centroid_tag = GetTag(centroid_name);   break;
				case BARYCENTER: barycenter_tag = GetTag(barycenter_name); break;
				case NORMAL:         normal_tag = GetTag(normal_name);     break;
Kirill Terekhov's avatar
Kirill Terekhov committed
707
708
709
710
				}
			}
		}
	}
711

Kirill Terekhov's avatar
Kirill Terekhov committed
712
713
	void Mesh::RepairGeometricTags()
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
714
		if( HaveTag(measure_name) )
Kirill Terekhov's avatar
Kirill Terekhov committed
715
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
716
			measure_tag = GetTag(measure_name);
Kirill Terekhov's avatar
Kirill Terekhov committed
717
718
719
720
			for(ElementType etype = EDGE; etype <= CELL; etype = NextElementType(etype))
				if( measure_tag.isDefined(etype) && !HaveGeometricData(MEASURE,etype) )
					ShowGeometricData(MEASURE,etype);
		}
Kirill Terekhov's avatar
Kirill Terekhov committed
721
		if( HaveTag(centroid_name) )
Kirill Terekhov's avatar
Kirill Terekhov committed
722
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
723
			centroid_tag = GetTag(centroid_name);
Kirill Terekhov's avatar
Kirill Terekhov committed
724
725
726
727
			for(ElementType etype = EDGE; etype <= CELL; etype = NextElementType(etype))
				if( centroid_tag.isDefined(etype) && !HaveGeometricData(CENTROID,etype) )
					ShowGeometricData(CENTROID,etype);
		}
Kirill Terekhov's avatar
Kirill Terekhov committed
728
		if( HaveTag(barycenter_name) )
Kirill Terekhov's avatar
Kirill Terekhov committed
729
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
730
			barycenter_tag = GetTag(barycenter_name);
Kirill Terekhov's avatar
Kirill Terekhov committed
731
732
733
734
			for(ElementType etype = EDGE; etype <= CELL; etype = NextElementType(etype))
				if( barycenter_tag.isDefined(etype) && !HaveGeometricData(BARYCENTER,etype) )
					ShowGeometricData(BARYCENTER,etype);
		}
Kirill Terekhov's avatar
Kirill Terekhov committed
735
		if( HaveTag(normal_name) )
Kirill Terekhov's avatar
Kirill Terekhov committed
736
		{
Kirill Terekhov's avatar
Kirill Terekhov committed
737
			normal_tag = GetTag(normal_name);
Kirill Terekhov's avatar
Kirill Terekhov committed
738
739
740
741
742
			for(ElementType etype = EDGE; etype <= CELL; etype = NextElementType(etype))
				if( normal_tag.isDefined(etype) && !HaveGeometricData(NORMAL,etype) )
					ShowGeometricData(NORMAL,etype);
		}
	}
Kirill Terekhov's avatar
Kirill Terekhov committed
743
744
745
	
	void Mesh::PrepareGeometricData(GeomParam table)
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
746
		std::sort(&*table.begin(),&*table.end());
Kirill Terekhov's avatar
Kirill Terekhov committed
747
748
749
750
751
752
		for(GeomParam::iterator it = table.begin(); it != table.end(); ++it)
		{
			GeometricData types = it->first;
			ElementType mask = it->second;
			if( types == ORIENTATION )
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
753
				//std::cout << "ORIENTATION" << std::endl;
Kirill Terekhov's avatar
Kirill Terekhov committed
754
				if( mask & FACE )
Kirill Terekhov's avatar
Kirill Terekhov committed
755
				{
756
757
758
					if( HideMarker() )
					{
						MarkerType hm = HideMarker();
Kirill Terekhov's avatar
Kirill Terekhov committed
759
760
761
#if defined(USE_OMP)
#pragma omp parallel for
#endif
762
763
764
765
766
767
768
769
770
771
772
						for(integer e = 0; e < FaceLastLocalID(); ++e) 
						{
							if( isValidElement(FACE,e) )
							{
								HandleType h = ComposeHandle(FACE,e);
								if( !GetMarker(h,hm) )
									Face(this,h)->FixNormalOrientation();
							}
						}
					}
					else
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
773
					{
774
						//std::cout << "Fix orientation" << std::endl;
775
776
777
#if defined(USE_OMP)
#pragma omp parallel for
#endif
778
779
						for(integer e = 0; e < FaceLastLocalID(); ++e) if( isValidElement(FACE,e) )
							Face(this,ComposeHandle(FACE,e))->FixNormalOrientation();
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
780
					}
Kirill Terekhov's avatar
Kirill Terekhov committed
781
				}
Kirill Terekhov's avatar
Kirill Terekhov committed
782
783
784
785
				ShowGeometricData(ORIENTATION,FACE);
			}
			if( types == MEASURE )
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
786
				//std::cout << "MEASURE" << std::endl;
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
787
				for(ElementType etype = EDGE; etype <= CELL; etype = NextElementType(etype))
Kirill Terekhov's avatar
Kirill Terekhov committed
788
789
790
				{
					if( (mask & etype) && !HaveGeometricData(MEASURE,etype))
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
791
						measure_tag = CreateTag(measure_name,DATA_REAL,etype,NONE,1);
792
793
794
						if( HideMarker() )
						{
							MarkerType hm = HideMarker();
Kirill Terekhov's avatar
Kirill Terekhov committed
795
796
797
#if defined(USE_OMP)
#pragma omp parallel for
#endif
798
799
800
801
802
803
804
							for(integer e = 0; e < LastLocalID(etype); ++e) if( isValidElement(etype,e) )
							{
								HandleType h = ComposeHandle(etype,e);
								if( !GetMarker(h,hm) ) GetGeometricData(h,MEASURE,static_cast<Storage::real *>(MGetDenseLink(h,measure_tag)));
							}
						}
						else
Kirill Terekhov's avatar
Kirill Terekhov committed
805
						{
806
807
808
809
810
811
812
813
#if defined(USE_OMP)
#pragma omp parallel for
#endif
							for(integer e = 0; e < LastLocalID(etype); ++e) if( isValidElement(etype,e) )
							{
								HandleType h = ComposeHandle(etype,e);
								GetGeometricData(h,MEASURE,static_cast<Storage::real *>(MGetDenseLink(h,measure_tag)));
							}
Kirill Terekhov's avatar
Kirill Terekhov committed
814
						}
Kirill Terekhov's avatar
Kirill Terekhov committed
815
816
817
818
819
820
						ShowGeometricData(MEASURE,etype);
					}
				}
			}
			if( types == CENTROID )
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
821
				//std::cout << "CENTROID" << std::endl;
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
822
				for(ElementType etype = EDGE; etype <= CELL; etype = NextElementType(etype))
Kirill Terekhov's avatar
Kirill Terekhov committed
823
824
825
				{
					if( (mask & etype) && !HaveGeometricData(CENTROID,etype))
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
826
						centroid_tag = CreateTag(centroid_name,DATA_REAL,etype,NONE,GetDimensions());
827
828
829
						if( HideMarker() )
						{
							MarkerType hm = HideMarker();
Kirill Terekhov's avatar
Kirill Terekhov committed
830
831
832
#if defined(USE_OMP)
#pragma omp parallel for
#endif
833
834
835
836
837
838
839
							for(integer k = 0; k < LastLocalID(etype); ++k) if( isValidElement(etype,k) )
							{
								HandleType h = ComposeHandle(etype,k);
								if( !GetMarker(h,hm) ) GetGeometricData(h,CENTROID,static_cast<Storage::real *>(MGetDenseLink(h,centroid_tag)));
							}
						}
						else
Kirill Terekhov's avatar
Kirill Terekhov committed
840
						{
841
842
843
844
845
846
847
848
#if defined(USE_OMP)
#pragma omp parallel for
#endif
							for(integer k = 0; k < LastLocalID(etype); ++k) if( isValidElement(etype,k) )
							{
								HandleType h = ComposeHandle(etype,k);
								GetGeometricData(h,CENTROID,static_cast<Storage::real *>(MGetDenseLink(h,centroid_tag)));
							}
Kirill Terekhov's avatar
Kirill Terekhov committed
849
						}
Kirill Terekhov's avatar
Kirill Terekhov committed
850
851
852
853
854
855
						ShowGeometricData(CENTROID,etype);
					}
				}
			}
			if( types == BARYCENTER )
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
856
				//std::cout << "BARYCENTER" << std::endl;
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
857
				for(ElementType etype = EDGE; etype <= CELL; etype = NextElementType(etype))
Kirill Terekhov's avatar
Kirill Terekhov committed
858
859
860
				{
					if( (mask & etype) && !HaveGeometricData(BARYCENTER,etype))
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
861
						barycenter_tag = CreateTag(barycenter_name,DATA_REAL,etype,NONE,GetDimensions());
862
863
864
						if( HideMarker() )
						{
							MarkerType hm = HideMarker();
Kirill Terekhov's avatar
Kirill Terekhov committed
865
866
867
#if defined(USE_OMP)
#pragma omp parallel for
#endif
868
869
870
871
872
873
874
							for(integer e = 0; e < LastLocalID(etype); ++e) if( isValidElement(etype,e) )
							{
								HandleType h = ComposeHandle(etype,e);
								if( !GetMarker(h,hm) ) GetGeometricData(h,BARYCENTER,static_cast<Storage::real *>(MGetDenseLink(h,barycenter_tag)));
							}
						}
						else
Kirill Terekhov's avatar
Kirill Terekhov committed
875
						{
876
877
878
879
880
881
882
883
#if defined(USE_OMP)
#pragma omp parallel for
#endif
							for(integer e = 0; e < LastLocalID(etype); ++e) if( isValidElement(etype,e) )
							{
								HandleType h = ComposeHandle(etype,e);
								GetGeometricData(h,BARYCENTER,static_cast<Storage::real *>(MGetDenseLink(h,barycenter_tag)));
							}
Kirill Terekhov's avatar
Kirill Terekhov committed
884
						}
Kirill Terekhov's avatar
Kirill Terekhov committed
885
886
887
888
889
890
						ShowGeometricData(BARYCENTER,etype);
					}
				}	
			}
			if( types == NORMAL )
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
891
				//std::cout << "NORMAL" << std::endl;
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
892
				for(ElementType etype = FACE; etype <= CELL; etype = NextElementType(etype))
Kirill Terekhov's avatar
Kirill Terekhov committed
893
				{
Kirill Terekhov's avatar
Kirill Terekhov committed
894
895
					if( (mask & etype) && !HaveGeometricData(NORMAL,etype))
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
896
						normal_tag = CreateTag(normal_name,DATA_REAL,etype,NONE,GetDimensions());
897
898
899
						if( HideMarker() )
						{
							MarkerType hm = HideMarker();
Kirill Terekhov's avatar
Kirill Terekhov committed
900
901
902
#if defined(USE_OMP)
#pragma omp parallel for
#endif
903
904
905
906
907
908
909
							for(integer e = 0; e < LastLocalID(etype); ++e) if( isValidElement(etype,e) )
							{
								HandleType h = ComposeHandle(etype,e);
								if( !GetMarker(h,hm) ) GetGeometricData(h,NORMAL,static_cast<Storage::real *>(MGetDenseLink(h,normal_tag)));
							}
						}
						else
Kirill Terekhov's avatar
Kirill Terekhov committed
910
						{
911
912
913
914
915
916
917
918
#if defined(USE_OMP)
#pragma omp parallel for
#endif
							for(integer e = 0; e < LastLocalID(etype); ++e) if( isValidElement(etype,e) )
							{
								HandleType h = ComposeHandle(etype,e);
								GetGeometricData(h,NORMAL,static_cast<Storage::real *>(MGetDenseLink(h,normal_tag)));
							}
Kirill Terekhov's avatar
Kirill Terekhov committed
919
						}
Kirill Terekhov's avatar
Kirill Terekhov committed
920
921
						ShowGeometricData(NORMAL,etype);
					}
Kirill Terekhov's avatar
Kirill Terekhov committed
922
				}
Kirill Terekhov's avatar
Kirill Terekhov committed
923
924
925
926
			}
		}
	}
	
Kirill Terekhov's avatar
Kirill Terekhov committed
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
	void Mesh::FacesOrientation(ElementArray<Face> & faces, MarkerType rev)
	{
		//can copy orientation-independent algorithm from
		//incident_matrix.hpp: incident_matrix::compute_measure
		//assume mdim is of size 3 at most
		if( !faces.empty() )
		{
			//real was = *ret/3.0;
			Face cur = faces[0];
			Mesh * mesh = faces.GetMeshLink();
			//firstly, have to figure out orientation of each face
			//mark all faces, so that we can perform adjacency retrival
			MarkerType mrk = mesh->CreatePrivateMarker();
			//MarkerType rev = mesh->CreatePrivateMarker(); //reverse orientation
			faces.SetPrivateMarker(mrk); //0-th face orientation is default
			cur->RemPrivateMarker(mrk);
			Node n1,n2; //to retrive edge
			bool reverse = false; //reverse orientation in considered face
			std::deque< orient_face > stack; //edge and first node and face for visiting
			ElementArray<Edge> edges = cur->getEdges();
			do
			{
				//figure out starting node order
				if( edges[0]->getBeg() == edges[1]->getBeg() ||
				    edges[0]->getBeg() == edges[1]->getEnd() )
				{
					n1 = edges[0]->getEnd();
					n2 = edges[0]->getBeg();
				}
				else
				{
					n1 = edges[0]->getBeg();
					n2 = edges[0]->getEnd();
				}
				//schedule unvisited adjacent faces
				for(unsigned j = 0; j < edges.size(); j++)
				{
					//schedule face adjacent to considered edge
					ElementArray<Face> adjacent = edges[j]->getFaces(mrk);
					assert(adjacent.size() <= 1);
					if( !adjacent.empty() )
					{
						adjacent.RemPrivateMarker(mrk);
						stack.push_back(orient_face(edges[j],reverse ? n2 : n1,adjacent[0]));
					}
					//update edge nodes
					n1 = n2; //current end is new begin
					//find new end
					if( n2 == edges[(j+1)%edges.size()]->getBeg() )
						n2 = edges[(j+1)%edges.size()]->getEnd();
						else
							n2 = edges[(j+1)%edges.size()]->getBeg();
							}
				if( stack.empty() ) break;
				//get entry from stack
				orient_face r = stack.front();
				//remove face from stack
				stack.pop_front();
				//retrive edges for new face
				edges = r.face->getEdges();
				reverse = false;
				//figure out starting node order
				if( edges[0]->getBeg() == edges[1]->getBeg() ||
				    edges[0]->getBeg() == edges[1]->getEnd() )
				{
					n1 = edges[0]->getEnd();
					n2 = edges[0]->getBeg();
				}
				else
				{
					n1 = edges[0]->getBeg();
					n2 = edges[0]->getEnd();
				}
				//find out common edge orientation
				for(unsigned j = 0; j < edges.size(); j++)
				{
					if( edges[j] == r.bridge ) //found the edge
					{
						//reverse ordering on this face
						if( r.first == n1 )
						{
							if( isPrivate(rev) )
								r.face->SetPrivateMarker(rev);
							else
								r.face->SetMarker(rev);
							reverse = true;
						}
						break;
					}
					//update edge nodes
					n1 = n2; //current end is new begin
					//find new end
					if( n2 == edges[(j+1)%edges.size()]->getBeg() )
						n2 = edges[(j+1)%edges.size()]->getEnd();
					else
						n2 = edges[(j+1)%edges.size()]->getBeg();
				}
			} while(true);
			faces.RemPrivateMarker(mrk);
			mesh->ReleasePrivateMarker(mrk);
			//faces.RemPrivateMarker(rev);
		}
	}
	
Kirill Terekhov's avatar
Kirill Terekhov committed
1031
	void Mesh::GetGeometricData(HandleType e, GeometricData type, Storage::real * ret)
Kirill Terekhov's avatar
Kirill Terekhov committed
1032
	{
Kirill Terekhov's avatar
Kirill Terekhov committed
1033
1034
		assert(e != InvalidHandle());
		assert(ret != NULL);
Kirill Terekhov's avatar
Kirill Terekhov committed
1035
1036
1037
1038
		assert(type == MEASURE ||
			   type == CENTROID ||
			   type == BARYCENTER ||
			   type == NORMAL);
Kirill Terekhov's avatar
Kirill Terekhov committed
1039
1040
1041
		ElementType etype = GetHandleElementType(e);
		integer edim = Element::GetGeometricDimension(GetGeometricType(e));
		integer mdim = GetDimensions();
Kirill Terekhov's avatar
Kirill Terekhov committed
1042
1043
1044
1045
1046
		switch(type)
		{
			case MEASURE:
			if( HaveGeometricData(MEASURE,etype) )
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
1047
				*ret = static_cast<Storage::real *>(MGetDenseLink(e,measure_tag))[0];
Kirill Terekhov's avatar
Kirill Terekhov committed
1048
1049
1050
1051
1052
1053
1054
1055
1056
				//~ if( isnan(*ret) || fabs(*ret) < 1e-15  ) throw -1;
			}
			else
			{
				switch(edim)
				{
					case 0: *ret = 0; break;
					case 1: //length of edge
					{
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
1057
						ElementArray<Node> nodes = Element(this,e)->getNodes();
Kirill Terekhov's avatar
Kirill Terekhov committed
1058
1059
						if( nodes.size() > 1 )
						{
Kirill Terekhov's avatar
Kirill Terekhov committed
1060
1061
1062
1063
							real c[3] = {0,0,0};
							real_array v0 = nodes[0].Coords();
							real_array v1 = nodes[1].Coords();
							vec_diff(v0.data(),v1.data(),c,mdim);
Kirill Terekhov's avatar
Kirill Terekhov committed
1064
1065
1066
							*ret = vec_len(c,mdim);
						}
						else *ret = 0;
Kirill Terekhov's avatar
Kirill Terekhov committed
1067
1068
1069
1070
1071
						//~ if( isnan(*ret) || fabs(*ret) < 1e-15  ) throw -1;
						break;
					}
					case 2: //area of face
					{
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
1072
						ElementArray<Node> nodes = Element(this,e)->getNodes();
Kirill Terekhov's avatar
Kirill Terekhov committed
1073
						if( nodes.size() > 2 )
Kirill Terekhov's avatar
Kirill Terekhov committed
1074
						{
Kirill Terekhov's avatar
Kirill Terekhov committed
1075
1076
							*ret = 0;
							real nt[3] = {0,0,0}, l1[3] = {0,0,0}, l2[3] = {0,0,0},n0[3] = {0,0,0}, ss;
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
							//real_array v0 = nodes[0].Coords();
							//real_array v1 = nodes[1].Coords();
							//real_array v2 = nodes[2].Coords();
							//vec_diff(v1,v0,l1,mdim);
							//vec_diff(v2,v0,l2,mdim);
							//vec_cross_product(l1,l2,n0);
							real_array v0 = nodes[0].Coords(), v1, v2;
							for(int i = 1; i < (int)nodes.size()-1; i++)
							{
								v1 = nodes[i].Coords();
								v2 = nodes[i+1].Coords();
								vec_diff(v1,v0,l1,mdim);
								vec_diff(v2,v0,l2,mdim);
								vec_cross_product(l1,l2,nt);
								for(int q = 0; q < 3; ++q)
									n0[q] += nt[q]*0.5;
							}
Kirill Terekhov's avatar
Kirill Terekhov committed
1094
							for(int i = 1; i < (int)nodes.size()-1; i++)
Kirill Terekhov's avatar
Kirill Terekhov committed
1095
							{
Kirill Terekhov's avatar
Kirill Terekhov committed
1096
1097
1098
1099
1100
1101
								v1 = nodes[i].Coords();
								v2 = nodes[i+1].Coords();
								vec_diff(v1,v0,l1,mdim);
								vec_diff(v2,v0,l2,mdim);
								vec_cross_product(l1,l2,nt);
								ss = vec_dot_product(n0,nt,3);
1102
								if( ss ) ss /= fabs(ss);
Kirill Terekhov's avatar
Kirill Terekhov committed
1103
								*ret += sqrt(vec_dot_product(nt,nt,3))*0.5*ss;
Kirill Terekhov's avatar
Kirill Terekhov committed
1104
							}
1105
							if( *ret != *ret ) std::cout << "area is nan" << std::endl;
Kirill Terekhov's avatar
Kirill Terekhov committed
1106
							*ret = fabs(*ret);
Kirill Terekhov's avatar
Kirill Terekhov committed
1107
						} else *ret = 0;
Kirill Terekhov's avatar
Kirill Terekhov committed
1108
1109
1110
1111
1112
						//~ if( isnan(*ret) || fabs(*ret) < 1e-15  ) throw -1;
						break;
					}
					case 3: //volume of cell
					{
1113
1114
						//bool print = false;
//redo:
Kirill Terekhov's avatar
Kirill Terekhov committed
1115
1116
						Cell me = Cell(this,e);
						ElementArray<Face> faces = me->getFaces();
1117
						bool ornt = true;//!HaveGeometricData(ORIENTATION,FACE);
Kirill Terekhov's avatar
Kirill Terekhov committed
1118
1119
						MarkerType rev = 0;
						if( ornt )
Kirill Terekhov's avatar
Kirill Terekhov committed
1120
						{
Kirill Terekhov's avatar
Kirill Terekhov committed
1121
1122
							rev = CreatePrivateMarker();
							FacesOrientation(faces,rev);
Kirill Terekhov's avatar
Kirill Terekhov committed
1123
						}
Kirill Terekhov's avatar
Kirill Terekhov committed
1124
1125
1126
						real vol = 0, a, at;
						real x[3] = {0,0,0}, n[3] = {0,0,0}, n0[3] = {0,0,0}, s, ss;
						real l1[3] = {0,0,0}, l2[3] = {0,0,0};
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
1127
1128
						real nt[3] = {0,0,0}, cx[3] = {0,0,0};
						me.Centroid(cx);
1129
						//if( print ) std::cout << "cx: " << cx[0] << " " << cx[1] << " " << cx[2] << std::endl;
Kirill Terekhov's avatar
Kirill Terekhov committed
1130
						for(unsigned j = 0; j < faces.size(); j++)
Kirill Terekhov's avatar
Kirill Terekhov committed
1131
						{
Kirill Terekhov's avatar
Kirill Terekhov committed
1132
1133
1134
1135
1136
1137
1138
1139
							//compute normal to face
							ElementArray<Node> nodes = faces[j].getNodes();
							if( ornt )
								s = faces[j].GetPrivateMarker(rev) ? -1.0 : 1.0;
							else
								s = faces[j].FaceOrientedOutside(me) ? 1.0 : -1.0;
							x[0] = x[1] = x[2] = 0;
							n[0] = n[1] = n[2] = 0;
1140
							n0[0] = n0[1] = n0[2] = 0;
Kirill Terekhov's avatar
Kirill Terekhov committed
1141
							a = 0;
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
							//real_array v0 = nodes[0].Coords();
							//real_array v1 = nodes[1].Coords();
							//real_array v2 = nodes[2].Coords();
							//vec_diff(v1,v0,l1,mdim);
							//vec_diff(v2,v0,l2,mdim);
							//vec_cross_product(l1,l2,n0);
							real_array v0 = nodes[0].Coords(), v1, v2;
							for(int i = 1; i < (int)nodes.size()-1; i++)
							{
								v1 = nodes[i].Coords();
								v2 = nodes[i+1].Coords();
								vec_diff(v1,v0,l1,mdim);
								vec_diff(v2,v0,l2,mdim);
								vec_cross_product(l1,l2,nt);
								//if( print ) std::cout << "nt: " << nt[0] << " " << nt[1] << " " << nt[2] << std::endl;
								for(int q = 0; q < 3; ++q)
									n0[q] += nt[q]*0.5;
							}
							//if( print ) std::cout << "n0: " << n0[0] << " " << n0[1] << " " << n0[2] << std::endl;
Kirill Terekhov's avatar
Kirill Terekhov committed
1161
							for(int k = 1; k < (int)nodes.size()-1; k++)
Kirill Terekhov's avatar
Kirill Terekhov committed
1162
							{
Kirill Terekhov's avatar
Kirill Terekhov committed
1163
1164
1165
1166
1167
1168
1169
								v1 = nodes[k+0].Coords();
								v2 = nodes[k+1].Coords();
								vec_diff(v1,v0,l1,mdim);
								vec_diff(v2,v0,l2,mdim);
								vec_cross_product(l1,l2,nt);
								for(int q = 0; q < 3; ++q) nt[q] *= 0.5;
								ss = vec_dot_product(n0,nt,3);
1170
								if( ss ) ss /= fabs(ss);
Kirill Terekhov's avatar
Kirill Terekhov committed
1171
								at = sqrt(vec_dot_product(nt,nt,3))*ss;
1172
								//if( print ) std::cout << "nt: " << nt[0] << " " << nt[1] << " " << nt[2] << " ss " << ss << " at " << at << std::endl;
Kirill Terekhov's avatar
Kirill Terekhov committed
1173
1174
1175
1176
1177
								//same as faces[j].Normal(n)
								for(int q = 0; q < 3; ++q)
									n[q] += nt[q];
								//same as faces[j].Centroid(x)
								for(int q = 0; q < 3; ++q)
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
1178
									x[q] += at*((v0[q]-cx[q])+(v1[q]-cx[q])+(v2[q]-cx[q]))/3.0;
Kirill Terekhov's avatar
Kirill Terekhov committed
1179
								a += at;
Kirill Terekhov's avatar
Kirill Terekhov committed
1180
							}
1181
1182
							//if( print ) std::cout << "n: " << n[0] << " " << n[1] << " " << n[2] << std::endl;
							//if( print ) std::cout << "x: " << x[0] << " " << x[1] << " " << x[2] << " a " << a << std::endl;
Kirill Terekhov's avatar
Kirill Terekhov committed
1183
1184
1185
							for(int q = 0; q < 3; ++q) x[q] /= a;
							vol += s*vec_dot_product(x,n,3);
						}
1186
						//if( print ) std::cout << "vol: " << vol << std::endl;
Kirill Terekhov's avatar
Kirill Terekhov committed
1187
1188
1189
						if( ornt )
						{
							if( vol < 0.0 ) vol = -vol;
Kirill Terekhov's avatar
Kirill Terekhov committed
1190
							faces.RemPrivateMarker(rev);
Kirill Terekhov's avatar
Kirill Terekhov committed
1191
							ReleasePrivateMarker(rev);
Kirill Terekhov's avatar
Kirill Terekhov committed
1192
						}
Kirill Terekhov's avatar
Kirill Terekhov committed
1193
						*ret = vol/3.0;
1194
1195
1196
1197
1198
1199
						//if( *ret < 0 || *ret != *ret ) 
						//{
						//	std::cout << "volume is " << *ret << std::endl;
						//	print = true;
						//	goto redo;
						//}
Kirill Terekhov's avatar
Kirill Terekhov committed
1200
1201
1202
1203
1204
1205
1206
						break;
					}
				}
			}
			//~ if( isnan(*ret) || fabs(*ret) < 1e-15  ) throw -1;
			break;
			case CENTROID:
Kirill Terekhov's avatar
Kirill Terekhov committed
1207
1208
1209
				if(etype == NODE )
					memcpy(ret,MGetDenseLink(e,CoordsTag()),sizeof(real)*mdim);
				else if(HaveGeometricData(CENTROID,etype))
Kirill Terekhov's avatar
Kirill Terekhov committed
1210
				{
Kirill Terekhov's avatar
Kirill Terekhov committed
1211
1212
1213
1214
1215
1216
1217
					memcpy(ret,MGetDenseLink(e,centroid_tag),sizeof(real)*mdim);
				}
				else
				{
					ElementArray<Node> nodes = Element(this,e).getNodes();
					memset(ret,0,sizeof(real)*mdim);
					for(unsigned k = 0; k < nodes.size(); ++k)
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
1218
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
1219
1220
						for(int q = 0; q < mdim; ++q)
							ret[q] += nodes[k].Coords()[q];
Kirill Terekhov's avatar
Fixes    
Kirill Terekhov committed
1221
					}
Kirill Terekhov's avatar
Kirill Terekhov committed
1222
1223
					for(int q = 0; q < mdim; ++q)
						ret[q] /= (real)nodes.size();
Kirill Terekhov's avatar
Kirill Terekhov committed
1224
1225
1226
				}
			break;
			case BARYCENTER:
Kirill Terekhov's avatar
Kirill Terekhov committed
1227
			if(etype == NODE )
Kirill Terekhov's avatar
Kirill Terekhov committed
1228
				memcpy(ret,MGetDenseLink(e,CoordsTag()),sizeof(real)*mdim);
Kirill Terekhov's avatar
Kirill Terekhov committed
1229
			else if(HaveGeometricData(BARYCENTER,etype))
Kirill Terekhov's avatar
Kirill Terekhov committed
1230
			{
Kirill Terekhov's avatar
Kirill Terekhov committed
1231
				memcpy(ret,MGetDenseLink(e,barycenter_tag),sizeof(real)*mdim);
Kirill Terekhov's avatar
Kirill Terekhov committed
1232
			}
Kirill Terekhov's avatar
Kirill Terekhov committed
1233
1234
1235
1236
1237
			else
			{
				memset(ret,0,sizeof(real)*mdim);
				if( edim == 1 )
				{
Kirill Terekhov's avatar
Kirill Terekhov committed
1238
					ElementArray<Node> n = Element(this,e)->getNodes();
Kirill Terekhov's avatar
Kirill Terekhov committed
1239
1240
					if( n.size() == 2 )
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
1241
1242
1243
1244
						real_array v0 = n[0].Coords();
						real_array v1 = n[1].Coords();
						for(integer j = 0; j < dim; j++)
							ret[j] = (v0[j] + v1[j])*0.5;
Kirill Terekhov's avatar
Kirill Terekhov committed
1245
1246
1247
					}
					else if( n.size() == 1 )
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
1248
1249
						real_array v0 = n[0].Coords();
						for(integer j = 0; j < dim; j++) ret[j] = v0[j];
Kirill Terekhov's avatar
Kirill Terekhov committed
1250
					}
Kirill Terekhov's avatar
Kirill Terekhov committed
1251
1252
1253
				}
				else if( edim == 2 )
				{
Kirill Terekhov's avatar
Kirill Terekhov committed
1254
					ElementArray<Node> nodes = Element(this,e)->getNodes();
Kirill Terekhov's avatar
Kirill Terekhov committed
1255
					if( nodes.size() > 2 )
Kirill Terekhov's avatar
Kirill Terekhov committed
1256
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
1257
1258
						*ret = 0;
						real nt[3] = {0,0,0}, l1[3] = {0,0,0}, l2[3] = {0,0,0};
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
1259
						real c[3] = {0,0,0}, n0[3] = {0,0,0}, ss, cx[3] = {0,0,0};
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
						//real_array v0 = nodes[0].Coords();
						//real_array v1 = nodes[1].Coords();
						//real_array v2 = nodes[2].Coords();
						//vec_diff(v1,v0,l1,mdim);
						//vec_diff(v2,v0,l2,mdim);
						//vec_cross_product(l1,l2,n0);
						real_array v0 = nodes[0].Coords(), v1, v2;
						for(int i = 1; i < (int)nodes.size()-1; i++)
						{
							v1 = nodes[i].Coords();
							v2 = nodes[i+1].Coords();
							vec_diff(v1,v0,l1,mdim);
							vec_diff(v2,v0,l2,mdim);
							vec_cross_product(l1,l2,nt);
							for(int q = 0; q < 3; ++q)
								n0[q] += nt[q]*0.5;
						}
Kirill Terekhov's avatar
Kirill Terekhov committed
1277
						real a = 0, at;
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
1278
						Element(this,e).Centroid(cx);
Kirill Terekhov's avatar
Kirill Terekhov committed
1279
						for(int i = 1; i < (int)nodes.size()-1; i++)
Kirill Terekhov's avatar
Kirill Terekhov committed
1280
						{
Kirill Terekhov's avatar
Kirill Terekhov committed
1281
1282
1283
1284
1285
1286
							real_array v1 = nodes[i].Coords();
							real_array v2 = nodes[i+1].Coords();
							vec_diff(v1,v0,l1,mdim);
							vec_diff(v2,v0,l2,mdim);
							vec_cross_product(l1,l2,nt);
							ss = vec_dot_product(n0,nt,3);
1287
							if( ss ) ss /= fabs(ss);
Kirill Terekhov's avatar
Kirill Terekhov committed
1288
1289
							at = sqrt(vec_dot_product(nt,nt,3))*0.5*ss;
							for(int q = 0; q < mdim; ++q)
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
1290
								c[q] += at*((v0[q]-cx[q])+(v1[q]-cx[q])+(v2[q]-cx[q]))/3.0;
Kirill Terekhov's avatar
Kirill Terekhov committed
1291
							a += at;
Kirill Terekhov's avatar
Kirill Terekhov committed
1292
						}
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
1293
						for(int q = 0; q < mdim; ++q) ret[q] = c[q]/a+cx[q];
Kirill Terekhov's avatar
Kirill Terekhov committed
1294
					}
Kirill Terekhov's avatar
Kirill Terekhov committed
1295
1296
1297
1298
1299
1300
					//std::cout << ret[0] << " " << ret[1] << " " << ret[2] << std::endl;
				}
				else if( edim == 3 )
				{
					Cell me = Cell(this,e);
					ElementArray<Face> faces = me->getFaces();
1301
					bool ornt = true;//!HaveGeometricData(ORIENTATION,FACE);
Kirill Terekhov's avatar
Kirill Terekhov committed
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
					MarkerType rev = 0;
					if( ornt )
					{
						rev = CreatePrivateMarker();
						FacesOrientation(faces,rev);
					}
					real vol = 0, a, at;
					real x[3] = {0,0,0}, nt[3] = {0,0,0}, s;
					real c[3] = {0,0,0}, n[3] = {0,0,0};
					real n0[3] = {0,0,0}, ss;
					real l1[3] = {0,0,0}, l2[3] = {0,0,0};
Kirill Terekhov's avatar
Updates    
Kirill Terekhov committed
1313
1314
					real cx[3] = {0,0,0};
					me.Centroid(cx);
Kirill Terekhov's avatar
Kirill Terekhov committed
1315
					for(unsigned j = 0; j < faces.size(); j++)
Kirill Terekhov's avatar
Kirill Terekhov committed
1316
					{
Kirill Terekhov's avatar
Kirill Terekhov committed
1317
1318
1319
1320
1321
1322
						//compute normal to face
						ElementArray<Node> nodes = faces[j].getNodes();
						if( ornt )
							s = faces[j].GetPrivateMarker(rev) ? -1.0 : 1.0;
						else
							s = faces[j].FaceOrientedOutside(me) ? 1.0