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 #554: Compile error when BEAMnrc EEMF macros are used #565

Merged
merged 1 commit into from
Jan 23, 2020
Merged

Fix #554: Compile error when BEAMnrc EEMF macros are used #565

merged 1 commit into from
Jan 23, 2020

Conversation

rtownson
Copy link
Collaborator

Fixes a compile error for EEMF beamnrc macros, due to an undeclared variable being used in an error message. Renames the BEAMnrc macros file to fix a typo in the filename. Removes a couple unused constants.

@rtownson rtownson self-assigned this Dec 13, 2019
@rtownson rtownson added this to the Release 2020 milestone Dec 13, 2019
@ftessier ftessier force-pushed the fix-eemf-compilation branch 3 times, most recently from 584639e to 73a3033 Compare January 13, 2020 15:35
@ftessier ftessier force-pushed the fix-eemf-compilation branch from 73a3033 to 318b2ed Compare January 13, 2020 19:46
@ftessier
Copy link
Member

Tweaked the commit message.

mainegra
mainegra approved these changes Jan 13, 2020
View reviewed changes
Copy link
Contributor

@mainegra mainegra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rtownson are the macros $PI_em and $LS2 not used at all?

@ftessier ftessier force-pushed the fix-eemf-compilation branch from 318b2ed to 47b7eb2 Compare January 23, 2020 14:48
@ftessier ftessier mentioned this pull request Jan 23, 2020
Closed
@ftessier
Copy link
Member

Added changes from #571.

@ftessier ftessier force-pushed the fix-eemf-compilation branch from 47b7eb2 to e4b8ded Compare January 23, 2020 15:04
@rtownson @ftessier
Fix #554: compile error in BEAMnrc with EEMF
b008e28 
Remove the undeclared variable ofr_cas in the enhanced electromagnetic
field (EEMF) macros, which caused an error when compiling with BEAMnrc.
Remove a couple unused constants and fix a typo in the file name
(beamnrc instead of beamrc). Also update the EEMF copyright details
and add publication reference in file headers.
@ftessier ftessier force-pushed the fix-eemf-compilation branch from e4b8ded to b008e28 Compare January 23, 2020 18:44
@ftessier
Copy link
Member

ftessier commented Jan 23, 2020 •
edited
Loading

Just tweaked the copyright name for Dave Rogers to D. W. O. Rogers. Otherwise we use Dave Rogers elsewhere to be consistent with other mentions throughout the EGSnrc project files.

@ftessier ftessier merged commit 7515d4a into develop Jan 23, 2020
@ftessier ftessier deleted the fix-eemf-compilation branch January 23, 2020 18:50
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

@blakewalters blakewalters blakewalters approved these changes

Assignees

@rtownson rtownson

Labels
compilation
Projects
None yet
Milestone
Release 2020
Development

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