From bf67d317ce3ef3b5c25b34ab1d4dacb4b4bc56fe Mon Sep 17 00:00:00 2001
From: TeroFrondelius <tero.frondeliu@gmail.com>
Date: Wed, 16 Oct 2019 20:10:41 +0300
Subject: [PATCH 1/5] Drucker-Prager viscoplacticity UMAT files. Thanks Kari
 Kolari for sharing them!

---
 build_tarballs.jl | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/build_tarballs.jl b/build_tarballs.jl
index ce1286c..298028f 100644
--- a/build_tarballs.jl
+++ b/build_tarballs.jl
@@ -3,7 +3,7 @@
 using BinaryBuilder
 
 name = "umat_binaries"
-version = v"0.2.0"
+version = v"0.5.0"
 
 # Collection of sources required to build umat_binaries
 sources = [
@@ -25,7 +25,7 @@ sources = [
 
     # Gurson model from UMAT.jl/umat_models
     "https://github.com/JuliaFEM/UMAT.jl.git" =>
-    "0225216125884a4a9439d5444221be450e9d9212"
+    "6a1b73f93473c3fcd7a82092f7fd3da8c40885e5"
 
 ]
 
@@ -35,7 +35,7 @@ cd $WORKSPACE/srcdir
 cat >CMakeLists.txt <<EOL
 cmake_minimum_required(VERSION 3.5)
 project(Umat)
-set(VERSION 0.1.0)
+set(VERSION 0.5.0)
 enable_language(Fortran)
 set(SOURCE_FILES mises_umat.f xit.f)
 set(LIBRARY_NAME mises_umat)
@@ -76,12 +76,15 @@ fi
 cat >CMakeLists.txt <<EOL
 cmake_minimum_required(VERSION 3.5)
 project(Umat)
-set(VERSION 0.1.0)
+set(VERSION 0.5.0)
 enable_language(Fortran)
 set(CMAKE_Fortran_FLAGS "-fdefault-real-8")
 add_library(gurson_porous_plasticity SHARED gurson_porous_plasticity.f90)
 target_link_libraries(gurson_porous_plasticity $OB)
 install(TARGETS gurson_porous_plasticity DESTINATION lib)
+
+add_library(drucker_prager_plasticity SHARED drucker_prager_plasticity.f90 drucker_prager_plasticity_deriv.f90)
+install(TARGETS drucker_prager_plasticity DESTINATION lib)
 EOL
 
 cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=/opt/$target/$target.toolchain
@@ -116,7 +119,8 @@ products(prefix) = [
     LibraryProduct(prefix, "libelastic", :elastic),
     LibraryProduct(prefix, "libisotropic_plast_exp", :isotropic_plast_exp),
     LibraryProduct(prefix, "libisotropic_plast_imp", :isotropic_plast_imp),
-    LibraryProduct(prefix, "libgurson_porous_plasticity", :gurson_porous_plasticity)
+    LibraryProduct(prefix, "libgurson_porous_plasticity", :gurson_porous_plasticity),
+    LibraryProduct(prefix, "libdrucker_prager_plasticity", :drucker_prager_plasticity)
 ]
 
 # Dependencies that must be installed before this package can be built

From 31c6559afa8e4d23daf4270c8ff5b7019681dd4e Mon Sep 17 00:00:00 2001
From: TeroFrondelius <tero.frondeliu@gmail.com>
Date: Wed, 16 Oct 2019 21:55:46 +0300
Subject: [PATCH 2/5] Fortran compiler flag -free

---
 build_tarballs.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_tarballs.jl b/build_tarballs.jl
index 298028f..1c87222 100644
--- a/build_tarballs.jl
+++ b/build_tarballs.jl
@@ -78,7 +78,7 @@ cmake_minimum_required(VERSION 3.5)
 project(Umat)
 set(VERSION 0.5.0)
 enable_language(Fortran)
-set(CMAKE_Fortran_FLAGS "-fdefault-real-8")
+set(CMAKE_Fortran_FLAGS "-fdefault-real-8 -free")
 add_library(gurson_porous_plasticity SHARED gurson_porous_plasticity.f90)
 target_link_libraries(gurson_porous_plasticity $OB)
 install(TARGETS gurson_porous_plasticity DESTINATION lib)

From 7224b541ac3876d91c4cac8cb952434cd3587e2c Mon Sep 17 00:00:00 2001
From: TeroFrondelius <tero.frondeliu@gmail.com>
Date: Wed, 16 Oct 2019 22:24:01 +0300
Subject: [PATCH 3/5] Changing '& syntax to ' & syntax (space added)

---
 build_tarballs.jl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build_tarballs.jl b/build_tarballs.jl
index 1c87222..8168410 100644
--- a/build_tarballs.jl
+++ b/build_tarballs.jl
@@ -62,9 +62,11 @@ cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=/opt/$target/$target
 make
 make install
 
-# From this forward is Gurson model building
+# From this forward is UMAT.jl/umat_models building
+
 cd UMAT.jl/umat_models
 sed -i 's/CALL ROTSIG(/!CALL ROTSIG(/g' gurson_porous_plasticity.f90
+sed -i "s/'&/\' \&/g" drucker_prager_plasticity_deriv.f90
 
 if [[ ${nbits} == 64 ]]; then
     export OB=openblas64_

From 7344aabbfa6cc4bc01f7998a92e4554aa46c9b22 Mon Sep 17 00:00:00 2001
From: Tero Frondelius <tero.frondelius@gmail.com>
Date: Thu, 17 Oct 2019 11:58:36 +0300
Subject: [PATCH 4/5] Small updates to sources.

---
 build_tarballs.jl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build_tarballs.jl b/build_tarballs.jl
index 8168410..1eef320 100644
--- a/build_tarballs.jl
+++ b/build_tarballs.jl
@@ -25,7 +25,7 @@ sources = [
 
     # Gurson model from UMAT.jl/umat_models
     "https://github.com/JuliaFEM/UMAT.jl.git" =>
-    "6a1b73f93473c3fcd7a82092f7fd3da8c40885e5"
+    "db0046a44b2c8dfd5ca5b3212cbd6fee37f6baa3"
 
 ]
 
@@ -62,11 +62,12 @@ cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=/opt/$target/$target
 make
 make install
 
+################################################################################
 # From this forward is UMAT.jl/umat_models building
+################################################################################
 
 cd UMAT.jl/umat_models
 sed -i 's/CALL ROTSIG(/!CALL ROTSIG(/g' gurson_porous_plasticity.f90
-sed -i "s/'&/\' \&/g" drucker_prager_plasticity_deriv.f90
 
 if [[ ${nbits} == 64 ]]; then
     export OB=openblas64_

From d3f36fc07acc51d20f1c06ad03b42a1570e4af69 Mon Sep 17 00:00:00 2001
From: Tero Frondelius <tero.frondelius@gmail.com>
Date: Thu, 17 Oct 2019 12:11:14 +0300
Subject: [PATCH 5/5] Adding the missing xit.f

---
 build_tarballs.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_tarballs.jl b/build_tarballs.jl
index 1eef320..79e7247 100644
--- a/build_tarballs.jl
+++ b/build_tarballs.jl
@@ -81,12 +81,12 @@ cmake_minimum_required(VERSION 3.5)
 project(Umat)
 set(VERSION 0.5.0)
 enable_language(Fortran)
-set(CMAKE_Fortran_FLAGS "-fdefault-real-8 -free")
+set(CMAKE_Fortran_FLAGS "-fdefault-real-8")
 add_library(gurson_porous_plasticity SHARED gurson_porous_plasticity.f90)
 target_link_libraries(gurson_porous_plasticity $OB)
 install(TARGETS gurson_porous_plasticity DESTINATION lib)
 
-add_library(drucker_prager_plasticity SHARED drucker_prager_plasticity.f90 drucker_prager_plasticity_deriv.f90)
+add_library(drucker_prager_plasticity SHARED drucker_prager_plasticity.f90 drucker_prager_plasticity_deriv.f90 ../../xit.f)
 install(TARGETS drucker_prager_plasticity DESTINATION lib)
 EOL