Fix variable names cut off in MFile#3531
Merged
timothy-nunn merged 2 commits intomainfrom Feb 19, 2025
Merged
Conversation
beb7bd0 to
6346bb7
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3531 +/- ##
==========================================
+ Coverage 31.31% 31.40% +0.09%
==========================================
Files 81 82 +1
Lines 19515 19548 +33
==========================================
+ Hits 6111 6140 +29
- Misses 13404 13408 +4 ☔ View full report in Codecov by Sentry. |
641aa10 to
a5d8989
Compare
a5d8989 to
43775ff
Compare
chris-ashe
approved these changes
Feb 14, 2025
Collaborator
chris-ashe
left a comment
There was a problem hiding this comment.
Happy with the truncation removal. Some variables are not aligned properly but this can be fixed later
jonmaddock
approved these changes
Feb 19, 2025
chris-ashe
pushed a commit
that referenced
this pull request
Feb 21, 2025
* Use process_output via Python interface * Convert ovarre, ovarrf, ocosts to Python
chris-ashe
pushed a commit
that referenced
this pull request
Feb 21, 2025
* Use process_output via Python interface * Convert ovarre, ovarrf, ocosts to Python
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #3427
Makes the entire output interface in Python which often just calls the underlying Fortran function.
There is a Python implementation of the
ovarre,ocosts, andovarrffunctions, with the latter two using the former. This will cause a slight change in the OUT.DAT which won't have1.234F5style variables, instead1.234e5.The Fortran implementations of
ocostsandovarrfare removed.ovarre's Fortran implementation can be removed in the scan conversion #3526.new_large_tokamak_nof.MFILE.DAT.txt
new_large_tokamak_nof.OUT.DAT.txt
old_large_tokamak_nof.MFILE.DAT.txt
old_large_tokamak_nof.OUT.DAT.txt
new_large_tokamak_once_through.MFILE.DAT.txt
new_large_tokamak_once_through.OUT.DAT.txt
old_large_tokamak_once_through.MFILE.DAT.txt
old_large_tokamak_once_through.OUT.DAT.txt
By eye, some of these have more decimal places but @jonmaddock please double check this still respects your 17 sig fig changes.
This also changes the cost output from
to
I also corrected some namespaced outputs that I found along the way e.g.
physics_variables.rmajor.tormajor.