Moved different models to different files.

examples/ex2.py

@@ -1,4 +1,5 @@
 from skfem import *
+from skfem.models.poisson import unit_load
 import numpy as np
 
 m = MeshTri()

examples/ex3.py

@@ -1,4 +1,5 @@
 from skfem import *
+from skfem.models.elasticity import *
 from scipy.sparse.linalg import eigsh
 import numpy as np
 
@@ -35,4 +36,4 @@ def mass(u, du, v, dv, w):
 y[I] = x[:, 4]
 
 MeshQuad(np.array([m.p[0, :]+y[gb.dofnum.n_dof[0, :]], m.p[1, :]+y[gb.dofnum.n_dof[1, :]]]), m.t).draw()
-m.show()
+m.show()

examples/ex4.py

@@ -1,5 +1,6 @@
 from skfem import *
-from skfem.models import *
+from skfem.mesh_importers import *
+from skfem.models.elasticity import *
 import numpy as np
 
 m = read_comsol("examples/square_smalltris.mphtxt")

examples/ex6.py

@@ -1,4 +1,5 @@
 from skfem import *
+from skfem.models.poisson import laplace
 
 """
 High-order plotting test.

examples/ex8.py

@@ -1,9 +1,4 @@
-from skfem.mesh import *
-from skfem.assembly import *
-from skfem.element import *
-from skfem.utils import *
-from skfem.mapping import *
-from skfem.extern_sfepy import *
+from skfem import *
 import matplotlib.pyplot as plt
 
 """

examples/ex9.py

@@ -1,5 +1,5 @@
 from skfem import *
-from skfem.models import *
+from skfem.models.poisson import *
 
 """
 Solve Laplace equation with zero Dirichlet BC

skfem/__init__.py

@@ -16,9 +16,7 @@ def _import_all_modules():
                 or filename == 'mesh.py' \
                 or filename == 'utils.py' \
                 or filename == 'element.py' \
-                or filename == 'mapping.py' \
-                or filename == 'extern_sfepy.py' \
-                or filename == 'models.py':
+                or filename == 'mapping.py':
             modulename = filename.split('.')[0]  # filename without extension
             package_module = '.'.join([__name__, modulename])
             try:

skfem/models.py → skfem/models/elasticity.py

@@ -1,27 +1,10 @@
 # -*- coding: utf-8 -*-
 """
-Weak forms for various PDE's
+Linear elasticity
 """
 import numpy as np
 from skfem.utils import bilinear_form, linear_form
 
-@bilinear_form
-def laplace(u, du, v, dv, w):
-    if du.shape[0] == 2:
-        return du[0]*dv[0] + du[1]*dv[1]
-    elif du.shape[0] == 3:
-        return du[0]*dv[0] + du[1]*dv[1] + du[2]*dv[2]
-    else:
-        raise NotImplementedError("Laplace weakform not implemented for the used dimension.")
-
-@bilinear_form
-def mass(u, du, v, dv, w):
-    return u*v
-
-@linear_form
-def unit_load(v, dv, w):
-    return v
-
 def plane_strain(Lambda=1.0, Mu=1.0):
     @bilinear_form
     def weakform(u, du, v, dv, w):
@@ -58,7 +41,7 @@ def ddot(A, B):
                    A[1, 0] * B[1, 0] + \
                    A[1, 1] * B[1, 1] + \
                    A[0, 2] * B[0, 2] + \
-                   A[2, 0] * B[2, 0] + \
+                   A[2, 0] * B[2, 0] + \
                    A[1, 2] * B[1, 2] + \
                    A[2, 1] * B[2, 1] + \
                    A[2, 2] * B[2, 2]
@@ -73,8 +56,8 @@ def C(T):
 
         def Eps(dw):
             return np.array([[dw[0][0], 0.5*(dw[0][1] + dw[1][0]), 0.5*(dw[0][2] + dw[2][0])],
-                             [0.5*(dw[1][0] + dw[0][1]), dw[1][1], 0.5*(dw[1][2] + dw[2][1])],
-                             [0.5*(dw[2][0] + dw[0][2]), 0.5*(dw[2][1] + dw[1][2]), dw[2][2]]])
+                             [0.5*(dw[1][0] + dw[0][1]), dw[1][1], 0.5*(dw[1][2] + dw[2][1])],
+                             [0.5*(dw[2][0] + dw[0][2]), 0.5*(dw[2][1] + dw[1][2]), dw[2][2]]])
 
         return ddot(C(Eps(du)), Eps(dv))
 

skfem/models/poisson.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+"""
+Poisson equation
+"""
+import numpy as np
+from skfem.utils import bilinear_form, linear_form
+
+@bilinear_form
+def laplace(u, du, v, dv, w):
+    if du.shape[0] == 2:
+        return du[0]*dv[0] + du[1]*dv[1]
+    elif du.shape[0] == 3:
+        return du[0]*dv[0] + du[1]*dv[1] + du[2]*dv[2]
+    else:
+        raise NotImplementedError("Laplace weakform not implemented for the used dimension.")
+
+@bilinear_form
+def mass(u, du, v, dv, w):
+    return u*v
+
+@linear_form
+def unit_load(v, dv, w):
+    return v