-
Notifications
You must be signed in to change notification settings - Fork 1
adding unit conversion functions #175
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.
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
Merged
Changes from all commits
Commits
Show all changes
54 commits
Select commit
Hold shift + click to select a range
7d4c374
rationalising unit tests
skeating 3cc4771
Merge branch 'develop' into 77-unit-conversion
skeating 0bbec40
beginning to work through converting units within a model
skeating 136dab1
Merge branch '159-get_data_from_equations' into 77-unit-conversion
skeating 400d226
Merge branch 'develop' into 77-unit-conversion
skeating b6f3699
convert initial value for new variable with converted units
skeating f2c966c
tests for adding an input that it is a state variable
skeating 63df5ca
Merge remote-tracking branch 'origin/develop' into 77-unit-conversion
skeating 8c0582c
isort
skeating 28adf49
isort still wasnt happy
skeating 916042e
Merge branch 'develop' into 77-unit-conversion
MauriceHendrix 3d98238
Merge branch 'develop' into 77-unit-conversion
skeating ef3bd65
changing units for the free variable
skeating 150b9b0
trying to make isort happy
skeating 4a04008
refactoring to make code easier to read
skeating ba355e6
converted a literal constant
skeating 3604ddf
flake8
skeating c3e8bde
refactoring to remove duplication of code
skeating d15d242
isort maybe
skeating da0eaa4
sort units imports
skeating 68d886a
isort again !
skeating 789cfd2
the imports are unchanged from last time it passed isort so ?????
skeating 1df8bd2
replace any derivative on rhs where units have changed
skeating 6f5d938
all aspects of add_input
skeating d25abe7
add output
skeating 17f7adc
slight change in order of code
skeating b7c0ca2
Revert "slight change in order of code"
skeating 4c6df83
Auto stash before revert of "slight change in order of code"
skeating 3f7eef8
sorted most differences between input/output
skeating c200c42
add test for free variable as output
skeating f6265ef
remove unused test file
skeating 41148fe
refactor add_input/add_output into convert_variable(variable, unit, d…
skeating 424d65b
flake8
skeating 07b7cbe
update docstrings
skeating 3100a21
tests input arguments are correct types
skeating 05f9fb1
unit conversion not possible
skeating c327e21
finally fixed my isort issue
skeating ad764aa
use an ontology term to find the variable whose units need changing
skeating fcd4016
create helper function for unique names
skeating 5f1cd2d
some doc string tidying
skeating ddba7a0
tweaks to docstrings
skeating 78e9a81
Remove using ontology term as argument
skeating 1691e5f
tweaks to docstrings
skeating 8c6690f
change name of check args function to specify which function it check…
skeating 72c9105
moved test that was about units but not conversion
skeating fbd950c
if original var replaced by equation remove initial value
skeating ca9ce01
remove missing unit tests - to be sorted by fc
skeating 7d9589d
pull repeated get initial state functions into locals
skeating 4cea9dd
add test for unchanged initial value and remove redundant test
skeating 15f5861
fix indent
skeating b51f3f0
tidy up logic of adding and replacing equations
skeating 4d95504
Fix typos
jonc125 bd8411f
New var doesn't get initial_value in OUTPUT case
jonc125 6cc0e0c
Merge branch 'develop' into 77-unit-conversion
jonc125 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.