Improve evaluations, matrix copies and add new features for PDEs and integration

Manifest.toml

@@ -1,8 +1,8 @@
 # This file is machine-generated - editing it directly is not advised
 
-julia_version = "1.11.1"
+julia_version = "1.11.5"
 manifest_format = "2.0"
-project_hash = "dfc125e4d5b45f24d2f9e76ff762f36327db0b9d"
+project_hash = "ccd7aa3f077b9dea60da31d56ef525ec4dab4eb9"
 
 [[deps.Artifacts]]
 uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
@@ -20,20 +20,30 @@ version = "1.11.0"
 
 [[deps.JLLWrappers]]
 deps = ["Artifacts", "Preferences"]
-git-tree-sha1 = "be3dc50a92e5a386872a493a10050136d4703f9b"
+git-tree-sha1 = "a007feb38b422fbdab534406aeca1b86823cb4d6"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.6.1"
+version = "1.7.0"
 
 [[deps.LLVMOpenMP_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "78211fb6cbc872f77cad3fc0b6cf647d923f4929"
+git-tree-sha1 = "eb62a3deb62fc6d8822c0c4bef73e4412419c5d8"
 uuid = "1d63c593-3942-5779-bab2-d838dc0a180e"
-version = "18.1.7+0"
+version = "18.1.8+0"
 
 [[deps.Libdl]]
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 version = "1.11.0"
 
+[[deps.LinearAlgebra]]
+deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+version = "1.11.0"
+
+[[deps.OpenBLAS_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
+uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
+version = "0.3.27+1"
+
 [[deps.Preferences]]
 deps = ["TOML"]
 git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6"
@@ -45,6 +55,29 @@ deps = ["Unicode"]
 uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 version = "1.11.0"
 
+[[deps.Random]]
+deps = ["SHA"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+version = "1.11.0"
+
+[[deps.SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+version = "0.7.0"
+
+[[deps.Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+version = "1.11.0"
+
+[[deps.SparseArrays]]
+deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+version = "1.11.0"
+
+[[deps.SuiteSparse_jll]]
+deps = ["Artifacts", "Libdl", "libblastrampoline_jll"]
+uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
+version = "7.7.0+0"
+
 [[deps.TOML]]
 deps = ["Dates"]
 uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
@@ -56,6 +89,11 @@ version = "1.11.0"
 
 [[deps.gismo_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "Libdl"]
-git-tree-sha1 = "20e95d695fb99e96765770247523eb64284d9143"
+git-tree-sha1 = "eb745b171074526cbb7b34fefa76255f4b293dcb"
 uuid = "c3015cfb-32aa-504c-ba3d-5541e7ecaf35"
-version = "24.8.0+0"
+version = "25.7.0+0"
+
+[[deps.libblastrampoline_jll]]
+deps = ["Artifacts", "Libdl"]
+uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
+version = "5.11.0+0"

Project.toml

@@ -1,13 +1,14 @@
 name = "Gismo"
 uuid = "f019f137-166b-4455-b646-ee200b009b83"
 authors = ["Hugo Verhelst <[email protected]>"]
-version = "25.1.0"
+version = "25.7.0"
 
 [deps]
 gismo_jll = "c3015cfb-32aa-504c-ba3d-5541e7ecaf35"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-gismo_jll = "25.1.0"
+gismo_jll = "25.7.0"
 julia = "1.9"
 
 [extras]

cmake/Gismo.jl.in

@@ -26,4 +26,10 @@ include("gsModeling.jl")
 # Load gsNurbs
 include("gsNurbs.jl")
 
+# Load gsPde
+include("gsPde.jl")
+
+@gsOptional_paths@
+
+
 end #module

examples/BSpline_example.jl

@@ -1,25 +1,24 @@
 using Plots
 using Gismo
-import Gismo.size
 
-KV = KnotVector([0.,0.,0.,1.,1.,1.])
-BB = BSplineBasis(KV)
+BB = KnotVector([0.,0.,0.,1.,1.,1.]) |> BSplineBasis
 uniformRefine!(BB)
 uniformRefine!(BB)
 
 # Create a matrix of random coefficients
-coefs = rand(size(BB),2)
+CC = rand(size(BB),2)
 # Create a BSpline geometry
-B = BSpline(BB,coefs)
+B = BSpline(BB,CC)
 
 # Create a matrix of linearly spaced evaluation points
-points1D = zeros(1,100)
-points1D[1,:] = range(0,stop=1,length=100)
-ev = asMatrix(val(B,points1D))
+points1D = zeros(1,3)
+points1D[1,:] = range(0,stop=1,length=3)
+evMat = val(B,points1D) # this is a C++ pointer
+ev = asMatrix(evMat) # convert to a Julia matrix (not owning the data)
 
 # Plot the geometry
 plot(ev[1,:],ev[2,:],legend=false)
-plot!(coefs[:,1],coefs[:,2],legend=false)
-plot!(coefs[:,1],coefs[:,2],legend=false,seriestype=:scatter)
+plot!(CC[:,1],CC[:,2],legend=false)
+plot!(CC[:,1],CC[:,2],legend=false,seriestype=:scatter)
 gui()
 

examples/OptionList_example.jl

@@ -5,17 +5,17 @@ println(options)
 gsOptionList = OptionList(options)
 println(gsOptionList)
 
-Gismo.setInt(gsOptionList,"a",2)
-Gismo.setReal(gsOptionList,"b",2.0)
-Gismo.setSwitch(gsOptionList,"c",false)
-Gismo.setString(gsOptionList,"d","two")
+setInt(gsOptionList,"a",2)
+setReal(gsOptionList,"b",2.0)
+setSwitch(gsOptionList,"c",false)
+setString(gsOptionList,"d","two")
 println(gsOptionList)
 
-int::Int = Gismo.getInt(gsOptionList,"a")
+int::Int = getInt(gsOptionList,"a")
 println("Integer read from option list: ",int)
-double::Float64 = Gismo.getReal(gsOptionList,"b")
+double::Float64 = getReal(gsOptionList,"b")
 println("Double read from option list: ",double)
-bool::Bool = Gismo.getSwitch(gsOptionList,"c")
+bool::Bool = getSwitch(gsOptionList,"c")
 println("Bool read from option list: ",bool)
-string::Cstring = Gismo.getString(gsOptionList,"d")
+string::Cstring = getString(gsOptionList,"d")
 println("String read from option list: ",string)

examples/THBSpline_example.jl

@@ -1,6 +1,5 @@
 using Plots
 using Gismo
-import Gismo.size
 
 KV = KnotVector([0.,0.,0.,1.,1.,1.])
 TBB = TensorBSplineBasis(KV,KV)
@@ -22,6 +21,12 @@ print("The size of the basis is: ",size(THB),"\n")
 
 print("The size of the basis is: ",size(THB),"\n")
 
+println("Level 1 is: ",tensorLevel(THB,Int32(1)))
+point = zeros(Float64,2,1)
+point[1] = 0.5
+point[2] = 0.5
+println("The level at the point is: ",getLevelAtPoint(THB,point))
+
 # Create a matrix of random coefficients
 coefs = rand(size(TBB),3)
 # Create a BSpline geometry

examples/TensorBSpline_example.jl

@@ -1,6 +1,5 @@
 using Plots
 using Gismo
-import Gismo.size
 
 KV = KnotVector([0.,0.,0.,1.,1.,1.])
 TBB = TensorBSplineBasis(KV,KV)
@@ -13,8 +12,6 @@ coefs = rand(size(TBB),3)
 # Create a BSpline geometry
 TB = TensorBSpline(TBB,coefs)
 
-Gismo.size(KV)
-
 # Create a matrix of linearly spaced evaluation points
 N = 10
 points1D = range(0,stop=1,length=N)

src/Declarations.jl

@@ -6,13 +6,16 @@
 mutable struct gsCMatrix end
 mutable struct gsCMatrixInt end
 mutable struct gsCVector end
+mutable struct gsCVectorInt end
+mutable struct gsCSparseMatrix end
 
 # Core
 mutable struct gsCFunctionSet end
 mutable struct gsCMultiPatch end
 mutable struct gsCMultiBasis end
 mutable struct gsCBasis end
 mutable struct gsCGeometry end
+mutable struct gsCFunctionExpr end
 
 # NURBS
 mutable struct gsCKnotVector end
@@ -25,3 +28,15 @@ mutable struct gsCOptionList end
 
 # Modeling
 mutable struct gsCFitting end
+
+# Pde
+mutable struct gsCBoundaryConditions end
+
+####### SUBMODULES
+# Submodules are declared within their own files,
+# such that this file does not need to change when submodules are added.
+
+# For example, the gsKLShell submodule is declared in gsKLShell.jl
+# gsKLShell
+# mutable struct gsCMaterialMatrixBase end
+# mutable struct gsCThinShellAssemblerBase end

src/Gismo.jl

@@ -26,4 +26,11 @@ include("gsModeling.jl")
 # Load gsNurbs
 include("gsNurbs.jl")
 
+# Load gsPde
+include("gsPde.jl")
+
+####### SUBMODULES
+
+
+
 end #module