From dccd02d484231fc0b4333ac7d9c33b5355769d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olli=20V=C3=A4in=C3=B6l=C3=A4?=
 <olli.vainola@student.oulu.fi>
Date: Thu, 17 Dec 2015 15:47:36 +0200
Subject: [PATCH] backup

---
 src/elasticity.jl | 106 +++-------------------------------------------
 1 file changed, 7 insertions(+), 99 deletions(-)

diff --git a/src/elasticity.jl b/src/elasticity.jl
index 29f59cc..f26bd69 100644
--- a/src/elasticity.jl
+++ b/src/elasticity.jl
@@ -5,8 +5,9 @@ include("vonmises.jl")
 
 # Elasticity problems
 
-abstract ElasticityProblem <: AbstractProblem
-abstract ElasticPlasticProblem <: AbstractProblem
+abstract ElasticityProblem     <: AbstractProblem
+
+abstract PlaneStressElasticityProblem     <: ElasticityProblem
 
 function get_unknown_field_name{P<:ElasticityProblem}(::Type{P})
     return "displacement"
@@ -24,20 +25,17 @@ function get_unknown_field_type{P<:ElasticPlasticProblem}(::Type{P})
     return Vector{Float64}
 end
 
+# 3D Elasticity problems
 function ElasticityProblem(dim::Int=3, elements=[])
     return Problem{ElasticityProblem}(dim, elements)
 end
 
-function ElasticPlasticProblem(dim::Int=3, elements=[])
-    return Problem{ElasticPlasticProblem}(dim, elements)
-end
-
-abstract PlaneStressElasticityProblem <: ElasticityProblem
-
+# 2D Plane stress elasticity problems
 function PlaneStressElasticityProblem(dim::Int=2, elements=[])
     return Problem{PlaneStressElasticityProblem}(dim, elements)
 end
 
+
 """ Elasticity equations.
 
 Formulation
@@ -69,6 +67,7 @@ https://en.wikipedia.org/wiki/Hooke's_law
 
 """
 function get_residual_vector{P<:ElasticityProblem}(problem::Problem{P}, element::Element, ip::IntegrationPoint, time::Number; variation=nothing)
+#function get_residual_vector{P<:ElasticPlasticProblem}(problem::Problem{P}, element::Element, ip::IntegrationPoint, time::Number; variation=nothing)
 
     r = zeros(Float64, problem.dim, length(element))
 
@@ -119,94 +118,3 @@ function get_residual_vector{P<:ElasticityProblem}(problem::Problem{P}, element:
 
     return vec(r)
 end
-
-"""
-
-"""
-function get_residual_vector{P<:ElasticPlasticProblem}(problem::Problem{P}, element::Element, ip::IntegrationPoint, time::Number; variation=nothing)
-
-
-    # u = element("displacement", ip, time, variation)
-
-    r = zeros(Float64, problem.dim, length(element))
-
-    # internal forces
-    if haskey(element, "youngs modulus") && haskey(element, "poissons ratio")
-        
-        if !haskey(element, "integration points")
-            last_stress = zeros(3,3)
-            last_strain = zeros(3,3)
-        else
-            for each_ip in element("integration points", time)
-                if isapprox(each_ip.xi, ip.xi)
-                    last_stress = ip("stress", time)
-                    last_strain = ip("stress", time)
-                    break
-                end
-            end
-        end
-
-        # last_ip = get_last_ip(problem, element, ip, time)
-        # stress_base = last_ip("stress")
-        u = element("displacement", time, variation)
-        grad = element(ip, time, Val{:grad})
-#        gradu = element("displacement", ip, time, Val{:grad}, variation)
-        gradu = grad*u
-
-        F = I + gradu # deformation gradient
-
-        young = element("youngs modulus", ip, time)
-        poisson = element("poissons ratio", ip, time)
-
-        C = stiffnessTensor(young, poisson)
-        mu = young/(2*(1+poisson))
-        lambda = young*poisson/((1+poisson)*(1-2*poisson))
-        if P == PlaneStressElasticityProblem
-            lambda = 2*lambda*mu/(lambda + 2*mu)  # <- correction for 2d problems
-        end
-        stress_y = element("yield stress", time).data
-        #E = 1/2*(F'*F - I)        # large strain
-        E = 1/2*(gradu + gradu') # finite strain (total)
-        dstrain = E - last_strain
-        material_model = element("material model", time)
-        s = last_stress
-        de = ForwardDiff.get_value(dstrain)
-        s_v = [s[1,1], s[2,2], s[3,3], s[2,3], s[1,3], s[1,2]]
-        de_ = [de[1,1], de[2,2], de[3,3], de[2,3], de[1,3], de[1,2]]
-        #println("stress: ", s_v)
-        #println("de: ",  de_)
-        #println(C)
-        #println("yield stress: ", stress_y)
-        plastic_multiplier = calculate_stress!(de_, s_v, C, stress_y, Val{:vonMises})
-        # dep = lambda * dfds(s)
-        # upate_material_parameters!(...)
-        S = [s_v[1] s_v[6] s_v[5];
-             s_v[6] s_v[2] s_v[4];
-             s_v[5] s_v[4] s_v[3]]
-        # S = C * (E - dep)
-        #S = lambda*trace(E)*I + 2*mu*E
-
-        #J = det(element, ip, time)
-        #T = J^-1*F*S*F'
-        #ip["cauchy stress"] = T
-        #ip["gl strain"] = E
-
-        r += F*S*grad
-    end
-
-    # external forces - volume load
-    if haskey(element, "displacement load")
-        basis = element(ip, time)
-        b = element("displacement load", ip, time)
-        r -= b*basis
-    end
-
-    # external forces - surface traction force
-    if haskey(element, "displacement traction force")
-        basis = element(ip, time)
-        T = element("displacement traction force", ip, time)
-        r -= T*basis
-    end
-
-    return vec(r)
-end