From b330aae4eee8a5a7437e16d05f9edaa501589c9b Mon Sep 17 00:00:00 2001 From: abuhsing Date: Tue, 25 Jun 2013 13:53:19 +0000 Subject: [PATCH] Dernieres options de compilation --- adm_local/unix/config_files/Makefile.am | 1 + .../unix/config_files/ac_python_devel.m4 | 325 ++++++++++++++++++ doc/Makefile.am | 2 +- salome_adm/unix/SALOMEconfig.h.in | 2 +- src/TEST_CPP/Makefile.am | 30 +- src/TEST_CPP/ModelTest.cxx | 6 +- src/TEST_CPP/test_hexa1.cxx | 87 +++-- src/TEST_PY/test_unit/test_cross.py | 7 +- 8 files changed, 412 insertions(+), 48 deletions(-) create mode 100755 adm_local/unix/config_files/ac_python_devel.m4 diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index a2dfe5e..8bdb11d 100755 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -20,4 +20,5 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_admlocalm4_DATA = \ check_sphinx.m4 \ + ac_python_devel.m4 \ check_HEXABLOCK.m4 diff --git a/adm_local/unix/config_files/ac_python_devel.m4 b/adm_local/unix/config_files/ac_python_devel.m4 new file mode 100755 index 0000000..d08b576 --- /dev/null +++ b/adm_local/unix/config_files/ac_python_devel.m4 @@ -0,0 +1,325 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_python_devel.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_DEVEL([version]) +# +# DESCRIPTION +# +# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it +# in your configure.ac. +# +# This macro checks for Python and tries to get the include path to +# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) +# output variables. It also exports $(PYTHON_EXTRA_LIBS) and +# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. +# +# You can search for some particular version of Python by passing a +# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please +# note that you *have* to pass also an operator along with the version to +# match, and pay special attention to the single quotes surrounding the +# version number. Don't use "PYTHON_VERSION" for this: that environment +# variable is declared as precious and thus reserved for the end-user. +# +# This macro should work for all versions of Python >= 2.1.0. As an end +# user, you can disable the check for the python version by setting the +# PYTHON_NOVERSIONCHECK environment variable to something else than the +# empty string. +# +# If you need to use this macro for an older Python version, please +# contact the authors. We're always open for feedback. +# +# LICENSE +# +# Copyright (c) 2009 Sebastian Huber +# Copyright (c) 2009 Alan W. Irwin +# Copyright (c) 2009 Rafael Laboissiere +# Copyright (c) 2009 Andrew Collier +# Copyright (c) 2009 Matteo Settenvini +# Copyright (c) 2009 Horst Knorr +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_PYTHON_DEVEL],[ + # + # Allow the use of a (user set) custom python version + # + AC_ARG_VAR([PYTHON_VERSION],[The installed Python + version to use, for example '2.3'. This string + will be appended to the Python interpreter + canonical name.]) + + AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) + if test -z "$PYTHON"; then + AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) + PYTHON_VERSION="" + fi + + # + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver >= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) + AC_MSG_FAILURE([ +This version of the AC@&t@_PYTHON_DEVEL macro +doesn't work properly with versions of Python before +2.1.0. You may need to re-run configure, setting the +variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, +PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. +Moreover, to disable this check, set PYTHON_NOVERSIONCHECK +to something else than an empty string. +]) + else + AC_MSG_RESULT([skip at user request]) + fi + else + AC_MSG_RESULT([yes]) + fi + + # + # if the macro parameter ``version'' is set, honour it + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver $1)"` + if test "$ac_supports_python_ver" = "True"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([this package requires Python $1. +If you have it installed, but it isn't the default Python +interpreter in your system path, please pass the PYTHON_VERSION +variable to configure. See ``configure --help'' for reference. +]) + PYTHON_VERSION="" + fi + fi + + # + # Check if you have distutils, else fail + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + if test -z "$ac_distutils_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot import Python module "distutils". +Please check your Python installation. The error was: +$ac_distutils_result]) + PYTHON_VERSION="" + fi + + # + # Check for Python include path + # + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_CPPFLAGS"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc ());"` + if test -n "${python_path}"; then + python_path="-I$python_path" + fi + PYTHON_CPPFLAGS=$python_path + fi + AC_MSG_RESULT([$PYTHON_CPPFLAGS]) + AC_SUBST([PYTHON_CPPFLAGS]) + + # + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) + if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<]], + [[Py_Initialize();]]) + ],[pythonexists=yes],[pythonexists=no]) + AC_LANG_POP([C]) + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" + + AC_MSG_RESULT([$pythonexists]) + + if test ! "x$pythonexists" = "xyes"; then + AC_MSG_FAILURE([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, + via the LDFLAGS environment variable. + Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" + ============================================================================ + ERROR! + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. + ============================================================================ + ]) + PYTHON_VERSION="" + fi + + # + # all done! + # +]) +AC_DEFUN([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) diff --git a/doc/Makefile.am b/doc/Makefile.am index f06c6c8..16c0241 100755 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -173,7 +173,7 @@ RSTFILES= \ -EXTRA_DIST+= $(RSTFILES) _static cas_test_python pyplots test_doc +EXTRA_DIST+= $(RSTFILES) _static cas_test_python install-data-local: $(INSTALL) -d $(DESTDIR)$(hexablockdocdir) diff --git a/salome_adm/unix/SALOMEconfig.h.in b/salome_adm/unix/SALOMEconfig.h.in index 5df9104..8db6100 100755 --- a/salome_adm/unix/SALOMEconfig.h.in +++ b/salome_adm/unix/SALOMEconfig.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/src/TEST_CPP/Makefile.am b/src/TEST_CPP/Makefile.am index bbff79a..811504c 100755 --- a/src/TEST_CPP/Makefile.am +++ b/src/TEST_CPP/Makefile.am @@ -49,7 +49,7 @@ COMMON_CPPFLAGS = \ # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS =\ @CPPUNIT_LIBS@ \ - $(RPATH)/HEXABLOCK/libHEXABLOCKimpl.la + $(RPATH)/HEXABLOCK/libHEXABLOCKEngine.la # =============================================================== # Libraries targets @@ -77,7 +77,7 @@ Test_HEXABLOCK_SOURCES = Test_HEXABLOCK.cxx Test_HEXABLOCK_CPPFLAGS = $(COMMON_CPPFLAGS) Test_HEXABLOCK_LDADD = \ libHEXABLOCKTest.la \ - ../HEXABLOCK/libHEXABLOCKimpl.la \ + ../HEXABLOCK/libHEXABLOCKEngine.la \ $(COMMON_LIBS) UNIT_TEST_PROG = ./Test_HEXABLOCK @@ -107,63 +107,63 @@ clean-local: # test_cartesi1_CPPFLAGS = $(COMMON_CPPFLAGS) # test_cartesi1_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # # test_clone_SOURCES = test_clone.cpp # test_clone_CPPFLAGS = $(COMMON_CPPFLAGS) # test_clone_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # # test_cyl_SOURCES = test_cyl.cpp # test_cyl_CPPFLAGS = $(COMMON_CPPFLAGS) # test_cyl_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # # test_decoupage_SOURCES = test_decoupage.cpp # test_decoupage_CPPFLAGS = $(COMMON_CPPFLAGS) # test_decoupage_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # # test_find_SOURCES = test_find.cpp # test_find_CPPFLAGS = $(COMMON_CPPFLAGS) # test_find_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # # test_gen_xml_SOURCES = test_gen_xml.cpp # test_gen_xml_CPPFLAGS = $(COMMON_CPPFLAGS) # test_gen_xml_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # # test_joint_SOURCES = test_joint.cpp # test_joint_CPPFLAGS = $(COMMON_CPPFLAGS) # test_joint_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # test_lecture_SOURCES = test_lecture.cpp # test_lecture_CPPFLAGS = $(COMMON_CPPFLAGS) # test_lecture_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # test_propagation_SOURCES = test_propagation.cpp # test_propagation_CPPFLAGS = $(COMMON_CPPFLAGS) # test_propagation_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # # @@ -171,7 +171,7 @@ clean-local: # test_separ_CPPFLAGS = $(COMMON_CPPFLAGS) # test_separ_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) @@ -180,7 +180,7 @@ clean-local: # test_hexa1_CPPFLAGS = $(COMMON_CPPFLAGS) # test_hexa1_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # # UNIT_TEST_PROG = ./test_hexa1 @@ -190,12 +190,12 @@ clean-local: # bielle_SOURCES = bielle.cpp # bielle_CPPFLAGS = $(COMMON_CPPFLAGS) # bielle_LDADD = \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) # tuyau_SOURCES = tuyau.cpp # tuyau_CPPFLAGS = $(COMMON_CPPFLAGS) # tuyau_LDADD = \ # libHEXATest.la \ -# ../HEXA/libHEXAimpl.la \ +# ../HEXA/libHEXAEngine.la \ # $(COMMON_LIBS) diff --git a/src/TEST_CPP/ModelTest.cxx b/src/TEST_CPP/ModelTest.cxx index 023a412..d7c07a6 100755 --- a/src/TEST_CPP/ModelTest.cxx +++ b/src/TEST_CPP/ModelTest.cxx @@ -218,7 +218,7 @@ void ModelTest::Test_joint () Hex::Vector* vectj = doc->addVector (0,1,0); Hex::Vector* vecti = doc->addVector (1,0,0); Hex::Elements* grid2 = doc->makeCylindrical (orig2, vecti, vectj, - 1, 180, 1, dimz,dimy,dimx); + 1, 180, 1, dimz,dimy,dimx, true); int mx = dimx/2; int my = dimy/2; @@ -965,10 +965,10 @@ void ModelTest::Test_deux_cyl () int nl = 10; /* Hex::Elements* cyl1 = */ doc->makeCylindrical(orig1, vy,vz, dr, da, - dl,nr,na,nl); + dl,nr,na,nl, false); /* Hex::Elements* cyl2 = */ doc->makeCylindrical(orig2, vz,vx, dr/2, da, - dl,nr,na,nl); + dl,nr,na,nl, false); doc->saveVtk ("deux_cylindres.vtk"); CPPUNIT_ASSERT( true ); } diff --git a/src/TEST_CPP/test_hexa1.cxx b/src/TEST_CPP/test_hexa1.cxx index a7d68f9..913a791 100755 --- a/src/TEST_CPP/test_hexa1.cxx +++ b/src/TEST_CPP/test_hexa1.cxx @@ -33,7 +33,6 @@ #include "HexVertex.hxx" #include "HexPropagation.hxx" -#include "HexOldShape.hxx" #include "HexLaw.hxx" #include "HexMatrix.hxx" #include "HexCramer.hxx" @@ -234,7 +233,7 @@ int test_joint (int nbargs, cpchar tabargs[]) Hex::Vector* vectj = doc->addVector (0,1,0); Hex::Vector* vecti = doc->addVector (1,0,0); Hex::Elements* grid2 = doc->makeCylindrical (orig2, vecti, vectj, - 1, 180, 1, dimz,dimy,dimx); + 1, 180, 1, dimz,dimy,dimx, true); int mx = dimx/2; int my = dimy/2; @@ -576,9 +575,8 @@ int test_count (int nbargs, cpchar tabargs[]) int nr = 2; int nl = 3; - Hex::Elements* c1; - - c1 = doc->makeCylindrical (orig1, vx,vz,dr, 360, dl,nr, 10, nl, false); +// Hex::Elements* c1 = + doc->makeCylindrical (orig1, vx,vz,dr, 360, dl,nr, 10, nl, false); HexDisplay (doc->countVertex ()); HexDisplay (doc->countUsedVertex ()); @@ -624,9 +622,10 @@ int test_gen_xml (int nbargs, cpchar tabargs[]) Hex::Vertex* orig = doc->addVertex (0,0,0); Hex::Vector* dir = doc->addVector (1,1,1); - Hex::Elements* grid = doc->makeCartesian (orig, dir, size_x,size_y,size_z); + // Hex::Elements* grid = + doc->makeCartesian (orig, dir, size_x,size_y,size_z); - Hex::Hexa* cell = grid->getHexa (0); + // Hex::Hexa* cell = grid->getHexa (0); // Hex::Quad* face = cell->getQuad (0); // Hex::Edge* arete = cell->getEdge (0); // Hex::Vertex* noeud = cell->getVertex (0); @@ -676,9 +675,10 @@ int test_string_xml (int nbargs, cpchar tabargs[]) Hex::Vertex* orig = doc->addVertex (0,0,0); Hex::Vector* dir = doc->addVector (1,1,1); - Hex::Elements* grid = doc->makeCartesian (orig, dir, size_x,size_y,size_z); + // Hex::Elements* grid = + doc->makeCartesian (orig, dir, size_x,size_y,size_z); - Hex::Hexa* cell = grid->getHexa (0); + // Hex::Hexa* cell = grid->getHexa (0); // Hex::Quad* face = cell->getQuad (0); // Hex::Edge* arete = cell->getEdge (0); // Hex::Vertex* noeud = cell->getVertex (0); @@ -808,11 +808,11 @@ int test_spherical (int nbargs, const char* tabargs[]) double rayon = 1; int nbr = 3; - Hex::Elements* grid = doc->makeSpherical (orig, rayon, nbr); + Hex::Elements* grid = doc->makeSpherical (orig, rayon, nbr, 1); int nbhexas = grid->countHexa (); HexDisplay (nbhexas); - for (int nro=0 ; nrogetHexa(nro)->remove(); HexDisplay (doc->countHexa ()); doc->saveVtk ("shperical.vtk"); @@ -843,14 +843,13 @@ int test_grille_cyl (int nbargs, cpchar tabargs[]) int nr = 2; int nl = 3; - Hex::Elements *c1, *c2, *c3, *c4, *c5, *c6; - - c1 = doc->makeCylindrical (orig1, vx,vz,dr, 360, dl,nr, 4, nl, true); - c2 = doc->makeCylindrical (orig2, vx,vz,dr, 360, dl,nr, 8, nl, true); - c3 = doc->makeCylindrical (orig3, vx,vz,dr, 270, dl,nr, 8, nl, true); - c4 = doc->makeCylindrical (orig4, vx,vz,dr, 270, dl,nr, 7, nl, true); - c5 = doc->makeCylindrical (orig5, vx,vz,dr, 360, dl,nr, 5, nl, true); - c6 = doc->makeCylindrical (orig6, vx,vz,dr, 360, dl,nr, 6, nl, true); + doc->makeCylindrical (orig1, vx,vz,dr, 360, dl,nr, 4, nl, true); + Hex::Elements* c2 = + doc->makeCylindrical (orig2, vx,vz,dr, 360, dl,nr, 8, nl, true); + doc->makeCylindrical (orig3, vx,vz,dr, 270, dl,nr, 8, nl, true); + doc->makeCylindrical (orig4, vx,vz,dr, 270, dl,nr, 7, nl, true); + doc->makeCylindrical (orig5, vx,vz,dr, 360, dl,nr, 5, nl, true); + doc->makeCylindrical (orig6, vx,vz,dr, 360, dl,nr, 6, nl, true); int base2 = nr*nl*8; c2->getHexa(base2 + 0)->setScalar (5); @@ -899,7 +898,7 @@ int test_cylindrical (int nbargs, cpchar tabargs[]) // Hex::Cylinder* cyl = doc->addCylinder (orig, vz, nr, nl); // Hex::Elements* grid = doc->makeCylinder (cyl, vx, nr, na, nl); doc->makeCylindrical (orig,vx, vz, dr,da,dl, nr,na, nl, true); - doc ->saveVtk (fic_vtk, na); + doc->saveVtk (fic_vtk, na); return HOK; } // ===================================================== test_cylinder @@ -1102,23 +1101,23 @@ int test_joint2 (int nbargs, cpchar tabargs[]) int test_croix (int nbargs, cpchar tabargs[]) { Hex::Hex mon_ex; - docu = mon_ex.addDocument (); + case_name = "croix"; + docu = mon_ex.addDocument (case_name); - Hex::Vertex* ori1 = docu->addVertex ( 100,0,0); + Hex::Vertex* ori1 = docu->addVertex ( 0,0,0); Hex::Vertex* ori2 = docu->addVertex (-5,0,5); Hex::Vector* vz = docu->addVector ( 0,0,1); Hex::Vector* vx = docu->addVector ( 1,0,0); double r1 = 2; double r2 = 3; - double l1 = 5; + double l1 = 10; double l2 = 10; Hex::Cylinder* cyl1 = docu->addCylinder (ori1, vz, r1, l1); Hex::Cylinder* cyl2 = docu->addCylinder (ori2, vx, r2, l2); Hex::CrossElements* grid = docu->makeCylinders (cyl1, cyl2); - case_name = "croix"; save_vtk (); PutData ((BadElement (grid))); @@ -1155,6 +1154,44 @@ int test_croix (int nbargs, cpchar tabargs[]) del_tranche (grid, 1, 1, 2, 2); return HOK; } +// ======================================================== test_croix2 +int test_croix2 (int nbargs, cpchar tabargs[]) +{ + Hex::Hex mon_ex; + case_name = "croix"; + docu = mon_ex.addDocument (case_name); + + Hex::Vertex* pt1 = docu->addVertex ( 0,0,0); + Hex::Vertex* pt2 = docu->addVertex (10,0,0); + + Hex::Vector* dx = docu->addVector ( 1,0,0); + Hex::Vector* dy = docu->addVector ( 0,1,0); + Hex::Vector* dz = docu->addVector ( 0,0,1); + + double r1 = 4; + double r2 = 2; + double l1 = 20; + double l2 = 15; + + Hex::Cylinder* cyl1 = docu->addCylinder (pt1, dx, r1, l1); + Hex::Cylinder* cyl2 = docu->addCylinder (pt2, dz, r2, l2); + + int nr = 3; + int na = 8; + int nl = 2; + Hex::Elements* grid1 = docu->makeCylinder (cyl1, dy, nr, na, nl); + grid1->saveVtk ("cyl_big.vtk"); + Hex::Elements* grid2 = docu->makeCylinder (cyl2, dy, nr, na, nl); + grid2->saveVtk ("cyl_small.vtk"); + + PutData ((BadElement (grid1))); + PutData ((BadElement (grid2))); + + Hex::CrossElements* grid = docu->makeCylinders (cyl1, cyl2); + + grid->saveVtk ("cyl_all.vtk"); + return HOK; +} // ======================================================== test_pipes int test_pipes (int nbargs, cpchar tabargs[]) { @@ -1890,7 +1927,7 @@ int test_edge (int nbargs, cpchar tabargs[]) Hex::Vertex* orig = doc->addVertex (0, 0, 0); Hex::Vector* vx = doc->addVector (1 ,0, 0); - doc->addEdge (orig, vx); + doc->addEdgeVector (orig, vx); HexDisplay (doc->countVertex()); HexDisplay (doc->countEdge()); diff --git a/src/TEST_PY/test_unit/test_cross.py b/src/TEST_PY/test_unit/test_cross.py index 21b977c..f8cfed5 100644 --- a/src/TEST_PY/test_unit/test_cross.py +++ b/src/TEST_PY/test_unit/test_cross.py @@ -65,7 +65,7 @@ def test_croix () : nr1 = 2 nl1 = 10 - nr2 = 1 + nr2 = 1.8 nl2 = 10 cyl1 = doc.addCylinder (ori1, vz, nr1, nl1) @@ -78,8 +78,9 @@ def test_croix () : # ================================================================= Begin -doc = test_pipes () -doc.setLevel (747) +## doc = test_pipes () +doc = test_croix () +## doc.setLevel (747) law = doc.addLaw("Uniform", 4) -- 2.39.2