Skip to content

1. In the section involving 'allaxesdummy', where a dummy variable is cr... #1047

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

Merged
doutriaux1 merged 1 commit into from
Feb 18, 2015
Merged

1. In the section involving 'allaxesdummy', where a dummy variable is cr... #1047

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
7 changes: 5 additions & 2 deletions Packages/cdms2/Script/cdscan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,11 +1058,14 @@ def main(argv):

varnames = f.variables.keys()

# try to force all axes to be included...
# Try to force all axes to be included, but only small ones, length<100.
# This section was motivated by a need to preserve the cloud axes isccp_prs,isccp_tau.
# If we ever need to preserve longer axes as well, we could create one variable per axis...
crude_var_axes = [ [ ax[0] for ax in var.getDomain() ] for var in f.variables.values() ]
var_axes = set().union( *crude_var_axes )
other_axes = list( set(f.axes.values()) - var_axes )
if len(other_axes)>0:
other_axes = [ax for ax in other_axes if len(ax)<100]
other_axes.sort( key=(lambda ax:ax.id) )
axisvar = cdms2.createVariable( numpy.ones([len(ax) for ax in other_axes]),
axes=other_axes, id='allaxesdummy')
Expand Down Expand Up @@ -1160,7 +1163,7 @@ def main(argv):
else:
currentdomain, attrs, tcode = vardict[var.id]
if comparedomains(currentdomain, tempdomain):
sepname = disambig(var.id, vardict, var.size, compareVarDictValues, (tempdomain, None))
sepname = disambig(var.id, vardict, var.size(), compareVarDictValues, (tempdomain, None))
saveid = var.id
varname = var.id = sepname
varattrs = copyDict(var.attributes)
Expand Down
⚡