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

Jump to bottom

Updates to HDF5 metadata #192

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Updates to HDF5 metadata #192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f1d11d
Fixed missing dimensions for tensor coordinate axes; added labels to …
jsoishi Apr 26, 2022
39ebe88
Merge branch 'DedalusProject:master' into master
jsoishi Apr 27, 2022
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
29 changes: 26 additions & 3 deletions dedalus/core/evaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,29 @@ def dset_metadata(self, task, task_num, dset, scale_group, gnc_shape, gnc_start,
scale.make_scale(sn)
dset.dims[0].attach_scale(scale)

# Tensor components
skip = 1
for comp in op.tensorsig:
data = np.array(comp.names,dtype='S')
sn = 'coords'
if self.dist.comm_cart.rank == 0:
scale_hash = hashlib.sha1(data).hexdigest()
else:
scale_hash = None
if not virtual_file:
scale_hash = self.dist.comm_cart.bcast(scale_hash, root=0)

lookup = 'hash_' + scale_hash

if lookup not in scale_group:
scale_group.create_dataset(name=lookup, data=data)
scale_group[lookup].make_scale(sn)

scale = scale_group[lookup]
dset.dims[skip].label = sn
dset.dims[skip].attach_scale(scale)
skip += 1

# Spatial scales
for axis in range(self.dist.dim):
basis = op.domain.full_bases[axis]
Expand Down Expand Up @@ -662,10 +685,10 @@ def dset_metadata(self, task, task_num, dset, scale_group, gnc_shape, gnc_start,

if lookup not in scale_group:
scale_group.create_dataset(name=lookup, data=data)
scale_group[lookup].make_scale()
scale_group[lookup].make_scale(sn)
scale = scale_group[lookup]
dset.dims[axis+1].label = sn
dset.dims[axis+1].attach_scale(scale)
dset.dims[axis+skip].label = sn
dset.dims[axis+skip].attach_scale(scale)


def process(self, world_time=0, wall_time=0, sim_time=0, timestep=0, iteration=0, **kw):
Expand Down