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

Pt/exp branch #3095

Closed
wants to merge 83 commits into from
Closed

Pt/exp branch #3095

wants to merge 83 commits into from

Commits on Mar 5, 2024

  1. this compiles

    Pavel Tomin committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    79b293c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    207212d View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    3fe3e96 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. test case

    Pavel Tomin committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    0d04f8a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    bc06545 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. wip

    Pavel Tomin committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    db2401e View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. cleanup

    Pavel Tomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    aaf0539 View commit details
    Browse the repository at this point in the history

  2. Update CoupledReservoirAndWellsBase.hpp

    @paveltomin
    paveltomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    7d28924 View commit details
    Browse the repository at this point in the history

  3. Update CoupledSolver.hpp

    @paveltomin
    paveltomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    de4b1bf View commit details
    Browse the repository at this point in the history

  4. simplify

    Pavel Tomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    a7193f2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'fractures-wells-draft' of https://github.com/GEOS-DEV/GEOS 

     into fractures-wells-draft
    Pavel Tomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    73f6b21 View commit details
    Browse the repository at this point in the history

  6. Delete inputFiles/poromechanicsFractures/PoroElastic_conformingFractu… 

    …re_2d_faultSlip_well.xml
    @paveltomin
    paveltomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    8d1b40b View commit details
    Browse the repository at this point in the history

  7. merge

    Pavel Tomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    94dec11 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'fractures-wells-draft' of https://github.com/GEOS-DEV/GEOS 

     into fractures-wells-draft
    Pavel Tomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    914caf4 View commit details
    Browse the repository at this point in the history

  9. catalogName

    Pavel Tomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    54cc129 View commit details
    Browse the repository at this point in the history

  10. Update MultiphasePoromechanics.cpp

    @paveltomin
    paveltomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    be2d4d9 View commit details
    Browse the repository at this point in the history

  11. Update PoromechanicsSolver.hpp

    @paveltomin
    paveltomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    6d29251 View commit details
    Browse the repository at this point in the history

  12. cleanup

    Pavel Tomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    ef39011 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    1aea5c0 View commit details
    Browse the repository at this point in the history

  14. merge

    Pavel Tomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    2737e29 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    1c954e0 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Merge branch 'fractures-wells-draft' of https://github.com/GEOS-DEV/GEOS 

     into fractures-wells-draft
    Pavel Tomin committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    815e2e2 View commit details
    Browse the repository at this point in the history

  2. default template

    Pavel Tomin committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    44a81b4 View commit details
    Browse the repository at this point in the history

  3. Delete src/coreComponents/schema/docs/PermeabilityBase.rst

    @paveltomin
    paveltomin committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    dc6bf1c View commit details
    Browse the repository at this point in the history

  4. Delete src/coreComponents/schema/docs/PermeabilityBase_other.rst

    @paveltomin
    paveltomin committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    0a8af2c View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    3531adf View commit details
    Browse the repository at this point in the history

  2. small fix

    Pavel Tomin committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    452f7a0 View commit details
    Browse the repository at this point in the history

  3. revert

    @paveltomin
    paveltomin committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    550fe07 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge branch 'develop' into pt/hypre-fix-contact

    @paveltomin
    paveltomin committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    f72da12 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Merge branch 'develop' of https://github.com/GEOS-DEV/GEOS into develop

    Pavel Tomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    c81fd8d View commit details
    Browse the repository at this point in the history

  2. do not set to 0

    Pavel Tomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    258e5dc View commit details
    Browse the repository at this point in the history

  3. try this

    Pavel Tomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    b5c7439 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into pt/contact-exp

    @paveltomin
    paveltomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    a6e7954 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    8704805 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into pt/contact-exp

    @paveltomin
    paveltomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    79da7e9 View commit details
    Browse the repository at this point in the history

  7. Update SolverBase.cpp

    @paveltomin
    paveltomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    45aa297 View commit details
    Browse the repository at this point in the history

  8. Update CoupledSolver.hpp

    @paveltomin
    paveltomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    791520a View commit details
    Browse the repository at this point in the history

  9. Update CoupledSolver.hpp

    @paveltomin
    paveltomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    5948f38 View commit details
    Browse the repository at this point in the history

  10. Update SinglePhaseReservoirAndWells.cpp

    @paveltomin
    paveltomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    867acb2 View commit details
    Browse the repository at this point in the history

  11. Update CompositionalMultiphaseReservoirAndWells.cpp

    @paveltomin
    paveltomin committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    c3c935d View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Update SinglePhaseReservoirAndWells.cpp

    @paveltomin
    paveltomin committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    7d35a83 View commit details
    Browse the repository at this point in the history

  2. remove debug

    Pavel Tomin committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    79895ea View commit details
    Browse the repository at this point in the history

  3. let's try this

    Pavel Tomin committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    06dda37 View commit details
    Browse the repository at this point in the history

  4. revert and try another way

    Pavel Tomin committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    78b47b6 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Update SinglePhasePoromechanicsConformingFractures.cpp

    @paveltomin
    paveltomin committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    23620b8 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. simplify poromechanics initialization setup

    Pavel Tomin committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    2da35af View commit details
    Browse the repository at this point in the history

  2. Update PoroElastic_staircase_co2_3d_fim.xml

    @paveltomin
    paveltomin committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    fbdafe8 View commit details
    Browse the repository at this point in the history

  3. Update PoroElastic_staircase_co2_3d_sequential.xml

    @paveltomin
    paveltomin committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    ad6947c View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Update PoromechanicsInitialization.cpp

    @paveltomin
    paveltomin committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    f2851af View commit details
    Browse the repository at this point in the history

  2. separate and try to normalize

    Pavel Tomin committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    439cd63 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pt/contact-exp' into contact-norm

    @paveltomin
    paveltomin committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    cc17bb3 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. code style

    Pavel Tomin committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    3c24821 View commit details
    Browse the repository at this point in the history

  2. build fix

    Pavel Tomin committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    32b1f88 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'contact-norm' of https://github.com/GEOS-DEV/GEOS into … 

    …contact-norm
    Pavel Tomin committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    9cd13be View commit details
    Browse the repository at this point in the history

  4. try this

    Pavel Tomin committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    4b4af0b View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    cd9b3f5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into pt/contact-exp

    @paveltomin
    paveltomin committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    36a4ac3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into simplify-poromech-init

    @paveltomin
    paveltomin committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    291b1ab View commit details
    Browse the repository at this point in the history

  4. Merge branch 'pt/contact-exp' into contact-norm

    @paveltomin
    paveltomin committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d6a97b1 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Update PoromechanicsSolver.hpp

    @paveltomin
    paveltomin committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    fcffbdc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into simplify-poromech-init

    @paveltomin
    paveltomin committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    322cf4a View commit details
    Browse the repository at this point in the history

  3. Update src/coreComponents/physicsSolvers/contact/SolidMechanicsEmbedd… 

    …edFractures.cpp

Co-authored-by: Matteo Cusini <49037133+CusiniM@users.noreply.github.com>
    @paveltomin @CusiniM
    paveltomin and CusiniM committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    36a031e View commit details
    Browse the repository at this point in the history

  4. Update src/coreComponents/physicsSolvers/contact/SolidMechanicsEmbedd… 

    …edFractures.cpp

Co-authored-by: Matteo Cusini <49037133+CusiniM@users.noreply.github.com>
    @paveltomin @CusiniM
    paveltomin and CusiniM committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    90a3bef View commit details
    Browse the repository at this point in the history

  5. Update NonlinearSolverParameters.cpp

    @paveltomin
    paveltomin committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    112e416 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into pt/contact-exp

    @paveltomin
    paveltomin committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    e6640fe View commit details
    Browse the repository at this point in the history

  7. Merge branch 'pt/contact-exp' into contact-norm

    @paveltomin
    paveltomin committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    f39c22b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into fractures-wells-draft

    @paveltomin
    paveltomin committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    27dafd5 View commit details
    Browse the repository at this point in the history

  9. code style

    Pavel Tomin committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    6a976e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. cuda build

    @paveltomin
    paveltomin committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    b9b76e8 View commit details
    Browse the repository at this point in the history

  2. add an option to print out statistics after init

    Pavel Tomin committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    84941b8 View commit details
    Browse the repository at this point in the history

  3. Update src/coreComponents/physicsSolvers/contact/SolidMechanicsLagran… 

    …geContact.cpp

Co-authored-by: Matteo Cusini <49037133+CusiniM@users.noreply.github.com>
    @paveltomin @CusiniM
    paveltomin and CusiniM committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    267ce24 View commit details
    Browse the repository at this point in the history

  4. Update src/coreComponents/physicsSolvers/contact/SolidMechanicsLagran… 

    …geContact.cpp

Co-authored-by: Matteo Cusini <49037133+CusiniM@users.noreply.github.com>
    @paveltomin @CusiniM
    paveltomin and CusiniM committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3c9a6c8 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Merge branch 'develop' into pt/contact-exp

    @paveltomin
    paveltomin committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    3d66d47 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pt/contact-exp' into contact-norm

    @paveltomin
    paveltomin committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b6436c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge branch 'develop' into pt/contact-exp

    @paveltomin
    paveltomin committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    b2bcdd4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pt/contact-exp' into contact-norm

    @paveltomin
    paveltomin committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    fac90bf View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Merge remote-tracking branch 'origin/pt/contact-exp' into pt/conf-tol

    Pavel Tomin committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    986669e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/contact-norm' into pt/conf-tol

    Pavel Tomin committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    022e02b View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Merge branch 'fractures-wells-draft' into pt/conf-tol

    Pavel Tomin committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    55659b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. debug

    Pavel Tomin committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    276afe9 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. merge

    Pavel Tomin committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    0d8daf8 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. merge

    Pavel Tomin committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    0f87bce View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. merge again

    Pavel Tomin committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    6ef28b9 View commit details
    Browse the repository at this point in the history