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

Adds Permeability #225

Merged
merged 13 commits into from
Oct 18, 2024
Merged

Adds Permeability #225

merged 13 commits into from
Oct 18, 2024

Conversation

aelligp
Copy link
Collaborator

@aelligp aelligp commented Oct 17, 2024

This adds a first part of permeability to GP:

  • ConstantPermeability
  • HazenPermeability
  • PowerLawPermeability
  • CarmanKozenyPermeability

Copy link

codecov bot commented Oct 17, 2024

Codecov Report

Attention: Patch coverage is 65.27778% with 25 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
src/Permeability/Permeability.jl 67.16% 22 Missing ⚠️
src/MaterialParameters.jl 40.00% 3 Missing ⚠️
Additional details and impacted files

📢 Thoughts on this report? Let us know!


function compute_permeability!(k::AbstractArray, s::ConstantPermeability; kwargs...)
@unpack_val k_val = s
k[:] .= k_val

Choose a reason for hiding this comment

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

Suggested change
k[:] .= k_val
k .= k_val

Not sure why you want to convert it into a vector.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

this has also been done here. This can be removed in both cases I guess

Choose a reason for hiding this comment

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

Yes indeed

end


### Georg Adjoint 2 pahse paper,

Choose a reason for hiding this comment

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

Suggested change
### Georg Adjoint 2 pahse paper,
### Georg Adjoint 2 phase paper,

"""
function bulk_viscosity(η_shear, ϕ, C, R, λ, P_eff)

η_bulk = η_shear / ϕ * C * (1.0 + 0.5 * (inv(R) - 1.0) * (1.0 + tanh(-P_eff * inv(λ))))

Choose a reason for hiding this comment

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

Suggested change
η_bulk = η_shear / ϕ * C * (1.0 + 0.5 * (inv(R) - 1.0) * (1.0 + tanh(-P_eff * inv(λ))))
η_bulk = η_shear / ϕ * C * (1 + 0.5 * (inv(R) - 1) * (1 + tanh(-P_eff * inv(λ))))

Copy link
Collaborator Author

@aelligp aelligp Oct 18, 2024

Choose a reason for hiding this comment

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

This file slipped into the PR, should be removed or adapted to GP syntax

test/test_Permeability.jl Outdated Show resolved Hide resolved
test/test_Permeability.jl Outdated Show resolved Hide resolved
aelligp and others added 4 commits October 18, 2024 16:18
Co-authored-by: Albert de Montserrat <58044444+albert-de-montserrat@users.noreply.github.com>
@aelligp aelligp merged commit 2b4f474 into main Oct 18, 2024
20 checks passed
@aelligp aelligp deleted the pa-permea branch October 18, 2024 15:22
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