|
32 | 32 | emission_spc = 'emission_species.json'
|
33 | 33 | emission_inv = 'emission_inventories.json'
|
34 | 34 |
|
| 35 | +# List of variables that should not be read by xarray |
| 36 | +drop_varlist = ['anchor'] |
| 37 | + |
35 | 38 |
|
36 | 39 | def compare_single_level(refdata, refstr, devdata, devstr, varlist=None,
|
37 | 40 | ilev=0, itime=0, weightsdir=None, pdfname='',
|
@@ -2972,15 +2975,15 @@ def make_benchmark_conc_plots(ref, refstr, dev, devstr, dst='./1mo_benchmark',
|
2972 | 2975 |
|
2973 | 2976 | # Ref dataset
|
2974 | 2977 | try:
|
2975 |
| - refds = xr.open_dataset(ref) |
| 2978 | + refds = xr.open_dataset(ref, drop_variables=dropvars) |
2976 | 2979 | except FileNotFoundError:
|
2977 | 2980 | print('Could not find Ref file: {}'.format(ref))
|
2978 | 2981 | raise
|
2979 | 2982 | refds = core.add_lumped_species_to_dataset(refds, verbose=verbose)
|
2980 | 2983 |
|
2981 | 2984 | # Dev dataset
|
2982 | 2985 | try:
|
2983 |
| - devds = xr.open_dataset(dev) |
| 2986 | + devds = xr.open_dataset(dev, drop_variables=dropvars) |
2984 | 2987 | except FileNotFoundError:
|
2985 | 2988 | print('Could not find Dev file: {}!'.format(dev))
|
2986 | 2989 | raise
|
@@ -3213,14 +3216,14 @@ def make_benchmark_emis_plots(ref, refstr, dev, devstr,
|
3213 | 3216 |
|
3214 | 3217 | # Ref dataset
|
3215 | 3218 | try:
|
3216 |
| - refds = xr.open_dataset(ref) |
| 3219 | + refds = xr.open_dataset(ref, drop_variables=dropvars) |
3217 | 3220 | except FileNotFoundError:
|
3218 | 3221 | print('Could not find Ref file: {}'.format(ref))
|
3219 | 3222 | raise
|
3220 | 3223 |
|
3221 | 3224 | # Dev dataset
|
3222 | 3225 | try:
|
3223 |
| - devds = xr.open_dataset(dev) |
| 3226 | + devds = xr.open_dataset(dev, drop_variables=dropvars) |
3224 | 3227 | except FileNotFoundError:
|
3225 | 3228 | print('Could not find Dev file: {}'.format(dev))
|
3226 | 3229 | raise
|
@@ -3441,23 +3444,23 @@ def make_benchmark_emis_tables(reflist, refstr, devlist, devstr,
|
3441 | 3444 |
|
3442 | 3445 | # Ref
|
3443 | 3446 | if len(reflist) == 1:
|
3444 |
| - refds = xr.open_dataset(reflist[0]) |
| 3447 | + refds = xr.open_dataset(reflist[0], drop_variables=dropvars) |
3445 | 3448 | assert gcc_area_name in list(refds.keys()),'Ref file {} does not contain area variable {}'.format(reflist[0], gcc_area_name)
|
3446 | 3449 |
|
3447 | 3450 | elif len(reflist) == 2:
|
3448 |
| - refds = xr.open_dataset(reflist[0]) |
3449 |
| - metrefds = xr.open_dataset(reflist[1]) |
| 3451 | + refds = xr.open_dataset(reflist[0], drop_variables=dropvars) |
| 3452 | + metrefds = xr.open_dataset(reflist[1], drop_variables=dropvars) |
3450 | 3453 | assert gchp_area_name in list(metrefds.keys()),'Ref met file {} does not contain area variable {}'.format(reflist[1], gchp_area_name)
|
3451 | 3454 | refds[gcc_area_name] = metrefds[gchp_area_name]
|
3452 | 3455 |
|
3453 | 3456 | # Dev
|
3454 | 3457 | if len(devlist) == 1:
|
3455 |
| - devds = xr.open_dataset(devlist[0]) |
| 3458 | + devds = xr.open_dataset(devlist[0], drop_variables=dropvars) |
3456 | 3459 | assert gcc_area_name in list(refds.keys()),'Dev file {} does not contain area variable {}'.format(devlist[0], gcc_area_name)
|
3457 | 3460 |
|
3458 | 3461 | elif len(devlist) == 2:
|
3459 |
| - devds = xr.open_dataset(devlist[0]) |
3460 |
| - metdevds = xr.open_dataset(devlist[1]) |
| 3462 | + devds = xr.open_dataset(devlist[0], drop_variables=dropvars) |
| 3463 | + metdevds = xr.open_dataset(devlist[1], drop_variables=dropvars) |
3461 | 3464 | assert gchp_area_name in list(metdevds.keys()),'Dev met file {} does not contain area variable {}'.format(devlist[1], gchp_area_name)
|
3462 | 3465 | devds[gcc_area_name] = metdevds[gchp_area_name]
|
3463 | 3466 |
|
@@ -3604,14 +3607,14 @@ def make_benchmark_jvalue_plots(ref, refstr, dev, devstr,
|
3604 | 3607 |
|
3605 | 3608 | # Ref dataset
|
3606 | 3609 | try:
|
3607 |
| - refds = xr.open_dataset(ref) |
| 3610 | + refds = xr.open_dataset(ref, drop_variables=dropvars) |
3608 | 3611 | except FileNotFoundError:
|
3609 | 3612 | print('Could not find Ref file: {}'.format(ref))
|
3610 | 3613 | raise
|
3611 | 3614 |
|
3612 | 3615 | # Dev dataset
|
3613 | 3616 | try:
|
3614 |
| - devds = xr.open_dataset(dev) |
| 3617 | + devds = xr.open_dataset(dev, drop_variables=dropvars) |
3615 | 3618 | except FileNotFoundError:
|
3616 | 3619 | print('Could not find Dev file: {}'.format(dev))
|
3617 | 3620 | raise
|
@@ -3832,14 +3835,14 @@ def make_benchmark_aod_plots(ref, refstr, dev, devstr,
|
3832 | 3835 |
|
3833 | 3836 | # Read the Ref dataset
|
3834 | 3837 | try:
|
3835 |
| - refds = xr.open_dataset(ref) |
| 3838 | + refds = xr.open_dataset(ref, drop_variables=dropvars) |
3836 | 3839 | except FileNotFoundError:
|
3837 | 3840 | print('Could not find Ref file: {}'.format(ref))
|
3838 | 3841 | raise
|
3839 | 3842 |
|
3840 | 3843 | # Read the Dev dataset
|
3841 | 3844 | try:
|
3842 |
| - devds = xr.open_dataset(dev) |
| 3845 | + devds = xr.open_dataset(dev, drop_variables=dropvars) |
3843 | 3846 | except FileNotFoundError:
|
3844 | 3847 | print('Could not find Dev file: {}'.format(dev))
|
3845 | 3848 | raise
|
@@ -4054,14 +4057,14 @@ def make_benchmark_mass_tables(reflist, refstr, devlist, devstr,
|
4054 | 4057 |
|
4055 | 4058 | # Ref
|
4056 | 4059 | try:
|
4057 |
| - refds = xr.open_mfdataset(reflist) |
| 4060 | + refds = xr.open_mfdataset(reflist, drop_variables=dropvars) |
4058 | 4061 | except FileNotFoundError:
|
4059 | 4062 | print('Error opening Ref files: {}'.format(reflist))
|
4060 | 4063 | raise
|
4061 | 4064 |
|
4062 | 4065 | # Dev dataset
|
4063 | 4066 | try:
|
4064 |
| - devds = xr.open_mfdataset(devlist) |
| 4067 | + devds = xr.open_mfdataset(devlist, drop_variables=dropvars) |
4065 | 4068 | except FileNotFoundError:
|
4066 | 4069 | print('Error opening Dev files: {}!'.format(devlist))
|
4067 | 4070 | raise
|
@@ -4214,7 +4217,7 @@ def make_benchmark_budget_tables(devlist, devstr, dst='./1mo_benchmark',
|
4214 | 4217 |
|
4215 | 4218 | # Dev
|
4216 | 4219 | try:
|
4217 |
| - devds = xr.open_mfdataset(devlist) |
| 4220 | + devds = xr.open_mfdataset(devlist, drop_variables=dropvars) |
4218 | 4221 | except FileNotFoundError:
|
4219 | 4222 | print('Could not find one of the Dev files: {}'.format(devlist))
|
4220 | 4223 | raise
|
|
0 commit comments