# HG changeset patch # User Eugenio Gianniti # Date 1407436490 -7200 # Node ID 41b76530fe5e71417a82ea2a9d788894701f415d # Parent a61fc34334cac05740dd69568610061ee17f0563 Do not force extension for imported MeshFunction To be consistent with Mesh diff -r a61fc34334ca -r 41b76530fe5e inst/private/generate_mf_constructor.m --- 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 \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 const &\n\ pmsh = msh_arg.get_pmsh ();\n\ - filename += "".xdmf"";\n\ \n\ try\n\ { retval = new meshfunction_@@LABEL@@ (pmsh, filename); }\n\ diff -r a61fc34334ca -r 41b76530fe5e src/MeshFunction.cc --- 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 const & pmsh = msh_arg.get_pmsh (); - filename += ".xdmf"; try { retval = new meshfunction (label, pmsh, filename); }