Changeset 2634 for development

Timestamp:

Mar 30, 2006, 9:12:24 AM (19 years ago)

Author:

nicholas

Message:

Corrected folder lookups for CCS.py

Location:

development/momentum_sink

Files:

• CCS.py (modified) (10 diffs)
• PCS.py (modified) (2 diffs)
• Sorter.py (modified) (1 diff)
• create_buildings.py (modified) (4 diffs)
• loop_buildings.py (modified) (2 diffs)
• project.py (modified) (1 diff)

development/momentum_sink/CCS.py

@@ -12 +12 @@
 import project
 import string
-import operator
 from pyvolution.util import file_function
 from create_buildings import WidtH
-from pylab import *
 from numerical_tools import norm, corr, err  
 
@@ -23 +21 @@
 #-------------------------------------------------------------------------
 # Sorting function used to sort files by 
-B_list_unsorted=os.listdir("buildings_Str_half_Off") # <<<< place folder name here
+B_list_unsorted=os.listdir(project.building_dir) # <<<< place folder name here
 B_strings=[]
 B_list=[]
@@ -32 +30 @@
     B_current = [A,B,C]; B_strings.append(B_current)
 
-B_strings.sort(key=operator.itemgetter(1))
+B_strings.sort(lambda x, y: cmp(x[1],y[1]))
 
 for B_str in B_strings:
@@ -38 +36 @@
     final=string.join(B_str).replace(' ','')
     B_list.append(final)
-
+print B_list
 print ">> ",B_list[0],"<< FIRST file"
 print ">> ",B_list[-1],"<< LAST file"
 # End of sorting file
 #-------------------------------------------------------------------------
-
-fd = open("buildings_Str_Off(hlf)_report.csv", 'w')
-fd.write( 'buildings_Str_Off(hlf)_report. Summary.' + '\n' )
+raw_input('next')
+fd = open("buildings_Str_half_Off_report.csv", 'w')
+fd.write( 'buildings_Str_half_Off_report. Summary.' + '\n' )
 
 best_fric=[]
@@ -52 +50 @@
 Breadth=[]
 prev_index=0
-
+u=1
 
 #-------------------------------------------------------------------------
 # Buildings scenario loops from sorting.
 for B_file in B_list:
-    swwfile_B = project.outputdir + sep  + B_file
+    swwfile_B = project.building_dir + B_file
     bre = float(B_file.split('=')[1].split('_')[0]) # middle part of string
     print bre, "breadth"
@@ -91 +89 @@
     #Friction_log = [0.025, 0.1, 0.2, 0.5, 1, 2, 5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000]
     Friction.extend(Friction_large)
+    #Friction = [0.8, 0.825, 0.85, 0.875, 0.9, 0.925, 0.95, 0.975, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
 
     if prev_index < 6:
@@ -100 +99 @@
    
 
-    for f_index, fric in enumerate(Friction[pri:]):
-        swwfile_F = project.outputdir + sep  + 'friction_n=' + str(fric) + '_3135.sww'
+    for f_index, fric in enumerate(Friction):
+    #for f_index, fric in enumerate(Friction[pri:]):
+        swwfile_F = project.friction_dir + sep  + 'friction_n=' + str(fric) + '_3135.sww'
         f_F = file_function(swwfile_F,
                           quantities = quantities,
@@ -127 +127 @@
 
             #m = sqrt(uh*uh + vh*vh)   #Absolute momentum
-            velB = sqrt(uhB*uhB + vhB*vhB) / (wB + 1.e-30) #Absolute velocity
-            velF = sqrt(uhF*uhF + vhF*vhF) / (wF + 1.e-30) #Absolute velocity                   
+            velB = ((uhB*uhB + vhB*vhB)**0.5) / (wB + 1.e-30) #Absolute velocity
+            velF = ((uhF*uhF + vhF*vhF)**0.5) / (wF + 1.e-30) #Absolute velocity                   
             stages_B.append(wB)
             stages_F.append(wF)
@@ -139 +139 @@
         norm_F = err(Ar_F, Ar_B, 2, relative = True)  # 2nd norm (rel. RMS) test
         Normal.append(norm_F)
+        fd.write(str(fric) + ', ' +  str(norm_F) + '\n')
         if norm_F < least_norm:
             least_norm = norm_F
             fric_OK = fric
             prev_index = Friction.index(fric)
-            fd.write(str(fric) + ', ' +  str(norm_F) + '\n')
-        #elif norm_F > least_norm:
-        #    print fric, " NOT OK" 
-        else:   
-
-            break
+            
+        else:
+            print "not OK"
+            #break
 
     print fric_OK, " <- This Manning's n is best fit from 2nd norm test"
@@ -163 +162 @@
 len_file=Numeric.arrayrange(0,len(B_list),1)
 fd.write('_______________________________________________________' + '\n' )
-fd.write( '<<<<< buildings_Str_Off(hlf)_report Summary >>>>>' + '\n' )
+fd.write( '<<<<< buildings_Str_half_Off_report Summary >>>>>' + '\n' )
 fd.write( 'width, footprint ratio, mannings n, 2nd norm ' + '\n')
 for i in len_file:

development/momentum_sink/PCS.py

@@ -16 +16 @@
 
 #swwfile_B = project.outputdir + sep  + 'Buildings_3790.sww'
-swwfile_B = project.outputdir + sep  + 'buildings_Str_Off_BR=15_5_2287.sww'
-#swwfile_B = project.outputdir + sep  + 'friction_n=10_3135.sww'
-swwfile_F = project.outputdir + sep  + 'friction_n=Dbl_33_0.sww'
+#swwfile_B = project.outputdir + sep  + 'buildings_Str_Off(hlf)D=7.44_1092.sww'
+#swwfile_F = project.outputdir + sep  + 'buildings_Str_Off(hlf)D=7.45_1099.sww'
+swwfile_B = project.outputdir + sep  + 'friction_n=0.975_3135.sww'
+swwfile_F = project.outputdir + sep  + 'friction_n=7_3135.sww'
 
 # gauge_depth = Numeric.arrayrange(51, 1.5*WidtH, 25) # Random special
@@ -46 +47 @@
 
 
-T = Numeric.arrayrange(0,1000,10)
+T = Numeric.arrayrange(700,1000,10)
 #T = [ 20, 50, 100, 150, 200 ]
 

development/momentum_sink/Sorter.py

@@ -1 +1 @@
 
 
-def Sorter(B_list_unsorted)
-    import os
-    import string
-    import operator
+import os
+import string
+import operator
 
-    B_list_unsorted=os.listdir("buildings_straight")
-    B_strings=[]
-    B_list=[]
-    for B_L in B_list_unsorted:
-        A = B_L.split('=')[0] + '=' # first part of string
-        B = float(B_L.split('=')[1].split('_')[0]) # middle part of string
-        C = '_' + B_L.split('=')[1].split('_')[1] # last part of string
-        B_current = [A,B,C]; B_strings.append(B_current)
+B_list_unsorted=os.listdir("buildings_Str_half_Off")
+B_strings=[]
+B_list=[]
+for B_L in B_list_unsorted:
+    A = B_L.split('=')[0] + '=' # first part of string
+    B = float(B_L.split('=')[1].split('_')[0]) # middle part of string
+    C = '_' + B_L.split('=')[1].split('_')[1] # last part of string
+    B_current = [A,B,C]; B_strings.append(B_current)
 
-    B_strings.sort(key=operator.itemgetter(1))
+B_strings.sort(key=operator.itemgetter(1))
+#B_strings.sort(lambda x, y: cmp(x[1],y[1]))
 
-    for stt in B_strings:
-        stt[1]=str(stt[1])
-        final=string.join(stt).replace(' ','')
-        B_list.append(final)
-    return B_list
+for stt in B_strings:
+    stt[1]=str(stt[1])
+    final=string.join(stt).replace(' ','')
+    B_list.append(final)
+print B_list
+print "you suck222222222"

development/momentum_sink/create_buildings.py

@@ -3 +3 @@
 import math
 import random
+import polygon
+import array
 # add inundation dir to your pythonpath
 from pmesh.mesh import Mesh
@@ -52 +54 @@
 
     for i,D in enumerate(Depths):
-        Breadths = Breadths + ((-1)**i)*(0.5*BL/2) #Used to offset buildings
+        Breadths = Breadths + ((-1)**i)*(BL/2) #Used to offset buildings
         for B in Breadths:
             wh1 = (-whs) * math.cos(Th) + (-lhs) * math.sin(Th)
@@ -62 +64 @@
             wh4 = (-whs) * math.cos(Th) + (+lhs) * math.sin(Th)
             lh4 = (+lhs) * math.cos(Th) - (-whs) * math.sin(Th)
-            polygon = [[D+wh1,B+lh1],[D+wh2,B+lh2],[D+wh3,B+lh3],[D+wh4,B+lh4]]
-            m.add_hole_from_polygon(polygon, tags={'wall':[0,1,2,3]})        
+            house = [[D+wh1,B+lh1],[D+wh2,B+lh2],[D+wh3,B+lh3],[D+wh4,B+lh4]]
+            point_indexes=polygon.inside_polygon(house, outer_polygon)
+            house_cropped=array.tolist(Numeric.take(house,point_indexes))
+            walls = range(len(house_cropped))
+            m.add_hole_from_polygon(house_cropped, tags={'wall':walls})        
             # Th = Th + (37.3 *(3.14159/180)) # keeps rotating individual buildings.
     #left_polygon = [[0,WidtH],[5*WidtH,WidtH],[5*WidtH,WidtH+BL],[0,WidtH+BL]]
@@ -76 +81 @@
     else:
         if triangles_in_name is True:
-            mesh_file = mesh_file[:-4] + '_Str_Off(hlf)D=' + str(depth) + '_' + str(triangle_count) \
+            mesh_file = mesh_file[:-4] + '_Str_Off_D=' + str(depth) + '_' + str(triangle_count) \
                         + mesh_file[-4:]
         m.export_mesh_file(mesh_file)

development/momentum_sink/loop_buildings.py

@@ -21 +21 @@
 
 
-DR = list(Numeric.arange(12.8,23.2,0.2))
+DR = list(Numeric.arange(3,23.2,0.2))
 #[3,5,7,9,11,13,15,17,19,21,23]
 for depth in DR:
@@ -44 +44 @@
 
 
-    domain.set_name(project.basename + '_Str_Off(hlf)D=%s_%d' %(str(depth), triagle_count))
+    domain.set_name(project.basename + '_Str_Off_D=%s_%d' %(str(depth), triagle_count))
     domain.set_datadir(project.outputdir)
     domain.store = True

development/momentum_sink/project.py

@@ -23 +23 @@
 meshdir = home+sep+scenario_dir_name+sep+'meshes'+sep
 outputdir = home+sep+scenario_dir_name+sep+'output'+sep
-
+building_dir = home+sep+scenario_dir_name+sep+'output'+sep+'buildings_Str_half_Off'+sep
+friction_dir = home+sep+scenario_dir_name+sep+'output'+sep+'friction_files'+sep
 meshname = meshdir + basename + '.tsh'
 outputname = outputdir + basename  + '.sww' #Used by post processing