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

Implement Killough Model for capillary hysteresis #2159

Draft
wants to merge 41 commits into
base: develop
Choose a base branch
from
Draft

Implement Killough Model for capillary hysteresis #2159

wants to merge 41 commits into from

Commits on Nov 10, 2022

  1. save commit before refactoring

    @jafranc
    jafranc committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    87d210e View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. factor out Killough Parameters to be used by TableHysteresis

    @jafranc
    jafranc committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    4e937e1 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2022

  1. Adding TableCapillaryPressureHysteresis class

    @jafranc
    jafranc committed Nov 12, 2022
    Configuration menu
    Copy the full SHA
    81a85cc View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. adding phaseVolTrapped to CapillaryBase + inheritance

    @jafranc
    jafranc committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    162b899 View commit details
    Browse the repository at this point in the history

  2. adding Hysteresis capillary table

    @jafranc
    jafranc committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    b4456bf View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. few correction/missing parts

    jacques committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    fa48972 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2022

  1. uncrustify + some corrections

    jacques committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    35988c4 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. addding save converged state for capillary model

    jacques committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    4e4956c View commit details
    Browse the repository at this point in the history

  2. adding headers and minor fixes

    jacques committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    67a3cf7 View commit details
    Browse the repository at this point in the history

  3. adding a test for capillary hysteresis

    jacques committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    505d475 View commit details
    Browse the repository at this point in the history

  4. adapt test for hyst relperm

    jacques committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    3da2cd5 View commit details
    Browse the repository at this point in the history

  5. uncrustify

    jacques committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    a016798 View commit details
    Browse the repository at this point in the history

  6. uncrustified + bounded F ratio

    jacques committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    c4c592e View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. added a Logic error

    jacques committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    6701749 View commit details
    Browse the repository at this point in the history

  2. add flags logic and correct 2phase

    jacques committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    21f6a3b View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. flags as cell-wise fields

    jacques committed Dec 5, 2022
    Configuration menu
    Copy the full SHA
    3da4473 View commit details
    Browse the repository at this point in the history

  2. adding a test case

    jacques committed Dec 5, 2022
    Configuration menu
    Copy the full SHA
    f766c68 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. clean capillaryPCHyst + fix few filename convention

    jacques committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    63a086b View commit details
    Browse the repository at this point in the history

  2. init KilloughHysteresis obj through relpermClass + usage of 3-points … 

    …curves instead of tables
    jacques committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    cc01813 View commit details
    Browse the repository at this point in the history

  3. start revising unitest

    jacques committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    c5ae8cd View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2022

  1. cleaning up interfaces

    @jafranc
    jafranc committed Dec 10, 2022
    Configuration menu
    Copy the full SHA
    53e89f5 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. Merge branch 'develop' into jafranc/refactor/relpermHysteresis 

    # Conflicts:
#	src/coreComponents/constitutive/CMakeLists.txt
#	src/coreComponents/constitutive/capillaryPressure/CapillaryPressureBase.cpp
#	src/coreComponents/constitutive/capillaryPressure/CapillaryPressureExtrinsicData.hpp
#	src/coreComponents/constitutive/relativePermeability/RelativePermeabilityExtrinsicData.hpp
#	src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.cpp
#	src/coreComponents/constitutive/thermalConductivity/MultiPhaseThermalConductivityFields.hpp
#	src/coreComponents/constitutive/thermalConductivity/SinglePhaseThermalConductivityFields.hpp
#	src/coreComponents/constitutive/thermalConductivity/ThermalConductivityFields.hpp
#	src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp
    jacques committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    ea74141 View commit details
    Browse the repository at this point in the history

  2. clean up post-merge

    jacques committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    7ce9a1b View commit details
    Browse the repository at this point in the history

  3. fix trapped fraction

    jacques committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    1b60f12 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. make KilloughHysteresis a simple helpers class

    jacques committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    1540d0d View commit details
    Browse the repository at this point in the history

  2. reorderd messed ratio

    jacques committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    fcf366b View commit details
    Browse the repository at this point in the history

  3. some more comments and uncrustify

    jacques committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    5067990 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Merge branch 'develop' into jafranc/feat/Killough-PC 

    # Conflicts:
#	src/coreComponents/constitutive/CMakeLists.txt
#	src/coreComponents/constitutive/capillaryPressure/CapillaryPressureBase.cpp
#	src/coreComponents/constitutive/capillaryPressure/CapillaryPressureExtrinsicData.hpp
#	src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.cpp
#	src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.hpp
    @jafranc
    jafranc committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    14be27c View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. Merge remote-tracking branch 'origin/jafranc/feat/Killough-PC' into j… 

    …afranc/feat/Killough-PC
    jacques committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    b7ccd4f View commit details
    Browse the repository at this point in the history

  2. Fix indices in formula

    jacques committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    9788bd8 View commit details
    Browse the repository at this point in the history

  3. Residual clean up from branching f766c68

    jacques committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    32a366d View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. Clean and made KilloughHysteresis static

    jacques committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    d60e095 View commit details
    Browse the repository at this point in the history

  2. discard wip-test

    jacques committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    6e52e30 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into jafranc/refactor/relpermHysteresis 

    # Conflicts:
#	src/coreComponents/constitutive/CMakeLists.txt
#	src/coreComponents/constitutive/relativePermeability/RelativePermeabilityBase.hpp
#	src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.hpp
#	src/coreComponents/unitTests/constitutiveTests/constitutiveTestHelpers.hpp
    jacques committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    04fdd27 View commit details
    Browse the repository at this point in the history

  4. post-merge/ fix minPhaseFraction getters

    jacques committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    3a8b75d View commit details
    Browse the repository at this point in the history

  5. uncrustify

    jacques committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    a01db8c View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. merge refactor/relpermHysteresis

    jacques committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    ec5751b View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. 2phase-3phase dispatch handling + few fixes

    jacques committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    e187b2a View commit details
    Browse the repository at this point in the history

  2. minor fixes

    @jafranc
    jafranc committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    e0bf9aa View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. trapped phase in two phase flow handling

    jacques committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    cd1bce8 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Merge branch 'develop' into jafranc/feat/Killough-PC

    @francoishamon
    francoishamon committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    01f2787 View commit details
    Browse the repository at this point in the history