upgraded to Grassmann v0.8

Author: chakravala

Project.toml

@@ -12,9 +12,9 @@ AbstractTensors = "a8e43f4a-99b7-5565-8bf1-0165161caaea"
 
 [compat]
 julia = "1"
-AbstractTensors = "0.6"
-DirectSum = "0.7"
-Grassmann = "0.7"
+AbstractTensors = "0.7"
+DirectSum = "0.8"
+Grassmann = "0.8"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/Adapode.jl

@@ -1,7 +1,22 @@
 module Adapode
 
-#   This file is part of Aadapode.jl. It is licensed under the GPL license
+#   This file is part of Aadapode.jl
+#   It is licensed under the GPL license
 #   Adapode Copyright (C) 2019 Michael Reed
+#       _           _                         _
+#      | |         | |                       | |
+#   ___| |__   __ _| | ___ __ __ ___   ____ _| | __ _
+#  / __| '_ \ / _` | |/ / '__/ _` \ \ / / _` | |/ _` |
+# | (__| | | | (_| |   <| | | (_| |\ V / (_| | | (_| |
+#  \___|_| |_|\__,_|_|\_\_|  \__,_| \_/ \__,_|_|\__,_|
+#
+#   https://github.com/chakravala
+#   https://crucialflow.com
+#   _______     __                          __
+#  |   _   |.--|  |.---.-..-----..-----..--|  |.-----.
+#  |       ||  _  ||  _  ||  _  ||  _  ||  _  ||  -__|
+#  |___|___||_____||___._||   __||_____||_____||_____|
+#                         |__|
 
 using SparseArrays, LinearAlgebra
 using AbstractTensors, DirectSum, Grassmann
@@ -43,7 +58,7 @@ function weights(c,fx)
     return cfx
 end
 @pure shift(::Val{m},::Val{k}=Val(1)) where {m,k} = Values{m,Int}(k:m+k-1)
-@pure shift(M::Val{m},i) where {m,a} = ((shift(M,Val{0}()).+i).%(m+1)).+1
+@pure shift(M::Val{m},i) where m = ((shift(M,Val{0}()).+i).%(m+1)).+1
 explicit(x,h,c,fx) = (l=length(c);x+weights(h*c,l≠length(fx) ? fx[shift(Val(l))] : fx))
 explicit(x,h,c,fx,i) = (l=length(c);weights(h*c,l≠length(fx) ? fx[shift(Val(l),i)] : fx))
 improved_heun(x,f,h) = (fx = f(x); x+(h/2)*(fx+f(x+h*fx)))
@@ -175,16 +190,18 @@ function timeloop!(x,t,tmax,::Val{m}=Val(1)) where m
         t.s = 0
     end
     iszero(t.s) && checkstep!(t)
-    d = tmax-x[t.i][1]
+    d = tmax-time(x[t.i])
     d ≤ t.h && (t.h = d)
     done = d ≤ t.hmax
     done && truncate!(x,t.i-1)
     return !done
 end
 
+time(x) = x[1]
+
 Base.resize!(x,i,h) = length(x)<i+1 && resize!(x,i+h)
 truncate!(x,i) = length(x)>i+1 && resize!(x,i)
 
-show_progress(x,t,b) = t.i%75000 == 11 && println(x[t.i][1]," out of ",b)
+show_progress(x,t,b) = t.i%75000 == 11 && println(time(x[t.i])," out of ",b)
 
 end # module

src/element.jl

@@ -1,6 +1,16 @@
 
-#   This file is part of Adapode.jl. It is licensed under the AGPL license
+#   This file is part of Adapode.jl
+#   It is licensed under the AGPL license
 #   Adapode Copyright (C) 2019 Michael Reed
+#       _           _                         _
+#      | |         | |                       | |
+#   ___| |__   __ _| | ___ __ __ ___   ____ _| | __ _
+#  / __| '_ \ / _` | |/ / '__/ _` \ \ / / _` | |/ _` |
+# | (__| | | | (_| |   <| | | (_| |\ V / (_| | | (_| |
+#  \___|_| |_|\__,_|_|\_\_|  \__,_| \_/ \__,_|_|\__,_|
+#
+#   https://github.com/chakravala
+#   https://crucialflow.com
 
 export assemble, assembleglobal, assemblestiffness, assembleconvection, assembleSD
 export assemblemass, assemblefunction, assemblemassfunction, assembledivergence
@@ -107,7 +117,7 @@ function incidence(t,cols=columns(t))
 end # node-element incidence, A[i,j]=1 -> i∈t[j]
 
 assemblemassincidence(t,f,m=volumes(t),l=m) = assemblemassincidence(t,iterpts(t,f),iterable(t,m),iterable(t,l))
-function assemblemassincidence(t,f::F,m::V,l::T) where {F<:AbstractVector,V<:AbstractVector,T<:AbstractVector,D<:AbstractVector}
+function assemblemassincidence(t,f::F,m::V,l::T) where {F<:AbstractVector,V<:AbstractVector,T<:AbstractVector}
     np,n = length(points(t)),Val(mdims(Manifold(t)))
     M,b,v = spzeros(np,np), zeros(np), f
     for k ∈ 1:length(t)
@@ -131,11 +141,11 @@ pretni(t,B::SparseMatrixCSC=incidence(t)) = assembleload(t,sparse(B'))
 pretni(t,ut,B=pretni(t)) = B*ut #interp(t,ut,B::SparseMatrixCSC) = B*ut
 
 #mass(a,b,::Val{N}) where N = (ones(SMatrix{N,N,Int})+I)/Int(factorial(N+1)/factorial(N-1))
-mass(a,b,::Val{N}) where N = (x=SubManifold(N)(∇);outer(x,x)+I)/Int(factorial(N+1)/factorial(N-1))
+mass(a,b,::Val{N}) where N = (x=Submanifold(N)(∇);outer(x,x)+I)/Int(factorial(N+1)/factorial(N-1))
 assemblemass(t,m=volumes(t)) = assembleglobal(mass,t,iterpts(t,m))
 
 stiffness(c,g::Float64,::Val{2}) = (cg = c*g^2; Chain(Chain(cg,-cg),Chain(-cg,cg)))
-stiffness(c,g,::Val{N}) where N = Chain{SubManifold(N),1}(map.(*,c,value(g).⋅Ref(g)))
+stiffness(c,g,::Val{N}) where N = Chain{Submanifold(N),1}(map.(*,c,value(g).⋅Ref(g)))
 assemblestiffness(t,c=1,m=volumes(t),g=gradienthat(t,m)) = assembleglobal(stiffness,t,m,iterable(c isa Real ? t : means(t),c),g)
 # iterable(means(t),c) # mapping of c.(means(t))
 
@@ -310,7 +320,7 @@ function nedelec(λ,g,v::Val{3})
 end
 
 function basisnedelec(p)
-    M = SubManifold(ℝ^3); V = ↓(M)
+    M = Submanifold(ℝ^3); V = ↓(M)
     Chain{M,1}(
         Chain{V,1}(-p[2],p[1]),
         Chain{V,1}(-p[2],p[1]-1),