From 0eebd0984db72501c8840513f3f87c6b475be88e Mon Sep 17 00:00:00 2001 From: xyhe <1225385871@qq.com> Date: Thu, 2 May 2024 21:08:55 +0800 Subject: [PATCH] update manifest --- Project.toml | 4 ++-- src/Extends/IOs.jl | 2 +- src/MLFMA/AggOnBF/AggCFIE.jl | 2 +- src/MLFMA/AggOnBF/AggEFIE.jl | 10 +++++----- src/MLFMA/AggOnBF/AggMFIE.jl | 2 +- src/MLFMA/PhaseShiftAndTransFactors.jl | 4 ++-- src/MLFMA/Precondition/SAI.jl | 4 ++-- src/MLFMA/Precondition/SAIChunks.jl | 2 +- src/PostProcess/CurrentOnGeos.jl | 2 +- src/PostProcess/FarField.jl | 8 ++++---- src/PostProcess/RCS.jl | 6 +++--- src/PostProcess/RadiationIntegral.jl | 2 +- src/ZmatAndVvec/CFIE/CFIERWGTri.jl | 2 +- src/ZmatAndVvec/EFIE/EFIEPWCHexa.jl | 4 ++-- src/ZmatAndVvec/EFIE/EFIEPWCTetra.jl | 4 ++-- src/ZmatAndVvec/EFIE/EFIEPWCTetraHexa.jl | 2 +- src/ZmatAndVvec/EFIE/EFIERBFHexa.jl | 2 +- src/ZmatAndVvec/EFIE/EFIERWGTri.jl | 2 +- src/ZmatAndVvec/EFIE/EFIESWGTetra.jl | 2 +- src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCHexa.jl | 2 +- src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCTetra.jl | 2 +- src/ZmatAndVvec/EFIE/EFIEVSIERWGRBF.jl | 6 +++--- src/ZmatAndVvec/EFIE/EFIEVSIERWGSWG.jl | 2 +- src/ZmatAndVvec/MFIE/MFIERWGTri.jl | 2 +- 24 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Project.toml b/Project.toml index 3f145c3..4956e1f 100644 --- a/Project.toml +++ b/Project.toml @@ -38,7 +38,7 @@ IncompleteLU = "0.2 - 0.3" JLD2 = "0.4 - 0.5" LegendrePolynomials = "0.4 - 0.5" LinearMaps = "3.1 - 3.20" -MoM_Basics = "0.0.8 - 0.1" +MoM_Basics = "0.0.8 - 0.9" OffsetArrays = "1.1 - 1.30" Primes = "0.5 - 0.6" ProgressMeter = "1.5 - 1.10" @@ -46,7 +46,7 @@ SpecialFunctions = "2.0 - 2.5" StaticArrays = "1.5 - 2.6" ThreadsX = "0.1 - 0.2" UnicodePlots = "3" -julia = "1.8 - 1.10" +julia = "1.8 - 1.20" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/src/Extends/IOs.jl b/src/Extends/IOs.jl index eafc64a..1e67f15 100644 --- a/src/Extends/IOs.jl +++ b/src/Extends/IOs.jl @@ -226,7 +226,7 @@ function saveCubes(cubes, partition; name, dir="", kcubeIndices = nothing) # 拿到各块的包含邻盒子的id cubesFarNeighbors_ChunksIndices = ThreadsX.mapi(chunkIndice -> getNeiFarNeighborCubeIDs(cubes, chunkIndice), indices) - pmeter = Progress(length(indices), "Saving cubes...") + pmeter = Progress(length(indices); desc = "Saving cubes...") # 重新组合 kcubeIndices，以避免层间分区不在同一维度时 子盒子区间计算错误 kindices = isnothing(kcubeIndices) ? nothing : get_partition_map(partition, kcubeIndices) diff --git a/src/MLFMA/AggOnBF/AggCFIE.jl b/src/MLFMA/AggOnBF/AggCFIE.jl index 33cc3c9..26d2c4f 100644 --- a/src/MLFMA/AggOnBF/AggCFIE.jl +++ b/src/MLFMA/AggOnBF/AggCFIE.jl @@ -57,7 +57,7 @@ function aggSBFOnLevelCFIE!(aggSBF, disaggSBF, level, trianglesInfo::Vector{Tria ntri = length(trianglesInfo) # Progress Meter - pmeter = Progress(nCubes, "Aggregating on RWG (CFIE)...") + pmeter = Progress(nCubes; desc = "Aggregating on RWG (CFIE)...") # 对盒子循环计算 @threads for iCube in eachindex(cubes) # 盒子 diff --git a/src/MLFMA/AggOnBF/AggEFIE.jl b/src/MLFMA/AggOnBF/AggEFIE.jl index 1b35b6c..9419472 100644 --- a/src/MLFMA/AggOnBF/AggEFIE.jl +++ b/src/MLFMA/AggOnBF/AggEFIE.jl @@ -68,7 +68,7 @@ function aggSBFOnLevelEFIE!(aggSBF, disaggSBF, level, trianglesInfo::Vector{Tria ntri = length(trianglesInfo) # Progress Meter - pmeter = Progress(nCubes, "Aggregating on RWG (EFIE)...") + pmeter = Progress(nCubes; desc = "Aggregating on RWG (EFIE)...") # 对盒子循环计算 @threads for iCube in eachindex(cubes) # 盒子 @@ -199,7 +199,7 @@ function aggSBFOnLevel!(aggSBF, disaggSBF, level, tetrasInfo::AbstractVector{Tet # 是否为偏置数组 geoInterval = getGeosInterval(tetrasInfo) # Progress Meter - pmeter = Progress(nCubes, "Aggregating on SWG (EFIE)...") + pmeter = Progress(nCubes; desc = "Aggregating on SWG (EFIE)...") # 对盒子循环计算 @threads for iCube in eachindex(cubes) @@ -323,7 +323,7 @@ function aggSBFOnLevel!(aggSBF, disaggSBF, level, tetrasInfo::AbstractVector{Tet # 判断体电流的离散方式 discreteJ::Bool = SimulationParams.discreteVar === "J" # Progress Meter - pmeter = Progress(nCubes, "Aggregating on PWC (EFIE)...") + pmeter = Progress(nCubes; desc = "Aggregating on PWC (EFIE)...") # 对盒子循环计算 @threads for iCube in eachindex(cubes) @@ -425,7 +425,7 @@ function aggSBFOnLevel!(aggSBF, disaggSBF, level, hexasInfo::AbstractVector{Hexa JK_0 = Params.JK_0 CT0 = zero(CT) # Progress Meter - pmeter = Progress(nCubes, "Aggregating on PWC (EFIE)...") + pmeter = Progress(nCubes; desc = "Aggregating on PWC (EFIE)...") # 对盒子循环计算 @threads for iCube in eachindex(cubes) @@ -528,7 +528,7 @@ function aggSBFOnLevel!(aggSBF, disaggSBF, level, hexasInfo::AbstractVector{VT}, geoInterval = getGeosInterval(hexasInfo) # Progress Meter - pmeter = Progress(nCubes, "Aggregating on RBF (EFIE)...") + pmeter = Progress(nCubes; desc = "Aggregating on RBF (EFIE)...") # 对盒子循环计算 @threads for iCube in eachindex(cubes) diff --git a/src/MLFMA/AggOnBF/AggMFIE.jl b/src/MLFMA/AggOnBF/AggMFIE.jl index b52e60b..0de723b 100644 --- a/src/MLFMA/AggOnBF/AggMFIE.jl +++ b/src/MLFMA/AggOnBF/AggMFIE.jl @@ -52,7 +52,7 @@ function aggSBFOnLevelMFIE!(aggSBF, disaggSBF, level, trianglesInfo::Vector{Tria ntri = length(trianglesInfo) # Progress Meter - pmeter = Progress(nCubes, "Aggregating on RWG (MFIE)...") + pmeter = Progress(nCubes; desc = "Aggregating on RWG (MFIE)...") # 对盒子循环计算 @threads for iCube in eachindex(cubes) # 盒子 diff --git a/src/MLFMA/PhaseShiftAndTransFactors.jl b/src/MLFMA/PhaseShiftAndTransFactors.jl index eb4dd8c..19369cd 100644 --- a/src/MLFMA/PhaseShiftAndTransFactors.jl +++ b/src/MLFMA/PhaseShiftAndTransFactors.jl @@ -133,7 +133,7 @@ function setLevelTransFactor!(nLevels::Int, levels::Dict{Int, LV}) where{LV<:Abs # 进度条 - pmeter = Progress(length(2:nLevels), "Calculating translation factors...") + pmeter = Progress(length(2:nLevels); desc = "Calculating translation factors...") # 从 第“2”层开始计算到 叶 层计算子层到本层的转移因子 for iLevel in 2:nLevels @@ -175,7 +175,7 @@ function calαTransOnLevel!(level, truncL, all316FarNeighID, all343InFar316) # 预分配内存 αTrans = zeros(Complex{FT}, nPoles, 316) - pmeter = Progress(316, "Calculating translation factors on level $(level.ID)...") + pmeter = Progress(316; desc = "Calculating translation factors on level $(level.ID)...") @floop WorkStealingEx() for iFarNei in 1:316 # 本层盒子中心到远亲盒子中心之间的 对应的 316 个 偏置向量 diff --git a/src/MLFMA/Precondition/SAI.jl b/src/MLFMA/Precondition/SAI.jl index cb66c98..693970a 100644 --- a/src/MLFMA/Precondition/SAI.jl +++ b/src/MLFMA/Precondition/SAI.jl @@ -48,7 +48,7 @@ function sparseApproximateInversePl(Znear::ZnearT{CT}, cubes::AbstractVector) wh nCubes = length(cubes) # 进度条 - pmeter = Progress(nCubes, "Pₗ") + pmeter = Progress(nCubes; desc = "Pₗ") # Znn ZnnH 按线程预分配内存 Znnts = [zeros(CT, 1) for _ in 1:nthds] @@ -149,7 +149,7 @@ function sparseApproximateInversePr(Znear::ZnearT{CT}, cubes::AbstractVector) wh nCubes = length(cubes) # 进度条 - pmeter = Progress(nCubes, "Calculating SAI right preconditioner...") + pmeter = Progress(nCubes; desc = "Calculating SAI right preconditioner...") # Znn ZnnH 按线程预分配内存 Znnts = [zeros(CT, 1) for _ in 1:nthds] diff --git a/src/MLFMA/Precondition/SAIChunks.jl b/src/MLFMA/Precondition/SAIChunks.jl index 4c6e492..a403f6b 100644 --- a/src/MLFMA/Precondition/SAIChunks.jl +++ b/src/MLFMA/Precondition/SAIChunks.jl @@ -48,7 +48,7 @@ function sparseApproximateInversePl(ZnearChunks::ZnearChunksStruct{CT}, level; n nCubes = length(cubes) # 进度条 - pmeter = Progress(nCubes, "Pₗ (T) ...") + pmeter = Progress(nCubes; desc = "Pₗ (T) ...") # 对所有盒子循环 @threads for iCube in 1:nCubes diff --git a/src/PostProcess/CurrentOnGeos.jl b/src/PostProcess/CurrentOnGeos.jl index 7f77f70..0faa91c 100644 --- a/src/PostProcess/CurrentOnGeos.jl +++ b/src/PostProcess/CurrentOnGeos.jl @@ -309,7 +309,7 @@ Jtri ::Marrix{Complex{FT}}, 三角形上加权后的电流 Jtris = zeros(CT, 3, GQPNTri, ntri) # Progress Meter - pmeter = Progress(ntri, "Calculating J on triangles' gaussquad points ($GQPNTri × $ntri)") + pmeter = Progress(ntri; desc = "Calculating J on triangles' gaussquad points ($GQPNTri × $ntri)") # 对三角形循环计算 @threads for ti in 1:ntri diff --git a/src/PostProcess/FarField.jl b/src/PostProcess/FarField.jl index 8ecd4a2..78f9d4d 100644 --- a/src/PostProcess/FarField.jl +++ b/src/PostProcess/FarField.jl @@ -28,7 +28,7 @@ function farField(θs_obs, ϕs_obs, farEθsϕsrsp = reshape(farEθsϕs, (2, nobs)) # 进度条 - pmeter = Progress(nobs, "Calculating farE ($Nθ_obs × $Nϕ_obs)") + pmeter = Progress(nobs; desc = "Calculating farE ($Nθ_obs × $Nϕ_obs)") # 计算farE @threads for ii in 1:nobs # 辐射积分 @@ -82,7 +82,7 @@ function farField(θs_obs, ϕs_obs, ICoeff::Vector{CT}, geosInfo::Vector{VT}, so farEθsϕsrsp = reshape(farEθsϕs, (2, nobs)) # 进度条 - pmeter = Progress(nobs, "Calculating farE ($(length(θs_obs)) × $(length(ϕs_obs))))") + pmeter = Progress(nobs; desc = "Calculating farE ($(length(θs_obs)) × $(length(ϕs_obs))))") # 计算farE @threads for ii in 1:nobs # 辐射积分 @@ -145,7 +145,7 @@ function farField(θs_obs, ϕs_obs, # 进度条 - pmeter = Progress(nobs, "Calculating farE ($(length(θs_obs)) × $(length(ϕs_obs))))") + pmeter = Progress(nobs; desc = "Calculating farE ($(length(θs_obs)) × $(length(ϕs_obs))))") # 计算farE @threads for ii in 1:nobs # 辐射积分 @@ -203,7 +203,7 @@ function farField(θs_obs, ϕs_obs, source; str::String = "") farEθsϕsrsp = reshape(farEθsϕs, (2, nobs)) # 进度条 - pmeter = Progress(nobs, "Calculating source farE ($Nθ_obs × $Nϕ_obs)") + pmeter = Progress(nobs; desc = "Calculating source farE ($Nθ_obs × $Nϕ_obs)") # 计算farE @threads for ii in 1:nobs # 天线的远场电场 diff --git a/src/PostProcess/RCS.jl b/src/PostProcess/RCS.jl index 226b880..d028d5a 100644 --- a/src/PostProcess/RCS.jl +++ b/src/PostProcess/RCS.jl @@ -28,7 +28,7 @@ function radarCrossSection(θs_obs, ϕs_obs, ICoeff::Vector{CT}, RCSθsϕsrsp = reshape(RCSθsϕs, (2, nobs)) # 进度条 - pmeter = Progress(nobs, "Calculating RCS ($Nθ_obs × $Nϕ_obs)") + pmeter = Progress(nobs; desc = "Calculating RCS ($Nθ_obs × $Nϕ_obs)") # 计算RCS @threads for ii in 1:nobs # 辐射积分 @@ -81,7 +81,7 @@ function radarCrossSection(θs_obs, ϕs_obs, ICoeff::Vector{CT}, geosInfo::Vecto RCSθsϕsrsp = reshape(RCSθsϕs, (2, nobs)) # 进度条 - pmeter = Progress(nobs, "Calculating RCS ($(length(θs_obs)) × $(length(ϕs_obs))))") + pmeter = Progress(nobs; desc = "Calculating RCS ($(length(θs_obs)) × $(length(ϕs_obs))))") # 计算RCS @threads for ii in 1:nobs # 辐射积分 @@ -140,7 +140,7 @@ function radarCrossSection(θs_obs, ϕs_obs, RCSθsϕsrsp = reshape(RCSθsϕs, (2, nobs)) # 进度条 - pmeter = Progress(nobs, "Calculating RCS ($(length(θs_obs)) × $(length(ϕs_obs))))") + pmeter = Progress(nobs; desc = "Calculating RCS ($(length(θs_obs)) × $(length(ϕs_obs))))") # 计算RCS @threads for ii in 1:nobs # 辐射积分 diff --git a/src/PostProcess/RadiationIntegral.jl b/src/PostProcess/RadiationIntegral.jl index c6067c4..4ecb12d 100644 --- a/src/PostProcess/RadiationIntegral.jl +++ b/src/PostProcess/RadiationIntegral.jl @@ -226,7 +226,7 @@ function raditionalIntegralNCal(θs_obs, ϕs_obs, geosInfo::Vector{TriangleInfo{ Nθsϕsrsp = reshape(Nθsϕs, (2, nobs)) # Progress Meter - pmeter = Progress(nobs, "Calculating radiational integral ($Nθ_obs × $Nϕ_obs)") + pmeter = Progress(nobs; desc = "Calculating radiational integral ($Nθ_obs × $Nϕ_obs)") # 输入的为高斯求积点电流则提取中心值 Jgeos2 = if typeof(Jgeos)<:Array{CT, 3} Jgeos[:, 1, :] diff --git a/src/ZmatAndVvec/CFIE/CFIERWGTri.jl b/src/ZmatAndVvec/CFIE/CFIERWGTri.jl index c7f3ea1..a08d24e 100644 --- a/src/ZmatAndVvec/CFIE/CFIERWGTri.jl +++ b/src/ZmatAndVvec/CFIE/CFIERWGTri.jl @@ -368,7 +368,7 @@ function impedancemat4CFIE4PEC(trianglesInfo::Vector{TriangleInfo{IT, FT}}, nrwg # 线程锁防止对同一数据写入出错 lockZ = SpinLock() # Progress Meter - pmeter = Progress(trisnum, "Calculating Impedance Matrix($nrwg × $nrwg)") + pmeter = Progress(trisnum; desc = "Calculating Impedance Matrix($nrwg × $nrwg)") # 外层定义为场基函数循环 @threads for triti in trisIdx diff --git a/src/ZmatAndVvec/EFIE/EFIEPWCHexa.jl b/src/ZmatAndVvec/EFIE/EFIEPWCHexa.jl index 788b527..e829a14 100644 --- a/src/ZmatAndVvec/EFIE/EFIEPWCHexa.jl +++ b/src/ZmatAndVvec/EFIE/EFIEPWCHexa.jl @@ -226,7 +226,7 @@ Zmat : 阻抗矩阵 # Rsglr = Params.Rsglr # # Progress Meter # nbf = size(Zmat, 1) -# pmeter = Progress(hexasnum, "Calculating Z (PWC)($nbf × $nbf)...") +# pmeter = Progress(hexasnum; desc = "Calculating Z (PWC)($nbf × $nbf)...") # # 外层定义为场基函数循环 # @threads for ti in geoInterval # # 局域的场六面体 @@ -321,7 +321,7 @@ function impedancemat4VIE!(Zmat::Matrix{CT}, hexasInfo::AbstractVector{Hexahedra Rsglr = Params.Rsglr # Progress Meter nbf = size(Zmat, 1) - pmeter = Progress(hexasnum, "Calculating Z (PWC)($nbf × $nbf)...") + pmeter = Progress(hexasnum; desc = "Calculating Z (PWC)($nbf × $nbf)...") # 外层定义为场基函数循环 @threads for ti in geoInterval # 局域的场六面体 diff --git a/src/ZmatAndVvec/EFIE/EFIEPWCTetra.jl b/src/ZmatAndVvec/EFIE/EFIEPWCTetra.jl index 5ac7519..56bdc2b 100644 --- a/src/ZmatAndVvec/EFIE/EFIEPWCTetra.jl +++ b/src/ZmatAndVvec/EFIE/EFIEPWCTetra.jl @@ -242,7 +242,7 @@ function impedancemat4VIE!(Zmat::Matrix{CT}, tetrasInfo::AbstractVector{Tetrahed Rsglr = Params.Rsglr # Progress Meter nbf = size(Zmat, 1) - pmeter = Progress(tetrasnum, "Calculating Z (PWC)($nbf × $nbf)") + pmeter = Progress(tetrasnum; desc = "Calculating Z (PWC)($nbf × $nbf)") # 外层定义为场基函数循环 @threads for ti in geoInterval # 局域的场四面体 @@ -356,7 +356,7 @@ end # Rsglr = Params.Rsglr # # Progress Meter # nbf = size(Zmat, 1) -# pmeter = Progress(tetrasnum, "Calculating Z (PWC)($nbf × $nbf)") +# pmeter = Progress(tetrasnum; desc = "Calculating Z (PWC)($nbf × $nbf)") # # 外层定义为场基函数循环 # @threads for ti in geoInterval # # 局域的场四面体 diff --git a/src/ZmatAndVvec/EFIE/EFIEPWCTetraHexa.jl b/src/ZmatAndVvec/EFIE/EFIEPWCTetraHexa.jl index 66c9cd8..a0cd5fe 100644 --- a/src/ZmatAndVvec/EFIE/EFIEPWCTetraHexa.jl +++ b/src/ZmatAndVvec/EFIE/EFIEPWCTetraHexa.jl @@ -167,7 +167,7 @@ function impedancemat4VIE!(Zmat::Matrix{CT}, hexasInfo::AbstractVector{Hexahedra Rsglr = Params.Rsglr # Progress Meter nbf = size(Zmat, 1) - pmeter = Progress(hexasnum, "Calculating Z (PWC)($nbf × $nbf)...") + pmeter = Progress(hexasnum; desc = "Calculating Z (PWC)($nbf × $nbf)...") # 外层定义为场基函数循环 @threads for hexat in hexasInfo # 场六面体介质对比度 diff --git a/src/ZmatAndVvec/EFIE/EFIERBFHexa.jl b/src/ZmatAndVvec/EFIE/EFIERBFHexa.jl index 6289ea1..c0c4c36 100644 --- a/src/ZmatAndVvec/EFIE/EFIERBFHexa.jl +++ b/src/ZmatAndVvec/EFIE/EFIERBFHexa.jl @@ -782,7 +782,7 @@ function impedancemat4VIE!(Zmat::Matrix{CT}, hexasInfo::AbstractVector{Hexahedra lockZ = SpinLock() nbf = size(Zmat, 1) # Progress Meter - pmeter = Progress(hexasnum, "Calculating Z (RBF, EFIE) ($nbf × $nbf)...") + pmeter = Progress(hexasnum; desc = "Calculating Z (RBF, EFIE) ($nbf × $nbf)...") # 外层定义为场基函数循环 @threads for it in geoInterval # 局域的场六面体 diff --git a/src/ZmatAndVvec/EFIE/EFIERWGTri.jl b/src/ZmatAndVvec/EFIE/EFIERWGTri.jl index f9a816a..b8c600f 100644 --- a/src/ZmatAndVvec/EFIE/EFIERWGTri.jl +++ b/src/ZmatAndVvec/EFIE/EFIERWGTri.jl @@ -290,7 +290,7 @@ function impedancemat4EFIE4PEC!(Zmat::Matrix{Complex{FT}}, trianglesInfo::Vector # 矩阵大小 nbf = size(Zmat, 1) # Progress Meter - pmeter = Progress(trisnum, "Calculating Z (RWG, EFIE) ($nbf × $nbf)") + pmeter = Progress(trisnum; desc = "Calculating Z (RWG, EFIE) ($nbf × $nbf)") # 外层定义为场基函数循环 @threads for triti in trisIdx diff --git a/src/ZmatAndVvec/EFIE/EFIESWGTetra.jl b/src/ZmatAndVvec/EFIE/EFIESWGTetra.jl index 17b4fba..74d050a 100644 --- a/src/ZmatAndVvec/EFIE/EFIESWGTetra.jl +++ b/src/ZmatAndVvec/EFIE/EFIESWGTetra.jl @@ -726,7 +726,7 @@ function impedancemat4VIE!(Zmat::Matrix{CT}, tetrasInfo::AbstractVector{Tetrahed # 矩阵大小 nbf = size(Zmat, 1) # Progress Meter - pmeter = Progress(tetrasnum, "Calculating Z (SWG, EFIE) ($nbf × $nbf)") + pmeter = Progress(tetrasnum; desc = "Calculating Z (SWG, EFIE) ($nbf × $nbf)") # 外层定义为场基函数循环 @threads for it in geoInterval # 局域的场四面体 diff --git a/src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCHexa.jl b/src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCHexa.jl index dd96a54..680fd8d 100644 --- a/src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCHexa.jl +++ b/src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCHexa.jl @@ -185,7 +185,7 @@ function impedancemat4RWGPWC!(Zmat::Matrix{CT}, trisInfo::AbstractVector{Triangl # 矩阵大小 nbf = size(Zmat, 1) # Progress Meter - pmeter = Progress(trinum, "Calculating Z (RWG + PWC) ($nbf × $nbf)...") + pmeter = Progress(trinum; desc = "Calculating Z (RWG + PWC) ($nbf × $nbf)...") # 外层定义为场基函数循环 @threads for it in eachindex(trisInfo) # 局域的场网格元（几何体）@inbounds diff --git a/src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCTetra.jl b/src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCTetra.jl index d735d69..4fc1b56 100644 --- a/src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCTetra.jl +++ b/src/ZmatAndVvec/EFIE/EFIEVSIERWGPWCTetra.jl @@ -185,7 +185,7 @@ function impedancemat4RWGPWC!(Zmat::Matrix{CT}, trisInfo::AbstractVector{Triangl # 矩阵大小 nbf = size(Zmat, 1) # Progress Meter - pmeter = Progress(trinum, "Calculating Z (RWG + PWC) ($nbf × $nbf)...") + pmeter = Progress(trinum; desc = "Calculating Z (RWG + PWC) ($nbf × $nbf)...") # 外层定义为场基函数循环 @threads for it in eachindex(trisInfo) # 局域的场网格元（几何体）@inbounds diff --git a/src/ZmatAndVvec/EFIE/EFIEVSIERWGRBF.jl b/src/ZmatAndVvec/EFIE/EFIEVSIERWGRBF.jl index 395eefe..9917538 100644 --- a/src/ZmatAndVvec/EFIE/EFIEVSIERWGRBF.jl +++ b/src/ZmatAndVvec/EFIE/EFIEVSIERWGRBF.jl @@ -318,15 +318,15 @@ function impedancemat4RWGRBF!(Zmat::Matrix{CT}, trisInfo::AbstractVector{Triangl # 矩阵大小 nbf = size(Zmat, 1) # Progress Meter - pmeter = Progress(trinum, "Calculating Z (RWG + RBF) ($nbf × $nbf)...") + pmeter = Progress(trinum; desc = "Calculating Z (RWG + RBF) ($nbf × $nbf)...") # 外层定义为场基函数循环 @threads for it in eachindex(trisInfo) # 局域的场网格元（几何体）@inbounds - trit = trisInfo[it] + trit = trisInfo[it] # 局部判断奇异性距离 Rsglrlc = Rsglr # 对源网格元（几何体）循环@inbounds - for js in eachindex(hexasInfo) + for js in eachindex(hexasInfo) # 局域的源网格元（几何体） hexas = hexasInfo[js] # 场源距离 diff --git a/src/ZmatAndVvec/EFIE/EFIEVSIERWGSWG.jl b/src/ZmatAndVvec/EFIE/EFIEVSIERWGSWG.jl index 15622d1..55eea5c 100644 --- a/src/ZmatAndVvec/EFIE/EFIEVSIERWGSWG.jl +++ b/src/ZmatAndVvec/EFIE/EFIEVSIERWGSWG.jl @@ -378,7 +378,7 @@ function impedancemat4RWGSWG!(Zmat::Matrix{CT}, trisInfo::AbstractVector{Triangl # 矩阵大小 nbf = size(Zmat, 1) # Progress Meter - pmeter = Progress(trinum, "Calculating Z (RWG + SWG) ($nbf × $nbf)...") + pmeter = Progress(trinum; desc = "Calculating Z (RWG + SWG) ($nbf × $nbf)...") # 外层定义为场基函数循环@threads @threads for it in eachindex(trisInfo) # 局域的场网格元（几何体） diff --git a/src/ZmatAndVvec/MFIE/MFIERWGTri.jl b/src/ZmatAndVvec/MFIE/MFIERWGTri.jl index cc6b8af..902df75 100644 --- a/src/ZmatAndVvec/MFIE/MFIERWGTri.jl +++ b/src/ZmatAndVvec/MFIE/MFIERWGTri.jl @@ -285,7 +285,7 @@ function impedancemat4MFIE4PEC(trianglesInfo::Vector{TriangleInfo{IT, FT}}, nrwg # 线程锁防止对同一数据写入出错 lockZ = SpinLock() # Progress Meter - pmeter = Progress(trisnum, "Calculating Impedance Matrix($nrwg × $nrwg)") + pmeter = Progress(trisnum; desc = "Calculating Impedance Matrix($nrwg × $nrwg)") # 外层定义为场基函数循环 @threads for triti in trisIdx