[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: |
Sun, 23 Dec 2018 11:23:38 -0500 (EST) |
branch: consistent_partitioning_for_open_mp
commit 69ba6429abf6fba43a9d971eae03a725e4f49cdb
Author: Yves Renard <address@hidden>
Date: Sun Dec 23 17:17:59 2018 +0100
Adaptations for Scilab 6.0
---
.gitignore | 4 ++++
interface/src/getfemint.h | 1 +
interface/src/scilab/builder.sce | 4 ++--
interface/src/scilab/macros/gf_compute_Q1grid_interp.sci | 2 +-
interface/src/scilab/macros/gf_plot_slice.sci | 2 +-
interface/src/scilab/macros/init_pde.sci | 3 +--
interface/src/scilab/sci_gateway/c/gfm_common.c | 6 +++---
interface/src/scilab/sci_gateway/c/gfm_common.h | 4 +++-
interface/src/scilab/sci_gateway/c/gfm_scilab.cpp | 4 +---
interface/src/scilab/sci_gateway/c/sci_cgne.c | 4 +---
interface/src/scilab/sci_gateway/c/sci_cgs.c | 4 +---
interface/src/scilab/sci_gateway/c/sci_gmres.c | 4 +---
interface/src/scilab/sci_gateway/c/sci_mgcr.c | 4 +---
interface/src/scilab/sci_gateway/c/sci_spchol.c | 6 ++----
interface/src/scilab/sci_gateway/c/sci_spcholinc.c | 4 +---
interface/src/scilab/sci_gateway/c/sci_spchsolve.c | 4 +---
interface/src/scilab/sci_gateway/c/sci_splu.c | 4 +---
interface/src/scilab/sci_gateway/c/sci_spluinc.c | 4 +---
interface/src/scilab/sci_gateway/c/sci_splusolve.c | 4 +---
19 files changed, 28 insertions(+), 44 deletions(-)
diff --git a/.gitignore b/.gitignore
index 397f882..0f6c00e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,6 +109,10 @@ Makefile
/interface/src/scilab/macros/overload/names
/interface/src/scilab/sci_gateway/c/cleaner.sce
/interface/src/scilab/sci_gateway/c/libscigetfem_c.c
+/interface/src/scilab/sci_gateway/c/libscigetfem_c.cpp
+/interface/src/scilab/sci_gateway/c/libscigetfem_c.h
+/interface/src/scilab/sci_gateway/c/libscigetfem_c.hxx
+/interface/src/scilab/src/cleaner_src.sce
/interface/src/scilab/sci_gateway/c/libscigetfem_c.so
/interface/src/scilab/sci_gateway/c/loader.sce
/interface/src/scilab/sci_gateway/cleaner_gateway.sce
diff --git a/interface/src/getfemint.h b/interface/src/getfemint.h
index c93320d..b41a8f3 100644
--- a/interface/src/getfemint.h
+++ b/interface/src/getfemint.h
@@ -41,6 +41,7 @@
#include <getfem/dal_static_stored_objects.h>
#include <getfem/dal_bit_vector.h>
#include <getfem/getfem_config.h>
+#include <getfem/getfem_mesh.h>
#include <gfi_array.h>
namespace getfemint {
diff --git a/interface/src/scilab/builder.sce b/interface/src/scilab/builder.sce
index d6a4be5..7abe127 100644
--- a/interface/src/scilab/builder.sce
+++ b/interface/src/scilab/builder.sce
@@ -10,12 +10,12 @@ try
catch
error(gettext('Scilab 5.3.x or more is required.'));
end;
-if v(2) < 3 then
+if v(1) < 6 then
error(gettext('Scilab 5.3.x or more is required.'));
end
// ====================================================================
if ~with_module('development_tools') then
- error(msprintf(gettext('%s module not installed."),'development_tools'));
+ error(msprintf(gettext('%s module not installed.'),'development_tools'));
end
// ====================================================================
TOOLBOX_NAME = 'sci_getfem';
diff --git a/interface/src/scilab/macros/gf_compute_Q1grid_interp.sci
b/interface/src/scilab/macros/gf_compute_Q1grid_interp.sci
index 7a7bfd1..d9750f3 100644
--- a/interface/src/scilab/macros/gf_compute_Q1grid_interp.sci
+++ b/interface/src/scilab/macros/gf_compute_Q1grid_interp.sci
@@ -82,7 +82,7 @@ try
if (nargout == 3) then
gf_workspace('keep', MF2);
end;
-catch,
+catch
gf_workspace('pop');
error(lasterror());
end
diff --git a/interface/src/scilab/macros/gf_plot_slice.sci
b/interface/src/scilab/macros/gf_plot_slice.sci
index 7c6bec6..b16a5b6 100644
--- a/interface/src/scilab/macros/gf_plot_slice.sci
+++ b/interface/src/scilab/macros/gf_plot_slice.sci
@@ -263,7 +263,7 @@ while (1)
// search for consecutive edge points
it1 = it0;
//while (it1 < nT & T(1,it1+1) == T(2,it1)) it1 = it1+1; end;
- while (it1 < nT & T(1,it1+1) == T(2,it1)) it1 = it1+1; end;
+ while (it1 < nT & T(1,it1+1) == T(2,it1)), it1 = it1+1; end;
//disp(sprintf('sequence: %d - %d -- [%d-%d] -
[%d-%d]',it0,it1,T(1,it0),T(2,it0),T(1,it1),T(2,it1)))
// extract the sequence of points
ip = [T(1,it0) T(2,it0:it1)];
diff --git a/interface/src/scilab/macros/init_pde.sci
b/interface/src/scilab/macros/init_pde.sci
index 2aebe70..df249ef 100644
--- a/interface/src/scilab/macros/init_pde.sci
+++ b/interface/src/scilab/macros/init_pde.sci
@@ -39,8 +39,7 @@ pde = mlist(['pde', ...
'PR', ...
'E', ...
'pdetool', ... // pde('pdetool')('b'), pde('pdetool')('e'),
- 'bound', ...
- ]);
+ 'bound']);
pde('verbosity') = 0; // integer
pde('type') = []; // 'laplacian', 'linear elasticity', 'stockes'
diff --git a/interface/src/scilab/sci_gateway/c/gfm_common.c
b/interface/src/scilab/sci_gateway/c/gfm_common.c
index 0c486ab..b1a2ba6 100644
--- a/interface/src/scilab/sci_gateway/c/gfm_common.c
+++ b/interface/src/scilab/sci_gateway/c/gfm_common.c
@@ -24,11 +24,11 @@
#include <string.h>
#include <stdio.h>
-#include <stack-c.h>
+#include <api_scilab.h>
+#include <api_stack_common.h>
#include <Scierror.h>
#include <sciprint.h>
-#include <MALLOC.h>
-#include <api_scilab.h>
+#include <localization.h>
#include "gfm_common.h"
diff --git a/interface/src/scilab/sci_gateway/c/gfm_common.h
b/interface/src/scilab/sci_gateway/c/gfm_common.h
index f392fbc..c7a7805 100644
--- a/interface/src/scilab/sci_gateway/c/gfm_common.h
+++ b/interface/src/scilab/sci_gateway/c/gfm_common.h
@@ -32,9 +32,11 @@
#ifndef GFM_COMMON_H
#define GFM_COMMON_H
-#include <stack-c.h>
+#include <api_scilab.h>
#include "gfi_array.h"
+extern StrCtx* pvApiCtx; // valid for Scilab 6.0 ?
+
const char* sci_ClassID2string(sci_types id);
int sci_array_to_gfi_array(int * sci_x, gfi_array *t);
int gfi_array_to_sci_array(gfi_array *t, int i);
diff --git a/interface/src/scilab/sci_gateway/c/gfm_scilab.cpp
b/interface/src/scilab/sci_gateway/c/gfm_scilab.cpp
index 9a03b73..71ffe00 100644
--- a/interface/src/scilab/sci_gateway/c/gfm_scilab.cpp
+++ b/interface/src/scilab/sci_gateway/c/gfm_scilab.cpp
@@ -29,11 +29,9 @@
#include <unistd.h>
#endif
extern "C" {
-#include <stack-c.h>
+#include <api_scilab.h>
#include <sciprint.h>
#include <Scierror.h>
-#include <api_scilab.h>
-#include <MALLOC.h>
}
extern "C" {
diff --git a/interface/src/scilab/sci_gateway/c/sci_cgne.c
b/interface/src/scilab/sci_gateway/c/sci_cgne.c
index 9603e97..3805c0a 100644
--- a/interface/src/scilab/sci_gateway/c/sci_cgne.c
+++ b/interface/src/scilab/sci_gateway/c/sci_cgne.c
@@ -20,9 +20,7 @@
===========================================================================*/
#include <stdio.h>
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_cgs.c
b/interface/src/scilab/sci_gateway/c/sci_cgs.c
index cb34a9d..c25a87d 100644
--- a/interface/src/scilab/sci_gateway/c/sci_cgs.c
+++ b/interface/src/scilab/sci_gateway/c/sci_cgs.c
@@ -21,9 +21,7 @@
#include <stdio.h>
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_gmres.c
b/interface/src/scilab/sci_gateway/c/sci_gmres.c
index b6ead60..66216b2 100644
--- a/interface/src/scilab/sci_gateway/c/sci_gmres.c
+++ b/interface/src/scilab/sci_gateway/c/sci_gmres.c
@@ -21,9 +21,7 @@
#include <stdio.h>
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_mgcr.c
b/interface/src/scilab/sci_gateway/c/sci_mgcr.c
index 951673e..96617b7 100644
--- a/interface/src/scilab/sci_gateway/c/sci_mgcr.c
+++ b/interface/src/scilab/sci_gateway/c/sci_mgcr.c
@@ -21,9 +21,7 @@
#include <stdio.h>
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_spchol.c
b/interface/src/scilab/sci_gateway/c/sci_spchol.c
index ea20041..93767ec 100644
--- a/interface/src/scilab/sci_gateway/c/sci_spchol.c
+++ b/interface/src/scilab/sci_gateway/c/sci_spchol.c
@@ -18,10 +18,8 @@
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
===========================================================================*/
-#include <api_scilab.h>
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_spcholinc.c
b/interface/src/scilab/sci_gateway/c/sci_spcholinc.c
index 3e14cc5..3cf58f9 100644
--- a/interface/src/scilab/sci_gateway/c/sci_spcholinc.c
+++ b/interface/src/scilab/sci_gateway/c/sci_spcholinc.c
@@ -19,9 +19,7 @@
===========================================================================*/
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+#include <gfm_common.h>
#include <sciprint.h>
#include <Scierror.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_spchsolve.c
b/interface/src/scilab/sci_gateway/c/sci_spchsolve.c
index 63bc8e1..9da9feb 100644
--- a/interface/src/scilab/sci_gateway/c/sci_spchsolve.c
+++ b/interface/src/scilab/sci_gateway/c/sci_spchsolve.c
@@ -19,9 +19,7 @@
===========================================================================*/
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_splu.c
b/interface/src/scilab/sci_gateway/c/sci_splu.c
index b53ae02..893f531 100644
--- a/interface/src/scilab/sci_gateway/c/sci_splu.c
+++ b/interface/src/scilab/sci_gateway/c/sci_splu.c
@@ -20,9 +20,7 @@
===========================================================================*/
#include <stdio.h>
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_spluinc.c
b/interface/src/scilab/sci_gateway/c/sci_spluinc.c
index d56b227..db9b25a 100644
--- a/interface/src/scilab/sci_gateway/c/sci_spluinc.c
+++ b/interface/src/scilab/sci_gateway/c/sci_spluinc.c
@@ -19,9 +19,7 @@
===========================================================================*/
-#include <api_scilab.h>
-#include <stack-c.h>
-#include <MALLOC.h>
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>
diff --git a/interface/src/scilab/sci_gateway/c/sci_splusolve.c
b/interface/src/scilab/sci_gateway/c/sci_splusolve.c
index 4a96bdf..a805ad4 100644
--- a/interface/src/scilab/sci_gateway/c/sci_splusolve.c
+++ b/interface/src/scilab/sci_gateway/c/sci_splusolve.c
@@ -19,9 +19,7 @@
===========================================================================*/
-#include <api_scilab.h>
-#include <MALLOC.h>
-#include <stack-c.h>
+#include <gfm_common.h>
#include <Scierror.h>
#include <sciprint.h>