Skip to content

Commit 05d219b

Browse files
benoit128benoit128
committed
CPlot: minor
1 parent c9225b0 commit 05d219b

17 files changed

+69
-76
lines changed

‎Cassiopee/CPlot/CPlot/Display/createDLSIsoSolidZone.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@
3737
void DataDL::createGPUSIsoSolidZone(StructZone* zonep, E_Int zone, E_Int nofield)
3838
{
3939
E_Int stepi, stepj, stepk;
40-
float offb;
40+
float offb = 0.;
4141
stepi = 1; stepj = 1; stepk = 1;
42-
offb = 0.;
4342
ZoneImplDL* zImpl = static_cast<ZoneImplDL*>(zonep->ptr_impl);
4443
zImpl->_DLiso = glGenLists(1);
4544
glNewList(zImpl->_DLiso, GL_COMPILE);
@@ -64,9 +63,7 @@ void DataDL::createGPUSIsoSolidZone(StructZone* zonep, E_Int zone,
6463
E_Int nofield1, E_Int nofield2, E_Int nofield3)
6564
{
6665
E_Int stepi, stepj, stepk;
67-
float offb;
6866
stepi = 1; stepj = 1; stepk = 1;
69-
offb = 0.;
7067
ZoneImplDL* zImpl = static_cast<ZoneImplDL*>(zonep->ptr_impl);
7168

7269
zImpl->_DLiso = glGenLists(1);

‎Cassiopee/CPlot/CPlot/Display/createDLUMeshZone.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
//=============================================================================
2727
void DataDL::createGPUUMeshZone(UnstructZone* zonep, E_Int zone, E_Int zonet)
2828
{
29-
if (zonep->_is_high_order == true)
29+
if (zonep->_isHighOrder == true)
3030
{
3131
createGPUUMeshZoneHO(zonep, zone, zonet);
3232
return;

‎Cassiopee/CPlot/CPlot/Display/displayActivePoint.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -384,49 +384,49 @@ void Data::displayActivePoint()
384384
case 0:
385385
sprintf(msg,"%s (NODE)", zone->zoneName); break;
386386
case 1:
387-
if (zu->_is_high_order && eltSize == 3)
387+
if (zu->_isHighOrder && eltSize == 3)
388388
sprintf(msg,"%s (BAR_3)", zone->zoneName);
389389
else
390390
sprintf(msg,"%s (BAR)", zone->zoneName);
391391
break;
392392
case 2:
393-
if (zu->_is_high_order && eltSize == 6)
393+
if (zu->_isHighOrder && eltSize == 6)
394394
sprintf(msg,"%s (TRI_6)", zone->zoneName);
395395
else
396396
sprintf(msg,"%s (TRI)", zone->zoneName);
397397
break;
398398
case 3:
399-
if (zu->_is_high_order && eltSize == 8)
399+
if (zu->_isHighOrder && eltSize == 8)
400400
sprintf(msg,"%s (QUAD_8)", zone->zoneName);
401-
else if (zu->_is_high_order && eltSize == 9)
401+
else if (zu->_isHighOrder && eltSize == 9)
402402
sprintf(msg,"%s (QUAD_9)", zone->zoneName);
403403
else
404404
sprintf(msg,"%s (QUAD)", zone->zoneName);
405405
break;
406406
case 4:
407-
if (zu->_is_high_order && eltSize == 10)
407+
if (zu->_isHighOrder && eltSize == 10)
408408
sprintf(msg,"%s (TETRA_10)", zone->zoneName);
409409
else
410410
sprintf(msg,"%s (TETRA)", zone->zoneName);
411411
break;
412412
case 5:
413-
if (zu->_is_high_order && eltSize == 15)
413+
if (zu->_isHighOrder && eltSize == 15)
414414
sprintf(msg,"%s (PENTA_15)", zone->zoneName);
415-
else if (zu->_is_high_order && eltSize == 18)
415+
else if (zu->_isHighOrder && eltSize == 18)
416416
sprintf(msg,"%s (PENTA_18)", zone->zoneName);
417417
else
418418
sprintf(msg,"%s (PENTA)", zone->zoneName);
419419
break;
420420
case 6:
421-
if (zu->_is_high_order && eltSize == 14)
421+
if (zu->_isHighOrder && eltSize == 14)
422422
sprintf(msg,"%s (PYRA_14)", zone->zoneName);
423423
else
424424
sprintf(msg,"%s (PYRA)", zone->zoneName);
425425
break;
426426
case 7:
427-
if (zu->_is_high_order && eltSize == 20)
427+
if (zu->_isHighOrder && eltSize == 20)
428428
sprintf(msg,"%s (HEXA_20)", zone->zoneName);
429-
else if (zu->_is_high_order && eltSize == 27)
429+
else if (zu->_isHighOrder && eltSize == 27)
430430
sprintf(msg,"%s (HEXA_27)", zone->zoneName);
431431
else
432432
sprintf(msg,"%s (HEXA)", zone->zoneName);
@@ -468,49 +468,49 @@ void Data::displayActivePoint()
468468
case 0:
469469
sprintf(msg,"%s (NODE)", zone->zoneName); break;
470470
case 1:
471-
if (zu->_is_high_order && eltSize == 3)
471+
if (zu->_isHighOrder && eltSize == 3)
472472
sprintf(msg,"%s (BAR_3)", zone->zoneName);
473473
else
474474
sprintf(msg,"%s (BAR)", zone->zoneName);
475475
break;
476476
case 2:
477-
if (zu->_is_high_order && eltSize == 6)
477+
if (zu->_isHighOrder && eltSize == 6)
478478
sprintf(msg,"%s (TRI_6)", zone->zoneName);
479479
else
480480
sprintf(msg,"%s (TRI)", zone->zoneName);
481481
break;
482482
case 3:
483-
if (zu->_is_high_order && eltSize == 8)
483+
if (zu->_isHighOrder && eltSize == 8)
484484
sprintf(msg,"%s (QUAD_8)", zone->zoneName);
485-
else if (zu->_is_high_order && eltSize == 9)
485+
else if (zu->_isHighOrder && eltSize == 9)
486486
sprintf(msg,"%s (QUAD_9)", zone->zoneName);
487487
else
488488
sprintf(msg,"%s (QUAD)", zone->zoneName);
489489
break;
490490
case 4:
491-
if (zu->_is_high_order && eltSize == 10)
491+
if (zu->_isHighOrder && eltSize == 10)
492492
sprintf(msg,"%s (TETRA_10)", zone->zoneName);
493493
else
494494
sprintf(msg,"%s (TETRA)", zone->zoneName);
495495
break;
496496
case 5:
497-
if (zu->_is_high_order && eltSize == 15)
497+
if (zu->_isHighOrder && eltSize == 15)
498498
sprintf(msg,"%s (PENTA_15)", zone->zoneName);
499-
else if (zu->_is_high_order && eltSize == 18)
499+
else if (zu->_isHighOrder && eltSize == 18)
500500
sprintf(msg,"%s (PENTA_18)", zone->zoneName);
501501
else
502502
sprintf(msg,"%s (PENTA)", zone->zoneName);
503503
break;
504504
case 6:
505-
if (zu->_is_high_order && eltSize == 14)
505+
if (zu->_isHighOrder && eltSize == 14)
506506
sprintf(msg,"%s (PYRA_14)", zone->zoneName);
507507
else
508508
sprintf(msg,"%s (PYRA)", zone->zoneName);
509509
break;
510510
case 7:
511-
if (zu->_is_high_order && eltSize == 20)
511+
if (zu->_isHighOrder && eltSize == 20)
512512
sprintf(msg,"%s (HEXA_20)", zone->zoneName);
513-
else if (zu->_is_high_order && eltSize == 27)
513+
else if (zu->_isHighOrder && eltSize == 27)
514514
sprintf(msg,"%s (HEXA_27)", zone->zoneName);
515515
else
516516
sprintf(msg,"%s (HEXA)", zone->zoneName);

‎Cassiopee/CPlot/CPlot/Display/displayText.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -648,64 +648,64 @@ void Data::displayInfo()
648648
z->zoneName, zu->npts);
649649
break;
650650
case 1:
651-
if (zu->_is_high_order && eltSize == 3)
651+
if (zu->_isHighOrder && eltSize == 3)
652652
sprintf(temp,"@1%s@0 (BAR_3): " SF_D_ " pts, " SF_D_ " elts",
653653
z->zoneName, zu->npts, zu->ne);
654654
else
655655
sprintf(temp,"@1%s@0 (BAR): " SF_D_ " pts, " SF_D_ " elts",
656656
z->zoneName, zu->npts, zu->ne);
657657
break;
658658
case 2:
659-
if (zu->_is_high_order && eltSize == 6)
659+
if (zu->_isHighOrder && eltSize == 6)
660660
sprintf(temp,"@1%s@0 (TRI_6): " SF_D_ " pts, " SF_D_ " elts",
661661
z->zoneName, zu->npts, zu->ne);
662662
else
663663
sprintf(temp,"@1%s@0 (TRI): " SF_D_ " pts, " SF_D_ " elts",
664664
z->zoneName, zu->npts, zu->ne);
665665
break;
666666
case 3:
667-
if (zu->_is_high_order && eltSize == 8)
667+
if (zu->_isHighOrder && eltSize == 8)
668668
sprintf(temp,"@1%s@0 (QUAD_8): " SF_D_ " pts, " SF_D_ " elts",
669669
z->zoneName, zu->npts, zu->ne);
670-
else if (zu->_is_high_order && eltSize == 9)
670+
else if (zu->_isHighOrder && eltSize == 9)
671671
sprintf(temp,"@1%s@0 (QUAD_9): " SF_D_ " pts, " SF_D_ " elts",
672672
z->zoneName, zu->npts, zu->ne);
673673
else
674674
sprintf(temp,"@1%s@0 (QUAD): " SF_D_ " pts, " SF_D_ " elts",
675675
z->zoneName, zu->npts, zu->ne);
676676
break;
677677
case 4:
678-
if (zu->_is_high_order && eltSize == 10)
678+
if (zu->_isHighOrder && eltSize == 10)
679679
sprintf(temp,"@1%s@0 (TETRA_10): " SF_D_ " pts, " SF_D_ " elts",
680680
z->zoneName, zu->npts, zu->ne);
681681
else
682682
sprintf(temp,"@1%s@0 (TETRA): " SF_D_ " pts, " SF_D_ " elts",
683683
z->zoneName, zu->npts, zu->ne);
684684
break;
685685
case 5:
686-
if (zu->_is_high_order && eltSize == 15)
686+
if (zu->_isHighOrder && eltSize == 15)
687687
sprintf(temp,"@1%s@0 (PENTA_15): " SF_D_ " pts, " SF_D_ " elts",
688688
z->zoneName, zu->npts, zu->ne);
689-
else if (zu->_is_high_order && eltSize == 18)
689+
else if (zu->_isHighOrder && eltSize == 18)
690690
sprintf(temp,"@1%s@0 (PENTA_18): " SF_D_ " pts, " SF_D_ " elts",
691691
z->zoneName, zu->npts, zu->ne);
692692
else
693693
sprintf(temp,"@1%s@0 (PENTA): " SF_D_ " pts, " SF_D_ " elts",
694694
z->zoneName, zu->npts, zu->ne);
695695
break;
696696
case 6:
697-
if (zu->_is_high_order && eltSize == 14)
697+
if (zu->_isHighOrder && eltSize == 14)
698698
sprintf(temp,"@1%s@0 (PYRA_14): " SF_D_ " pts, " SF_D_ " elts",
699699
z->zoneName, zu->npts, zu->ne);
700700
else
701701
sprintf(temp,"@1%s@0 (PYRA): " SF_D_ " pts, " SF_D_ " elts",
702702
z->zoneName, zu->npts, zu->ne);
703703
break;
704704
case 7:
705-
if (zu->_is_high_order && eltSize == 20)
705+
if (zu->_isHighOrder && eltSize == 20)
706706
sprintf(temp,"@1%s@0 (HEXA_20): " SF_D_ " pts, " SF_D_ " elts",
707707
z->zoneName, zu->npts, zu->ne);
708-
else if (zu->_is_high_order && eltSize == 27)
708+
else if (zu->_isHighOrder && eltSize == 27)
709709
sprintf(temp,"@1%s@0 (HEXA_27): " SF_D_ " pts, " SF_D_ " elts",
710710
z->zoneName, zu->npts, zu->ne);
711711
else

‎Cassiopee/CPlot/CPlot/Display/displayUMeshZone.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
//=============================================================================
5454
void Data::displayUMeshZone(UnstructZone* zonep, E_Int zone, E_Int zonet)
5555
{
56-
if (zonep->_is_high_order == true)
56+
if (zonep->_isHighOrder == true)
5757
{
5858
displayUMeshZone_ho(zonep, zone, zonet);
5959
return;

‎Cassiopee/CPlot/CPlot/Display/displayUMeshZone.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
double* y = zonep->y;
2727
double* z = zonep->z;
2828

29-
for (size_t nc = 0; nc < zonep->connect.size(); nc++) {
29+
for (size_t nc = 0; nc < zonep->connect.size(); nc++) { // ME
3030

3131
E_Int eltType = zonep->eltType[nc];
3232
E_Int* connect = zonep->connect[nc];

‎Cassiopee/CPlot/CPlot/Display/displayUSolid.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void DataDL::displayUSolid()
107107
if (ptrState->simplifyOnDrag == 1 && ptrState->ondrag == 1) displayUBBZone(zonep);
108108
else
109109
{
110-
if (zonep->_is_high_order == false)
110+
if (zonep->_isHighOrder == false)
111111
{
112112
if (zoneImpl->_DLsolid != 0) renderGPUUSolidZone(zonep, zone, zonet);
113113
else displayUSolidZone(zonep, zone, zonet); // Direct

‎Cassiopee/CPlot/CPlot/Display/displayUSolidZone.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
float* surfy = surfx + np;
214214
float* surfz = surfy + np;
215215

216-
glBegin(GL_QUADS);
216+
glBegin(GL_QUADS);
217217

218218
if (zonep->blank == 0)
219219
{

‎Cassiopee/CPlot/CPlot/Display/renderDLUMeshZone.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void DataDL::renderGPUUMeshZone(UnstructZone* zonep, E_Int zone, E_Int zonet)
113113
#include "meshStyles.h"
114114
#include "selection.h"
115115

116-
if (zonep->_is_high_order == true)
116+
if (zonep->_isHighOrder == true)
117117
{
118118
int ishader = 3;
119119
this->_shaders.set_tesselation(ishader);

‎Cassiopee/CPlot/CPlot/Tk.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,21 +277,22 @@ def buildCPlotArrays(a, topTree=[]):
277277

278278
ap = Internal.copyRef(a)
279279

280-
# Oneovern for structured grids
280+
# for structured grids, do ONEOVERN on zones
281281
if __ONEOVERN__ > 1:
282282
for z in Internal.getZones(ap):
283283
if Internal.getZoneType(z) == 1:
284284
T._oneovern(z, (__ONEOVERN__,__ONEOVERN__,__ONEOVERN__))
285285

286-
# Transmet les maillages contenant les borders elts pour les zones volumiques
286+
# for unstructured, use exteriorFaces or exteriorElts on zones
287287
if __ONEOVERN__ > 0:
288288
for z in Internal.getZones(ap):
289289
dimz = Internal.getZoneDim(z)
290290
if dimz[0] == 'Unstructured' and dimz[4] == 3:
291-
if dimz[3] == "NGON":
292-
P._exteriorFaces(z)
293-
else:
291+
if dimz[3] == "NGON": P._exteriorFaces(z)
292+
else:
294293
P._exteriorElts(z)
294+
#if ',' not in dimz[3]: P._exteriorFaces(z)
295+
#else: P._exteriorElts(z)
295296

296297
if __FIELD__ == '__all__':
297298
arrays = C.getAllFields(ap, 'nodes', api=3)

0 commit comments

Comments
 (0)