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

Update master branch with adaptation trigger logic from other branch #1075

Merged
merged 19 commits into from
Feb 13, 2020
Merged

Update master branch with adaptation trigger logic from other branch #1075

merged 19 commits into from
Feb 13, 2020

Conversation

zhang-alvin
Copy link
Contributor

Cherry-picked features from other branch that includes adaptation trigger logic.

Contingent on update of the scorec feedstock on conda-forge: conda-forge/scorec-feedstock#2

The hashdist stack likely needs to be updated as well.

Copy link
Member

@cekees cekees left a comment

Choose a reason for hiding this comment

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

I added a few comments/questions but looks good overall.

@codecov
Copy link

codecov bot commented Feb 4, 2020

Codecov Report

Merging #1075 into master will decrease coverage by 0.01%.
The diff coverage is 22%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1075      +/-   ##
==========================================
- Coverage    50.4%   50.39%   -0.02%     
==========================================
  Files         527      527              
  Lines      101062   101101      +39     
==========================================
+ Hits        50941    50949       +8     
- Misses      50121    50152      +31
Impacted Files Coverage Δ
proteus/mprans/VOF.py 80.64% <100%> (+0.26%) ⬆️
proteus/NumericalSolution.py 49.25% <2.5%> (-0.95%) ⬇️
proteus/tests/test_boundaryconditions.py 97.33% <0%> (-0.25%) ⬇️
proteus/TwoPhaseFlow/utils/Parameters.py 65.22% <0%> (-0.05%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5a0bd52...339afdd. Read the comment docs.

@zhang-alvin
Copy link
Contributor Author

Something's strange with the Travis environment and the scorec package. It compiles locally.

@zhang-alvin zhang-alvin merged commit a89873b into erdc:master Feb 13, 2020
@zhang-alvin zhang-alvin deleted the add_MeshAdapt_updates branch February 13, 2020 03:46
zhang-alvin added a commit that referenced this pull request Feb 14, 2020
…1075)

* LFS: add mesh.edge back to lfs

* STATE: first pass at moving latest adaptation updates into master

* FIX: get adaptivity code to work like feature branch, still segfaults while cleaning up

* FIX: comment out aspects of destructor to avoid seg faults

* MAINT: moved header inclusion to top of file

* DEL: removed flcbdfWrappersModule.cpp

* STACK: updated stack

* Update stack

* TRAVIS: try shifting to N=1 for hashdist build to fix zoltan issue

* TRAVIS: try bionic distribution

* Revert "TRAVIS: try bionic distribution"

This reverts commit 614938b.

* Revert "TRAVIS: try shifting to N=1 for hashdist build to fix zoltan issue"

This reverts commit b2169c5.

* TRAVIS: python 3.7 to fix build?

* Revert "TRAVIS: python 3.7 to fix build?"

This reverts commit d782b05.

* STACK: update for zoltan changes

* Revert "Revert "TRAVIS: try bionic distribution""

This reverts commit 5f7b3eb.

* Revert "Revert "TRAVIS: try shifting to N=1 for hashdist build to fix zoltan issue""

This reverts commit 5b92f5a.

* Revert "Revert "Revert "TRAVIS: try shifting to N=1 for hashdist build to fix zoltan issue"""

This reverts commit f4ff4b1.

* Revert "Revert "Revert "TRAVIS: try bionic distribution"""

This reverts commit b267dba.
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.

2 participants