[Octave-cvsupdate] SF.net SVN: octave:[8041] trunk/octave-forge/extra/msh/inst

[<cu...@us...>]

Revision: 8041
          http://octave.svn.sourceforge.net/octave/?rev=8041&view=rev
Author:   culpo
Date:     2010-12-27 16:26:44 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
Fixed a bug occurring with new gmsh version

Modified Paths:
--------------
    trunk/octave-forge/extra/msh/inst/msh2m_gmsh.m
    trunk/octave-forge/extra/msh/inst/msh3m_gmsh.m

Modified: trunk/octave-forge/extra/msh/inst/msh2m_gmsh.m
===================================================================
--- trunk/octave-forge/extra/msh/inst/msh2m_gmsh.m	2010-12-27 15:48:45 UTC (rev 8040)
+++ trunk/octave-forge/extra/msh/inst/msh2m_gmsh.m	2010-12-27 16:26:44 UTC (rev 8041)
@@ -80,9 +80,9 @@
   ## Points
   com_p   = "awk '/\\$Nodes/,/\\$EndNodes/ {print $2, $3 > ""msh_p.txt""}' ";
   ## Side edges
-  com_e   = "awk '/\\$Elements/,/\\$EndElements/ {if ($2 == ""1"") print $7, $8,$5 > ""msh_e.txt""}' ";
+  com_e   = "awk '/\\$Elements/,/\\$EndElements/ {n=3+$3; if ($2 == ""1"") print $(n+1), $(n+2), $5 > ""msh_e.txt""}' ";
   ## Triangles
-  com_t   = "awk '/\\$Elements/,/\\$EndElements/ {if ($2 == ""2"") print $7, $8, $9, $5 > ""msh_t.txt""}' ";
+  com_t   = "awk '/\\$Elements/,/\\$EndElements/ {n=3+$3; if ($2 == ""2"") print $(n+1), $(n+2), $(n+3), $5 > ""msh_t.txt""}' ";
 
   command = [com_p,geometry,".msh ; "];
   command = [command,com_e,geometry,".msh ; "];

Modified: trunk/octave-forge/extra/msh/inst/msh3m_gmsh.m
===================================================================
--- trunk/octave-forge/extra/msh/inst/msh3m_gmsh.m	2010-12-27 15:48:45 UTC (rev 8040)
+++ trunk/octave-forge/extra/msh/inst/msh3m_gmsh.m	2010-12-27 16:26:44 UTC (rev 8041)
@@ -81,11 +81,11 @@
   ## Points
   com_p   = "awk '/\\$Nodes/,/\\$EndNodes/ {print $2, $3, $4 > ""msh_p.txt""}' ";
   ## Surface edges
-  com_e   = "awk '/\\$Elements/,/\\$EndElements/ {if ($2 == ""2"") print $7, $8, $9, $5 > ""msh_e.txt""}' ";
+  com_e   = "awk '/\\$Elements/,/\\$EndElements/ {n=3+$3; if ($2 == ""2"") print $(n+1), $(n+2), $(n+3), $5 > ""msh_e.txt""}' ";
   ## Tetrahedra
-  com_t   = "awk '/\\$Elements/,/\\$EndElements/ {if ($2 == ""4"") print $7, $8, $9, $10, $5 > ""msh_t.txt""}' ";
+  com_t   = "awk '/\\$Elements/,/\\$EndElements/ {n=3+$3; if ($2 == ""4"") print $(n+1), $(n+2), $(n+3), $(n+4), $5 > ""msh_t.txt""}' ";
   ## Side edges
-  com_s   = "awk '/\\$Elements/,/\\$EndElements/ {if ($2 == ""1"") print $7, $8, $5 > ""msh_s.txt""}' ";
+  com_s   = "awk '/\\$Elements/,/\\$EndElements/ {n=3+$3; if ($2 == ""1"") print $(n+2), $(n+2), $5 > ""msh_s.txt""}' ";
 
   command = [com_p,geometry,".msh ; "];
   command = [command,com_e,geometry,".msh ; "];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.