Merge lp:~asc/fluidity/mesh_spherical_shells into lp:fluidity

[Adam Candy]

New option in gmsh2triangle to interpret a 3d input mesh as a 2d mesh on a spherical shell.
This avoids having to apply sed to the node file.

An improvement would be to have Fluidity detect this independent of the dimension in the node file.

[Alexandros Avdis (alexandros-avdis)]

Looks good

review: Approve

[Simon Mouradian (mouradian)]

There should be an accompanying update to the manual. I will add this shortly.

[Adam Candy (asc)]

Thanks Simon

=== modified file 'tools/gmsh2triangle.py'
--- tools/gmsh2triangle.py	2012-03-14 11:01:33 +0000
+++ tools/gmsh2triangle.py	2012-09-20 17:28:19 +0000
@@ -16,6 +16,9 @@
                   help="discard 3rd coordinate of node positions",
                   action="store_const", const=2, dest="dim", default=3)
 
+optparser.add_option("--shell", "-s",
+                  help="interpret a 3d input mesh as a 2d mesh on a spherical shell",
+                  action="store_const", const=True, dest="spherical_shell", default=False)
 
 optparser.add_option("--internal-boundary", "-i", 
                   help="mesh contains internal faces - this option is required if you have assigned " +
@@ -57,6 +60,9 @@
   sys.exit(1)
 
 dim=options.dim
+nodefile_dim = dim
+if options.spherical_shell:
+  nodefile_dim -= 1
 
 nodefile_linelist = []
 for i in range(nodecount):
@@ -154,7 +160,7 @@
     sys.exit(1)
 
 nodefile=file(basename+".node", 'w')
-nodefile.write(`nodecount`+" "+`options.dim`+" 0 0\n")
+nodefile.write(`nodecount`+" "+`nodefile_dim`+" 0 0\n")
 j=0
 for i in range(nodecount):    
   j=j+1