Skip to content

Commit 37c80c4

Browse files
committed
fix make
1 parent 177ab31 commit 37c80c4

3 files changed

Lines changed: 110 additions & 32 deletions

File tree

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "FinEtoolsFlexStructures"
22
uuid = "723391e6-6814-4d1d-921c-018f691214d8"
33
authors = ["Petr Krysl <pkrysl@ucsd.edu>"]
4-
version = "3.4.0"
4+
version = "3.4.1"
55

66
[deps]
77
Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"

examples/Manifest.toml

Lines changed: 105 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ version = "3.5.2+0"
4141

4242
[[deps.ArrayInterface]]
4343
deps = ["Adapt", "LinearAlgebra"]
44-
git-tree-sha1 = "78b3a7a536b4b0a747a0f296ea77091ca0a9f9a3"
44+
git-tree-sha1 = "54f895554d05c83e3dd59f6a396671dae8999573"
4545
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
46-
version = "7.23.0"
46+
version = "7.24.0"
4747

4848
[deps.ArrayInterface.extensions]
4949
ArrayInterfaceAMDGPUExt = "AMDGPU"
@@ -323,7 +323,7 @@ version = "3.0.6"
323323
deps = ["Arpack", "DataDrop", "Dierckx", "FinEtools", "FinEtoolsDeforLinear", "LinearAlgebra", "SparseArrays", "SparseMatricesCSR", "Statistics", "SymRCM", "Test"]
324324
path = ".."
325325
uuid = "723391e6-6814-4d1d-921c-018f691214d8"
326-
version = "3.3.3"
326+
version = "3.4.0"
327327

328328
[[deps.FixedPointNumbers]]
329329
deps = ["Statistics"]
@@ -339,9 +339,9 @@ version = "0.5.0"
339339

340340
[[deps.HDF5]]
341341
deps = ["Compat", "HDF5_jll", "Libdl", "MPIPreferences", "Mmap", "Preferences", "Printf", "Random", "Requires", "UUIDs"]
342-
git-tree-sha1 = "e856eef26cf5bf2b0f95f8f4fc37553c72c8641c"
342+
git-tree-sha1 = "491ea627ac824619f34168e29a0427a9e00e3e40"
343343
uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
344-
version = "0.17.2"
344+
version = "0.17.3"
345345

346346
[deps.HDF5.extensions]
347347
MPIExt = "MPI"
@@ -350,10 +350,10 @@ version = "0.17.2"
350350
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
351351

352352
[[deps.HDF5_jll]]
353-
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"]
354-
git-tree-sha1 = "e94f84da9af7ce9c6be049e9067e511e17ff89ec"
353+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "MPIABI_jll", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "aws_c_s3_jll", "dlfcn_win32_jll", "libaec_jll", "mpif_jll"]
354+
git-tree-sha1 = "45337643a2d97262d5fe72ce1f13e8a662d13d62"
355355
uuid = "0234f1f7-429e-5d53-9886-15a909be8d59"
356-
version = "1.14.6+0"
356+
version = "2.1.2+0"
357357

358358
[[deps.HTTP]]
359359
deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "PrecompileTools", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
@@ -530,11 +530,17 @@ git-tree-sha1 = "5d4278f755440f70648d80cc6225f51e78e94094"
530530
uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b"
531531
version = "3.5.1"
532532

533+
[[deps.MPIABI_jll]]
534+
deps = ["Artifacts", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"]
535+
git-tree-sha1 = "9be143b6045719e8fb019d2b3bc2aebad1184fef"
536+
uuid = "b5ada748-db0f-5fc0-8972-9331c762740c"
537+
version = "0.1.5+0"
538+
533539
[[deps.MPICH_jll]]
534-
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"]
535-
git-tree-sha1 = "9341048b9f723f2ae2a72a5269ac2f15f80534dc"
540+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "Libdl", "MPIPreferences", "TOML"]
541+
git-tree-sha1 = "07dbec8aab01696edc0151a401a6cdfe95b9b885"
536542
uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4"
537-
version = "4.3.2+0"
543+
version = "5.0.1+0"
538544

539545
[[deps.MPIPreferences]]
540546
deps = ["Libdl", "Preferences"]
@@ -544,9 +550,9 @@ version = "0.1.12"
544550

545551
[[deps.MPItrampoline_jll]]
546552
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"]
547-
git-tree-sha1 = "36c2d142e7d45fb98b5f83925213feb3292ca348"
553+
git-tree-sha1 = "675df097f8eeb28998b2cfe3b25655af73d5f7df"
548554
uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748"
549-
version = "5.5.5+0"
555+
version = "5.5.6+0"
550556

551557
[[deps.MacroTools]]
552558
git-tree-sha1 = "1e0228a030642014fe5cfe68c2c0a818f9e3f522"
@@ -626,9 +632,9 @@ version = "0.3.29+0"
626632

627633
[[deps.OpenMPI_jll]]
628634
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"]
629-
git-tree-sha1 = "2f3d05e419b6125ffe06e55784102e99325bdbe2"
635+
git-tree-sha1 = "6d6c0ca4824268c1a7dca1f4721c535ac63d9074"
630636
uuid = "fe0851c0-eecd-5654-98d4-656369965a5c"
631-
version = "5.0.10+0"
637+
version = "5.0.11+0"
632638

633639
[[deps.OpenSSL]]
634640
deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "NetworkOptions", "OpenSSL_jll", "Sockets"]
@@ -672,9 +678,9 @@ version = "0.12.3"
672678

673679
[[deps.Parsers]]
674680
deps = ["Dates", "PrecompileTools", "UUIDs"]
675-
git-tree-sha1 = "7d2f8f21da5db6a806faf7b9b292296da42b2810"
681+
git-tree-sha1 = "5d5e0a78e971354b1c7bff0655d11fdc1b0e12c8"
676682
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
677-
version = "2.8.3"
683+
version = "2.8.4"
678684

679685
[[deps.Pidfile]]
680686
deps = ["FileWatching", "Test"]
@@ -711,9 +717,9 @@ version = "0.8.23"
711717

712718
[[deps.PlotlyJS]]
713719
deps = ["Base64", "Blink", "DelimitedFiles", "JSExpr", "JSON", "Kaleido_jll", "Markdown", "Pkg", "PlotlyBase", "PlotlyKaleido", "REPL", "Reexport", "Requires", "WebIO"]
714-
git-tree-sha1 = "287e092914da6c91f002aafcf82a2ec065bf94a3"
720+
git-tree-sha1 = "4bf6c08295346efba58bb2d5f8c52984efed7f27"
715721
uuid = "f0f68f2c-4968-5e81-91da-67840de0976a"
716-
version = "0.18.17"
722+
version = "0.18.18"
717723

718724
[deps.PlotlyJS.extensions]
719725
CSVExt = "CSV"
@@ -845,15 +851,15 @@ version = "0.6.12"
845851

846852
[[deps.Static]]
847853
deps = ["CommonWorldInvalidations", "IfElse", "PrecompileTools", "SciMLPublic"]
848-
git-tree-sha1 = "49440414711eddc7227724ae6e570c7d5559a086"
854+
git-tree-sha1 = "bb072715f158b59ad8819ff80da5ffa90cce6ceb"
849855
uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
850-
version = "1.3.1"
856+
version = "1.4.0"
851857

852858
[[deps.StaticArrayInterface]]
853859
deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "PrecompileTools", "SciMLPublic", "Static"]
854-
git-tree-sha1 = "aa1ea41b3d45ac449d10477f65e2b40e3197a0d2"
860+
git-tree-sha1 = "2a635e15d5035c53b345077c947f31ff91744078"
855861
uuid = "0d7ed370-da01-4f52-bd93-41d350b8b718"
856-
version = "1.9.0"
862+
version = "1.10.0"
857863

858864
[deps.StaticArrayInterface.extensions]
859865
StaticArrayInterfaceOffsetArraysExt = "OffsetArrays"
@@ -875,9 +881,9 @@ weakdeps = ["SparseArrays"]
875881

876882
[[deps.StrideArraysCore]]
877883
deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"]
878-
git-tree-sha1 = "83151ba8065a73f53ca2ae98bc7274d817aa30f2"
884+
git-tree-sha1 = "5316097111523c9a970596a5b33cfea5f92e8581"
879885
uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da"
880-
version = "0.5.8"
886+
version = "0.5.9"
881887

882888
[[deps.StyledStrings]]
883889
uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b"
@@ -1031,15 +1037,75 @@ version = "2.13.9+0"
10311037

10321038
[[deps.Xorg_libpciaccess_jll]]
10331039
deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"]
1034-
git-tree-sha1 = "4909eb8f1cbf6bd4b1c30dd18b2ead9019ef2fad"
1040+
git-tree-sha1 = "58972370b81423fc546c56a60ed1a009450177c3"
10351041
uuid = "a65dc6b1-eb27-53a1-bb3e-dea574b5389e"
1036-
version = "0.18.1+0"
1042+
version = "0.19.0+0"
10371043

10381044
[[deps.Zlib_jll]]
10391045
deps = ["Libdl"]
10401046
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
10411047
version = "1.3.1+2"
10421048

1049+
[[deps.aws_c_auth_jll]]
1050+
deps = ["Artifacts", "JLLWrappers", "Libdl", "aws_c_cal_jll", "aws_c_http_jll", "aws_c_sdkutils_jll"]
1051+
git-tree-sha1 = "8cab83c96af80a1be968251ce1a0548a7545484d"
1052+
uuid = "2b3700d1-4306-52e2-a478-c162f0c514be"
1053+
version = "0.9.6+0"
1054+
1055+
[[deps.aws_c_cal_jll]]
1056+
deps = ["Artifacts", "JLLWrappers", "Libdl", "aws_c_common_jll"]
1057+
git-tree-sha1 = "22c0f42f4a1f0dc5dcfa8fd267c4ac407c455e7a"
1058+
uuid = "70f11efc-bab2-57f1-b0f3-22aad4e67c4b"
1059+
version = "0.9.13+0"
1060+
1061+
[[deps.aws_c_common_jll]]
1062+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
1063+
git-tree-sha1 = "a759cb9bf456ad792cc7898a81ae333cce9ef02a"
1064+
uuid = "73048d1d-b8c4-5092-a58d-866c5e8d1e50"
1065+
version = "0.12.6+0"
1066+
1067+
[[deps.aws_c_compression_jll]]
1068+
deps = ["Artifacts", "JLLWrappers", "Libdl", "aws_c_common_jll"]
1069+
git-tree-sha1 = "7910c72f45f44afd297c39fe43b99c56d5ed22ec"
1070+
uuid = "73a04cd5-f3d7-5bac-9290-e8adb709f224"
1071+
version = "0.3.2+0"
1072+
1073+
[[deps.aws_c_http_jll]]
1074+
deps = ["Artifacts", "JLLWrappers", "Libdl", "aws_c_compression_jll", "aws_c_io_jll"]
1075+
git-tree-sha1 = "e358d5a001ef7afbd4f8c5225322512819cda2f2"
1076+
uuid = "3254fc65-9028-534d-aa9d-d76d128babc6"
1077+
version = "0.10.13+0"
1078+
1079+
[[deps.aws_c_io_jll]]
1080+
deps = ["Artifacts", "JLLWrappers", "Libdl", "aws_c_cal_jll", "aws_c_common_jll", "s2n_tls_jll"]
1081+
git-tree-sha1 = "7e481d474b2087ee8bbf55b81bf9119f21e396d9"
1082+
uuid = "13c41daa-f319-5298-b5eb-5754e0170d52"
1083+
version = "0.26.3+0"
1084+
1085+
[[deps.aws_c_s3_jll]]
1086+
deps = ["Artifacts", "JLLWrappers", "Libdl", "aws_c_auth_jll", "aws_c_common_jll", "aws_c_http_jll", "aws_checksums_jll", "s2n_tls_jll"]
1087+
git-tree-sha1 = "3e9917ab25114feba657e71be41cad068b9f6595"
1088+
uuid = "bd1f34fb-993f-5903-a121-aaf302eed6d4"
1089+
version = "0.11.5+0"
1090+
1091+
[[deps.aws_c_sdkutils_jll]]
1092+
deps = ["Artifacts", "JLLWrappers", "Libdl", "aws_c_common_jll"]
1093+
git-tree-sha1 = "c43dfba2c1ab9ea9f02f2c80e86fa16f6460244e"
1094+
uuid = "1282aa60-004d-510b-9f52-12498d409daa"
1095+
version = "0.2.4+1"
1096+
1097+
[[deps.aws_checksums_jll]]
1098+
deps = ["Artifacts", "JLLWrappers", "Libdl", "aws_c_common_jll"]
1099+
git-tree-sha1 = "2570c8e23f4771a087b12a47edcaaa670ac05a01"
1100+
uuid = "b2a88e68-78e7-5e94-8c20-c02986ec140e"
1101+
version = "0.2.10+0"
1102+
1103+
[[deps.dlfcn_win32_jll]]
1104+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
1105+
git-tree-sha1 = "e141d67ffe550eadfb5af1bdbdaf138031e4805f"
1106+
uuid = "c4b69c83-5512-53e3-94e6-de98773c479f"
1107+
version = "1.4.2+0"
1108+
10431109
[[deps.libaec_jll]]
10441110
deps = ["Artifacts", "JLLWrappers", "Libdl"]
10451111
git-tree-sha1 = "1411bc34c180946d3cef591de1384012afa6edee"
@@ -1051,6 +1117,12 @@ deps = ["Artifacts", "Libdl"]
10511117
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
10521118
version = "5.15.0+0"
10531119

1120+
[[deps.mpif_jll]]
1121+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIABI_jll", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "TOML"]
1122+
git-tree-sha1 = "a8083ee0737c243c8f40a4ba86a0956997facb73"
1123+
uuid = "9aeb927a-4695-514f-a259-621a69f20ec0"
1124+
version = "0.1.7+0"
1125+
10541126
[[deps.nghttp2_jll]]
10551127
deps = ["Artifacts", "Libdl"]
10561128
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
@@ -1060,3 +1132,9 @@ version = "1.64.0+1"
10601132
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
10611133
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
10621134
version = "17.7.0+0"
1135+
1136+
[[deps.s2n_tls_jll]]
1137+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
1138+
git-tree-sha1 = "6b99e06a3863de281da6ff0e193a5b3706349054"
1139+
uuid = "cddc5d3d-934d-5d3a-9747-62fc12ea3f48"
1140+
version = "1.7.2+0"

src/FEMMShellQ4RSModule.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ end
229229
Make a Q4RS FEMM from the integration domain, and a material.
230230
Default isoparametric method for computing the normais is used.
231231
"""
232-
function make(integdomain, material)
233-
return FEMMShellQ4RS(integdomain, material)
232+
function make(integdomain, material, mult_el_size = _mult_el_size)
233+
return FEMMShellQ4RS(integdomain, material, mult_el_size)
234234
end
235235

236236
"""
@@ -239,8 +239,8 @@ end
239239
Make a Q4RS FEMM from the integration domain, a coordinate system to define the
240240
orientation of the normals, and a material.
241241
"""
242-
function make(integdomain, mcsys, material)
243-
return FEMMShellQ4RS(integdomain, mcsys, material)
242+
function make(integdomain, mcsys, material, mult_el_size = _mult_el_size)
243+
return FEMMShellQ4RS(integdomain, mcsys, material, mult_el_size)
244244
end
245245

246246
function _e_g!(E_G, J)

0 commit comments

Comments
 (0)