Changeset 6097

Timestamp:

Dec 22, 2008, 5:22:25 PM (16 years ago)

Author:

ole

Message:

Work on River2D integration

File:

• anuga_work/development/river2d_integration/River2Dcdg_ANUGAMesh.py (modified) (2 diffs)

anuga_work/development/river2d_integration/River2Dcdg_ANUGAMesh.py

@@ -77 +77 @@
         x=float(fields[x_index])
         y=float(fields[x_index + 1])
-        #z=float(fields[x_index + 2]) # TODO: Get elevation data a separate list
+        z=float(fields[x_index + 2]) # Elevation
+        n=float(fields[x_index + 3]) # Mannings roughness
         outfid1.write('%.3f, %.3f\n' % (x, y))
 
-    elif reading_vertices is True:    # Read Vertices
+    elif reading_vertices is True:    # Read Elements
         fields = line.split()
 
         # Create indices and make them start from 0
-        pt1=int(fields[3]) - 1
-        pt2=int(fields[4]) - 1
-        pt3=int(fields[5]) - 1
+        pt1 = int(fields[3]) - 1
+        pt2 = int(fields[4]) - 1
+        pt3 = int(fields[5]) - 1
         outfid2.write('%d, %d, %d\n' % (pt1, pt2,pt3)) 
 
@@ -92 +93 @@
 outfid1.close()
 outfid2.close()
-print "\nConversion complete.\n"
-print 'ALL DONE'
-raw_input("Press ENTER to exit.\n")
+print '\nConversion complete.'
+raw_input('Press ENTER to exit.')