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

Add Tribol to codevelop build #985

Merged
merged 25 commits into from
Dec 14, 2023
Merged

Conversation

ebchin
Copy link
Member

@ebchin ebchin commented Aug 19, 2023

This adds Tribol to the serac codevelop build (see #981).

.gitmodules Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Aug 21, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a06ab78) 89.83% compared to head (5d79185) 89.86%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #985      +/-   ##
===========================================
+ Coverage    89.83%   89.86%   +0.03%     
===========================================
  Files          149      149              
  Lines        12091    12091              
===========================================
+ Hits         10862    10866       +4     
+ Misses        1229     1225       -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jamiebramwell
Copy link
Member

Should this go in before or after the other Tribol PR?

@ebchin
Copy link
Member Author

ebchin commented Sep 25, 2023

Should this go in before or after the other Tribol PR?

Either should be OK, but I think the other Tribol PR should be higher priority and is in a more ready-to-merge state.

Base automatically changed from feature/chin23/contact_mechanics to develop November 10, 2023 21:02
@jamiebramwell
Copy link
Member

@chapman39 @white238 , could you take a look at this?

if(${PROJECT_NAME} STREQUAL "smith")
include(serac/tribol/cmake/TribolMacros.cmake)
add_subdirectory(${PROJECT_SOURCE_DIR}/serac/tribol/src ${CMAKE_BINARY_DIR}/tribol)
tribol_configure_file(${PROJECT_SOURCE_DIR}/serac/tribol/src/tribol/config.hpp.in
Copy link
Member

Choose a reason for hiding this comment

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

Why is tribol not configuring this file itself?

Copy link
Member Author

Choose a reason for hiding this comment

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

It will when LLNL/Tribol#45 is merged in. Added a note here as a reminder to get rid of this when we update serac's Tribol again.

$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/tribol/src>
)

target_include_directories(tribol PUBLIC
Copy link
Member

Choose a reason for hiding this comment

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

I really wish I could figure out why these includes disappear. Axom does the same thing and I can't for the life of my figure out why.

@jamiebramwell
Copy link
Member

@white238 could you take another look at this?

@jamiebramwell jamiebramwell merged commit ee1045f into develop Dec 14, 2023
2 checks passed
@jamiebramwell jamiebramwell deleted the feature/chin23/tribol_submodule branch December 14, 2023 23:30
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.

5 participants