Attachment #188380 for bug #223952

Lines 14-33 Link Here

(-)science/tfel/Makefile (-4 / +12 lines)
14		14
15	ONLY_FOR_ARCHS= amd64 i386	15	ONLY_FOR_ARCHS= amd64 i386
16		16
17	OPTIONS_DEFINE= GNUPLOT PYTHON	17	USES= libtool tar:bzip2
18	OPTIONS_DEFAULT= GNUPLOT	18
		19	OPTIONS_DEFINE= CAST3M EPX GNUPLOT PYTHON
		20	OPTIONS_DEFAULT= GNUPLOT PYTHON
19	OPTIONS_SUB= yes	21	OPTIONS_SUB= yes
20		22
		23	CAST3M_DESC= Cast3M(Castem) Interface
		24	EPX_DESC= Europlexus Interface
		25
		26	CAST3M_CONFIGURE_ENABLE= local-castem-header
		27	EPX_CONFIGURE_ENABLE= europlexus
		28
21	GNUPLOT_BUILD_DEPENDS= gnuplot:math/gnuplot	29	GNUPLOT_BUILD_DEPENDS= gnuplot:math/gnuplot
22	GNUPLOT_RUN_DEPENDS= gnuplot:math/gnuplot	30	GNUPLOT_RUN_DEPENDS= gnuplot:math/gnuplot
23		31
24	PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs	32	PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs
25	PYTHON_USES= localbase python	33	PYTHON_USES= localbase python
26	PYTHON_CONFIGURE_ARGS= --enable-python-bindings	34	PYTHON_CONFIGURE_ENABLE= python
		35	PYTHON_CONFIGURE_ARGS= --enable-python-bindings
27	PYTHON_CONFIGURE_WITH= boost=${LOCALBASE}	36	PYTHON_CONFIGURE_WITH= boost=${LOCALBASE}
28	PYTHON_USES= localbase python	37	PYTHON_USES= localbase python
29		38
30	USES= libtool tar:bzip2
31	GNU_CONFIGURE= yes	39	GNU_CONFIGURE= yes
32	CONFIGURE_ARGS+= --enable-aster	40	CONFIGURE_ARGS+= --enable-aster
33	CONFIGURE_ARGS+= --enable-abaqus	41	CONFIGURE_ARGS+= --enable-abaqus




--- bindings/python/include/TFEL/Python/VectorConverter.hxx.orig	2017-10-25 12:34:02 UTC
+++ bindings/python/include/TFEL/Python/VectorConverter.hxx
@@ -32,17 +32,13 @@ namespace tfel
     template<typename T>
     struct vector_to_python_list
     {
-      static PyObject* convert(const T& v)
+      static PyObject* convert(const T& o)
       {
-	using namespace std;
-	using namespace boost::python;
-	using boost::python::iterator;
-	typename T::const_iterator p;
-	list l;
-	for(p=v.begin();p!=v.end();++p){
-	  l.append(*p);
+	boost::python::list l;
+	for(const auto& v : o){
+	  l.append(v);
 	}
-	return incref(l.ptr());
+	return boost::python::incref(l.ptr());
       }
     };
 




include/MFront/BehaviourQuery.hxx
include/MFront/BehaviourSymmetryType.hxx
include/MFront/BoundsDescription.hxx
include/MFront/Castem/Castem.hxx
include/MFront/Castem/CastemBehaviourHandler.hxx
include/MFront/Castem/CastemComputeStiffnessTensor.hxx
include/MFront/Castem/CastemComputeThermalExpansionCoefficientTensor.hxx
include/MFront/Castem/CastemConfig.hxx
include/MFront/Castem/CastemException.hxx
include/MFront/Castem/CastemFiniteStrain.hxx
include/MFront/Castem/CastemGenericPlaneStressHandler.hxx
include/MFront/Castem/CastemGetModellingHypothesis.hxx
include/MFront/Castem/CastemInterface.hxx
include/MFront/Castem/CastemInterfaceDispatch.hxx
include/MFront/Castem/CastemInterfaceExceptions.hxx
include/MFront/Castem/CastemIsotropicBehaviour.hxx
include/MFront/Castem/CastemIsotropicBehaviourHandler.hxx
include/MFront/Castem/CastemOrthotropicBehaviour.hxx
include/MFront/Castem/CastemOrthotropicBehaviourHandler.hxx
include/MFront/Castem/CastemOutOfBoundsPolicy.hxx
include/MFront/Castem/CastemRotationMatrix.hxx
include/MFront/Castem/CastemStressFreeExpansionHandler.hxx
include/MFront/Castem/CastemTangentOperator.hxx
include/MFront/Castem/CastemTraits.hxx
include/MFront/CastemInterface.hxx
include/MFront/CastemMaterialPropertyInterface.hxx
include/MFront/CodeBlock.hxx
include/MFront/DSLBase.hxx
include/MFront/DSLBase.ixx

include/MFront/DefaultDSLBase.hxx
include/MFront/DefaultFiniteStrainDSL.hxx
include/MFront/DrivingVariable.hxx
include/MFront/Europlexus/Europlexus.hxx
include/MFront/Europlexus/EuroplexusBehaviourHandler.hxx
include/MFront/Europlexus/EuroplexusComputeStiffnessTensor.hxx
include/MFront/Europlexus/EuroplexusComputeThermalExpansionCoefficientTensor.hxx
include/MFront/Europlexus/EuroplexusConfig.hxx
include/MFront/Europlexus/EuroplexusException.hxx
include/MFront/Europlexus/EuroplexusFiniteStrain.hxx
include/MFront/Europlexus/EuroplexusInterface.hxx
include/MFront/Europlexus/EuroplexusInterfaceExceptions.hxx
include/MFront/Europlexus/EuroplexusOrthotropicBehaviour.hxx
include/MFront/Europlexus/EuroplexusStressFreeExpansionHandler.hxx
include/MFront/Europlexus/EuroplexusTraits.hxx
include/MFront/EuroplexusInterface.hxx
include/MFront/FileDescription.hxx
include/MFront/GeneratorOptions.hxx
include/MFront/GenericData.hxx

include/TFEL/Utilities/TestDocumentation.hxx
include/TFEL/Utilities/TextData.hxx
include/TFEL/Utilities/Token.hxx
include/castem.h
lib/libAbaqusInterface.so
lib/libAbaqusInterface.so.0
lib/libAbaqusInterface.so.0.0.0

lib/libAsterInterface.so
lib/libAsterInterface.so.0
lib/libAsterInterface.so.0.0.0
lib/libCastemInterface.so
lib/libCastemInterface.so.0
lib/libCastemInterface.so.0.0.0
lib/libEuroplexusInterface.so
lib/libEuroplexusInterface.so.0
lib/libEuroplexusInterface.so.0.0.0
lib/libMFrontLogStream.so
lib/libMFrontLogStream.so.0
lib/libMFrontLogStream.so.0.0.0

Return to bug 223952

Line 0 Link Here

(-)science/tfel/files/patch-bindings_python_include_TFEL_Python_VectorConverter.hxx (+25 lines)
	1	--- bindings/python/include/TFEL/Python/VectorConverter.hxx.orig 2017-10-25 12:34:02 UTC
	2	+++ bindings/python/include/TFEL/Python/VectorConverter.hxx
	3	@@ -32,17 +32,13 @@ namespace tfel
	4	template<typename T>
	5	struct vector_to_python_list
	6	{
	7	- static PyObject* convert(const T& v)
	8	+ static PyObject* convert(const T& o)
	9	{
	10	- using namespace std;
	11	- using namespace boost::python;
	12	- using boost::python::iterator;
	13	- typename T::const_iterator p;
	14	- list l;
	15	- for(p=v.begin();p!=v.end();++p){
	16	- l.append(*p);
	17	+ boost::python::list l;
	18	+ for(const auto& v : o){
	19	+ l.append(v);
	20	}
	21	- return incref(l.ptr());
	22	+ return boost::python::incref(l.ptr());
	23	}
	24	};
	25

Lines 74-79 Link Here

(-)science/tfel/pkg-plist (+43 lines)
74	include/MFront/BehaviourQuery.hxx	74	include/MFront/BehaviourQuery.hxx
75	include/MFront/BehaviourSymmetryType.hxx	75	include/MFront/BehaviourSymmetryType.hxx
76	include/MFront/BoundsDescription.hxx	76	include/MFront/BoundsDescription.hxx
		77	include/MFront/Castem/Castem.hxx
		78	include/MFront/Castem/CastemBehaviourHandler.hxx
		79	include/MFront/Castem/CastemComputeStiffnessTensor.hxx
		80	include/MFront/Castem/CastemComputeThermalExpansionCoefficientTensor.hxx
		81	include/MFront/Castem/CastemConfig.hxx
		82	include/MFront/Castem/CastemException.hxx
		83	include/MFront/Castem/CastemFiniteStrain.hxx
		84	include/MFront/Castem/CastemGenericPlaneStressHandler.hxx
		85	include/MFront/Castem/CastemGetModellingHypothesis.hxx
		86	include/MFront/Castem/CastemInterface.hxx
		87	include/MFront/Castem/CastemInterfaceDispatch.hxx
		88	include/MFront/Castem/CastemInterfaceExceptions.hxx
		89	include/MFront/Castem/CastemIsotropicBehaviour.hxx
		90	include/MFront/Castem/CastemIsotropicBehaviourHandler.hxx
		91	include/MFront/Castem/CastemOrthotropicBehaviour.hxx
		92	include/MFront/Castem/CastemOrthotropicBehaviourHandler.hxx
		93	include/MFront/Castem/CastemOutOfBoundsPolicy.hxx
		94	include/MFront/Castem/CastemRotationMatrix.hxx
		95	include/MFront/Castem/CastemStressFreeExpansionHandler.hxx
		96	include/MFront/Castem/CastemTangentOperator.hxx
		97	include/MFront/Castem/CastemTraits.hxx
		98	include/MFront/CastemInterface.hxx
		99	include/MFront/CastemMaterialPropertyInterface.hxx
77	include/MFront/CodeBlock.hxx	100	include/MFront/CodeBlock.hxx
78	include/MFront/DSLBase.hxx	101	include/MFront/DSLBase.hxx
79	include/MFront/DSLBase.ixx	102	include/MFront/DSLBase.ixx
Lines 86-91 Link Here
86	include/MFront/DefaultDSLBase.hxx	109	include/MFront/DefaultDSLBase.hxx
87	include/MFront/DefaultFiniteStrainDSL.hxx	110	include/MFront/DefaultFiniteStrainDSL.hxx
88	include/MFront/DrivingVariable.hxx	111	include/MFront/DrivingVariable.hxx
		112	include/MFront/Europlexus/Europlexus.hxx
		113	include/MFront/Europlexus/EuroplexusBehaviourHandler.hxx
		114	include/MFront/Europlexus/EuroplexusComputeStiffnessTensor.hxx
		115	include/MFront/Europlexus/EuroplexusComputeThermalExpansionCoefficientTensor.hxx
		116	include/MFront/Europlexus/EuroplexusConfig.hxx
		117	include/MFront/Europlexus/EuroplexusException.hxx
		118	include/MFront/Europlexus/EuroplexusFiniteStrain.hxx
		119	include/MFront/Europlexus/EuroplexusInterface.hxx
		120	include/MFront/Europlexus/EuroplexusInterfaceExceptions.hxx
		121	include/MFront/Europlexus/EuroplexusOrthotropicBehaviour.hxx
		122	include/MFront/Europlexus/EuroplexusStressFreeExpansionHandler.hxx
		123	include/MFront/Europlexus/EuroplexusTraits.hxx
		124	include/MFront/EuroplexusInterface.hxx
89	include/MFront/FileDescription.hxx	125	include/MFront/FileDescription.hxx
90	include/MFront/GeneratorOptions.hxx	126	include/MFront/GeneratorOptions.hxx
91	include/MFront/GenericData.hxx	127	include/MFront/GenericData.hxx
Lines 725-730 Link Here
725	include/TFEL/Utilities/TestDocumentation.hxx	761	include/TFEL/Utilities/TestDocumentation.hxx
726	include/TFEL/Utilities/TextData.hxx	762	include/TFEL/Utilities/TextData.hxx
727	include/TFEL/Utilities/Token.hxx	763	include/TFEL/Utilities/Token.hxx
		764	include/castem.h
728	lib/libAbaqusInterface.so	765	lib/libAbaqusInterface.so
729	lib/libAbaqusInterface.so.0	766	lib/libAbaqusInterface.so.0
730	lib/libAbaqusInterface.so.0.0.0	767	lib/libAbaqusInterface.so.0.0.0
Lines 731-736 Link Here
731	lib/libAsterInterface.so	768	lib/libAsterInterface.so
732	lib/libAsterInterface.so.0	769	lib/libAsterInterface.so.0
733	lib/libAsterInterface.so.0.0.0	770	lib/libAsterInterface.so.0.0.0
		771	lib/libCastemInterface.so
		772	lib/libCastemInterface.so.0
		773	lib/libCastemInterface.so.0.0.0
		774	lib/libEuroplexusInterface.so
		775	lib/libEuroplexusInterface.so.0
		776	lib/libEuroplexusInterface.so.0.0.0
734	lib/libMFrontLogStream.so	777	lib/libMFrontLogStream.so
735	lib/libMFrontLogStream.so.0	778	lib/libMFrontLogStream.so.0
736	lib/libMFrontLogStream.so.0.0.0	779	lib/libMFrontLogStream.so.0.0.0