Skip to content

Commit 1f8468c

Browse files
Merge pull request #46 from vincentcasseau/main
KCore: booleans in i8 and notifications
2 parents bf48b72 + a985c3f commit 1f8468c

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

Cassiopee/Generator/Generator/close.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ PyObject* K_GENERATOR::closeMesh(PyObject* self, PyObject* args)
4141
E_Bool rmDegeneratedFaces = true;
4242
E_Bool rmDegeneratedElts = true;
4343

44-
if (!PYPARSETUPLE_(args, O_ R_ II_ IIII_,
44+
if (!PYPARSETUPLE_(args, O_ R_ BB_ BBBB_,
4545
&array, &eps, &rmOverlappingPts, &rmOrphanPts,
4646
&rmDuplicatedFaces, &rmDuplicatedElts,
4747
&rmDegeneratedFaces, &rmDegeneratedElts)) return NULL;
@@ -51,7 +51,7 @@ PyObject* K_GENERATOR::closeMesh(PyObject* self, PyObject* args)
5151
FldArrayF* f; FldArrayI* cn;
5252
char* varString; char* eltType;
5353

54-
E_Int res = K_ARRAY::getFromArray(array, varString, f, im, jm, km, cn, eltType);
54+
E_Int res = K_ARRAY::getFromArray3(array, varString, f, im, jm, km, cn, eltType);
5555
E_Int posx = K_ARRAY::isCoordinateXPresent(varString);
5656
E_Int posy = K_ARRAY::isCoordinateYPresent(varString);
5757
E_Int posz = K_ARRAY::isCoordinateZPresent(varString);

Cassiopee/KCore/KCore/Array/Array.h

+4
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@
108108
#define TRRR_ "(fff)"
109109
#define TRRRR_ "(ffff)"
110110
#endif
111+
#define B_ "i"
112+
#define BB_ "ii"
113+
#define BBB_ "iii"
114+
#define BBBB_ "iiii"
111115
#define O_ "O"
112116
#define OO_ "OO"
113117
#define OOO_ "OOO"

Cassiopee/KCore/installLib.py

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
shutil.copyfile("installPath.py", installPath+"/installPath.py")
4343
shutil.copyfile("installBase.py", installPath+"/installBase.py")
4444
shutil.copyfile("test/notify.py", installPath+"/notify.py")
45+
shutil.copyfile("test/notifyInstall.py", installPath+"/notifyInstall.py")
4546

4647
# Ecrit les infos d'install
4748
Dist.writeBuildInfo()

Cassiopee/KCore/test/notifyInstall.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ def parseArgs():
1919
if __name__ == '__main__':
2020
script_args = parseArgs()
2121
recipients = script_args.recipients.split(' ')
22-
if not recipients[0]:
23-
22+
if not recipients[0]: recipients = []
2423

2524
# Check install status
2625
log_entries = []

0 commit comments

Comments
 (0)