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

Feature/pchakrab/#12 create tp core driver #23

Merged
merged 5 commits into from
Jan 15, 2020

Conversation

pchakraborty
Copy link
Collaborator

This branch, containing the tp_core driver does not involve Kokkos and can be safely merged to geos/develop. The CMakeLists.txt is modified to include building the tp_core driver. Other than that, all changes are encapsulated in the model/tpcore-driver directory.

@pchakraborty pchakraborty added the 0 diff structural Structural changes to repository that are zero-diff label Jan 8, 2020
Copy link

@tclune tclune left a comment

Choose a reason for hiding this comment

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

@pchakraborty I'm hesitant to add this onto the orphan development branch. There is a risk it will be lost when we adopt the GFDL branch. OTOH, there is a risk if we don't merge as well.

@tclune tclune merged commit 4e7d06f into geos/develop Jan 15, 2020
@tclune tclune deleted the feature/pchakrab/#12-create-tp-core-driver branch January 15, 2020 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff structural Structural changes to repository that are zero-diff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants