Attachment 188380 Details for Bug 223952 – tfel diff

[patch] tfel diff

science-tfel.diff (text/plain), 5.61 KB, created by Pedro F. Giffuni on 2017-11-28 23:23:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2017-11-28 23:23:33 UTC

Size: 5.61 KB

patch

obsolete

>Index: science/tfel/Makefile
>===================================================================
>--- science/tfel/Makefile	(revision 454995)
>+++ science/tfel/Makefile	(working copy)
>@@ -14,20 +14,28 @@
> 
> ONLY_FOR_ARCHS=	amd64 i386
> 
>-OPTIONS_DEFINE=		GNUPLOT PYTHON
>-OPTIONS_DEFAULT=	GNUPLOT
>+USES=		libtool tar:bzip2
>+
>+OPTIONS_DEFINE=		CAST3M EPX GNUPLOT PYTHON
>+OPTIONS_DEFAULT=	GNUPLOT PYTHON
> OPTIONS_SUB=		yes
> 
>+CAST3M_DESC=		Cast3M(Castem) Interface
>+EPX_DESC=		Europlexus Interface
>+
>+CAST3M_CONFIGURE_ENABLE=	local-castem-header
>+EPX_CONFIGURE_ENABLE=		europlexus
>+
> GNUPLOT_BUILD_DEPENDS=	gnuplot:math/gnuplot
> GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
> 
> PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
> PYTHON_USES=		localbase python
>-PYTHON_CONFIGURE_ARGS=	--enable-python-bindings
>+PYTHON_CONFIGURE_ENABLE= python
>+PYTHON_CONFIGURE_ARGS= 	--enable-python-bindings
> PYTHON_CONFIGURE_WITH=	boost=${LOCALBASE}
> PYTHON_USES=		localbase python
> 
>-USES=		libtool tar:bzip2
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=	--enable-aster
> CONFIGURE_ARGS+=	--enable-abaqus
>Index: science/tfel/files/patch-bindings_python_include_TFEL_Python_VectorConverter.hxx
>===================================================================
>--- science/tfel/files/patch-bindings_python_include_TFEL_Python_VectorConverter.hxx	(nonexistent)
>+++ science/tfel/files/patch-bindings_python_include_TFEL_Python_VectorConverter.hxx	(working copy)
>@@ -0,0 +1,25 @@
>+--- 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());
>+       }
>+     };
>+ 
>
>Property changes on: science/tfel/files/patch-bindings_python_include_TFEL_Python_VectorConverter.hxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/tfel/pkg-plist
>===================================================================
>--- science/tfel/pkg-plist	(revision 454995)
>+++ science/tfel/pkg-plist	(working copy)
>@@ -74,6 +74,29 @@
> 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
>@@ -86,6 +109,19 @@
> 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
>@@ -725,6 +761,7 @@
> 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
>@@ -731,6 +768,12 @@
> 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

Actions: View | Diff

Attachments on bug 223952: 188380 | 188383 | 188866 | 188891 | 191280