Changeset 7184


Ignore:
Timestamp:
Jun 11, 2009, 3:19:14 PM (15 years ago)
Author:
rwilson
Message:

Updated all licence files to use new checksum.

Location:
branches/numpy_anuga_validation
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • branches/numpy_anuga_validation/automated_validation_tests/UQ_runup_2006/Dam break_240406_0011.lic

    r5337 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
    3   <ga_license_file>
     1<?xml version='1.0' encoding='iso-8859-1'?>
     2<ga_license_file>
    43    <metadata>
    54      <author>Duncan Gray</author>

  • branches/numpy_anuga_validation/automated_validation_tests/UQ_runup_2006/actual.lic

    r5105 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
    3   <ga_license_file>
     1<?xml version='1.0' encoding='iso-8859-1'?>
     2<ga_license_file>
    43    <metadata>
    54      <author>Duncan Gray</author>

  • branches/numpy_anuga_validation/automated_validation_tests/okushiri_tank_validation/Benchmark_2_Bathymetry.lic

    r5025 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>

  • branches/numpy_anuga_validation/automated_validation_tests/okushiri_tank_validation/Benchmark_2_input.lic

    r5025 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>

  • branches/numpy_anuga_validation/automated_validation_tests/okushiri_tank_validation/output_ch5-7-9.lic

    r5025 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>
    … …  
    87  <datafile>
    98    <filename>output_ch5-7-9.txt</filename>
    10     <checksum>-1044604103</checksum>
     9    <checksum>3250363193</checksum>
    1110    <publishable>Yes</publishable>
    1211    <accountable>Ole Nielsen</accountable>

  • branches/numpy_anuga_validation/automated_validation_tests/urs_mux_files_validation/boundary_gauges.lic

    r5109 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
    3   <ga_license_file>
     1<?xml version='1.0' encoding='iso-8859-1'?>
     2<ga_license_file>
    43    <metadata>
    54      <author>Duncan Gray</author>
    … …  
    76    <datafile>
    87      <filename>boundary_gauges.txt</filename>
    9       <checksum>-1553233046</checksum>
     8      <checksum>2741734250</checksum>
    109      <publishable>Yes</publishable>
    1110      <accountable>Duncan Gray</accountable>

  • branches/numpy_anuga_validation/automated_validation_tests/urs_mux_files_validation/gauges.lic

    r5109 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
    3   <ga_license_file>
     1<?xml version='1.0' encoding='iso-8859-1'?>
     2<ga_license_file>
    43    <metadata>
    54      <author>Duncan Gray</author>

  • branches/numpy_anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test-e-mux.lic

    r5505 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
    3   <ga_license_file>
     1<?xml version='1.0' encoding='iso-8859-1'?>
     2<ga_license_file>
    43    <metadata>
    54      <author>Duncan Gray</author>
    … …  
    76    <datafile>
    87      <filename>o_test-e-mux</filename>
    9       <checksum>-1664514244</checksum>
     8      <checksum>2630453052</checksum>
    109      <publishable>Yes</publishable>
    1110      <accountable>Duncan Gray</accountable>

  • branches/numpy_anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test-n-mux.lic

    r5505 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
    3   <ga_license_file>
     1<?xml version='1.0' encoding='iso-8859-1'?>
     2<ga_license_file>
    43    <metadata>
    54      <author>Duncan Gray</author>

  • branches/numpy_anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test-z-mux.lic

    r5505 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
    3   <ga_license_file>
     1<?xml version='1.0' encoding='iso-8859-1'?>
     2<ga_license_file>
    43    <metadata>
    54      <author>Duncan Gray</author>
    … …  
    76    <datafile>
    87      <filename>o_test-z-mux</filename>
    9       <checksum>-1449856062</checksum>
     8      <checksum>2845111234</checksum>
    109      <publishable>Yes</publishable>
    1110      <accountable>Duncan Gray</accountable>

  • branches/numpy_anuga_validation/okushiri_2005/Benchmark_2_Bathymetry.lic

    r5023 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>
    … …  
    87  <datafile>
    98    <filename>Benchmark_2_Bathymetry.txt</filename>
    10     <checksum>-1310724450</checksum>
     9    <checksum>2984242846</checksum>
    1110    <publishable>Yes</publishable>
    1211    <accountable>Ole Nielsen</accountable>

  • branches/numpy_anuga_validation/okushiri_2005/Benchmark_2_input.lic

    r5023 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>

  • branches/numpy_anuga_validation/okushiri_2005/compare_timeseries.py

    r4557 r7184  
    55"""
    66
    7 from Numeric import allclose, argmin, argmax
     7import numpy as num
    88from Scientific.IO.NetCDF import NetCDFFile
    99
    … …  
    5555
    5656for i, line in enumerate(lines[1:]):
    57     if i == len(input_time): break
     57    if i
     58    import numpy as num== len(input_time): break
    5859   
    5960    fields = line.split()
    … …  
    6869assert reference_time[0] == 0.0
    6970assert reference_time[-1] == finaltime
    70 assert allclose(reference_time, input_time)
     71assert num.allclose(reference_time, input_time)
    7172
    7273for key in gauge_names:
    … …  
    144145
    145146    # Locations of extrema
    146     i0 = argmax(observed_timeseries)
    147     i1 = argmax(model)
     147    i0 = num.argmax(observed_timeseries)
     148    i1 = num.argmax(model)
    148149    res = abs(reference_time[i1] - reference_time[i0])
    149150    print 'Timelag between maxima = %.18e' %res
    150151   
    151152
    152     i0 = argmin(observed_timeseries)
    153     i1 = argmin(model)
     153    i0 = num.argmin(observed_timeseries)
     154    i1 = num.argmin(model)
    154155    res = abs(reference_time[i1] - reference_time[i0])
    155156    print 'Timelag between minima = %.18e' %res

  • branches/numpy_anuga_validation/okushiri_2005/create_okushiri.py

    r3915 r7184  
    11"""Create mesh and time boundary for the Okushiri island validation
    22"""
    3 
    4 
    5 from Numeric import array, zeros, Float, allclose
    63
    74from anuga.pmesh.mesh import *
    … …  
    96from anuga.coordinate_transforms.geo_reference import Geo_reference
    107from anuga.geospatial_data import Geospatial_data
     8
     9from Scientific.IO.NetCDF import NetCDFFile
    1110
    1211import project
    … …  
    5150    """
    5251
    53     from Scientific.IO.NetCDF import NetCDFFile
    54     from Numeric import array
    55 
    56 
    5752    print 'Creating', filename
    5853
    … …  
    6964
    7065    N = len(lines)
    71     T = zeros(N, Float)  #Time
    72     Q = zeros(N, Float)  #Values
     66    T = num.zeros(N, num.float)  #Time
     67    Q = num.zeros(N, num.float)  #Values
    7368
    7469    for i, line in enumerate(lines):
    … …  
    8681    fid.starttime = 0.0
    8782    fid.createDimension('number_of_timesteps', len(T))
    88     fid.createVariable('time', Float, ('number_of_timesteps',))
     83    fid.createVariable('time', netcdf_float, ('number_of_timesteps',))
    8984    fid.variables['time'][:] = T
    9085
    91     fid.createVariable('stage', Float, ('number_of_timesteps',))
     86    fid.createVariable('stage', netcdf_float, ('number_of_timesteps',))
    9287    fid.variables['stage'][:] = Q[:]
    9388
    94     fid.createVariable('xmomentum', Float, ('number_of_timesteps',))
     89    fid.createVariable('xmomentum', netcdf_float, ('number_of_timesteps',))
    9590    fid.variables['xmomentum'][:] = 0.0
    9691
    97     fid.createVariable('ymomentum', Float, ('number_of_timesteps',))
     92    fid.createVariable('ymomentum', netcdf_float, ('number_of_timesteps',))
    9893    fid.variables['ymomentum'][:] = 0.0
    9994

  • branches/numpy_anuga_validation/okushiri_2005/create_okushiri_original.py

    r3913 r7184  
    22"""
    33
    4 from Numeric import array, zeros, Float, allclose
     4import numpy as num
     5from Scientific.IO.NetCDF import NetCDFFile
    56
    67from anuga.pmesh.mesh import *
    78from anuga.coordinate_transforms.geo_reference import Geo_reference
     9from anuga.config import netcdf_float
    810
    911import project
    … …  
    1921
    2022    print 'Preparing time boundary from %s' %textversion
    21     from Numeric import array
    2223
    2324    fid = open(textversion)
    … …  
    3233
    3334    N = len(lines)
    34     T = zeros(N, Float)  #Time
    35     Q = zeros(N, Float)  #Values
     35    T = num.zeros(N, num.float)  #Time
     36    Q = num.zeros(N, num.float)  #Values
    3637
    3738    for i, line in enumerate(lines):
    … …  
    4344
    4445    #Create tms file
    45     from Scientific.IO.NetCDF import NetCDFFile
    46 
    4746    print 'Writing to', filename
    4847    fid = NetCDFFile(filename, 'w')
    … …  
    5251    fid.starttime = 0.0
    5352    fid.createDimension('number_of_timesteps', len(T))
    54     fid.createVariable('time', Float, ('number_of_timesteps',))
     53    fid.createVariable('time', netcdf_float, ('number_of_timesteps',))
    5554    fid.variables['time'][:] = T
    5655
    57     fid.createVariable('stage', Float, ('number_of_timesteps',))
     56    fid.createVariable('stage', netcdf_float, ('number_of_timesteps',))
    5857    fid.variables['stage'][:] = Q[:]
    5958
    60     fid.createVariable('xmomentum', Float, ('number_of_timesteps',))
     59    fid.createVariable('xmomentum', netcdf_float, ('number_of_timesteps',))
    6160    fid.variables['xmomentum'][:] = 0.0
    6261
    63     fid.createVariable('ymomentum', Float, ('number_of_timesteps',))
     62    fid.createVariable('ymomentum', netcdf_float, ('number_of_timesteps',))
    6463    fid.variables['ymomentum'][:] = 0.0
    6564
    … …  
    226225    m.generateMesh('pzq28.0za1000000a')
    227226
    228     import project
    229227    m.export_mesh_file(project.mesh_filename)
    230228   

  • branches/numpy_anuga_validation/okushiri_2005/output_ch5-7-9.lic

    r5020 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>
    … …  
    1918  <datafile>
    2019    <filename>output_ch5-7-9.txt</filename>
    21     <checksum>-1044604103</checksum>
     20    <checksum>3250363193</checksum>
    2221    <publishable>Yes</publishable>
    2322    <accountable>Ole Nielsen</accountable>

  • branches/numpy_anuga_validation/okushiri_2005/problem02.lic

    r5023 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>
    … …  
    87  <datafile>
    98    <filename>problem02.doc</filename>
    10     <checksum>-1811884659</checksum>
     9    <checksum>2483082637</checksum>
    1110    <publishable>Yes</publishable>
    1211    <accountable>Ole Nielsen</accountable>

  • branches/numpy_anuga_validation/okushiri_2005/test_caching_of_set_quantity.py

    r7039 r7184  
    1616from anuga.fit_interpolate.fit import _fit_to_mesh
    1717import project
    18 import Numeric as num
     18import numpy as num
    1919import time
    2020

  • branches/numpy_anuga_validation/okushiri_2005/timings.lic

    r5023 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>
    … …  
    87  <datafile>
    98    <filename>timings.txt</filename>
    10     <checksum>-1935951304</checksum>
     9    <checksum>2359015992</checksum>
    1110    <publishable>Yes</publishable>
    1211    <accountable>Ole Nielsen</accountable>

  • branches/numpy_anuga_validation/performance_tests/okushiri/Benchmark_2.lic

    r5026 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>

  • branches/numpy_anuga_validation/performance_tests/okushiri/Benchmark_2_Bathymetry.lic

    r5026 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>

  • branches/numpy_anuga_validation/performance_tests/okushiri/Benchmark_2_input.lic

    r5026 r7184  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
    2 
     1<?xml version='1.0' encoding='iso-8859-1'?>
    32<ga_license_file>
    43  <metadata>
    … …  
    87  <datafile>
    98    <filename>Benchmark_2_input.tms</filename>
    10     <checksum>-725631838</checksum>
     9    <checksum>3569335458</checksum>
    1110    <publishable>Yes</publishable>
    1211    <accountable>Ole Nielsen</accountable>
Note: See TracChangeset for help on using the changeset viewer.