Changeset 6085

Timestamp:

Dec 16, 2008, 5:04:35 PM (16 years ago)

Author:

ole

Message:

Got River2D runfile reader and associated ANUGA domain to work

Location:

anuga_work/development/river2d_integration

Files:

• Create_Domain_From_Pts_Vert.py (modified) (1 diff)
• River2Dcdg_ANUGAMesh.py (modified) (2 diffs)

anuga_work/development/river2d_integration/Create_Domain_From_Pts_Vert.py

@@ -74 +74 @@
 #------------------------------------------------------------------------------
 
+domain.set_quantity('stage', 1.0)
 
 

anuga_work/development/river2d_integration/River2Dcdg_ANUGAMesh.py

@@ -20 +20 @@
 print "\nFILES are open ready for conversion....\n"
 
+lines = infid.readlines()
 
-linecounter =0
+# Ignore all metadata prior to node information
+for i, line in enumerate(lines):
+    if line.strip().startswith('Node #'):
+        # Found node information
+        break
+
+
 reading_points = True
 reading_vertices = False
 last_point_index = 0
 
-for line in infid.readlines():
-    linecounter=linecounter+1
-    print 'line ',linecounter,reading_points, line.strip()
+for L in lines[i+1:]:
+    line = L.strip()
 
-    raw_input("Press ENTER to exit.\n")
-    if linecounter < 35:
-        reading_vertices = False
-        reading_points = False
+    print line
+    
+    if line == '':
         continue
 
-    if line.strip() == '':
+    if line.startswith('Element Information'):
         continue
-
-    if line.lower().startswith(' node #, coordinates'):
-        raw_input("Press ENTER to exit.\n")
-        reading_vertices = True
-        reading_points = True
-        continue
-
-    if line.lower().startswith(' element #, vtype, gtype, nodes'):
+        
+    if line.startswith('Element #'):
         reading_vertices = True
         reading_points = False
         continue
 
-    if line.lower().startswith(' boundary element #, vtype, gtype, nodes, boundary condition codes'):
+    if line.startswith('Boundary Element #'):
+        print 'Reached boundary info, not processing yet'
         break
 
     if reading_points is True:   # Read Points
-        fields = line.split(' ')
+        fields = line.split()
+
+        #print fields, len(fields)
+
+        if len(fields) == 9:
+            # No single character flag
+            x_index = 1
+        elif len(fields) == 10:
+            # Single character flag used in in second column
+            x_index = 2
+        else:
+            print fields, len(fields)
+            raise Exception, 'Bad file format'
+            
         # Check that point indices are consecutive        
         s = fields[0]
-        print s
         index = int(s)
         assert index-1 == last_point_index
@@ -63 +75 @@
 
         # Get points
-        s = line[11:39]
-        fields = s.split(' ')
-        x=float(fields[0])
-        y=float(fields[1])
-        #z=float(fields[3]) # TODO: Get elevation data a separate list
+        x=float(fields[x_index])
+        y=float(fields[x_index + 1])
+        #z=float(fields[x_index + 2]) # TODO: Get elevation data a separate list
         outfid1.write('%.3f, %.3f\n' % (x, y))
 
     elif reading_vertices is True:    # Read Vertices
-        fields = line.split(' ')
+        fields = line.split()
 
         # Create indices and make them start from 0
-        pt1=int(line[1:6]) - 1
-        pt2=int(line[10:16]) - 1
-        pt3=int(line[20:26]) - 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))