Skip to content

Commit 17033ae

Browse files
rqueyrquey
committed
Fix -morpho tesr
Fixed transfer of cell ids and oris from (input) tesr to (output) tess.
1 parent dbf41ec commit 17033ae

File tree

17 files changed

+54
-20
lines changed

17 files changed

+54
-20
lines changed

‎VERSIONS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
New in 4.8.2-7 (22 Mar 2024):
1+
New in 4.8.2-8 (25 Mar 2024):
22
- module -T: added -transform "cut(cube)", improved -transform "cut(cubei)",
3-
made minor improvements.
3+
made minor fixes and improvements.
44
- module -M: made minor improvements.
55

66
New in 4.8.1 (02 Feb 2024):

‎doc/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import sphinx_rtd_theme
1212

1313
project = u'Neper'
14-
version = u'4.8.2-7'
15-
release = u'4.8.2-7'
14+
version = u'4.8.2-8'
15+
release = u'4.8.2-8'
1616
author = u'Romain Quey'
1717
copyright = u'Romain Quey'
1818
language = 'en'

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(POLICY CMP0077)
77
cmake_policy(SET CMP0077 NEW)
88
endif()
99

10-
set(NEPER_VERSION \"4.8.2-7\")
10+
set(NEPER_VERSION \"4.8.2-8\")
1111
project(neper)
1212

1313
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8.1)

‎src/neper_t/net_transform/net_transform_tess/net_transform_tess_cut/net_transform_tess_cut1.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ net_transform_tess_cut (char *expr, struct TESS Dom, struct TESS *pTess)
5151

5252
net_transform_tess_cut_clean (Prim, PrimQty, cutcells, cutcellqty,
5353
mirrorseeds, mirrorseedprims, mirrorseedqty,
54-
pTess);
54+
pTess, intseed_oldseed, &intseedqty);
55+
5556
// finalizing
5657

5758
net_transform_tess_cut_post (TessGen, intseed_oldseed, intseedqty, pTess);

‎src/neper_t/net_transform/net_transform_tess/net_transform_tess_cut/net_transform_tess_cut2.c‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ void
126126
net_transform_tess_cut_clean (struct PRIM *Prim, int PrimQty, int *cutcells,
127127
int cutcellqty, int *mirrorseeds,
128128
int *mirrorseedprims, int mirrorseedqty,
129-
struct TESS *pTess)
129+
struct TESS *pTess,
130+
int *intseed_oldseed, int *pintseedqty)
130131
{
131132
int i, j;
132133
int *seeds = NULL, seedqty;
@@ -149,6 +150,13 @@ net_transform_tess_cut_clean (struct PRIM *Prim, int PrimQty, int *cutcells,
149150

150151
int domfaceqty_old = (*pTess).DomFaceQty;
151152

153+
for (i = 1; i <= (*pTess).PolyQty; i++)
154+
if ((*pTess).PolyState[i] == -1)
155+
{
156+
ut_array_1d_int_memcpy (intseed_oldseed + i + 1, (*pintseedqty) - i, intseed_oldseed + i);
157+
(*pintseedqty)--;
158+
}
159+
152160
neut_tess_compress (pTess);
153161

154162
ut_array_1d_int_addval (newdomfaces, PrimQty,
@@ -176,7 +184,7 @@ net_transform_tess_cut_post (struct TESS TessGen, int *intseed_oldseed,
176184
ut_string_string (TessGen.CellCrySym, &(*pTess).CellCrySym);
177185

178186
// CellId
179-
if ((*pTess).CellQty && TessGen.CellId)
187+
if ((*pTess).CellQty && !TessGen.CellId && intseedqty > 0)
180188
{
181189
oldseed_max = ut_array_1d_int_max (intseed_oldseed + 1, intseedqty);
182190

‎src/neper_t/net_transform/net_transform_tess/net_transform_tess_cut/net_transform_tess_cut_.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ extern void net_transform_tess_cut_clean (struct PRIM *Prim, int PrimQty,
3232
int *cutcells, int cutcellqty, int
3333
*mirrorseeds, int *mirrorseedprims,
3434
int mirrorseedqty, struct TESS
35-
*pTess);
35+
*pTess,
36+
int *intseed_oldseed, int *pintseedqty);
3637

3738
extern void net_transform_tess_cut_post (struct TESS TessGen,
3839
int *intseed_oldseed, int intseedqty,

‎tests/T/domain_rotate2/ref.tess‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
1 1.000000000000 0.000000000000 0.000000000000 0
2222
2 1.000000000000 1.000000000000 0.000000000000 0
2323
3 0.000000000000 1.000000000000 0.000000000000 0
24-
4 -0.000000000000 0.658050611345 -0.000000000000 0
25-
5 0.935716889234 -0.000000000000 -0.000000000000 0
24+
4 -0.000000000000 0.658050611345 0.000000000000 0
25+
5 0.935716889234 0.000000000000 -0.000000000000 0
2626
6 0.000000000000 0.000000000000 0.000000000000 0
2727
**edge
2828
7
@@ -37,11 +37,11 @@
3737
2
3838
1 5 3 2 1 5 4
3939
5 -4 -2 -3 5 -1
40-
-0.000000000000 -0.000000000000 -0.000000000000 -1.000000000000
40+
-0.000000000000 -0.000000000000 0.000000000000 -1.000000000000
4141
0 -1 0.000000000000 0.000000000000 0.000000000000
4242
2 3 6 4 5
4343
3 -6 -5 -7
44-
-0.000000000000 -0.000000000000 -0.000000000000 -1.000000000000
44+
-0.000000000000 -0.000000000000 0.000000000000 -1.000000000000
4545
0 -1 0.000000000000 0.000000000000 0.000000000000
4646
**domain
4747
*general

‎tests/T/morphooptistop_time/ref.tess‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*crysym
99
triclinic
1010
*seed
11-
1 0.468640582331 0.292014848850 -0.096218778925 0.717402135053
12-
2 0.459433795178 0.227372628370 0.634139726582 0.498527167308
11+
1 0.459410633066 0.227398920258 -0.097023700321 0.717973441777
12+
2 0.459409303364 0.227371850480 0.713534577720 0.392823573214
1313
*ori
1414
rodrigues:active
1515
-2.444015198417 0.618305125773 2.829029762200
@@ -20,10 +20,10 @@
2020
2 1.000000000000 0.000000000000 0.000000000000 0
2121
3 1.000000000000 1.000000000000 0.000000000000 0
2222
4 0.000000000000 1.000000000000 0.000000000000 0
23-
5 -0.000000000000 -0.000000000000 0.422321831349 0
24-
6 -0.000000000000 1.000000000000 0.510829351960 0
25-
7 1.000000000000 1.000000000000 0.523435198382 0
26-
8 1.000000000000 -0.000000000000 0.434927677771 0
23+
5 -0.000000000000 -0.000000000000 0.531041375817 0
24+
6 -0.000000000000 1.000000000000 0.531074772278 0
25+
7 1.000000000000 1.000000000000 0.531076412755 0
26+
8 1.000000000000 -0.000000000000 0.531043016294 0
2727
9 0.000000000000 0.000000000000 1.000000000000 0
2828
10 0.000000000000 1.000000000000 1.000000000000 0
2929
11 1.000000000000 1.000000000000 1.000000000000 0
@@ -74,7 +74,7 @@
7474
0 0 0.000000000000 0.000000000000 0.000000000000
7575
6 4 5 6 7 8
7676
4 3 12 7 10
77-
-0.420644179930 0.012555770355 0.088155929108 -0.996027552226
77+
-0.531041375520 0.000001640477 0.000033396461 -0.999999999441
7878
0 0 0.000000000000 0.000000000000 0.000000000000
7979
7 4 9 10 6 5
8080
4 13 14 -3 15

‎tests/T/transform_cut_cube/ref.tess‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
3 standard
66
**cell
77
84
8+
*id
9+
2 3 4 5 6 7 8 9 11 12 13 14 16 17 18 19 20 22 24 25 26 27 28 29 30 31
10+
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 0 65 0
11+
1 -1 1 1 -1 1 1 1 1 0 990972560 22488 682 683 341 676 527 684 185 64 0 64
12+
0 523 509 535 537 277 281 529 202 520 521 522
813
*crysym
914
triclinic
1015
*seed

‎tests/T/transform_cut_cylinder/ref.tess‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
3 standard
66
**cell
77
10
8+
*id
9+
2 5 12410 0 0 0 12666 0 0 0
810
*crysym
911
triclinic
1012
*seed

0 commit comments

Comments
 (0)