From c37250fe6d78c3a504a7ddccfa2d24a4d7cbe5f8 Mon Sep 17 00:00:00 2001
From: Jukka Aho <jukka.aho@kapsi.fi>
Date: Mon, 1 Feb 2016 09:14:08 +0200
Subject: [PATCH] moving code

---
 src/equations.jl | 53 +++++++++---------------------------------------
 1 file changed, 10 insertions(+), 43 deletions(-)

diff --git a/src/equations.jl b/src/equations.jl
index 031573b..2034eac 100644
--- a/src/equations.jl
+++ b/src/equations.jl
@@ -1,49 +1,6 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
 
-# Functions to handle element level things -- integration, assembly, ...
-
-type FieldAssembly
-    mass_matrix :: SparseMatrixCOO
-    stiffness_matrix :: SparseMatrixCOO
-    force_vector :: SparseMatrixCOO
-end
-
-function FieldAssembly()
-    return FieldAssembly(
-        SparseMatrixCOO(),
-        SparseMatrixCOO(),
-        SparseMatrixCOO())
-end
-
-typealias Assembly FieldAssembly
-
-"""
-"Boundary" matrices C₁, C₂, D, g for general problem type
-Au + C₁'λ = f
-C₂u + Dλ  = g
-"""
-type BoundaryAssembly
-    C1 :: SparseMatrixCOO
-    C2 :: SparseMatrixCOO
-    D :: SparseMatrixCOO
-    g :: SparseMatrixCOO
-end
-
-function BoundaryAssembly()
-    return BoundaryAssembly(
-        SparseMatrixCOO(),
-        SparseMatrixCOO(),
-        SparseMatrixCOO(),
-        SparseMatrixCOO())
-end
-
-function Base.empty!(assembly::Assembly)
-    empty!(assembly.mass_matrix)
-    empty!(assembly.stiffness_matrix)
-    empty!(assembly.force_vector)
-end
-
 function get_mass_matrix
 end
 
@@ -90,6 +47,16 @@ function get_gdofs(element::Element, dim::Int)
     return gdofs
 end
 
+function get_gdofs(element::Element, problem::FieldProblem)
+    dim = problem.dim
+    return get_gdofs(element, dim)
+end
+
+function get_gdofs(element::Element, problem::BoundaryProblem)
+    dim = problem.parent_field_dim
+    return get_gdofs(element, dim)
+end
+
 """ Assemble element. """
 function assemble!(assembly::Assembly, problem::Problem, element::Element, time::Number)