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

Adding trapped mass as output from compositional statistics #2052

Merged
merged 25 commits into from
Sep 15, 2022
Merged

Adding trapped mass as output from compositional statistics #2052

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d5f9a8c
cleaned up bc
francoishamon Aug 6, 2022
30220f2
Merge branch 'develop' into refactor/hamon/bcCleanup
francoishamon Aug 14, 2022
227e32f
Merge branch 'develop' into refactor/hamon/bcCleanup
francoishamon Aug 21, 2022
9d5eca8
Merge branch 'develop' into refactor/hamon/bcCleanup
francoishamon Aug 23, 2022
f811a4b
WIP
MatthiasCremon Aug 23, 2022
3add582
Merge branch 'develop' into matthias/exp_mgr_strategies
MatthiasCremon Aug 24, 2022
1136777
first working prototype
MatthiasCremon Aug 24, 2022
aa0ff5b
move-up m_phaseMinVolFrac to get it while stat-ing compflow
Sep 6, 2022
0f5c7a0
adding basic immobile mass in comp stats
Sep 6, 2022
d7e26ec
refact rename immobilePhase->trappedPhase
jafranc Sep 7, 2022
683af41
adding element-wise trapped saturation to be integrated over
Sep 7, 2022
2940b7a
Merge remote-tracking branch 'remotes/origin/matthias/exp_mgr_strateg…
jafranc Sep 7, 2022
7d089cf
introducing tracking of critical sat in hysteresis
jafranc Sep 8, 2022
5d1a6e1
revert matthias/exp_mgr_strategies merge
Sep 9, 2022
88c88fd
some clean up and uncrustify
Sep 9, 2022
f34bfdd
Addressing Francois coment on naming conv and array2d->array3d
jafranc Sep 9, 2022
5ee8124
uncrustify
jafranc Sep 9, 2022
8052c80
implementing Francois's refactor
jafranc Sep 9, 2022
55327b9
Merge branch 'develop' into jafranc/feat/add-mobile-comp-stat
jafranc Sep 9, 2022
c921a1d
life is better with labels
jafranc Sep 9, 2022
410e6ac
Merge remote-tracking branch 'origin/jafranc/feat/add-mobile-comp-sta…
jafranc Sep 9, 2022
0a701d0
Merge remote-tracking branch 'origin/develop' into jafranc/feat/add-m…
Sep 14, 2022
ae690b8
Merge remote-tracking branch 'origin/jafranc/feat/add-mobile-comp-sta…
Sep 14, 2022
b42c09c
Merge branch 'develop' into jafranc/feat/add-mobile-comp-stat
Sep 14, 2022
7f4973f
updated integratedTests submodule
francoishamon Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into refactor/hamon/bcCleanup
  • Loading branch information
@francoishamon
francoishamon committed Aug 21, 2022
commit 227e32f000fdcb8f4ce6af47392b4cbace14f55b

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.