Merge pull request #46 from vincentcasseau/main

KCore: booleans in i8 and notifications
onera · Jun 17, 2024 · 1f8468c · 1f8468c
2 parents bf48b72 + a985c3f
commit 1f8468c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Cassiopee/Generator/Generator/close.cpp b/Cassiopee/Generator/Generator/close.cpp
@@ -41,7 +41,7 @@ PyObject* K_GENERATOR::closeMesh(PyObject* self, PyObject* args)
   E_Bool rmDegeneratedFaces = true;
   E_Bool rmDegeneratedElts = true;
 
-  if (!PYPARSETUPLE_(args, O_ R_ II_ IIII_,
+  if (!PYPARSETUPLE_(args, O_ R_ BB_ BBBB_,
                     &array, &eps, &rmOverlappingPts, &rmOrphanPts,
                     &rmDuplicatedFaces, &rmDuplicatedElts,
                     &rmDegeneratedFaces, &rmDegeneratedElts)) return NULL;
@@ -51,7 +51,7 @@ PyObject* K_GENERATOR::closeMesh(PyObject* self, PyObject* args)
   FldArrayF* f; FldArrayI* cn;
   char* varString; char* eltType;
 
-  E_Int res = K_ARRAY::getFromArray(array, varString, f, im, jm, km, cn, eltType);
+  E_Int res = K_ARRAY::getFromArray3(array, varString, f, im, jm, km, cn, eltType);
   E_Int posx = K_ARRAY::isCoordinateXPresent(varString);
   E_Int posy = K_ARRAY::isCoordinateYPresent(varString);
   E_Int posz = K_ARRAY::isCoordinateZPresent(varString);

diff --git a/Cassiopee/KCore/KCore/Array/Array.h b/Cassiopee/KCore/KCore/Array/Array.h
@@ -108,6 +108,10 @@
 #define TRRR_ "(fff)"
 #define TRRRR_ "(ffff)"
 #endif
+#define B_ "i"
+#define BB_ "ii"
+#define BBB_ "iii"
+#define BBBB_ "iiii"
 #define O_ "O"
 #define OO_ "OO"
 #define OOO_ "OOO"

diff --git a/Cassiopee/KCore/installLib.py b/Cassiopee/KCore/installLib.py
@@ -42,6 +42,7 @@
 shutil.copyfile("installPath.py", installPath+"/installPath.py")
 shutil.copyfile("installBase.py", installPath+"/installBase.py")
 shutil.copyfile("test/notify.py", installPath+"/notify.py")
+shutil.copyfile("test/notifyInstall.py", installPath+"/notifyInstall.py")
 
 # Ecrit les infos d'install
 Dist.writeBuildInfo()

diff --git a/Cassiopee/KCore/test/notifyInstall.py b/Cassiopee/KCore/test/notifyInstall.py
@@ -19,8 +19,7 @@ def parseArgs():
 if __name__ == '__main__':
   script_args = parseArgs()
   recipients = script_args.recipients.split(' ')
-  if not recipients[0]:
-    recipients = ['[email protected]', '[email protected]']
+  if not recipients[0]: recipients = []
 
   # Check install status
   log_entries = []