replaced implicit imports by explicit imports

Author: chmerdon

src/ExtendableFEMBase.jl

@@ -1,28 +1,55 @@
 module ExtendableFEMBase
 
-using ExtendableGrids # + some reexports from there
-export Edge1D, Triangle2D, Parallelogram2D, Tetrahedron3D, Parallelepiped3D
-export ON_CELLS, ON_FACES, ON_IFACES, ON_BFACES, ON_EDGES, ON_BEDGES
-using ExtendableSparse
-using SparseArrays
-using DiffResults
-using LinearAlgebra
-using ForwardDiff
-using DocStringExtensions
-using Printf
-using UnicodePlots
-using Term
-using SpecialPolynomials
-using Polynomials
-
-
-include("qpinfos.jl")
-export QPInfos
-
-include("quadrature.jl")
-export QuadratureRule
-export VertexRule
-export integrate!, integrate, ref_integrate!
+using DocStringExtensions: DocStringExtensions, TYPEDEF, TYPEDSIGNATURES
+using ExtendableGrids: ExtendableGrids, AT_NODES, AbstractElementGeometry,
+						AbstractElementGeometry0D, AbstractElementGeometry1D,
+						AbstractElementGeometry2D, AbstractElementGeometry3D,
+						AbstractGridAdjacency, AbstractGridComponent,
+						AbstractGridFloatArray2D, AbstractGridIntegerArray2D,
+						Adjacency, AssemblyType, BEdgeEdges, BEdgeGeometries,
+						BEdgeRegions, BEdgeVolumes, BFaceEdges, BFaceFaces,
+						BFaceGeometries, BFaceNodes, BFaceParents, BFaceRegions,
+						BFaceVolumes, CellEdgeSigns, CellEdges,
+						CellFaceOrientations, CellFaceSigns, CellFaces,
+						CellFinder, CellGeometries, CellNodes, CellParents,
+						CellRegions, CellVolumes, Coordinates, Edge1D,
+						EdgeCells, EdgeGeometries, EdgeNodes, EdgeTangents,
+						EdgeVolumes, ElementGeometries, ExtendableGrid,
+						FaceCells, FaceEdgeSigns, FaceEdges, FaceGeometries,
+						FaceNodes, FaceNormals, FaceParents, FaceRegions,
+						FaceVolumes, GridComponentGeometries4AssemblyType,
+						GridComponentNodes4AssemblyType,
+						GridComponentRegions4AssemblyType,
+						GridComponentUniqueGeometries4AssemblyType,
+						GridComponentVolumes4AssemblyType, GridEGTypes,
+						GridRegionTypes, Hexahedron3D, L2GTransformer,
+						ON_BEDGES, ON_BFACES, ON_CELLS, ON_EDGES, ON_FACES,
+						ON_IFACES, Parallelepiped3D, Parallelogram2D,
+						ParentGrid, ParentGridRelation, Quadrilateral2D,
+						SerialVariableTargetAdjacency, SubGrid, Tetrahedron3D,
+						Triangle2D, UniqueBEdgeGeometries,
+						UniqueBFaceGeometries, UniqueCellGeometries,
+						UniqueEdgeGeometries, UniqueFaceGeometries,
+						VariableTargetAdjacency, Vertex0D, append!, atranspose,
+						dim_element, eval_trafo!, gFindLocal!, interpolate!,
+						local_celledgenodes, local_cellfacenodes, mapderiv!,
+						max_num_targets_per_source, num_cells, num_edges,
+						num_faces, num_nodes, num_sources, num_targets,
+						reference_domain, simplexgrid, subgrid, unique,
+						update_trafo!
+using ExtendableSparse: ExtendableSparse, ExtendableSparseMatrix, flush!,
+						rawupdateindex!
+using ForwardDiff: ForwardDiff, DiffResults
+using LinearAlgebra: LinearAlgebra, convert, det, diagm, dot, eigen, ldiv!, lu,
+					mul!, norm, transpose
+using Polynomials: Polynomials, Polynomial, coeffs
+using Printf: Printf, @printf
+using SparseArrays: SparseArrays, AbstractSparseArray, AbstractSparseMatrix,
+					SparseMatrixCSC, nzrange, rowvals, sparse
+using SpecialPolynomials: SpecialPolynomials, ShiftedLegendre, basis
+using Term: Term, grid
+using UnicodePlots: UnicodePlots, BrailleCanvas, Plot, heatmap, lineplot,
+					lineplot!
 
 include("functionoperators.jl")
 export AbstractFunctionOperator
@@ -38,6 +65,17 @@ export Trace, Deviator
 export NeededDerivative4Operator, Length4Operator, QuadratureOrderShift4Operator, DefaultName4Operator
 export OperatorPair, OperatorTriple
 
+include("qpinfos.jl")
+#include("feview.jl")
+export FEView
+export QPInfos
+
+include("quadrature.jl")
+export QuadratureRule
+export VertexRule
+export integrate!, integrate, ref_integrate!
+
+
 
 include("finiteelements.jl") # also includes dofmaps.jl and feevaluator*.jl
 export DofMap

src/fedefs/hdiv_rtk_enrich.jl

@@ -19,17 +19,17 @@ abstract type HDIVRTkENRICH{edim, k, stack} <: AbstractHdivFiniteElement where {
 
 const _num_RTk_enrich_bubbles = [[2, 3, 4], [3, 9]]
 const _num_RTk_enrich_bubbles_stacked = [[2, 5, 9], [3, 9]]
-ExtendableFEMBase.get_ncomponents(::Type{<:HDIVRTkENRICH{edim, order}}) where {order, edim} = edim
-ExtendableFEMBase.get_ndofs(::Type{ON_CELLS}, FEType::Type{<:HDIVRTkENRICH{edim, order, false}}, EG::Type{<:AbstractElementGeometry}) where {edim, order} = _num_RTk_enrich_bubbles[edim-1][order]
-ExtendableFEMBase.get_ndofs(::Type{ON_CELLS}, FEType::Type{<:HDIVRTkENRICH{edim, order, true}}, EG::Type{<:AbstractElementGeometry}) where {edim, order} = _num_RTk_enrich_bubbles_stacked[edim-1][order]
-ExtendableFEMBase.get_polynomialorder(::Type{<:HDIVRTkENRICH{edim, order}}, ::Type{<:AbstractElementGeometry}) where {edim, order} = order + 1
-ExtendableFEMBase.get_dofmap_pattern(FEType::Type{<:HDIVRTkENRICH}, ::Type{CellDofs}, EG::Type{<:AbstractElementGeometry}) = "i$(get_ndofs(ON_CELLS, FEType, EG))"
+get_ncomponents(::Type{<:HDIVRTkENRICH{edim, order}}) where {order, edim} = edim
+get_ndofs(::Type{ON_CELLS}, FEType::Type{<:HDIVRTkENRICH{edim, order, false}}, EG::Type{<:AbstractElementGeometry}) where {edim, order} = _num_RTk_enrich_bubbles[edim-1][order]
+get_ndofs(::Type{ON_CELLS}, FEType::Type{<:HDIVRTkENRICH{edim, order, true}}, EG::Type{<:AbstractElementGeometry}) where {edim, order} = _num_RTk_enrich_bubbles_stacked[edim-1][order]
+get_polynomialorder(::Type{<:HDIVRTkENRICH{edim, order}}, ::Type{<:AbstractElementGeometry}) where {edim, order} = order + 1
+get_dofmap_pattern(FEType::Type{<:HDIVRTkENRICH}, ::Type{CellDofs}, EG::Type{<:AbstractElementGeometry}) = "i$(get_ndofs(ON_CELLS, FEType, EG))"
 
 isdefined(FEType::Type{<:HDIVRTkENRICH}, ::Type{<:Triangle2D}) = true
 isdefined(FEType::Type{<:HDIVRTkENRICH}, ::Type{<:Tetrahedron3D}) = true
 
 ## basis on reference triangle
-function ExtendableFEMBase.get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{2, order, false}}, EG::Type{<:Triangle2D}) where {order}
+function get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{2, order, false}}, EG::Type{<:Triangle2D}) where {order}
 	@assert order in 1:3
 	#@show chosen_bubbles
 	function closure(refbasis, xref)
@@ -81,7 +81,7 @@ end
 
 
 ## basis on reference tetrahedron
-function ExtendableFEMBase.get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{3, order, false}}, EG::Type{<:Tetrahedron3D}) where {order}
+function get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{3, order, false}}, EG::Type{<:Tetrahedron3D}) where {order}
 	@assert order in 1:2
 	#@show chosen_bubbles
 	function closure(refbasis, xref)
@@ -111,7 +111,7 @@ function ExtendableFEMBase.get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{3, o
 	end
 end
 
-function ExtendableFEMBase.get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{2, order, true}}, EG::Type{<:Triangle2D}) where {order}
+function get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{2, order, true}}, EG::Type{<:Triangle2D}) where {order}
 	@assert order in 1:3
 	refbasisRT0 = zeros(Real, 3, 2)
 	refbasisRT1 = zeros(Real, 2, 2) # only bubbles
@@ -159,7 +159,7 @@ function ExtendableFEMBase.get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{2, o
 	end
 end
 
-function ExtendableFEMBase.get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{3, order, true}}, EG::Type{<:Tetrahedron3D}) where {order}
+function get_basis(::Type{ON_CELLS}, ::Type{HDIVRTkENRICH{3, order, true}}, EG::Type{<:Tetrahedron3D}) where {order}
 	@assert order in 1:3
 	refbasisRT0 = zeros(Real, 4, 3)
 	refbasisRT1 = zeros(Real, 3, 3) # only bubbles

src/feevaluator.jl

@@ -58,7 +58,7 @@ function FEEvaluator(
 
 	# get effective assembly type for basis
 	# depending on the AT and the AT of the FESpace
-	FEAT = ExtendableFEMBase.EffAT4AssemblyType(FEAPT, AT)
+	FEAT = EffAT4AssemblyType(FEAPT, AT)
 
 	@debug "Creating FEEvaluator for $FEType, EG = $EG, operator = $operator, FEAT = $FEAT, AT = $AT"
 
@@ -294,7 +294,7 @@ end
 ## general call to update subset
 function _update_subset!(FEBE::FEEvaluator)
 	subset = FEBE.current_subset
-	if FEBE.subset_handler != ExtendableFEMBase.NothingFunction
+	if FEBE.subset_handler != NothingFunction
 		FEBE.subset_handler(subset, FEBE.citem[])
 	end
 	return subset

src/plots.jl

@@ -1,5 +1,5 @@
 
-import UnicodePlots: lines!, points!, pixel!
+import UnicodePlots: lines!
 
 """
 ````

src/point_evaluator.jl

@@ -93,7 +93,7 @@ function initialize!(O::PointEvaluator{T, UT}, sol; time = 0, kwargs...) where {
 	Ti = eltype(xgrid[CellNodes])
 	EGs = xgrid[UniqueCellGeometries]
 	AT = ON_CELLS
-	gridAT = ExtendableFEMBase.EffAT4AssemblyType(get_AT(FES_args[1]), AT)
+	gridAT = EffAT4AssemblyType(get_AT(FES_args[1]), AT)
 	xgrid = FES_args[1].xgrid
 	itemregions = xgrid[CellRegions]
 	itemgeometries = xgrid[CellGeometries]
@@ -120,7 +120,7 @@ function initialize!(O::PointEvaluator{T, UT}, sol; time = 0, kwargs...) where {
 	append!(op_offsets_args, cumsum(op_lengths_args))
 	input_args = zeros(T, op_offsets_args[end])
 
-	FEATs_args = [ExtendableFEMBase.EffAT4AssemblyType(get_AT(FES_args[j]), AT) for j ∈ 1:nargs]
+	FEATs_args = [EffAT4AssemblyType(get_AT(FES_args[j]), AT) for j ∈ 1:nargs]
 	itemdofs_args::Array{Union{Adjacency{Ti}, SerialVariableTargetAdjacency{Ti}}, 1} = [FES_args[j][Dofmap4AssemblyType(FEATs_args[j])] for j ∈ 1:nargs]
 	kernel = O.kernel
 
@@ -138,7 +138,7 @@ function initialize!(O::PointEvaluator{T, UT}, sol; time = 0, kwargs...) where {
 
 		for id ∈ 1:nargs
 			# update basis evaluations at xref
-			ExtendableFEMBase.relocate_xref!(BE_args[id], xref)
+			relocate_xref!(BE_args[id], xref)
 
 			# update operator eveluation on item
 			update_basis!(BE_args[id], item)

src/reconstructionoperators.jl

@@ -16,9 +16,9 @@ abstract type Reconstruct{FETypeR, O} <: ReconstructionOperator where {FETypeR <
 StandardFunctionOperator(::Type{Reconstruct{FETypeR, O}}) where {FETypeR, O} = O
 ReconstructionSpace(::Type{Reconstruct{FETypeR, O}}) where {FETypeR, O} = FETypeR
 
-ExtendableFEMBase.NeededDerivative4Operator(::Type{Reconstruct{FETypeR, O}}) where {FETypeR, O} = NeededDerivative4Operator(O)
-ExtendableFEMBase.Length4Operator(::Type{Reconstruct{FETypeR, O}}, xdim, nc) where {FETypeR, O} = Length4Operator(O, xdim, nc)
-ExtendableFEMBase.DefaultName4Operator(::Type{Reconstruct{FETypeR, O}}) where {FETypeR, O} = "R(" * DefaultName4Operator(O) * ")"
+NeededDerivative4Operator(::Type{Reconstruct{FETypeR, O}}) where {FETypeR, O} = NeededDerivative4Operator(O)
+Length4Operator(::Type{Reconstruct{FETypeR, O}}, xdim, nc) where {FETypeR, O} = Length4Operator(O, xdim, nc)
+DefaultName4Operator(::Type{Reconstruct{FETypeR, O}}) where {FETypeR, O} = "R(" * DefaultName4Operator(O) * ")"
 
 struct FEReconstEvaluator{T, TvG, TiG, FEType, FEType2, stdop, O <: ReconstructionOperator} <: FEEvaluator{T, TvG, TiG}
 	citem::Base.RefValue{Int}                       # current item

src/segment_integrator.jl

@@ -101,7 +101,7 @@ function initialize!(O::SegmentIntegrator{T, UT}, sol; time = 0, kwargs...) wher
 	FETypes_args = [eltype(F) for F in FES_args]
 
 	AT = ON_CELLS
-	gridAT = ExtendableFEMBase.EffAT4AssemblyType(get_AT(FES_args[1]), AT)
+	gridAT = EffAT4AssemblyType(get_AT(FES_args[1]), AT)
 	xgrid = FES_args[1].xgrid
 	itemregions = xgrid[CellRegions]
 
@@ -113,7 +113,7 @@ function initialize!(O::SegmentIntegrator{T, UT}, sol; time = 0, kwargs...) wher
 	bonus_quadorder = O.parameters[:bonus_quadorder]
 	if O.parameters[:quadorder] == "auto"
 		polyorder = maximum([get_polynomialorder(FE, EG) for FE in FETypes_args])
-		minderiv = minimum([ExtendableFEMBase.NeededDerivative4Operator(op) for op in O.ops_args])
+		minderiv = minimum([NeededDerivative4Operator(op) for op in O.ops_args])
 		quadorder = polyorder - minderiv + bonus_quadorder
 	else
 		quadorder = O.parameters[:quadorder] + bonus_quadorder
@@ -142,7 +142,7 @@ function initialize!(O::SegmentIntegrator{T, UT}, sol; time = 0, kwargs...) wher
 	## parameter structure
 	QPinfo = QPInfos(xgrid; time = time, params = O.parameters[:params])
 
-	FEATs_args = [ExtendableFEMBase.EffAT4AssemblyType(get_AT(FES_args[j]), AT) for j ∈ 1:nargs]
+	FEATs_args = [EffAT4AssemblyType(get_AT(FES_args[j]), AT) for j ∈ 1:nargs]
 	itemdofs_args::Array{Union{Adjacency{Int32}, SerialVariableTargetAdjacency{Int32}}, 1} = [FES_args[j][Dofmap4AssemblyType(FEATs_args[j])] for j ∈ 1:nargs]
 
 	## prepare operator infos
@@ -193,7 +193,7 @@ function initialize!(O::SegmentIntegrator{T, UT}, sol; time = 0, kwargs...) wher
 
 			# update basis evaluations on new quadrature points
 			for id ∈ 1:nargs
-				ExtendableFEMBase.relocate_xref!(BE_args[id], xref)
+				relocate_xref!(BE_args[id], xref)
 				update_basis!(BE_args[id], item)
 			end
 
@@ -271,7 +271,7 @@ function initialize!(O::SegmentIntegrator{T, UT}, sol; time = 0, kwargs...) wher
 
 			# update basis evaluations on new quadrature points
 			for id ∈ 1:nargs
-				ExtendableFEMBase.relocate_xref!(BE_args[id], xref)
+				relocate_xref!(BE_args[id], xref)
 				update_basis!(BE_args[id], item)
 			end