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.

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

Handle Trelis 17 #64

Merged
merged 9 commits into from
Oct 13, 2020
Merged

Handle Trelis 17 #64

merged 9 commits into from
Oct 13, 2020

Conversation

ljacobson64
Copy link
Member

This PR combines some changes from @pshriwise and @bam241 to do a few things:

  • Allow building with Trelis 17. I took a commit from @pshriwise 's PR Handle API change between Cubit/Trelis 16 and 17 #61 for this. Note that I slightly changed how users specify whether their version of Trelis is >=17 or not: I introduced the required cmake variable CUBIT_VERSION which cmake uses to determine whether the CUBIT_17_PLUS definition should be used. I figure this is more forward compatible in case future versions of Trelis require slight changes as well.
  • Add the uwuw library to DAGMC, but don't actually add uwuw functionality to the plugin; that will take place in embedding the uwuw preprocessing in the plugin #62.
  • Update the readme to reflect the changes in the build procedure and specify differences between Trelis 16 and 17.

After this PR, everything should be set up properly for @bam241 to add his uwuw functionality.

Copy link
Member

@bam241 bam241 left a comment

Choose a reason for hiding this comment

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

few comments, otherwise this looks good!

thank @ljacobson64 !

CMakeLists.txt Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
Copy link
Member

@pshriwise pshriwise left a comment

Choose a reason for hiding this comment

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

Just a couple requests for clarity that the change in the API is based on the SDK being used as opposed to the version of Cubit/Trelis.

CMakeLists.txt Outdated
@@ -77,6 +85,9 @@ if (BUILD_IGEOM)
include_directories(iGeom)
add_library(iGeom SHARED ${IGEOM_SRC_FILES})
target_link_libraries(iGeom ${CUBIT_LIBS})
if (CUBIT_VERSION VERSION_GREATER_EQUAL 17.0)
Copy link
Member

Choose a reason for hiding this comment

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

Can we add a comment here noting that this really has to do with the SDK version as opposed to the version of Trelis/Cubit? As per @gonuke's comment #61 (comment) here, it still isn't clear what versions of Cubit (as opposed to Trelis versions) this will apply to.

Copy link
Member Author

Choose a reason for hiding this comment

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

This if statement was removed per my comment on iGeom.cpp

iGeom/iGeom.cpp Outdated Show resolved Hide resolved
@ljacobson64
Copy link
Member Author

I just pushed 2 commits to my branch, and I can see them if I look at my branch, but they're not showing up on this PR. Am I losing my mind?

@ljacobson64
Copy link
Member Author

https://www.githubstatus.com

Update - Pull Requests is experiencing degraded performance. We are continuing to investigate.
Oct 9, 22:02 UTC

Guess I'm not losing my mind

Copy link
Member

@bam241 bam241 left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Member

@pshriwise pshriwise left a comment

Choose a reason for hiding this comment

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

Looking good to me. Feeling much better about how the API change is being handled here. Thanks @ljacobson64!

@pshriwise
Copy link
Member

Will merge at the end of the day unless there are further comments.

@pshriwise pshriwise merged commit 181f65c into svalinn:develop Oct 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants