From c175f00d1e9bfce39a3de6e3a8eb3aa744ba5990 Mon Sep 17 00:00:00 2001 From: ageay Date: Mon, 15 Feb 2010 07:32:46 +0000 Subject: [PATCH] *** empty log message *** --- src/MEDCoupling_Swig/Makefile.am | 4 +--- src/MEDCoupling_Swig/libMEDCoupling_Swig.i | 28 +++++++++++++++++++++- src/MEDLoader/Swig/Makefile.am | 2 +- src/ParaMEDMEM_Swig/Makefile.am | 4 +--- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/MEDCoupling_Swig/Makefile.am b/src/MEDCoupling_Swig/Makefile.am index 11bf1a005..c1d31106d 100644 --- a/src/MEDCoupling_Swig/Makefile.am +++ b/src/MEDCoupling_Swig/Makefile.am @@ -46,6 +46,4 @@ _libMEDCoupling_Swig_la_LDFLAGS = -module $(PYTHON_LIBS) \ CLEANFILES = libMEDCoupling_Swig_wrap.cxx libMEDCoupling_Swig.py -nodist_salomescript_DATA= libMEDCoupling_Swig.py - -dist_salomescript_DATA= MEDCouplingBasicsTest.py +dist_salomescript_DATA= MEDCouplingBasicsTest.py libMEDCoupling_Swig.py diff --git a/src/MEDCoupling_Swig/libMEDCoupling_Swig.i b/src/MEDCoupling_Swig/libMEDCoupling_Swig.i index 448c68074..9e7222147 100644 --- a/src/MEDCoupling_Swig/libMEDCoupling_Swig.i +++ b/src/MEDCoupling_Swig/libMEDCoupling_Swig.i @@ -78,6 +78,7 @@ namespace ParaMEDMEM { public: static MEDCouplingUMesh *New(); + static MEDCouplingUMesh *New(const char *meshName, int meshDim); MEDCouplingUMesh *clone(bool recDeepCpy) const; void updateTime(); void checkCoherency() const throw(INTERP_KERNEL::Exception); @@ -170,11 +171,14 @@ namespace ParaMEDMEM class MEDCouplingFieldDouble : public ParaMEDMEM::MEDCouplingField { public: - static MEDCouplingFieldDouble *New(TypeOfField type); + static MEDCouplingFieldDouble *New(TypeOfField type, TypeOfTimeDiscretization td=NO_TIME); MEDCouplingFieldDouble *clone(bool recDeepCpy) const; void checkCoherency() const throw(INTERP_KERNEL::Exception); double getIJ(int tupleId, int compoId) const; void setArray(DataArrayDouble *array); + void setTime(double val, int dt, int it); + void setStartTime(double val, int dt, int it); + void setEndTime(double val, int dt, int it); DataArrayDouble *getArray() const { return _array; } void applyLin(double a, double b, int compoId); int getNumberOfComponents() const; @@ -207,6 +211,28 @@ namespace ParaMEDMEM PyList_SetItem(res,2,SWIG_From_int(tmp2)); return res; } + + PyObject *getStartTime() + { + int tmp1,tmp2; + double tmp0=self->getStartTime(tmp1,tmp2); + PyObject *res = PyList_New(3); + PyList_SetItem(res,0,SWIG_From_double(tmp0)); + PyList_SetItem(res,1,SWIG_From_int(tmp1)); + PyList_SetItem(res,2,SWIG_From_int(tmp2)); + return res; + } + + PyObject *getEndTime() + { + int tmp1,tmp2; + double tmp0=self->getEndTime(tmp1,tmp2); + PyObject *res = PyList_New(3); + PyList_SetItem(res,0,SWIG_From_double(tmp0)); + PyList_SetItem(res,1,SWIG_From_int(tmp1)); + PyList_SetItem(res,2,SWIG_From_int(tmp2)); + return res; + } } }; } diff --git a/src/MEDLoader/Swig/Makefile.am b/src/MEDLoader/Swig/Makefile.am index 5c6951725..41b83903a 100644 --- a/src/MEDLoader/Swig/Makefile.am +++ b/src/MEDLoader/Swig/Makefile.am @@ -51,5 +51,5 @@ _libMEDLoader_Swig_la_LDFLAGS = -module $(MED2_LIBS) $(HDF5_LIBS) $(PYTHON_LIBS CLEANFILES = libMEDLoader_Swig_wrap.cxx libMEDLoader_Swig.py -nodist_salomescript_DATA= libMEDLoader_Swig.py +dist_salomescript_DATA= libMEDLoader_Swig.py diff --git a/src/ParaMEDMEM_Swig/Makefile.am b/src/ParaMEDMEM_Swig/Makefile.am index 84dcc5ae7..e6861f024 100644 --- a/src/ParaMEDMEM_Swig/Makefile.am +++ b/src/ParaMEDMEM_Swig/Makefile.am @@ -57,9 +57,7 @@ endif CLEANFILES = libParaMEDMEM_Swig_wrap.cxx libParaMEDMEM_Swig.py -nodist_salomescript_DATA= libParaMEDMEM_Swig.py - dist_salomescript_DATA= test_InterpKernelDEC.py \ test_NonCoincidentDEC.py \ test_StructuredCoincodentDEC.py \ - ParaMEDMEM.py + ParaMEDMEM.py libParaMEDMEM_Swig.py -- 2.39.2