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

Fix #478: Fix search delimiters in medium data file. #503

Merged
merged 1 commit into from
Jan 13, 2020
Merged

Fix #478: Fix search delimiters in medium data file. #503

merged 1 commit into from
Jan 13, 2020

Conversation

blakewalters
Copy link
Contributor

Increased search delimiters from 40 to 80 chars. This is consistent
with the length of text read in and should eliminate (most) erroneous
medium definitions when there are many blank characters in the line
containing the "MEDIUM =" key.

@blakewalters blakewalters mentioned this pull request Dec 20, 2018
Closed
@ftessier
Copy link
Member

Should it be changed in get_inputs.mortran L223-224 as well?

@blakewalters
Copy link
Contributor Author

We probably don't need to, @ftessier. I think we keep a much tighter rein on our delimiters in the .egsinp file. It would only be for consistency's sake.

@blakewalters
Copy link
Contributor Author

...But I made the change anyway!

@rtownson rtownson added the bug label Feb 23, 2019
@ftessier ftessier force-pushed the fix-medium_name_parse branch 4 times, most recently from ef6a8bf to ae3e8df Compare November 22, 2019 17:34
@ftessier
Copy link
Member

Squashed the two commits together and adjusted commit title and message.

@ftessier
Copy link
Member

Fixed a conflict when rebasing on develop due to the increase of the length of the TEXTPIECE string to 256 chracters on the develop branch in commit 0965496. There was no real conflict, but because that line is abutting the proposed changes in the current commit, git flags it as a potential conflict. All good now.

@ftessier ftessier added this to the Release 2020 milestone Jan 13, 2020
@blakewalters @ftessier
Fix #478: increase size of delimiter strings
3f43e7f 
Increase the size of search delimiter strings from 40 to 80 characters.
This is consistent with the length of text read in and should eliminate
(most) erroneous medium definitions when there are many blank characters
in the line containing the "MEDIUM =" key.
@ftessier
Copy link
Member

Rebased on develop.

@ftessier ftessier merged commit 1d6e53e into develop Jan 13, 2020
@ftessier ftessier deleted the fix-medium_name_parse branch January 13, 2020 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ftessier ftessier ftessier approved these changes

@mainegra mainegra mainegra approved these changes

@rtownson rtownson rtownson approved these changes

Assignees

@blakewalters blakewalters

Labels
bug
Projects
None yet
Milestone
Release 2020
Development

Successfully merging this pull request may close these issues.
4 participants
@blakewalters @ftessier @mainegra @rtownson