Changeset 5616


Ignore:
Timestamp:
Aug 6, 2008, 9:36:38 AM (16 years ago)
Author:
duncan
Message:

Current Hinwood scenario

Location:
anuga_work/development/Hinwood_2008
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • anuga_work/development/Hinwood_2008/calc_norm.py

    r5595 r5616  
    3838    return band_condition
    3939   
    40 def auto_rrms(outputdir_tag, scenarios, quantity):
     40def auto_rrms(outputdir_tag, scenarios, quantity, y_location_tag=':0.0'):
    4141    """
    4242    Given a bunch of scenarios that have CSV guage files, calc the
     
    5656        for gauge_x in run_data['gauge_x']:
    5757            gauge_x = str(gauge_x)
    58             location_sims.append(gauge_x + ':0.0')
     58            location_sims.append(gauge_x + y_location_tag)
    5959            location_exps.append(gauge_x)
    6060       
     
    236236        sim['rmsd'] = sim['err']/sqrt(sim['amount'])
    237237        settings[outputdir_tag] = sim
    238     print "settings", settings
     238    #print "settings", settings
    239239
    240240    aux = [(settings[k]['rmsd'], k) for k in settings.keys()]
     
    273273   
    274274    outputdir_tags = []
     275    #outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_H")
     276    outputdir_tags.append("_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.01_G")
     277    #outputdir_tag = "_good_tri_area_0.01_D"
     278    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
    275279    outputdir_tags.append("_lmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
     280    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.05_mta_1e-05_G")
     281    outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.001_G")
     282    outputdir_tags.append("_nolmts_wdth_0.01_z_0.012_ys_0.01_mta_1e-05_G")
     283    outputdir_tags = [] # _no_velocity_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G
    276284    outputdir_tags.append("_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.01_G")
    277     outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.001_G")
    278     outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
    279     outputdir_tags.append("_nolmts_wdth_0.01_z_0.012_ys_0.01_mta_1e-05_G")
    280     outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.05_mta_1e-05_G")
    281     outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.05_mta_1e-05_G")
    282     outputdir_tags = [] # _no_velocity_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G
    283     outputdir_tags.append("_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
    284     outputdir_tags.append("_no_velocity_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G")
    285     outputdir_tag = "_good_lmts_wdth_1.0_z_0.012_ys_0.01_mta_0.001_F"
     285   
     286    #outputdir_tag = "_good_lmts_wdth_1.0_z_0.012_ys_0.01_mta_0.001_H"
    286287    #outputdir_tag = "_test_limiterC"
    287288    #scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!
    288289    #scenarios = scenarios[4:] # !!!!!!!!!!!!!!!!!!!!!!
    289290    #for outputdir_tag in outputdir_tags:
    290     #    auto_rrms(outputdir_tag, scenarios, "stage")
     291     #   auto_rrms(outputdir_tag, scenarios, "stage", y_location_tag=':0.0')
    291292   
    292293    #scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!
    293     #auto_plot_rrms_sensor_settings(outputdir_tags, scenarios, "stage")
    294     compare_different_settings(outputdir_tags, scenarios, "stage")
     294    auto_plot_rrms_sensor_settings(outputdir_tags, scenarios, "stage")
     295    #compare_different_settings(outputdir_tags, scenarios, "stage")
  • anuga_work/development/Hinwood_2008/plot.py

    r5595 r5616  
    6161   
    6262def Hinwood_files_locations(run_data, outputdir_tag, plot_type,
    63                             quantity = "depth"):
     63                            quantity = "depth",
     64                            y_location_tag=':0.0'):
    6465    """
    6566    run_data is a dictionary of data describing a Hinwood experiment
     
    8384    for gauge_x in run_data['gauge_x']:
    8485        gauge_x = str(gauge_x)
    85         location_sims.append(gauge_x + ':0.0')
     86        location_sims.append(gauge_x + y_location_tag)
    8687        location_exps.append(gauge_x)
    8788        save_as_list.append(pro_instance.plots_dir + sep + \
     
    9091    return file_exp, file_sim, location_sims, location_exps, outputdir_name, \
    9192           save_as_list
    92 def plot(scenarios, outputdir_tag, quantity = "stage",is_interactive=False):
     93
     94def plot(scenarios, outputdir_tag, quantity = "stage",is_interactive=False,
     95         y_location_tag=':0.0'):
    9396    plot_type = ".pdf"
    9497   
     
    9699       
    97100        temp = Hinwood_files_locations(run_data, outputdir_tag,
    98                                        plot_type, quantity)
     101                                       plot_type, quantity,
     102                                       y_location_tag=y_location_tag)
    99103                                   
    100104        file_exp, file_sim, location_sims, location_exps, outputdir_name, \
    101105                  save_as_list = temp
     106        print "file_exp",file_exp
    102107        print "run_data['scenario_id']", run_data['scenario_id']
    103108        #location_sims = [location_sims[0]]
     
    135140    from scenarios import scenarios
    136141    outputdir_tag = "_good_tri_area_0.01_limiterE"
    137     outputdir_tag = "_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_G"
     142    outputdir_tag = ""
     143    outputdir_tag = "_nolmts_wdth_0.1_z_0.012_ys_0.01_mta_0.01_H"
     144    outputdir_tag = "_good_tri_area_0.01_D"
    138145    #outputdir_tag = "_nolmts_wdth_0.01_z_0.012_ys_0.01_mta_1e-05_G"
    139146    #outputdir_tag = "_test_C"
    140147    #scenarios = scenarios[1:]
    141     #scenarios = [scenarios[0]]
     148    #scenarios = [scenarios[4]]
    142149    is_interactive = False
    143150    #is_interactive = True
    144     plot(scenarios, outputdir_tag,is_interactive=is_interactive)
     151    plot(scenarios, outputdir_tag,is_interactive=is_interactive,
     152         y_location_tag=':0.5')
    145153
  • anuga_work/development/Hinwood_2008/run_dam.py

    r5594 r5616  
    309309    # 8 is 0.00001  yieldstep = 0.05
    310310   
    311     #run_type = 1
    312     run_type = 4
     311    run_type = 1
     312    #run_type = 4
    313313    #for run_data in [scenarios[5]]:
    314     #scenarios = scenarios[2:]
     314    #scenarios = scenarios[3:]
    315315    #scenarios = [scenarios[0]]
    316316    width = 1.0
     
    325325                             use_limits=False,
    326326                             friction=0.012,
    327                              end_tag='_G')
     327                             end_tag='_H')
    328328        #gauges_for_slope(pro_instance.outputdir,[run_data])
Note: See TracChangeset for help on using the changeset viewer.