Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[10968] trunk/octave-forge/extra/fpl
|
From: <cd...@us...> - 2012-09-07 08:55:59
|
Revision: 10968
http://octave.svn.sourceforge.net/octave/?rev=10968&view=rev
Author: cdf
Date: 2012-09-07 08:55:50 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
get rid of oct files
Modified Paths:
--------------
trunk/octave-forge/extra/fpl/DESCRIPTION
trunk/octave-forge/extra/fpl/NEWS
trunk/octave-forge/extra/fpl/inst/fpl_vtk_b64_write_field.m
trunk/octave-forge/extra/fpl/inst/fpl_vtk_raw_write_field.m
Removed Paths:
-------------
trunk/octave-forge/extra/fpl/src/
Modified: trunk/octave-forge/extra/fpl/DESCRIPTION
===================================================================
--- trunk/octave-forge/extra/fpl/DESCRIPTION 2012-09-06 20:29:31 UTC (rev 10967)
+++ trunk/octave-forge/extra/fpl/DESCRIPTION 2012-09-07 08:55:50 UTC (rev 10968)
@@ -1,11 +1,11 @@
Name: fpl
-Version: 1.3.1
-Date: 2012-08-10
+Version: 1.3.2
+Date: 2012-09-07
Author: Carlo de Falco, Massimiliano Culpo and others
Maintainer: Carlo de Falco, Massimiliano Culpo
Title: Fem PLotting
Description: Collection of routines to export data produced by Finite Elements or Finite Volume Simulations in formats used by some visualization programs.
Categories: Graphics
-Depends: octave ( >= 3.4.2 )
+Depends: octave ( >= 3.2.3 )
License: GPLv3+
Modified: trunk/octave-forge/extra/fpl/NEWS
===================================================================
--- trunk/octave-forge/extra/fpl/NEWS 2012-09-06 20:29:31 UTC (rev 10967)
+++ trunk/octave-forge/extra/fpl/NEWS 2012-09-07 08:55:50 UTC (rev 10968)
@@ -1,3 +1,9 @@
+Summary of important user-visible changes for fpl 1.3.2:
+-------------------------------------------------------------------
+
+ * raw/base64 vtk exporters have been rewritten in a more backward-compatible
+ way. This should also make fpl easier to install.
+
Summary of important user-visible changes for fpl 1.3.1:
-------------------------------------------------------------------
Modified: trunk/octave-forge/extra/fpl/inst/fpl_vtk_b64_write_field.m
===================================================================
--- trunk/octave-forge/extra/fpl/inst/fpl_vtk_b64_write_field.m 2012-09-06 20:29:31 UTC (rev 10967)
+++ trunk/octave-forge/extra/fpl/inst/fpl_vtk_b64_write_field.m 2012-09-07 08:55:50 UTC (rev 10968)
@@ -156,8 +156,8 @@
## VTK-Points (mesh nodes)
fprintf (fid, " <Points>\n");
fprintf (fid, " <DataArray type=""Float64"" Name=""Array"" NumberOfComponents=""3"" format=""appended"" offset=""%d"" />\n", offset);
- newdata = __array_to_uint8__(p)(:);
- data = [data, base64_encode([__array_to_uint8__(int32 (numel (newdata)))(:); newdata])];
+ newdata = typecast (p, 'uint8')(:);
+ data = [data, base64_encode([typecast(int32 (numel (newdata)), 'uint8')(:); newdata])];
offset = numel (data);
fprintf (fid, " </Points>\n");
@@ -165,20 +165,20 @@
## VTK-Cells (mesh elements)
fprintf (fid, " <Cells>\n");
fprintf (fid, " <DataArray type=""Int32"" Name=""connectivity"" format=""appended"" offset=""%d"" />\n", offset);
- newdata = __array_to_uint8__(int32 (t))(:);
- data = [data, base64_encode([__array_to_uint8__(int32 (numel (newdata)))(:); newdata])];
+ newdata = typecast (int32 (t), 'uint8')(:);
+ data = [data, base64_encode([typecast(int32 (numel (newdata)), 'uint8')(:); newdata])];
offset = numel (data);
fprintf (fid, " <DataArray type=""Int32"" Name=""offsets"" format=""appended"" offset=""%d"" />\n", offset);
tmp = (dim+1):(dim+1):((dim+1)*nelems);
- newdata = __array_to_uint8__(int32 (tmp))(:);
- data = [data, base64_encode([__array_to_uint8__(int32 (numel (newdata)))(:); newdata])];
+ newdata = typecast(int32 (tmp), 'uint8')(:);
+ data = [data, base64_encode([typecast(int32 (numel (newdata)), 'uint8')(:); newdata])];
offset = numel (data);
fprintf (fid, " <DataArray type=""UInt8"" Name=""types"" format=""appended"" offset=""%d"" />\n", offset);
tmp = eltype*ones(nelems,1);
- newdata = __array_to_uint8__(uint8 (tmp))(:);
- data = [data, base64_encode([__array_to_uint8__(int32 (numel (newdata)))(:); newdata])];
+ newdata = typecast(uint8 (tmp), 'uint8')(:);
+ data = [data, base64_encode([typecast(int32 (numel (newdata)), 'uint8')(:); newdata])];
offset = numel (data);
fprintf (fid, " </Cells>\n");
@@ -204,8 +204,8 @@
endif
fprintf (fid, " <DataArray type=""Float64"" Name=""%s"" ", ndataname);
fprintf (fid, "NumberOfComponents=""%d"" format=""appended"" offset=""%d"" />\n", ncomp, offset);
- newdata = __array_to_uint8__(ndata.')(:);
- data = [data, base64_encode([__array_to_uint8__(int32 (numel (newdata)))(:); newdata])];
+ newdata = typecast (ndata.', 'uint8')(:);
+ data = [data, base64_encode([typecast(int32 (numel (newdata)), 'uint8')(:); newdata])];
offset = numel (data);
endfor
fprintf (fid, " </PointData>\n");
@@ -231,8 +231,8 @@
endif
fprintf (fid, " <DataArray type=""Float64"" Name=""%s"" ", cdataname);
fprintf (fid, "NumberOfComponents=""%d"" format=""appended"" offset=""%d"" />\n", ncomp, offset);
- newdata = __array_to_uint8__(cdata.')(:);
- data = [data, base64_encode([__array_to_uint8__(int32 (numel (newdata)))(:); newdata])];
+ newdata = typecast(cdata.', 'uint8')(:);
+ data = [data, base64_encode([typecast(int32 (numel (newdata)), 'uint8')(:); newdata])];
offset = numel (data);
endfor
fprintf (fid, " </CellData>\n");
Modified: trunk/octave-forge/extra/fpl/inst/fpl_vtk_raw_write_field.m
===================================================================
--- trunk/octave-forge/extra/fpl/inst/fpl_vtk_raw_write_field.m 2012-09-06 20:29:31 UTC (rev 10967)
+++ trunk/octave-forge/extra/fpl/inst/fpl_vtk_raw_write_field.m 2012-09-07 08:55:50 UTC (rev 10968)
@@ -151,8 +151,8 @@
## VTK-Points (mesh nodes)
fprintf (fid, " <Points>\n");
fprintf (fid, " <DataArray type=""Float64"" Name=""Array"" NumberOfComponents=""3"" format=""appended"" offset=""%d"" />\n", offset);
- newdata = __array_to_uint8__ (p);
- data = [data, __array_to_uint8__(int32 (numel (newdata))), newdata];
+ newdata = typecast (p, 'uint8')(:);
+ data = [data; typecast(int32 (numel (newdata)), 'uint8')(:); newdata];
offset = numel (data);
fprintf (fid, " </Points>\n");
@@ -160,20 +160,20 @@
## VTK-Cells (mesh elements)
fprintf (fid, " <Cells>\n");
fprintf (fid, " <DataArray type=""Int32"" Name=""connectivity"" format=""appended"" offset=""%d"" />\n", offset);
- newdata = __array_to_uint8__ (int32 (t));
- data = [data, __array_to_uint8__(int32 (numel (newdata))), newdata];
+ newdata = typecast (int32 (t), 'uint8')(:);
+ data = [data; typecast(int32 (numel (newdata)), 'uint8')(:); newdata];
offset = numel (data);
fprintf (fid, " <DataArray type=""Int32"" Name=""offsets"" format=""appended"" offset=""%d"" />\n", offset);
tmp = (dim+1):(dim+1):((dim+1)*nelems);
- newdata = __array_to_uint8__ (int32 (tmp));
- data = [data, __array_to_uint8__(int32 (numel (newdata))), newdata];
+ newdata = typecast (int32 (tmp), 'uint8')(:);
+ data = [data; typecast(int32 (numel (newdata)), 'uint8')(:); newdata];
offset = numel (data);
fprintf (fid, " <DataArray type=""UInt8"" Name=""types"" format=""appended"" offset=""%d"" />\n", offset);
tmp = eltype*ones(nelems,1);
- newdata = __array_to_uint8__ (uint8 (tmp));
- data = [data, __array_to_uint8__(int32 (numel (newdata))), newdata];
+ newdata = typecast (uint8 (tmp), 'uint8')(:);
+ data = [data; typecast(int32 (numel (newdata)), 'uint8')(:); newdata];
offset = numel (data);
fprintf (fid, " </Cells>\n");
@@ -199,8 +199,8 @@
endif
fprintf (fid, " <DataArray type=""Float64"" Name=""%s"" ", ndataname);
fprintf (fid, "NumberOfComponents=""%d"" format=""appended"" offset=""%d"" />\n", ncomp, offset);
- newdata = __array_to_uint8__ (ndata.');
- data = [data, __array_to_uint8__(int32 (numel (newdata))), newdata];
+ newdata = typecast (ndata.', 'uint8')(:);
+ data = [data; typecast(int32 (numel (newdata)), 'uint8')(:); newdata];
offset = numel (data);
endfor
fprintf (fid, " </PointData>\n");
@@ -226,8 +226,8 @@
endif
fprintf (fid, " <DataArray type=""Float64"" Name=""%s"" ", cdataname);
fprintf (fid, "NumberOfComponents=""%d"" format=""appended"" offset=""%d"" />\n", ncomp, offset);
- newdata = __array_to_uint8__ (cdata.');
- data = [data, __array_to_uint8__(int32 (numel (newdata))), newdata];
+ newdata = typecast (cdata.', 'uint8')(:);
+ data = [data; typecast(int32 (numel (newdata)), 'uint8')(:); newdata];
offset = numel (data);
endfor
fprintf (fid, " </CellData>\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
