Mercurial > fem-fenics-eugenio
changeset 264:41b76530fe5e
Do not force extension for imported MeshFunction
To be consistent with Mesh
| author | Eugenio Gianniti <eugenio.gianniti@mail.polimi.it> |
|---|---|
| date | Thu, 07 Aug 2014 20:34:50 +0200 |
| parents | a61fc34334ca |
| children | 0b9dc516ba36 |
| files | inst/private/generate_mf_constructor.m src/MeshFunction.cc |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/inst/private/generate_mf_constructor.m Thu Aug 07 19:21:36 2014 +0200 +++ b/inst/private/generate_mf_constructor.m Thu Aug 07 20:34:50 2014 +0200 @@ -26,7 +26,7 @@ #include ""meshfunction_@@LABEL@@.h""\n\ #include <fem-fenics/dolfin_compat.h>\n\ \n\ -DEFUN_DLD (MeshFunction_@@LABEL@@, args, nargout, ""MF = MeshFunction_@@LABEL@@ (MESH, FILENAME)"")\n\ +DEFUN_DLD (MeshFunction_@@LABEL@@, args, nargout, ""MF = MeshFunction_@@LABEL@@ (TYPE, MESH, FILENAME)"")\n\ {\n\ \n\ int nargin = args.length ();\n\ @@ -61,7 +61,6 @@ {\n\ SHARED_PTR <dolfin::Mesh const> const &\n\ pmsh = msh_arg.get_pmsh ();\n\ - filename += "".xdmf"";\n\ \n\ try\n\ { retval = new meshfunction_@@LABEL@@ (pmsh, filename); }\n\
--- a/src/MeshFunction.cc Thu Aug 07 19:21:36 2014 +0200 +++ b/src/MeshFunction.cc Thu Aug 07 20:34:50 2014 +0200 @@ -25,7 +25,7 @@ MeshFunction (@var{Mesh}, @var{filename})\n\ @deftypefnx {Function File} {[@var{meshfunc}]} = \ MeshFunction (@var{type}, @var{Mesh}, @var{filename})\n\ -Initialize a meshfunction with the values contained in a XDMF file.\n\ +Initialize a meshfunction with the values contained in a file.\n\ The output @var{meshfunc} is an object which contains a representation of the \ meshfunction in @var{filename} which can be used to mark subdomains or \ facets where Dirichlet boundary conditions are to be applied.\n\ @@ -78,7 +78,6 @@ { SHARED_PTR <dolfin::Mesh const> const & pmsh = msh_arg.get_pmsh (); - filename += ".xdmf"; try { retval = new meshfunction (label, pmsh, filename); }