[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
|
From: |
Yves Renard |
|
Subject: |
[Getfem-commits] (no subject) |
|
Date: |
Sat, 18 Apr 2020 08:52:27 -0400 (EDT) |
branch: devel-yves-octave
commit 75a8bb6d9025a2eb143c7c310897fe3c159642cc
Author: Yves Renard <address@hidden>
AuthorDate: Fri Apr 17 22:03:44 2020 +0200
Octave interface working apart for objects and sparse matrices
---
.gitignore | 1 +
configure.ac | 4 ++-
doc/sphinx/source/install/install_linux.rst | 7 +++-
interface/src/Makefile.am | 6 +++-
interface/src/octave/Makefile.am | 12 +++----
interface/src/octave/gf_asm.m | 4 +--
interface/src/octave/gf_compute.m | 4 +--
interface/src/octave/gf_cont_struct.m | 4 +--
interface/src/octave/gf_cont_struct_get.m | 4 +--
interface/src/octave/gf_cvstruct_get.m | 4 +--
interface/src/octave/gf_delete.m | 4 +--
interface/src/octave/gf_eltm.m | 4 +--
interface/src/octave/gf_fem.m | 4 +--
interface/src/octave/gf_fem_get.m | 4 +--
interface/src/octave/gf_geotrans.m | 4 +--
interface/src/octave/gf_geotrans_get.m | 4 +--
interface/src/octave/gf_global_function.m | 4 +--
interface/src/octave/gf_global_function_get.m | 4 +--
interface/src/octave/gf_integ.m | 4 +--
interface/src/octave/gf_integ_get.m | 4 +--
interface/src/octave/gf_levelset.m | 4 +--
interface/src/octave/gf_levelset_get.m | 4 +--
interface/src/octave/gf_levelset_set.m | 4 +--
interface/src/octave/gf_linsolve.m | 4 +--
interface/src/octave/gf_mesh.m | 4 +--
interface/src/octave/gf_mesh_fem.m | 4 +--
interface/src/octave/gf_mesh_fem_get.m | 4 +--
interface/src/octave/gf_mesh_fem_set.m | 4 +--
interface/src/octave/gf_mesh_get.m | 4 +--
interface/src/octave/gf_mesh_im.m | 4 +--
interface/src/octave/gf_mesh_im_data.m | 4 +--
interface/src/octave/gf_mesh_im_data_get.m | 4 +--
interface/src/octave/gf_mesh_im_data_set.m | 4 +--
interface/src/octave/gf_mesh_im_get.m | 4 +--
interface/src/octave/gf_mesh_im_set.m | 4 +--
interface/src/octave/gf_mesh_levelset.m | 4 +--
interface/src/octave/gf_mesh_levelset_get.m | 4 +--
interface/src/octave/gf_mesh_levelset_set.m | 4 +--
interface/src/octave/gf_mesh_set.m | 4 +--
interface/src/octave/gf_mesher_object.m | 4 +--
interface/src/octave/gf_mesher_object_get.m | 4 +--
interface/src/octave/gf_model.m | 4 +--
interface/src/octave/gf_model_get.m | 4 +--
interface/src/octave/gf_model_set.m | 4 +--
interface/src/octave/gf_precond.m | 4 +--
interface/src/octave/gf_precond_get.m | 4 +--
interface/src/octave/gf_slice.m | 4 +--
interface/src/octave/gf_slice_get.m | 4 +--
interface/src/octave/gf_slice_set.m | 4 +--
interface/src/octave/gf_spmat.m | 4 +--
interface/src/octave/gf_spmat_get.m | 4 +--
interface/src/octave/gf_spmat_set.m | 4 +--
interface/src/octave/gf_util.m | 4 +--
interface/src/octave/gf_workspace.m | 4 +--
interface/src/octave/gfm_common.c | 47 +++++++++++++--------------
interface/src/octave/gfm_common.h | 2 +-
interface/src/octave/gfm_mex.c | 10 +++---
57 files changed, 146 insertions(+), 139 deletions(-)
diff --git a/.gitignore b/.gitignore
index f48b68e..38074ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ interface/tests/python/results1/
/src/getfem/getfem_arch_config.h
/src/gmm/gmm_arch_config.h
/stamp-h1
+/interface/src/octave/gf_octave.*
/interface/src/matlab/@gf*
/interface/src/matlab/gf_asm.m
/interface/src/matlab/gf_compute.m
diff --git a/configure.ac b/configure.ac
index 6d1ad85..aa88278 100644
--- a/configure.ac
+++ b/configure.ac
@@ -993,7 +993,7 @@ if test "$useoctave" != NO; then
MKOCTFILE_EXE=`which $MKOCTFILE`
MKOCTFILE_EXE=`readlink -e $MKOCTFILE_EXE`
OCTAVE_ROOT=`echo $MKOCTFILE_EXE | sed -e 's/bin.*$//'`
- OCTAVE_COM_EXT=".oct"
+ OCTAVE_COM_EXT=".mex"
OCTAVE_RELEASE=`octave --version | grep "GNU Octave" | sed -n '1p' | sed
's/^.*version //g'`
echo "Octave release is $OCTAVE_RELEASE"
fi
@@ -1149,6 +1149,8 @@ interface/Makefile
\
interface/src/Makefile \
interface/src/matlab/Makefile \
interface/src/matlab/private/Makefile \
+interface/src/octave/Makefile \
+interface/src/octave/private/Makefile \
interface/src/python/Makefile \
interface/src/python/setup.py \
interface/src/scilab/Makefile \
diff --git a/doc/sphinx/source/install/install_linux.rst
b/doc/sphinx/source/install/install_linux.rst
index a36e2cc..57b085d 100644
--- a/doc/sphinx/source/install/install_linux.rst
+++ b/doc/sphinx/source/install/install_linux.rst
@@ -179,7 +179,12 @@ You have first to install |octv| with the developpement
package
* you should have use the ``--enable-octave`` option to configure the |gf|
sources (i.e. ``./configure --enable-octave`` ...)
-
+
+
+The last step is to add the path to the toolbox in the matlab path:
+
+* you can put ``addpath('toolbox_dir', '-begin')`` to your ``$HOME/.octaverc``
file
+* you can simply use the ``addpath`` command in the octave command line.
Matlab interface
^^^^^^^^^^^^^^^^
diff --git a/interface/src/Makefile.am b/interface/src/Makefile.am
index ecaba50..db3d20d 100644
--- a/interface/src/Makefile.am
+++ b/interface/src/Makefile.am
@@ -19,6 +19,10 @@ if BUILDMEX
subdirMATLAB=matlab
endif
+if BUILDOCTAVE
+subdirOCTAVE=octave
+endif
+
if BUILDPYTHON
subdirPYTHON=python
endif
@@ -27,7 +31,7 @@ if BUILDSCILAB
subdirSCILAB=scilab
endif
-SUBDIRS = . $(subdirMATLAB) $(subdirPYTHON) $(subdirSCILAB)
+SUBDIRS = . $(subdirMATLAB) $(subdirOCTAVE) $(subdirPYTHON) $(subdirSCILAB)
RPC_INC_DIR=@RPC_INC_DIR@
diff --git a/interface/src/octave/Makefile.am b/interface/src/octave/Makefile.am
index c44c0f8..982983c 100644
--- a/interface/src/octave/Makefile.am
+++ b/interface/src/octave/Makefile.am
@@ -34,10 +34,7 @@ EXTRA_DIST = gfm_rpc_mexint.c gfm_mex.c gfm_common.c
gfm_common.h $(M_FILES)
all: gf_mesh.m gf_octave@OCTAVE_COM_EXT@
-MEX=@MEX@
RPC_LIB = @RPC_LIB@
-GNUMEX=@top_srcdir@/gnumex
-GNUMEXOPTS=@top_srcdir@/gnumex.opts
GETFEM_LIB_LA = ../../../src/libgetfem.la
GETFEM_STATIC_LIB = ../../../src/.libs/libgetfem.a @LIBS@
@@ -45,7 +42,8 @@ GETFEM_STATIC_LIB = ../../../src/.libs/libgetfem.a @LIBS@
if BUILDOCTAVE
if USE_MINGW_OCTAVE
-#command extremely sensitive to any modification! fragile! keep the order of
the files
+# Command extremely sensitive to any modification! fragile!
+# keep the order of the files
# (gfm_mex.c must be first, libstdc++.a must be last)
gf_octave@OCTAVE_COM_EXT@: gfm_mex.c gfm_common.c ../libgetfemint.la
../gfi_array.c $(GETFEM_LIB_LA)
@@ -65,14 +63,12 @@ else !USE_MINGW_OCTAVE
# compiled with ifc (i.e. mumps)) of the command line, as it
# break the linking with g++-3.3 and matlab R14/R13 on debian (at least) ..
gf_octave@OCTAVE_COM_EXT@: gfm_mex.c gfm_common.c ../libgetfemint.la
../gfi_array.c $(GETFEM_LIB_LA)
- mkoctfile -largeArrayDims -output gf_octave -g CDEBUGFLAGS="$(CFLAGS)"
LD="$(CXX)" \
+ mkoctfile --mex -output gf_octave -g \
-I@srcdir@ -I@srcdir@/.. -DOCTAVE_RELEASE=@OCTAVE_RELEASE@ \
@srcdir@/gfm_mex.c @srcdir@/gfm_common.c @srcdir@/../gfi_array.c \
../.libs/libgetfemint.a $(GETFEM_STATIC_LIB) @STDCPP_STATICLIBS@ || (rm
$@; false)
endif !USE_MINGW_OCTAVE
-endif
-
-# -largeArrayDims
+endif
M_FILES = \
gf_asm_pdetoolbc.m \
diff --git a/interface/src/octave/gf_asm.m b/interface/src/octave/gf_asm.m
index 54dce58..a6832a2 100644
--- a/interface/src/octave/gf_asm.m
+++ b/interface/src/octave/gf_asm.m
@@ -335,9 +335,9 @@ function [varargout]=gf_asm(varargin)
end;
if (nargout),
- [varargout{1:nargout}]=gf_matlab('asm', varargin{:});
+ [varargout{1:nargout}]=gf_octave('asm', varargin{:});
else
- gf_matlab('asm', varargin{:});
+ gf_octave('asm', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_compute.m
b/interface/src/octave/gf_compute.m
index 9b9a2c7..0a9a3d7 100644
--- a/interface/src/octave/gf_compute.m
+++ b/interface/src/octave/gf_compute.m
@@ -161,9 +161,9 @@ function [varargout]=gf_compute(varargin)
end;
if (nargout),
- [varargout{1:nargout}]=gf_matlab('compute', varargin{:});
+ [varargout{1:nargout}]=gf_octave('compute', varargin{:});
else
- gf_matlab('compute', varargin{:});
+ gf_octave('compute', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_cont_struct.m
b/interface/src/octave/gf_cont_struct.m
index 956db43..0b252da 100644
--- a/interface/src/octave/gf_cont_struct.m
+++ b/interface/src/octave/gf_cont_struct.m
@@ -82,9 +82,9 @@
%
function [varargout]=gf_cont_struct(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('cont_struct', varargin{:});
+ [varargout{1:nargout}]=gf_octave('cont_struct', varargin{:});
else
- gf_matlab('cont_struct', varargin{:});
+ gf_octave('cont_struct', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_cont_struct_get.m
b/interface/src/octave/gf_cont_struct_get.m
index f9f93db..8bc09bb 100644
--- a/interface/src/octave/gf_cont_struct_get.m
+++ b/interface/src/octave/gf_cont_struct_get.m
@@ -69,9 +69,9 @@
%
function [varargout]=gf_cont_struct_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('cont_struct_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('cont_struct_get', varargin{:});
else
- gf_matlab('cont_struct_get', varargin{:});
+ gf_octave('cont_struct_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_cvstruct_get.m
b/interface/src/octave/gf_cvstruct_get.m
index bef8a9d..d224781 100644
--- a/interface/src/octave/gf_cvstruct_get.m
+++ b/interface/src/octave/gf_cvstruct_get.m
@@ -34,9 +34,9 @@
%
function [varargout]=gf_cvstruct_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('cvstruct_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('cvstruct_get', varargin{:});
else
- gf_matlab('cvstruct_get', varargin{:});
+ gf_octave('cvstruct_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_delete.m b/interface/src/octave/gf_delete.m
index 343e83f..31e4fd4 100644
--- a/interface/src/octave/gf_delete.m
+++ b/interface/src/octave/gf_delete.m
@@ -24,9 +24,9 @@
%
function [varargout]=gf_delete(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('delete', varargin{:});
+ [varargout{1:nargout}]=gf_octave('delete', varargin{:});
else
- gf_matlab('delete', varargin{:});
+ gf_octave('delete', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_eltm.m b/interface/src/octave/gf_eltm.m
index 3e44710..e0c82d0 100644
--- a/interface/src/octave/gf_eltm.m
+++ b/interface/src/octave/gf_eltm.m
@@ -41,9 +41,9 @@
%
function [varargout]=gf_eltm(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('eltm', varargin{:});
+ [varargout{1:nargout}]=gf_octave('eltm', varargin{:});
else
- gf_matlab('eltm', varargin{:});
+ gf_octave('eltm', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_fem.m b/interface/src/octave/gf_fem.m
index 633b9bc..7cb5186 100644
--- a/interface/src/octave/gf_fem.m
+++ b/interface/src/octave/gf_fem.m
@@ -85,9 +85,9 @@
%
function [varargout]=gf_fem(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('fem', varargin{:});
+ [varargout{1:nargout}]=gf_octave('fem', varargin{:});
else
- gf_matlab('fem', varargin{:});
+ gf_octave('fem', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_fem_get.m
b/interface/src/octave/gf_fem_get.m
index a16f0ff..a1c7165 100644
--- a/interface/src/octave/gf_fem_get.m
+++ b/interface/src/octave/gf_fem_get.m
@@ -80,9 +80,9 @@
%
function [varargout]=gf_fem_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('fem_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('fem_get', varargin{:});
else
- gf_matlab('fem_get', varargin{:});
+ gf_octave('fem_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_geotrans.m
b/interface/src/octave/gf_geotrans.m
index 9c7949d..e16bba2 100644
--- a/interface/src/octave/gf_geotrans.m
+++ b/interface/src/octave/gf_geotrans.m
@@ -27,9 +27,9 @@
%
function [varargout]=gf_geotrans(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('geotrans', varargin{:});
+ [varargout{1:nargout}]=gf_octave('geotrans', varargin{:});
else
- gf_matlab('geotrans', varargin{:});
+ gf_octave('geotrans', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_geotrans_get.m
b/interface/src/octave/gf_geotrans_get.m
index 8a55524..3b9be7c 100644
--- a/interface/src/octave/gf_geotrans_get.m
+++ b/interface/src/octave/gf_geotrans_get.m
@@ -45,9 +45,9 @@
%
function [varargout]=gf_geotrans_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('geotrans_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('geotrans_get', varargin{:});
else
- gf_matlab('geotrans_get', varargin{:});
+ gf_octave('geotrans_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_global_function.m
b/interface/src/octave/gf_global_function.m
index a81eaf9..c6d30d4 100644
--- a/interface/src/octave/gf_global_function.m
+++ b/interface/src/octave/gf_global_function.m
@@ -32,9 +32,9 @@
%
function [varargout]=gf_global_function(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('global_function', varargin{:});
+ [varargout{1:nargout}]=gf_octave('global_function', varargin{:});
else
- gf_matlab('global_function', varargin{:});
+ gf_octave('global_function', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_global_function_get.m
b/interface/src/octave/gf_global_function_get.m
index 8379a15..de46722 100644
--- a/interface/src/octave/gf_global_function_get.m
+++ b/interface/src/octave/gf_global_function_get.m
@@ -32,9 +32,9 @@
%
function [varargout]=gf_global_function_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('global_function_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('global_function_get', varargin{:});
else
- gf_matlab('global_function_get', varargin{:});
+ gf_octave('global_function_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_integ.m b/interface/src/octave/gf_integ.m
index da9a811..d93629c 100644
--- a/interface/src/octave/gf_integ.m
+++ b/interface/src/octave/gf_integ.m
@@ -59,9 +59,9 @@
%
function [varargout]=gf_integ(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('integ', varargin{:});
+ [varargout{1:nargout}]=gf_octave('integ', varargin{:});
else
- gf_matlab('integ', varargin{:});
+ gf_octave('integ', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_integ_get.m
b/interface/src/octave/gf_integ_get.m
index af58fb4..97cf3cd 100644
--- a/interface/src/octave/gf_integ_get.m
+++ b/interface/src/octave/gf_integ_get.m
@@ -55,9 +55,9 @@
%
function [varargout]=gf_integ_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('integ_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('integ_get', varargin{:});
else
- gf_matlab('integ_get', varargin{:});
+ gf_octave('integ_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_levelset.m
b/interface/src/octave/gf_levelset.m
index f4e5110..729af09 100644
--- a/interface/src/octave/gf_levelset.m
+++ b/interface/src/octave/gf_levelset.m
@@ -32,9 +32,9 @@
%
function [varargout]=gf_levelset(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('levelset', varargin{:});
+ [varargout{1:nargout}]=gf_octave('levelset', varargin{:});
else
- gf_matlab('levelset', varargin{:});
+ gf_octave('levelset', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_levelset_get.m
b/interface/src/octave/gf_levelset_get.m
index 89f4a95..89b8afe 100644
--- a/interface/src/octave/gf_levelset_get.m
+++ b/interface/src/octave/gf_levelset_get.m
@@ -33,9 +33,9 @@
%
function [varargout]=gf_levelset_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('levelset_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('levelset_get', varargin{:});
else
- gf_matlab('levelset_get', varargin{:});
+ gf_octave('levelset_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_levelset_set.m
b/interface/src/octave/gf_levelset_set.m
index 52ffbaa..dc05a33 100644
--- a/interface/src/octave/gf_levelset_set.m
+++ b/interface/src/octave/gf_levelset_set.m
@@ -16,9 +16,9 @@
%
function [varargout]=gf_levelset_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('levelset_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('levelset_set', varargin{:});
else
- gf_matlab('levelset_set', varargin{:});
+ gf_octave('levelset_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_linsolve.m
b/interface/src/octave/gf_linsolve.m
index b15163b..21e3bc6 100644
--- a/interface/src/octave/gf_linsolve.m
+++ b/interface/src/octave/gf_linsolve.m
@@ -33,9 +33,9 @@
%
function [varargout]=gf_linsolve(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('linsolve', varargin{:});
+ [varargout{1:nargout}]=gf_octave('linsolve', varargin{:});
else
- gf_matlab('linsolve', varargin{:});
+ gf_octave('linsolve', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh.m b/interface/src/octave/gf_mesh.m
index 3e88bd4..fa0148d 100644
--- a/interface/src/octave/gf_mesh.m
+++ b/interface/src/octave/gf_mesh.m
@@ -118,9 +118,9 @@
%
function [varargout]=gf_mesh(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh', varargin{:});
else
- gf_matlab('mesh', varargin{:});
+ gf_octave('mesh', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_fem.m
b/interface/src/octave/gf_mesh_fem.m
index 804f7db..1ce1c5b 100644
--- a/interface/src/octave/gf_mesh_fem.m
+++ b/interface/src/octave/gf_mesh_fem.m
@@ -64,9 +64,9 @@
%
function [varargout]=gf_mesh_fem(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_fem', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_fem', varargin{:});
else
- gf_matlab('mesh_fem', varargin{:});
+ gf_octave('mesh_fem', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_fem_get.m
b/interface/src/octave/gf_mesh_fem_get.m
index 5f999c0..58c710c 100644
--- a/interface/src/octave/gf_mesh_fem_get.m
+++ b/interface/src/octave/gf_mesh_fem_get.m
@@ -274,9 +274,9 @@ function [varargout]=gf_mesh_fem_get(varargin)
end;
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_fem_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_fem_get', varargin{:});
else
- gf_matlab('mesh_fem_get', varargin{:});
+ gf_octave('mesh_fem_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_fem_set.m
b/interface/src/octave/gf_mesh_fem_set.m
index a450656..e2bb29c 100644
--- a/interface/src/octave/gf_mesh_fem_set.m
+++ b/interface/src/octave/gf_mesh_fem_set.m
@@ -74,9 +74,9 @@
%
function [varargout]=gf_mesh_fem_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_fem_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_fem_set', varargin{:});
else
- gf_matlab('mesh_fem_set', varargin{:});
+ gf_octave('mesh_fem_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_get.m
b/interface/src/octave/gf_mesh_get.m
index 15bdeef..26cba41 100644
--- a/interface/src/octave/gf_mesh_get.m
+++ b/interface/src/octave/gf_mesh_get.m
@@ -290,9 +290,9 @@
%
function [varargout]=gf_mesh_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_get', varargin{:});
else
- gf_matlab('mesh_get', varargin{:});
+ gf_octave('mesh_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_im.m
b/interface/src/octave/gf_mesh_im.m
index 47f1def..5382ebe 100644
--- a/interface/src/octave/gf_mesh_im.m
+++ b/interface/src/octave/gf_mesh_im.m
@@ -68,9 +68,9 @@
%
function [varargout]=gf_mesh_im(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_im', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_im', varargin{:});
else
- gf_matlab('mesh_im', varargin{:});
+ gf_octave('mesh_im', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_im_data.m
b/interface/src/octave/gf_mesh_im_data.m
index 887cf51..96716c2 100644
--- a/interface/src/octave/gf_mesh_im_data.m
+++ b/interface/src/octave/gf_mesh_im_data.m
@@ -16,9 +16,9 @@
%
function [varargout]=gf_mesh_im_data(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_im_data', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_im_data', varargin{:});
else
- gf_matlab('mesh_im_data', varargin{:});
+ gf_octave('mesh_im_data', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_im_data_get.m
b/interface/src/octave/gf_mesh_im_data_get.m
index 7925cba..66c02a6 100644
--- a/interface/src/octave/gf_mesh_im_data_get.m
+++ b/interface/src/octave/gf_mesh_im_data_get.m
@@ -28,9 +28,9 @@
%
function [varargout]=gf_mesh_im_data_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_im_data_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_im_data_get', varargin{:});
else
- gf_matlab('mesh_im_data_get', varargin{:});
+ gf_octave('mesh_im_data_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_im_data_set.m
b/interface/src/octave/gf_mesh_im_data_set.m
index f395fa4..088336a 100644
--- a/interface/src/octave/gf_mesh_im_data_set.m
+++ b/interface/src/octave/gf_mesh_im_data_set.m
@@ -14,9 +14,9 @@
%
function [varargout]=gf_mesh_im_data_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_im_data_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_im_data_set', varargin{:});
else
- gf_matlab('mesh_im_data_set', varargin{:});
+ gf_octave('mesh_im_data_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_im_get.m
b/interface/src/octave/gf_mesh_im_get.m
index 9c9b480..af76159 100644
--- a/interface/src/octave/gf_mesh_im_get.m
+++ b/interface/src/octave/gf_mesh_im_get.m
@@ -78,9 +78,9 @@
%
function [varargout]=gf_mesh_im_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_im_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_im_get', varargin{:});
else
- gf_matlab('mesh_im_get', varargin{:});
+ gf_octave('mesh_im_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_im_set.m
b/interface/src/octave/gf_mesh_im_set.m
index b65dd84..445991b 100644
--- a/interface/src/octave/gf_mesh_im_set.m
+++ b/interface/src/octave/gf_mesh_im_set.m
@@ -23,9 +23,9 @@
%
function [varargout]=gf_mesh_im_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_im_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_im_set', varargin{:});
else
- gf_matlab('mesh_im_set', varargin{:});
+ gf_octave('mesh_im_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_levelset.m
b/interface/src/octave/gf_mesh_levelset.m
index c4586dc..5cec2d0 100644
--- a/interface/src/octave/gf_mesh_levelset.m
+++ b/interface/src/octave/gf_mesh_levelset.m
@@ -14,9 +14,9 @@
%
function [varargout]=gf_mesh_levelset(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_levelset', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_levelset', varargin{:});
else
- gf_matlab('mesh_levelset', varargin{:});
+ gf_octave('mesh_levelset', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_levelset_get.m
b/interface/src/octave/gf_mesh_levelset_get.m
index cf6237e..de65b77 100644
--- a/interface/src/octave/gf_mesh_levelset_get.m
+++ b/interface/src/octave/gf_mesh_levelset_get.m
@@ -36,9 +36,9 @@
%
function [varargout]=gf_mesh_levelset_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_levelset_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_levelset_get', varargin{:});
else
- gf_matlab('mesh_levelset_get', varargin{:});
+ gf_octave('mesh_levelset_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_levelset_set.m
b/interface/src/octave/gf_mesh_levelset_set.m
index fcc1b69..2800bdc 100644
--- a/interface/src/octave/gf_mesh_levelset_set.m
+++ b/interface/src/octave/gf_mesh_levelset_set.m
@@ -28,9 +28,9 @@
%
function [varargout]=gf_mesh_levelset_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_levelset_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_levelset_set', varargin{:});
else
- gf_matlab('mesh_levelset_set', varargin{:});
+ gf_octave('mesh_levelset_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesh_set.m
b/interface/src/octave/gf_mesh_set.m
index 80ec1e5..b51d012 100644
--- a/interface/src/octave/gf_mesh_set.m
+++ b/interface/src/octave/gf_mesh_set.m
@@ -117,9 +117,9 @@
%
function [varargout]=gf_mesh_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesh_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesh_set', varargin{:});
else
- gf_matlab('mesh_set', varargin{:});
+ gf_octave('mesh_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesher_object.m
b/interface/src/octave/gf_mesher_object.m
index 2227330..6b7feb4 100644
--- a/interface/src/octave/gf_mesher_object.m
+++ b/interface/src/octave/gf_mesher_object.m
@@ -52,9 +52,9 @@
%
function [varargout]=gf_mesher_object(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesher_object', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesher_object', varargin{:});
else
- gf_matlab('mesher_object', varargin{:});
+ gf_octave('mesher_object', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_mesher_object_get.m
b/interface/src/octave/gf_mesher_object_get.m
index 1ad2fac..1c2e7fe 100644
--- a/interface/src/octave/gf_mesher_object_get.m
+++ b/interface/src/octave/gf_mesher_object_get.m
@@ -17,9 +17,9 @@
%
function [varargout]=gf_mesher_object_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('mesher_object_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('mesher_object_get', varargin{:});
else
- gf_matlab('mesher_object_get', varargin{:});
+ gf_octave('mesher_object_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_model.m b/interface/src/octave/gf_model.m
index 8f25e43..1770ef3 100644
--- a/interface/src/octave/gf_model.m
+++ b/interface/src/octave/gf_model.m
@@ -17,9 +17,9 @@
%
function [varargout]=gf_model(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('model', varargin{:});
+ [varargout{1:nargout}]=gf_octave('model', varargin{:});
else
- gf_matlab('model', varargin{:});
+ gf_octave('model', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_model_get.m
b/interface/src/octave/gf_model_get.m
index e7820b7..844ee9c 100644
--- a/interface/src/octave/gf_model_get.m
+++ b/interface/src/octave/gf_model_get.m
@@ -323,9 +323,9 @@
%
function [varargout]=gf_model_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('model_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('model_get', varargin{:});
else
- gf_matlab('model_get', varargin{:});
+ gf_octave('model_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_model_set.m
b/interface/src/octave/gf_model_set.m
index 9c4f4ba..d76f4c4 100644
--- a/interface/src/octave/gf_model_set.m
+++ b/interface/src/octave/gf_model_set.m
@@ -1400,9 +1400,9 @@
%
function [varargout]=gf_model_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('model_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('model_set', varargin{:});
else
- gf_matlab('model_set', varargin{:});
+ gf_octave('model_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_precond.m
b/interface/src/octave/gf_precond.m
index 146f4b0..79c007d 100644
--- a/interface/src/octave/gf_precond.m
+++ b/interface/src/octave/gf_precond.m
@@ -49,9 +49,9 @@
%
function [varargout]=gf_precond(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('precond', varargin{:});
+ [varargout{1:nargout}]=gf_octave('precond', varargin{:});
else
- gf_matlab('precond', varargin{:});
+ gf_octave('precond', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_precond_get.m
b/interface/src/octave/gf_precond_get.m
index e7160da..d386f88 100644
--- a/interface/src/octave/gf_precond_get.m
+++ b/interface/src/octave/gf_precond_get.m
@@ -32,9 +32,9 @@
%
function [varargout]=gf_precond_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('precond_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('precond_get', varargin{:});
else
- gf_matlab('precond_get', varargin{:});
+ gf_octave('precond_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_slice.m b/interface/src/octave/gf_slice.m
index f3d5f9d..9a6de81 100644
--- a/interface/src/octave/gf_slice.m
+++ b/interface/src/octave/gf_slice.m
@@ -105,9 +105,9 @@
%
function [varargout]=gf_slice(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('slice', varargin{:});
+ [varargout{1:nargout}]=gf_octave('slice', varargin{:});
else
- gf_matlab('slice', varargin{:});
+ gf_octave('slice', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_slice_get.m
b/interface/src/octave/gf_slice_get.m
index 046fee4..755b62e 100644
--- a/interface/src/octave/gf_slice_get.m
+++ b/interface/src/octave/gf_slice_get.m
@@ -131,9 +131,9 @@
%
function [varargout]=gf_slice_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('slice_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('slice_get', varargin{:});
else
- gf_matlab('slice_get', varargin{:});
+ gf_octave('slice_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_slice_set.m
b/interface/src/octave/gf_slice_set.m
index fbbef07..f0226db 100644
--- a/interface/src/octave/gf_slice_set.m
+++ b/interface/src/octave/gf_slice_set.m
@@ -14,9 +14,9 @@
%
function [varargout]=gf_slice_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('slice_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('slice_set', varargin{:});
else
- gf_matlab('slice_set', varargin{:});
+ gf_octave('slice_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_spmat.m b/interface/src/octave/gf_spmat.m
index 2c313f2..4b3e7da 100644
--- a/interface/src/octave/gf_spmat.m
+++ b/interface/src/octave/gf_spmat.m
@@ -60,9 +60,9 @@
%
function [varargout]=gf_spmat(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('spmat', varargin{:});
+ [varargout{1:nargout}]=gf_octave('spmat', varargin{:});
else
- gf_matlab('spmat', varargin{:});
+ gf_octave('spmat', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_spmat_get.m
b/interface/src/octave/gf_spmat_get.m
index b62fb43..db7d6ea 100644
--- a/interface/src/octave/gf_spmat_get.m
+++ b/interface/src/octave/gf_spmat_get.m
@@ -83,9 +83,9 @@
%
function [varargout]=gf_spmat_get(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('spmat_get', varargin{:});
+ [varargout{1:nargout}]=gf_octave('spmat_get', varargin{:});
else
- gf_matlab('spmat_get', varargin{:});
+ gf_octave('spmat_get', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_spmat_set.m
b/interface/src/octave/gf_spmat_set.m
index dd80688..07b21cb 100644
--- a/interface/src/octave/gf_spmat_set.m
+++ b/interface/src/octave/gf_spmat_set.m
@@ -54,9 +54,9 @@
%
function [varargout]=gf_spmat_set(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('spmat_set', varargin{:});
+ [varargout{1:nargout}]=gf_octave('spmat_set', varargin{:});
else
- gf_matlab('spmat_set', varargin{:});
+ gf_octave('spmat_set', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_util.m b/interface/src/octave/gf_util.m
index 07c1b8c..b958af9 100644
--- a/interface/src/octave/gf_util.m
+++ b/interface/src/octave/gf_util.m
@@ -26,9 +26,9 @@
%
function [varargout]=gf_util(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('util', varargin{:});
+ [varargout{1:nargout}]=gf_octave('util', varargin{:});
else
- gf_matlab('util', varargin{:});
+ gf_octave('util', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gf_workspace.m
b/interface/src/octave/gf_workspace.m
index 52ec1a0..17e6451 100644
--- a/interface/src/octave/gf_workspace.m
+++ b/interface/src/octave/gf_workspace.m
@@ -51,9 +51,9 @@
%
function [varargout]=gf_workspace(varargin)
if (nargout),
- [varargout{1:nargout}]=gf_matlab('workspace', varargin{:});
+ [varargout{1:nargout}]=gf_octave('workspace', varargin{:});
else
- gf_matlab('workspace', varargin{:});
+ gf_octave('workspace', varargin{:});
if (exist('ans', 'var') == 1), varargout{1}=ans; end;
end;
% autogenerated mfile;
diff --git a/interface/src/octave/gfm_common.c
b/interface/src/octave/gfm_common.c
index 126c8ed..c59c0eb 100644
--- a/interface/src/octave/gfm_common.c
+++ b/interface/src/octave/gfm_common.c
@@ -19,40 +19,39 @@
===========================================================================*/
+#include <stdio.h>
#include <assert.h>
#include <signal.h>
#include <string.h>
#include "gfm_common.h"
-#include "mex.h"
+#include "octave/mex.h"
const char*
mxClassID2string(mxClassID id) {
switch (id) {
- case mxUNKNOWN_CLASS: return "UNKNOWN";
- case mxCELL_CLASS: return "CELL";
- case mxSTRUCT_CLASS: return "STRUCT";
+ case mxUNKNOWN_CLASS: return "UNKNOWN";
+ case mxCELL_CLASS: return "CELL";
+ case mxSTRUCT_CLASS: return "STRUCT";
/* case mxOBJECT_CLASS: return "OBJECT"; ## oct-modif## */
- case mxCHAR_CLASS: return "CHAR";
- case mxDOUBLE_CLASS: return "DOUBLE";
- case mxSINGLE_CLASS: return "SINGLE";
- case mxINT8_CLASS: return "INT8";
- case mxUINT8_CLASS: return "UINT8";
- case mxINT16_CLASS: return "INT16";
- case mxUINT16_CLASS: return "UINT16";
- case mxINT32_CLASS: return "INT32";
- case mxUINT32_CLASS: return "UINT32";
- case mxINT64_CLASS: return "INT64";
- case mxUINT64_CLASS: return "UINT64";
- /* case mxSPARSE_CLASS: return "SPARSE"; ## oct-modif## */
-#ifdef LOGICAL_IS_A_TYPE
- case mxLOGICAL_CLASS: return "LOGICAL";
-#endif
+ case mxCHAR_CLASS: return "CHAR";
+ case mxDOUBLE_CLASS: return "DOUBLE";
+ case mxSINGLE_CLASS: return "SINGLE";
+ case mxINT8_CLASS: return "INT8";
+ case mxUINT8_CLASS: return "UINT8";
+ case mxINT16_CLASS: return "INT16";
+ case mxUINT16_CLASS: return "UINT16";
+ case mxINT32_CLASS: return "INT32";
+ case mxUINT32_CLASS: return "UINT32";
+ case mxINT64_CLASS: return "INT64";
+ case mxUINT64_CLASS: return "UINT64";
+ /* case mxSPARSE_CLASS: return "SPARSE"; ## oct-modif## */
+ case mxLOGICAL_CLASS: return "LOGICAL";
/* case mxOPAQUE_CLASS: return "OPAQUE_CLASS"; ## oct-modif## */
- default:
- if (id != (mxClassID)(-1))
- return "OBJECT";
- else
- return "unknown class...did you use the correct mex version ?";
+ default:
+ if (id != (mxClassID)(-1))
+ return "OBJECT";
+ else
+ return "unknown class...did you use the correct mex version ?";
}
}
diff --git a/interface/src/octave/gfm_common.h
b/interface/src/octave/gfm_common.h
index 49b78e1..bf66ffa 100644
--- a/interface/src/octave/gfm_common.h
+++ b/interface/src/octave/gfm_common.h
@@ -31,7 +31,7 @@
#ifndef GFM_COMMON_H
#define GFM_COMMON_H
-#include "mex.h"
+#include "octave/mex.h"
#include <gfi_array.h>
const char* mxClassID2string(mxClassID id);
diff --git a/interface/src/octave/gfm_mex.c b/interface/src/octave/gfm_mex.c
index 41605ca..1ced49b 100644
--- a/interface/src/octave/gfm_mex.c
+++ b/interface/src/octave/gfm_mex.c
@@ -24,7 +24,7 @@
#include <errno.h>
#include <stdio.h>
/* #include <unistd.h> */
-#include "mex.h"
+#include "octave/mex.h"
#include "gfm_common.h"
#include "getfem_interface.h"
@@ -84,10 +84,10 @@ char *current_matlab_function = NULL;
void sigint_callback(int sig) {
char *s = current_matlab_function; if (!s) s = "doh!!";
- fprintf(stderr, "*** CTRL-C hit during execution of the getfem_matlab
function: gf_%s...\n" \
+ fprintf(stderr, "*** CTRL-C hit during execution of the getfem_octave
function: gf_%s...\n" \
"You will gain control as soon as the current operation is finished
***\n" \
"If you want to abort immediatly the current operation, hit CTRL-C
again\n" \
- "In that case, you will have to restart getfem_matlab, using 'clear
functions' for example:\n", s);
+ "In that case, you will have to restart getfem_octave, using 'clear
functions' for example:\n", s);
set_cancel_flag(1);
assert(handle_getfem_callback() == 1);
}
@@ -114,7 +114,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const
mxArray *prhs[]) {
remove_custom_sigint(out->status == GFI_STATUS_OK);
if (out == NULL) {
- mexPrintf("could not connect to getfem_matlab server...");
+ mexPrintf("could not connect to getfem_octave server...");
} else {
if (out->infomsg) {
mexPrintf("message from [gf_%s]:\n%s\n", current_matlab_function,
out->infomsg);
@@ -133,7 +133,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const
mxArray *prhs[]) {
}
FREE(outl->arg.arg_val);
} else {
- /* duplicate the string into a matlab-allocated buffer.. */
+ /* duplicate the string into a octave-allocated buffer.. */
char *s = mxCalloc(strlen(out->gfi_output_u.errmsg)+1,1);
strcpy(s, out->gfi_output_u.errmsg);
FREE(out->gfi_output_u.errmsg);
- [Getfem-commits] [getfem-commits] devel-yves-octave updated (28fe545 -> 0693d25), Yves Renard, 2020/04/18
- [Getfem-commits] (no subject), Yves Renard, 2020/04/18
- [Getfem-commits] (no subject), Yves Renard, 2020/04/18
- [Getfem-commits] (no subject), Yves Renard, 2020/04/18
- [Getfem-commits] (no subject), Yves Renard, 2020/04/18
- [Getfem-commits] (no subject), Yves Renard, 2020/04/18
- [Getfem-commits] (no subject), Yves Renard, 2020/04/18
- [Getfem-commits] (no subject),
Yves Renard <=
- [Getfem-commits] (no subject), Yves Renard, 2020/04/18