From fb335a947fdeff5189eeba64b8432835c7b4d972 Mon Sep 17 00:00:00 2001 From: szeng44 Date: Fri, 13 Dec 2024 17:33:42 -0500 Subject: [PATCH] updated to latest jutul and jutul darcy version, revise pyplot to pythonplot --- Project.toml | 31 ------------------------------- examples/Project.toml | 16 ---------------- examples/Vwell_2D.jl | 4 ++-- examples/basic2D.jl | 4 ++-- examples/compass.jl | 4 ++-- examples/end2end.jl | 4 ++-- examples/inv_2D.jl | 4 ++-- examples/inv_logK.jl | 4 ++-- examples/inv_tortuous.jl | 4 ++-- examples/inv_trans.jl | 4 ++-- examples/optim_K.jl | 2 +- examples/simple_2D.jl | 4 ++-- src/FlowRules/Types/type_utils.jl | 4 ++-- 13 files changed, 21 insertions(+), 68 deletions(-) delete mode 100644 Project.toml delete mode 100644 examples/Project.toml diff --git a/Project.toml b/Project.toml deleted file mode 100644 index cb0bd67..0000000 --- a/Project.toml +++ /dev/null @@ -1,31 +0,0 @@ -name = "JutulDarcyRules" -uuid = "41f0c4f5-9bdd-4ef1-8c3a-d454dff2d562" -authors = ["Ziyi Yin "] -version = "0.2.8" - -[deps] -ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" -Jutul = "2b460a1a-8a2b-45b2-b125-b5c536396eb9" -JutulDarcy = "82210473-ab04-4dce-b31b-11573c4f8e0a" -LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -Optim = "429524aa-4258-5aef-a3af-852621145aeb" -PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" -Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" - -[compat] -ChainRulesCore = "1" -Flux = "0.12, 0.13, 0.14" -Jutul = "=0.2.11" -JutulDarcy = "=0.2.7" -Optim = "1" -PrettyTables = "=2.2.3" -julia = "1" - -[extras] -Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" -Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[targets] -test = ["Printf", "Test", "Random"] diff --git a/examples/Project.toml b/examples/Project.toml deleted file mode 100644 index 8499d5f..0000000 --- a/examples/Project.toml +++ /dev/null @@ -1,16 +0,0 @@ -name = "JutulDarcyRules-example" -authors = ["Ziyi Yin"] - -[deps] -Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" -JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -JOLI = "bb331ad6-a1cf-11e9-23da-9bcb53c69f6f" -JUDI = "f3b833dc-6b2e-5b9c-b940-873ed6319979" -Jutul = "2b460a1a-8a2b-45b2-b125-b5c536396eb9" -JutulDarcy = "82210473-ab04-4dce-b31b-11573c4f8e0a" -LineSearches = "d3d80556-e9d4-5f37-9878-2ab0fcc64255" -LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -MAT = "23992714-dd62-5051-b70f-ba57cb901cac" -Optim = "429524aa-4258-5aef-a3af-852621145aeb" -PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" -SlimPlotting = "f6d04670-764e-495b-a720-91c3c9a588ff" diff --git a/examples/Vwell_2D.jl b/examples/Vwell_2D.jl index a26134d..6c89430 100644 --- a/examples/Vwell_2D.jl +++ b/examples/Vwell_2D.jl @@ -1,11 +1,11 @@ ## A simple 2D example for fluid-flow simulation using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot ## grid size n = (30, 1, 15) diff --git a/examples/basic2D.jl b/examples/basic2D.jl index 621962c..6168223 100644 --- a/examples/basic2D.jl +++ b/examples/basic2D.jl @@ -1,11 +1,11 @@ ## A simple 2D example for fluid-flow simulation using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot ## grid size n = (30, 1, 15) diff --git a/examples/compass.jl b/examples/compass.jl index cfcea71..47e195a 100644 --- a/examples/compass.jl +++ b/examples/compass.jl @@ -1,11 +1,11 @@ ## A 2D compass example using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot using Flux using LineSearches using JLD2 diff --git a/examples/end2end.jl b/examples/end2end.jl index 6de1807..4136f4a 100644 --- a/examples/end2end.jl +++ b/examples/end2end.jl @@ -1,11 +1,11 @@ ## A 64×64 2D example for end-to-end inversion of a tortuous channel using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot using Flux using LineSearches using JLD2 diff --git a/examples/inv_2D.jl b/examples/inv_2D.jl index 874a2c5..c7dfc72 100644 --- a/examples/inv_2D.jl +++ b/examples/inv_2D.jl @@ -1,11 +1,11 @@ ## A simple 2D example for permeability inversion using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot using Flux using LineSearches diff --git a/examples/inv_logK.jl b/examples/inv_logK.jl index e6f0262..491e572 100644 --- a/examples/inv_logK.jl +++ b/examples/inv_logK.jl @@ -1,11 +1,11 @@ ## A simple 2D example for permeability inversion using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot using Flux using LineSearches diff --git a/examples/inv_tortuous.jl b/examples/inv_tortuous.jl index c1b784a..3b599cd 100644 --- a/examples/inv_tortuous.jl +++ b/examples/inv_tortuous.jl @@ -1,11 +1,11 @@ ## A 64×64 2D example for permeability inversion of a tortuous channel using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot using Flux using LineSearches using JLD2 diff --git a/examples/inv_trans.jl b/examples/inv_trans.jl index 7a5fc26..72a6554 100644 --- a/examples/inv_trans.jl +++ b/examples/inv_trans.jl @@ -1,11 +1,11 @@ ## A simple 2D example for transmissibility inversion using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot using Flux using LineSearches diff --git a/examples/optim_K.jl b/examples/optim_K.jl index 5cb1094..c47094a 100644 --- a/examples/optim_K.jl +++ b/examples/optim_K.jl @@ -1,5 +1,5 @@ using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using Flux diff --git a/examples/simple_2D.jl b/examples/simple_2D.jl index ee04305..58f077a 100644 --- a/examples/simple_2D.jl +++ b/examples/simple_2D.jl @@ -1,11 +1,11 @@ ## A simple 2D example for fluid-flow simulation using DrWatson -@quickactivate "JutulDarcyRules-example" +@quickactivate "JutulDarcyRules" using JutulDarcyRules using LinearAlgebra -using PyPlot +using PythonPlot ## grid size n = (30, 1, 15) diff --git a/src/FlowRules/Types/type_utils.jl b/src/FlowRules/Types/type_utils.jl index 00a5508..61fc9db 100644 --- a/src/FlowRules/Types/type_utils.jl +++ b/src/FlowRules/Types/type_utils.jl @@ -43,7 +43,7 @@ function setup_well_model(M::jutulModel{D, T}, f::Union{jutulForce{D, T}, jutulV select_output_variables!(model.models.Reservoir, :all) ρ = ConstantCompressibilityDensities(p_ref = 150*bar, density_ref = [ρCO2, ρH2O], compressibility = [1e-4/bar, 1e-6/bar]) replace_variables!(model, PhaseMassDensities = ρ) - replace_variables!(model, RelativePermeabilities = BrooksCoreyRelPerm(sys, [2.0, 2.0], [0.1, 0.1], 1.0)) + replace_variables!(model, RelativePermeabilities = BrooksCoreyRelativePermeabilities(sys, [2.0, 2.0], [0.1, 0.1], 1.0)) for x ∈ keys(model.models) Jutul.select_output_variables!(model.models[x], :all) end @@ -76,6 +76,6 @@ function simple_model(M::jutulModel{D, T}; ρCO2::T=T(ρCO2), ρH2O::T=T(ρH2O)) model.primary_variables[:Pressure] = JutulDarcy.Pressure(minimum = -Inf, max_rel = nothing) ρ = ConstantCompressibilityDensities(p_ref = 150*bar, density_ref = [ρCO2, ρH2O], compressibility = [1e-4/bar, 1e-6/bar]) replace_variables!(model, PhaseMassDensities = ρ) - replace_variables!(model, RelativePermeabilities = BrooksCoreyRelPerm(sys, [2.0, 2.0], [0.1, 0.1], 1.0)) + replace_variables!(model, RelativePermeabilities = BrooksCoreyRelativePermeabilities(sys, [2.0, 2.0], [0.1, 0.1], 1.0)) return model end