Cleared up some terminology

这个提交包含在:
Craig Warren
2023-12-22 14:37:38 +00:00
父节点 abda0d0043
当前提交 5cb1f7672b

查看文件

@@ -278,7 +278,8 @@ class PeplinskiSoil:
watereri, waterer, watertau, watersig = calculate_water_properties(T, S)
f = 1.3e9
w = 2 * np.pi * f
erealw = watereri + ((waterer - watereri) / (1 + (w * watertau) ** 2))
waterdeltaer = waterer - watereri
erealw = watereri + (waterdeltaer / (1 + (w * watertau) ** 2))
a = 0.65 # Experimentally derived constant
es = (1.01 + 0.44 * self.rs) ** 2 - 0.062 #  Relative permittivity of sand particles
@@ -309,7 +310,7 @@ class PeplinskiSoil:
er = 1.15 * er - 0.68
# Permittivity at infinite frequency
eri = er - (muiter[0] ** (b2 / a) * DispersiveMaterial.waterdeltaer)
eri = er - (muiter[0] ** (b2 / a) * waterdeltaer)
# Effective conductivity
sig = muiter[0] ** (b2 / a) * ((sigf * (self.rs - self.rb)) / (self.rs * muiter[0]))
@@ -324,7 +325,7 @@ class PeplinskiSoil:
m.er = eri
m.se = sig
m.deltaer.append(er - eri)
m.tau.append(DispersiveMaterial.watertau)
m.tau.append(watertau)
m.ID = f"|{float(m.er):.4f}+{float(m.se):.4f}+{float(m.mr):.4f}+{float(m.sm):.4f}|"
G.materials.append(m)
self.matID.append(m.numID)
@@ -481,7 +482,7 @@ def calculate_water_properties(T=25, S=0):
"""Get extended Debye model properties for water.
Args:
T: float for emperature of water (degrees centigrade).
T: float for temperature of water (degrees centigrade).
S: float for salinity of water (part per thousand).
Returns: