Skip to content

Commit 6ece0bf

Browse files
j-fuj-fu
committed
Rename things
ICMPB -> SolverCore ICMPBData -> AugmentedPBData
1 parent b43a56f commit 6ece0bf

7 files changed

Lines changed: 28 additions & 28 deletions

‎notebooks/HalfCellAppliedPotential.jl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ begin
2121
using PythonPlot: pyplot
2222
using LaTeXStrings
2323
using Colors
24-
using AugmentedPoissonBoltzmann.ICMPBP: ICMPBP, ICMPBData, AppliedPotentialHalfCell, set_molarity!, calc_cmol, calc_c0mol, calc_χ, get_E, get_φ, get_p, get_c0,
25-
set_κ!, set_φ!
24+
using AugmentedPoissonBoltzmann.SolverCore: AugmentedPBP, AugmentedPBData, AppliedPotentialHalfCell, set_molarity!, calc_cmol, calc_c0mol, calc_χ, get_E, get_φ, get_p,
25+
set_κ!, set_φ!, dlcapsweep
2626
using DrWatson, PoissonBoltzmannIPAM2025
2727

2828
end
@@ -61,7 +61,7 @@ All values are given with respect to SI basic units (m, kg, s, V, A)
6161
"""
6262

6363
# ╔═╡ b24b7e23-61ea-41fc-a345-286e904c042b
64-
datavhalf = ICMPBData(χvar = true)
64+
datavhalf = AugmentedPBData(χvar = true)
6565

6666
# ╔═╡ 1bb47749-edde-4bee-be9f-059a7652b354
6767
begin
@@ -101,11 +101,11 @@ p1 = let
101101
M = molarities[i]
102102
set_molarity!(halfcell, M)
103103

104-
volts, dlcaps = ICMPBP.dlcapsweep(halfcell; φ_max)
104+
volts, dlcaps = dlcapsweep(halfcell; φ_max)
105105
plot(volts, dlcaps / (μF / cm^2), color = colors[i], linestyle = "--")
106106

107107
set_molarity!(halfcelldd, M)
108-
volts, dlcaps = ICMPBP.dlcapsweep(halfcelldd; φ_max, damp_initial = 0.5)
108+
volts, dlcaps = dlcapsweep(halfcelldd; φ_max, damp_initial = 0.5)
109109
plot(volts, dlcaps / (μF / cm^2), label = "M=$(M)", color = colors[i])
110110
end
111111
ax.set_xlabel("U/V")
@@ -140,10 +140,10 @@ p2 = let
140140
set_κ!(halfcell, κ)
141141
set_κ!(halfcelldd, κ)
142142

143-
volts, dlcaps = ICMPBP.dlcapsweep(halfcelldd; φ_max, damp_initial = 0.5)
143+
volts, dlcaps = dlcapsweep(halfcelldd; φ_max, damp_initial = 0.5)
144144
plot(volts, dlcaps / (μF / cm^2), label = "κ=$(κ)", color = colors[i])
145145

146-
volts, dlcaps = ICMPBP.dlcapsweep(halfcell; φ_max)
146+
volts, dlcaps = dlcapsweep(halfcell; φ_max)
147147
plot(volts, dlcaps / (μF / cm^2), color = colors[i], linestyle = "--")
148148

149149
end

‎notebooks/ICMPBP-DD-Draft.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ begin
2828
using LessUnitful
2929
using Test
3030
using PythonPlot
31-
using AugmentedPoissonBoltzmann.ICMPBP: ICMPBData, ICMPBSystem, L_Debye, set_molarity!, dlcap0, DerivedData, apply_charge!, ysum, qsweep, capscalc, calc_cmol, calc_c0mol, calc_χ, W, pramp
31+
using AugmentedPoissonBoltzmann.SolverCore: AugmentedPBData, AugmentedPBSystem, set_molarity!, calc_cmol, calc_c0mol, calc_χ, pramp, W
3232
end
3333

3434
# ╔═╡ ef660f6f-9de3-4896-a65e-13c60df5de1e
@@ -258,7 +258,7 @@ floataside(
258258

259259
# ╔═╡ eacdd772-1869-406a-b601-64cdd6453ec1
260260
begin
261-
data1 = ICMPBData(
261+
data1 = AugmentedPBData(
262262
κ = [kappa1, kappa1]
263263
)
264264
set_molarity!(data1, M1_avg)
@@ -285,7 +285,7 @@ begin
285285
end
286286

287287
# ╔═╡ 8433319f-2f78-494c-9b2e-a5390cf93b00
288-
sys1 = ICMPBSystem(grid, data1, valuetype = Float64);
288+
sys1 = AugmentedPBSystem(grid, data1, valuetype = Float64);
289289

290290
# ╔═╡ 70910bd5-b8ca-4021-9b40-233b50ea5601
291291
inival1 = unknowns(sys1, data1);

‎notebooks/ICMPBP-Draft.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ begin
1919
using Test
2020
using PythonPlot
2121
using Colors
22-
using AugmentedPoissonBoltzmann.ICMPBP: ICMPBData, ICMPBSystem, L_Debye, set_molarity!, dlcap0, DerivedData, apply_charge!, ysum, qsweep, capscalc
22+
using AugmentedPoissonBoltzmann.SolverCore: AugmentedPBData, AugmentedPBSystem, L_Debye, set_molarity!, dlcap0, DerivedData, apply_charge!, ysum, qsweep, capscalc
2323
end
2424

2525
# ╔═╡ ef660f6f-9de3-4896-a65e-13c60df5de1e
@@ -61,7 +61,7 @@ begin
6161
end
6262

6363
# ╔═╡ a3f23fe8-3b83-440a-8f4f-c4fedef5615b
64-
L_Debye(ICMPBData(molarity = 0.01 * ph"N_A" / ufac"dm^3")) / nm
64+
L_Debye(AugmentedPBData(molarity = 0.01 * ph"N_A" / ufac"dm^3")) / nm
6565

6666
# ╔═╡ 5a210961-19fc-40be-a5f6-033a80f1414d
6767
md"""
@@ -72,7 +72,7 @@ Check with Bard/Faulkner: the value must be $(22.8)μF/cm^2")
7272
# ╠═╡ skip_as_script = true
7373
#=╠═╡
7474
let
75-
data=ICMPBData()
75+
data=AugmentedPBData()
7676
set_molarity!(data,0.01)
7777
data.χ=78.49-1
7878
cdl0=dlcap0(data)/ufac"μF/cm^2"
@@ -82,7 +82,7 @@ end
8282

8383
# ╔═╡ b1e333c0-cdaa-4242-b71d-b54ff71aef83
8484
let
85-
data = ICMPBData()
85+
data = AugmentedPBData()
8686
set_molarity!(data, 0.01)
8787
ddata = DerivedData(data)
8888
sumyz = 0.0
@@ -111,7 +111,7 @@ end;
111111

112112
# ╔═╡ 05334798-a072-41ae-b23e-f884baadb071
113113
begin
114-
data = ICMPBData(; conserveions = true)
114+
data = AugmentedPBData(; conserveions = true)
115115
set_molarity!(data, 1)
116116
end
117117

@@ -129,7 +129,7 @@ begin
129129
end
130130

131131
# ╔═╡ 31a1f686-f0b6-430a-83af-187df411b293
132-
sys = ICMPBSystem(grid, data)
132+
sys = AugmentedPBSystem(grid, data)
133133

134134
# ╔═╡ 684aa24b-046f-426f-9b99-f0c45c70f654
135135
inival = unknowns(sys, data);

‎notebooks/ICMPBP-EndOfHackathon.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ begin
2929
using Test
3030
using PythonPlot
3131
using Colors
32-
using AugmentedPoissonBoltzmann.ICMPBP: ICMPBData, ICMPBSystem, L_Debye, set_molarity!, dlcap0, DerivedData, apply_charge!, ysum, qsweep, capscalc, calc_cmol, calc_c0mol
32+
using AugmentedPoissonBoltzmann.SolverCore: AugmentedPBData, AugmentedPBSystem, set_molarity!, calc_cmol, calc_c0mol
3333
end
3434

3535
# ╔═╡ ef660f6f-9de3-4896-a65e-13c60df5de1e
@@ -333,7 +333,7 @@ end
333333

334334
# ╔═╡ eacdd772-1869-406a-b601-64cdd6453ec1
335335
begin
336-
data1 = ICMPBData(
336+
data1 = AugmentedPBData(
337337
q = [surfcharge(n1_e), -surfcharge(n1_e)],
338338
κ = [kappa1, kappa1]
339339
)
@@ -342,7 +342,7 @@ begin
342342
end
343343

344344
# ╔═╡ 8433319f-2f78-494c-9b2e-a5390cf93b00
345-
sys1 = ICMPBSystem(grid, data1);
345+
sys1 = AugmentedPBSystem(grid, data1);
346346

347347
# ╔═╡ 70910bd5-b8ca-4021-9b40-233b50ea5601
348348
inival1 = unknowns(sys1, data1);

‎notebooks/MPBP-Draft.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ begin
1919
using Test
2020
using PythonPlot
2121
using Colors
22-
using AugmentedPoissonBoltzmann.ICMPBP: ICMPBData, ICMPBSystem, L_Debye, set_molarity!, dlcap0, DerivedData, apply_charge!, ysum, qsweep, capscalc
22+
using AugmentedPoissonBoltzmann.SolverCore: AugmentedPBData, AugmentedPBSystem, L_Debye, set_molarity!, dlcap0, DerivedData, apply_charge!, ysum, qsweep, capscalc
2323
end
2424

2525
# ╔═╡ ef660f6f-9de3-4896-a65e-13c60df5de1e
@@ -61,7 +61,7 @@ begin
6161
end
6262

6363
# ╔═╡ a3f23fe8-3b83-440a-8f4f-c4fedef5615b
64-
L_Debye(ICMPBData(molarity = 0.01 * ph"N_A" / ufac"dm^3")) / nm
64+
L_Debye(AugmentedPBData(molarity = 0.01 * ph"N_A" / ufac"dm^3")) / nm
6565

6666
# ╔═╡ 5a210961-19fc-40be-a5f6-033a80f1414d
6767
md"""
@@ -72,7 +72,7 @@ Check with Bard/Faulkner: the value must be $(22.8)μF/cm^2")
7272
# ╠═╡ skip_as_script = true
7373
#=╠═╡
7474
let
75-
data=ICMPBData()
75+
data=AugmentedPBData()
7676
set_molarity!(data,0.01)
7777
data.χ=78.49-1
7878
cdl0=dlcap0(data)/ufac"μF/cm^2"
@@ -82,7 +82,7 @@ end
8282

8383
# ╔═╡ b1e333c0-cdaa-4242-b71d-b54ff71aef83
8484
let
85-
data = ICMPBData()
85+
data = AugmentedPBData()
8686
set_molarity!(data, 0.01)
8787
ddata = DerivedData(data)
8888
sumyz = 0.0
@@ -114,7 +114,7 @@ dlcap_exact = 0.22846691848825248
114114

115115
# ╔═╡ 05334798-a072-41ae-b23e-f884baadb071
116116
begin
117-
data = ICMPBData()
117+
data = AugmentedPBData()
118118
set_molarity!(data, 0.01)
119119
end
120120

@@ -135,7 +135,7 @@ begin
135135
end
136136

137137
# ╔═╡ 31a1f686-f0b6-430a-83af-187df411b293
138-
sys = ICMPBSystem(grid, data)
138+
sys = AugmentedPBSystem(grid, data)
139139

140140
# ╔═╡ 9b16c019-f2ce-4b42-97e1-6d13a463a232
141141
inival = unknowns(sys, data)

‎notebooks/SymmetricCellSurfaceCharge.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ begin
2222
using LaTeXStrings
2323
using Colors
2424
using DrWatson, PoissonBoltzmannIPAM2025
25-
using AugmentedPoissonBoltzmann.ICMPBP: ICMPBP, ICMPBData, SurfaceChargedSymmetricCell, AbstractSymmetricCell, set_molarity!, calc_cmol, calc_c0mol, calc_χ, get_E, get_φ, get_p, get_c0,
25+
using AugmentedPoissonBoltzmann.SolverCore: AugmentedPBData, SurfaceChargedSymmetricCell, AbstractSymmetricCell, set_molarity!, calc_cmol, calc_c0mol, calc_χ, get_E, get_φ, get_p, get_c0,
2626
set_κ!, set_q!
2727
end
2828

@@ -75,7 +75,7 @@ All values are given with respect to SI basic units (m, kg, s, V, A)
7575
"""
7676

7777
# ╔═╡ b24b7e23-61ea-41fc-a345-286e904c042b
78-
data = ICMPBData(χvar = true, conserveions = true)
78+
data = AugmentedPBData(χvar = true, conserveions = true)
7979

8080
# ╔═╡ 1bb47749-edde-4bee-be9f-059a7652b354
8181
begin

‎src/PoissonBoltzmannIPAM2025.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ using LessUnitful
66
using ExtendableGrids
77
using VoronoiFVM
88
using Test
9-
using AugmentedPoissonBoltzmann.ICMPBP: ICMPBP, SurfaceChargedSymmetricCell, AbstractHalfCell, AbstractSymmetricCell, set_molarity!, calc_cmol, calc_c0mol, calc_χ, get_E, get_φ, get_p, get_c0,
9+
using AugmentedPoissonBoltzmann.SolverCore: SurfaceChargedSymmetricCell, AbstractHalfCell, AbstractSymmetricCell, set_molarity!, calc_cmol, calc_c0mol, calc_χ, get_E, get_φ, get_p, get_c0,
1010
set_κ!, set_q!, set_φ!, pramp
1111

1212
resultsdir(args...) = projectdir("results", args...)

0 commit comments

Comments
 (0)