Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hybrid pressure #46

Merged
merged 1 commit into from
Aug 31, 2012
Merged

Hybrid pressure #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ docs/iris/src/iris/
*~
\#*
\.\#*
*.swp
9 changes: 7 additions & 2 deletions etc/iris_tests_results/COLPEX/uwind_and_orog.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
0.0, 0.0, 0.0, 0.0, 0.0, 0.0]" shape="(70,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[2, 3]">
<AuxCoord id="cf20c06c74c057c" points="[[110.742, 136.728, 174.916, ..., 51.326, 52.346,
<AuxCoord id="dab9356f4d07915" points="[[110.742, 136.728, 174.916, ..., 51.326, 52.346,
50.7854],
[101.13, 118.558, 155.847, ..., 50.4832,
55.6483, 58.1083],
Expand All @@ -496,7 +496,12 @@
[334.015, 364.968, 397.844, ..., 117.883,
118.507, 118.111],
[364.028, 404.372, 436.014, ..., 125.827,
125.901, 125.843]]" shape="(412, 412)" standard_name="surface_altitude" units="Unit('m')" value_type="float32"/>
125.901, 125.843]]" shape="(412, 412)" standard_name="surface_altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="STASH" value="m01s00i033"/>
<attribute name="source" value="Data from Met Office Unified Model 7.04"/>
</attributes>
</AuxCoord>
</coord>
<coord datadims="[0]">
<DimCoord id="559b95abfcdf35de" points="[347921.166667, 347921.333333, 347921.5,
Expand Down
9 changes: 7 additions & 2 deletions etc/iris_tests_results/FF/qtgl.ssps_006_air_temperature_3.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@
0.0, 0.0, 0.0, 0.0, 0.0, 0.0]" shape="(70,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord datadims="[2, 3]">
<AuxCoord id="cf20c06c74c057c" points="[[2776.62, 2776.62, 2776.62, ..., 2776.62,
<AuxCoord id="31a0ca2120d88b70" points="[[2776.62, 2776.62, 2776.62, ..., 2776.62,
2776.62, 2776.62],
[2774.88, 2775.12, 2775.38, ..., 2774.12,
2774.38, 2774.62],
Expand All @@ -489,7 +489,12 @@
...,
[0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0],
[0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0],
[0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0]]" shape="(769, 1024)" standard_name="surface_altitude" units="Unit('m')" value_type="float32"/>
[0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0]]" shape="(769, 1024)" standard_name="surface_altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="STASH" value="m01s00i033"/>
<attribute name="source" value="Data from Met Office Unified Model 7.07"/>
</attributes>
</AuxCoord>
</coord>
<coord datadims="[0]">
<DimCoord id="559b95abfcdf35de" points="[361980.0, 361983.0, 361986.0]" shape="(3,)" standard_name="time" units="Unit('hours since 1970-01-01 00:00:00', calendar='gregorian')" value_type="float64"/>
Expand Down
18 changes: 18 additions & 0 deletions etc/iris_tests_results/analysis/interpolation/linear/circular_vs_non_circular.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube units="unknown">
<coords>
<coord datadims="[1]">
<AuxCoord id="5634c91ba5717382" long_name="other" points="[10.0, 7.33333333333, 6.0]" shape="(3,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord datadims="[0]">
<DimCoord id="5634c91ba5717382" long_name="r" points="[0.1, 0.2, 0.3, 0.4, 0.5]" shape="(5,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[1]">
<DimCoord id="31a3be9e9cebe09a" long_name="theta" points="[0.0, 60.0, 300.0]" shape="(3,)" units="Unit('degrees')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
<data checksum="-0x1b10bede" dtype="float32" shape="(5, 3)"/>
</cube>
</cubes>
21 changes: 21 additions & 0 deletions etc/iris_tests_results/analysis/interpolation/linear/dim_to_aux.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube long_name="test 2d dimensional cube" units="kelvin">
<coords>
<coord>
<AuxCoord id="5634c91ba5717382" long_name="an_other" points="[3.0]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord datadims="[0]">
<AuxCoord id="5634c91ba5717382" long_name="dim1" points="[7.0, 3.0, 5.0]" shape="(3,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[1]">
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.0, 3.5, 6.0]" shape="(3,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord datadims="[0]">
<AuxCoord id="5634c91ba5717382" long_name="was_dim" points="[3.0, 1.0, 2.0]" shape="(3,)" units="Unit('1')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
<data checksum="0x7b6fee44" dtype="float32" shape="(3, 3)"/>
</cube>
</cubes>
2 changes: 1 addition & 1 deletion etc/iris_tests_results/analysis/interpolation/linear/simple_casting_datatype.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.3125]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord>
<AuxCoord id="5634c91ba5717382" long_name="shared_x_coord" points="[7.5]" shape="(1,)" units="Unit('1')" value_type="float32"/>
<AuxCoord id="5634c91ba5717382" long_name="shared_x_coord" points="[7.5]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
Expand Down
2 changes: 1 addition & 1 deletion etc/iris_tests_results/analysis/interpolation/linear/simple_coord_linear_extrapolation.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<DimCoord id="5634c91ba5717382" long_name="dim1" points="[3.0, 5.0, 7.0, 9.0]" shape="(4,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[2.5]" shape="(1,)" units="Unit('1')" value_type="float32"/>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[2.5]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
Expand Down
2 changes: 1 addition & 1 deletion ...s_results/analysis/interpolation/linear/simple_coord_linear_extrapolation_multipoint1.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AuxCoord id="5634c91ba5717382" long_name="an_other" points="[3.0]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord datadims="[0]">
<AuxCoord id="5634c91ba5717382" long_name="dim1" points="[-1.0, 1.0, 10.0, 11.0]" shape="(4,)" units="Unit('1')" value_type="float32"/>
<DimCoord id="5634c91ba5717382" long_name="dim1" points="[-1.0, 1.0, 10.0, 11.0]" shape="(4,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[1]">
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.0, 3.5, 6.0]" shape="(3,)" units="Unit('1')" value_type="float64"/>
Expand Down
2 changes: 1 addition & 1 deletion ...s_results/analysis/interpolation/linear/simple_coord_linear_extrapolation_multipoint2.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AuxCoord id="5634c91ba5717382" long_name="an_other" points="[3.0]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord datadims="[0]">
<AuxCoord id="5634c91ba5717382" long_name="dim1" points="[1.0, 10.0]" shape="(2,)" units="Unit('1')" value_type="float32"/>
<DimCoord id="5634c91ba5717382" long_name="dim1" points="[1.0, 10.0]" shape="(2,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[1]">
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.0, 3.5, 6.0]" shape="(3,)" units="Unit('1')" value_type="float64"/>
Expand Down
2 changes: 1 addition & 1 deletion etc/iris_tests_results/analysis/interpolation/linear/simple_coord_nan_extrapolation.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<DimCoord id="5634c91ba5717382" long_name="dim1" points="[3.0, 5.0, 7.0, 9.0]" shape="(4,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[2.5]" shape="(1,)" units="Unit('1')" value_type="float32"/>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[2.5]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
Expand Down
4 changes: 2 additions & 2 deletions etc/iris_tests_results/analysis/interpolation/linear/simple_multiple_coords.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<DimCoord id="5634c91ba5717382" long_name="dim1" points="[4.0]" shape="(1,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.5]" shape="(1,)" units="Unit('1')" value_type="float32"/>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.5]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
<data dtype="float64" shape="()" state="loaded"/>
<data dtype="float32" shape="()" state="loaded"/>
</cube>
</cubes>
2 changes: 1 addition & 1 deletion ...iris_tests_results/analysis/interpolation/linear/simple_multiple_coords_extrapolation.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<DimCoord id="5634c91ba5717382" long_name="dim1" points="[1.5]" shape="(1,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[9.0]" shape="(1,)" units="Unit('1')" value_type="float32"/>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[9.0]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
Expand Down
2 changes: 1 addition & 1 deletion etc/iris_tests_results/analysis/interpolation/linear/simple_multiple_points.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AuxCoord id="5634c91ba5717382" long_name="an_other" points="[3.0]" shape="(1,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord datadims="[0]">
<AuxCoord id="5634c91ba5717382" long_name="dim1" points="[4.0, 5.0]" shape="(2,)" units="Unit('1')" value_type="float32"/>
<DimCoord id="5634c91ba5717382" long_name="dim1" points="[4.0, 5.0]" shape="(2,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[1]">
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.0, 3.5, 6.0]" shape="(3,)" units="Unit('1')" value_type="float64"/>
Expand Down
4 changes: 2 additions & 2 deletions etc/iris_tests_results/analysis/interpolation/linear/simple_multiple_points_circular.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<DimCoord id="5634c91ba5717382" long_name="r" points="[0.1, 0.2, 0.3, 0.4, 0.5]" shape="(5,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[1]">
<AuxCoord id="31a3be9e9cebe09a" long_name="theta" points="[0.0, 60.0, 120.0, 180.0]" shape="(4,)" units="Unit('degrees')" value_type="float32"/>
<DimCoord id="31a3be9e9cebe09a" long_name="theta" points="[0.0, 60.0, 120.0, 180.0]" shape="(4,)" units="Unit('degrees')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
<data checksum="0x75a3db43" dtype="float64" shape="(5, 4)"/>
<data checksum="-0x6f6bb460" dtype="float32" shape="(5, 4)"/>
</cube>
</cubes>
4 changes: 2 additions & 2 deletions etc/iris_tests_results/analysis/interpolation/linear/simple_shared_axis.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<DimCoord id="5634c91ba5717382" long_name="dim1" points="[3.0, 5.0, 7.0, 9.0]" shape="(4,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[1]">
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.5, 3.25]" shape="(2,)" units="Unit('1')" value_type="float32"/>
<AuxCoord id="5634c91ba5717382" long_name="dim2" points="[3.5, 3.25]" shape="(2,)" units="Unit('1')" value_type="float64"/>
</coord>
<coord datadims="[1]">
<AuxCoord id="5634c91ba5717382" long_name="shared_x_coord" points="[9.0, 7.0]" shape="(2,)" units="Unit('1')" value_type="float64"/>
</coord>
</coords>
<cellMethods/>
<data checksum="-0x7b6a878c" dtype="float64" shape="(4, 2)"/>
<data checksum="0x55f98e79" dtype="float32" shape="(4, 2)"/>
</cube>
</cubes>
9 changes: 7 additions & 2 deletions etc/iris_tests_results/cube_io/pickling/cubelist.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
0.0, 0.0]" shape="(70,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[2, 3]">
<AuxCoord id="cf20c06c74c057c" points="[[413.937, 417.817, 412.334, ..., 312.72, 317.89,
<AuxCoord id="dab9356f4d07915" points="[[413.937, 417.817, 412.334, ..., 312.72, 317.89,
324.58],
[386.476, 390.813, 393.15, ..., 316.098,
321.788, 330.007],
Expand All @@ -495,7 +495,12 @@
[401.5, 392.12, 382.88, ..., 286.75, 301.9,
310.3],
[407.9, 398.78, 389.6, ..., 281.0, 294.04,
300.34]]" shape="(100, 100)" standard_name="surface_altitude" units="Unit('m')" value_type="float32"/>
300.34]]" shape="(100, 100)" standard_name="surface_altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="STASH" value="m01s00i033"/>
<attribute name="source" value="Data from Met Office Unified Model 7.04"/>
</attributes>
</AuxCoord>
</coord>
<coord datadims="[0]">
<DimCoord id="559b95abfcdf35de" points="[347921.166667, 347921.333333, 347921.5,
Expand Down
9 changes: 7 additions & 2 deletions etc/iris_tests_results/cube_io/pickling/single_cube.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
0.0, 0.0]" shape="(70,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[2, 3]">
<AuxCoord id="cf20c06c74c057c" points="[[413.937, 417.817, 412.334, ..., 312.72, 317.89,
<AuxCoord id="dab9356f4d07915" points="[[413.937, 417.817, 412.334, ..., 312.72, 317.89,
324.58],
[386.476, 390.813, 393.15, ..., 316.098,
321.788, 330.007],
Expand All @@ -495,7 +495,12 @@
[401.5, 392.12, 382.88, ..., 286.75, 301.9,
310.3],
[407.9, 398.78, 389.6, ..., 281.0, 294.04,
300.34]]" shape="(100, 100)" standard_name="surface_altitude" units="Unit('m')" value_type="float32"/>
300.34]]" shape="(100, 100)" standard_name="surface_altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="STASH" value="m01s00i033"/>
<attribute name="source" value="Data from Met Office Unified Model 7.04"/>
</attributes>
</AuxCoord>
</coord>
<coord datadims="[0]">
<DimCoord id="559b95abfcdf35de" points="[347921.166667, 347921.333333, 347921.5,
Expand Down
2 changes: 1 addition & 1 deletion etc/iris_tests_results/file_load/5d_pp.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ digraph CubeGraph{
label = "AuxCoord|standard_name: None\nlong_name: sigma\nunits: 1"
]
"Coord_7" [
label = "AuxCoord|standard_name: surface_altitude\nlong_name: None\nunits: m"
label = "AuxCoord|standard_name: surface_altitude\nlong_name: None\nunits: m\nSTASH: m01s00i033\nsource: Data from Met Office Unified Model 7.04"
]
"Coord_8" [
label = "DimCoord|standard_name: time\nlong_name: None\nunits: hours since 1970-01-01 00:00:00\ncircular: False"
Expand Down
9 changes: 7 additions & 2 deletions etc/iris_tests_results/merge/theta_two_forecast_periods.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
0.0, 0.0]" shape="(70,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[2, 3]">
<AuxCoord id="cf20c06c74c057c" points="[[99.1904, 122.346, 151.11, ..., 49.5337,
<AuxCoord id="dab9356f4d07915" points="[[99.1904, 122.346, 151.11, ..., 49.5337,
53.1264, 51.5657],
[99.0009, 103.269, 133.847, ..., 46.566,
54.4183, 56.8783],
Expand All @@ -496,7 +496,12 @@
[317.526, 350.578, 379.358, ..., 117.066,
118.704, 118.309],
[345.036, 383.106, 425.639, ..., 125.724,
125.931, 125.872]]" shape="(412, 412)" standard_name="surface_altitude" units="Unit('m')" value_type="float32"/>
125.931, 125.872]]" shape="(412, 412)" standard_name="surface_altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="STASH" value="m01s00i033"/>
<attribute name="source" value="Data from Met Office Unified Model 7.04"/>
</attributes>
</AuxCoord>
</coord>
<coord datadims="[0]">
<DimCoord id="559b95abfcdf35de" points="[347921.166667, 347921.333333]" shape="(2,)" standard_name="time" units="Unit('hours since 1970-01-01 00:00:00', calendar='gregorian')" value_type="float64"/>
Expand Down
2 changes: 2 additions & 0 deletions etc/iris_tests_results/netcdf/netcdf_save_hybrid_height.cdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ variables:
float surface_altitude(grid_latitude, grid_longitude) ;
surface_altitude:units = "m" ;
surface_altitude:standard_name = "surface_altitude" ;
surface_altitude:ukmo__um_stash_source = "m01s00i033" ;
surface_altitude:source = "Data from Met Office Unified Model 7.04" ;

// global attributes:
:Conventions = "CF-1.5" ;
Expand Down
9 changes: 7 additions & 2 deletions etc/iris_tests_results/netcdf/netcdf_save_load_hybrid_height.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@
0.0, 0.0]" shape="(70,)" units="Unit('1')" value_type="float32"/>
</coord>
<coord datadims="[2, 3]">
<AuxCoord id="cf20c06c74c057c" points="[[99.1904, 122.346, 151.11, ..., 49.5337,
<AuxCoord id="19d01d98045b97db" points="[[99.1904, 122.346, 151.11, ..., 49.5337,
53.1264, 51.5657],
[99.0009, 103.269, 133.847, ..., 46.566,
54.4183, 56.8783],
Expand All @@ -490,7 +490,12 @@
[317.526, 350.578, 379.358, ..., 117.066,
118.704, 118.309],
[345.036, 383.106, 425.639, ..., 125.724,
125.931, 125.872]]" shape="(412, 412)" standard_name="surface_altitude" units="Unit('m')" value_type="float32"/>
125.931, 125.872]]" shape="(412, 412)" standard_name="surface_altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="source" value="Data from Met Office Unified Model 7.04"/>
<attribute name="ukmo__um_stash_source" value="m01s00i033"/>
</attributes>
</AuxCoord>
</coord>
<coord datadims="[0]">
<DimCoord id="559b95abfcdf35de" points="[347921.166667, 347921.333333, 347921.5,
Expand Down
Loading