Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

empyre
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

6c6c9232

Commit 6c6c9232 authored 7 years ago by Jan Caron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pyramid/tests/test_phasemapper.py

parents 6eaa81c0 71612458

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.DS_Store 0 additions, 0 deletions

.DS_Store
.gitignore 2 additions, 0 deletions

.gitignore
charge_phase_ref.hdf5 0 additions, 0 deletions

charge_phase_ref.hdf5
charge_proj.hdf5 0 additions, 0 deletions

charge_proj.hdf5
pyramid/.DS_Store 0 additions, 0 deletions

pyramid/.DS_Store
pyramid/phasemapper.py 5 additions, 2 deletions

pyramid/phasemapper.py
pyramid/tests/.DS_Store 0 additions, 0 deletions

pyramid/tests/.DS_Store
pyramid/tests/test_phasemapper.py 2 additions, 2 deletions

pyramid/tests/test_phasemapper.py
pyramid/tests/test_phasemapper/Charge_phase_ref.hdf5 0 additions, 0 deletions

pyramid/tests/test_phasemapper/Charge_phase_ref.hdf5

with 9 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment