Changeset 6077

Timestamp:

Dec 15, 2008, 4:56:07 PM (16 years ago)

Author:

ole

Message:

Some work on River2D integration - not working yet, mesh bungled.

Location:

anuga_work/development/river2d_integration

Files:

• Create_Domain_From_Pts_Vert.py (modified) (4 diffs)
• River2DMesh_ANUGAMesh.py (modified) (1 diff)

anuga_work/development/river2d_integration/Create_Domain_From_Pts_Vert.py

@@ -33 +33 @@
 
 # OLE How do I get the Domain Points to create a LIST of Points from the File ???
-
+import Numeric
 
 #------------------------------------------------------------------------------
@@ -39 +39 @@
 #------------------------------------------------------------------------------
 
-points='ANUGA_MeshPts.csv'
-vertices='ANUGA_MeshVertices.csv'
+
+
+
+points=[]
+fid = open('ANUGA_MeshPts.csv')
+for lines in fid.readlines():
+    if lines.strip() == '': continue
+    fields = lines.split(',')
+    x = float(fields[0])
+    y = float(fields[1])
+    points.append([x,y])
+fid.close()
+
+vertices = []
+fid = open('ANUGA_MeshVertices.csv')    
+for lines in fid.readlines():
+    if lines.strip() == '': continue
+    fields = lines.split(',')
+    i = int(fields[0])
+    j = int(fields[1])
+    k = int(fields[2])    
+    vertices.append([i,j,k])
+fid.close()
+
+boundary=None  # Deal with this later
+
+#print points
+#print vertices
 domain = Domain(points, vertices, boundary) # Create domain
+domain.check_integrity()
 
 #------------------------------------------------------------------------------
@@ -58 +85 @@
 
 
+#------------------------------------------------------------------------------
+#       BOUNDARY CONDITIONS
+#------------------------------------------------------------------------------
 
+Br = Reflective_boundary(domain)
+domain.set_boundary({'exterior': Br})  # Default tag
 
 #------------------------------------------------------------------------------
@@ -66 +98 @@
 import time
 t0 = time.time()
-if answer2 == 1:
-    for t in domain.evolve(yieldstep = 30, finaltime = 5000): 
-        domain.write_time()
-        domain.write_boundary_statistics(tags='east', quantities='stage')     
-if answer2 == 3:
-    for t in domain.evolve(yieldstep = 30, finaltime = 3600): 
-        domain.write_time()
-        domain.write_boundary_statistics(tags='east', quantities='stage')       
 
+for t in domain.evolve(yieldstep = 10, finaltime = 100): 
+    domain.write_time()
+    domain.write_boundary_statistics(quantities='stage')     
 
-print 'END OF RUN............'                  
+print 'That took', time.time() - t0, 'seconds'                  
     

anuga_work/development/river2d_integration/River2DMesh_ANUGAMesh.py

@@ -20 +20 @@
 print "\nFILES are open ready for conversion....\n"
 
-readpts=0
-type=1
-blank_line_count=0
+reading_points = True
+reading_vertices = False
+last_point_index = 0
 for line in infid.readlines():
-    print 'line', line
+    print 'line', line.strip()
+    
+    if line.strip() == '':
+        continue
 
-    #print 'type = ',type
-    if line.strip() == '':
-        #blank_line_count=blank_line_count+1
-        type=2   # blank line
+    if line.lower().startswith('no more nodes'):
+        reading_vertices = True
+        reading_points = False
         continue
-    
-    print 'readpts=  %i, Type = %i  Blank Line = %i'%(readpts, type, blank_line_count)
-    if readpts==0 and type==1:   # Start to read Points
+
+    if line.lower().startswith('no more boundary segments'):
+        break
+
+    if reading_points is True:   # Read Points
+
+        # Check that point indices are consecutive        
+        s = line[:5]
+        index = int(s.strip())
+        assert index-1 == last_point_index
+        last_point_index = index
+
+        # Get points
         s = line[9:38]
         fields = s.split(' ')
         x=float(fields[0])
         y=float(fields[1])
-        #z=float(fields[3])
-        outfid1.write('%.3f,%.3f\n' %(x, y)) 
-    elif readpts==1 and blank_line_count==2:    # Start to read Vertices
+        #z=float(fields[3]) # TODO: Get elevation data a separate list
+        outfid1.write('%.3f, %.3f\n' % (x, y))
+
+    elif reading_vertices is True:    # Read Vertices
         fields = line.split(' ')
-        pt1=int(line[1:6])
-        pt2=int(line[10:16])
-        pt3=int(line[20:26])
-        outfid2.write('%i,%i,%i\n' %(pt1, pt2,pt3)) 
 
-    if line=='no more boundary segments.':
-        print 'no more Vertices ALL DONE!!!!'
-        type=5   # End of File can stop processing
-    if line=='no more nodes.':
-        print 'no more nodes!!!!'
-        type=3  # End of Points 
-        readpts=1
-    if line.strip() == '':
-        blank_line_count=blank_line_count+1
-        type=4   # blank line
-        readpts=1
+        # 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
+        outfid2.write('%d, %d, %d\n' % (pt1, pt2,pt3)) 
+
     
 outfid1.close()
 outfid2.close()
 print "\nConversion complete.\n"
-raw_input("Press ENTER to exit.\n")
+