From e1af37fddfb1d1dbfd5ecd3fa0f9c73c476170bc Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 6 Sep 2018 11:12:12 +0300 Subject: [PATCH] Sacrifice of MEDRenumber python module for windows due to lack of time. medcoupling python module is now the right module. --- src/MEDCoupling/MEDCouplingFieldDouble.hxx | 14 +++++++------- src/RENUMBER_Swig/MEDRenumberCommon.i | 5 +++++ src/RENUMBER_Swig/MEDRenumberTest.py | 7 +------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.hxx b/src/MEDCoupling/MEDCouplingFieldDouble.hxx index 757df6ae7..051d4a5e2 100644 --- a/src/MEDCoupling/MEDCouplingFieldDouble.hxx +++ b/src/MEDCoupling/MEDCouplingFieldDouble.hxx @@ -154,13 +154,13 @@ namespace MEDCoupling protected: ~MEDCouplingFieldDouble() { } private: - MEDCouplingFieldDouble(TypeOfField type, TypeOfTimeDiscretization td); - MEDCouplingFieldDouble(const MEDCouplingFieldTemplate& ft, TypeOfTimeDiscretization td); - MEDCouplingFieldDouble(const MEDCouplingFieldDouble& other, bool deepCpy); - MEDCouplingFieldDouble(NatureOfField n, MEDCouplingTimeDiscretization *td, MEDCouplingFieldDiscretization *type); - MCAuto voronoizeGen(const Voronizer *vor, double eps) const; - MEDCouplingTimeDiscretization *timeDiscr(); - const MEDCouplingTimeDiscretization *timeDiscr() const; + MEDCOUPLING_EXPORT MEDCouplingFieldDouble(TypeOfField type, TypeOfTimeDiscretization td); + MEDCOUPLING_EXPORT MEDCouplingFieldDouble(const MEDCouplingFieldTemplate& ft, TypeOfTimeDiscretization td); + MEDCOUPLING_EXPORT MEDCouplingFieldDouble(const MEDCouplingFieldDouble& other, bool deepCpy); + MEDCOUPLING_EXPORT MEDCouplingFieldDouble(NatureOfField n, MEDCouplingTimeDiscretization *td, MEDCouplingFieldDiscretization *type); + MEDCOUPLING_EXPORT MCAuto voronoizeGen(const Voronizer *vor, double eps) const; + MEDCOUPLING_EXPORT MEDCouplingTimeDiscretization *timeDiscr(); + MEDCOUPLING_EXPORT const MEDCouplingTimeDiscretization *timeDiscr() const; }; } diff --git a/src/RENUMBER_Swig/MEDRenumberCommon.i b/src/RENUMBER_Swig/MEDRenumberCommon.i index a88e4fb6f..cfc8354ec 100644 --- a/src/RENUMBER_Swig/MEDRenumberCommon.i +++ b/src/RENUMBER_Swig/MEDRenumberCommon.i @@ -25,6 +25,11 @@ #ifdef WIN32 #define MEDCOUPLING_WIN32_SWIG #endif +%} + +%include "MEDCouplingCommon.i" + +%{ #include "MEDCouplingMemArray.txx" #include "MCAuto.hxx" #include "MEDCouplingDataArrayTypemaps.i" diff --git a/src/RENUMBER_Swig/MEDRenumberTest.py b/src/RENUMBER_Swig/MEDRenumberTest.py index f4bb20003..ba44c0846 100644 --- a/src/RENUMBER_Swig/MEDRenumberTest.py +++ b/src/RENUMBER_Swig/MEDRenumberTest.py @@ -23,13 +23,8 @@ import sys class MEDRenumberTest(unittest.TestCase): - @unittest.skipUnless("BOOST" in RenumberAvailableMethods(),"requires BOOST prerequisite !") + @unittest.skipUnless("Boost" in RenumberAvailableMethods(),"requires BOOST prerequisite !") def test1(self): - if sys.platform == "win32": - from MEDCouplingCompat import MEDCouplingCMesh - else: - from MEDCoupling import MEDCouplingCMesh - ren=RenumberingFactory("BOOST") arr=DataArrayDouble(10) ; arr.iota() c=MEDCouplingCMesh() ; c.setCoords(arr,arr) -- 2.39.2