Skip to content

Commit

Permalink
Corrected source code for version 4.1.0: added png GUI files that wer…
Browse files Browse the repository at this point in the history
…e left out of repository, reverted setup.py and init changes made after 4.1.0
  • Loading branch information
bdehrha committed May 16, 2022
1 parent c3c323f commit aeeb9bc
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 4 deletions.
Binary file added src/gui/Hyram.Gui/Resources/0p01pctFT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/gui/Hyram.Gui/Resources/0p1pctFT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/gui/Hyram.Gui/Resources/100pctFT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/gui/Hyram.Gui/Resources/10pctFT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/gui/Hyram.Gui/Resources/1pctFT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/gui/Hyram.Gui/Resources/ESD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/gui/Hyram.Gui/Resources/geometry of flame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/hyram/hyram/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"""

from __future__ import absolute_import
__version__ = '4.1.0-2'
__version__ = '4.1.0'
from . import phys, qra
6 changes: 3 additions & 3 deletions src/hyram/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ def get_version(rel_path):
setup(name='hyram',
packages = find_packages(),
version = get_version(os.path.join('hyram', '__init__.py')),
author = 'Brian D. Ehrhart, Cianan Sims, Ethan S. Hecht, Benjamin B. Schroeder, Katrina M. Groth, John T. Reynolds, and Gregory W. Walkup',
# author_email = '[email protected]',
author = 'Ethan Hecht',
author_email = '[email protected]',
description = 'Hydrogen Plus Other Alternative Fuels Risk Assessment Models - physics and QRA modules',
url = 'https://hyram.sandia.gov/',
license = 'GNU General Public License v3 (GPLv3)',
classifiers = ['Development Status :: 3 - Alpha'],
classifiers = 'Development Status :: 3 - Alpha',
install_requires = ['numpy', 'matplotlib', 'scipy', 'coolprop>=6.3', 'pythonnet'],
keywords = 'hydrogen, methane, propane, flame, plume, jet, overpressure, quantitiave risk assessment',
)

0 comments on commit aeeb9bc

Please sign in to comment.