Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
frodal committed Jun 28, 2019
2 parents dcd6670 + 7b89a89 commit 296e199
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "SCMMhypo-Manual"]
path = SCMMhypo-Manual
url = https://github.com/frodal/SCMMhypo-Manual
6 changes: 3 additions & 3 deletions Hypo.f
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ subroutine Hypo(stressNew,stateNew,defgradNew,
bm = props(5)! Instantaneous strain rate sensitivity
tau0_c = props(6)! Initial critical resolved shear stress
qhard = props(7)! Latent hardening coefficient
Txflag = int(props(8))! Texture flag (1=Euler angle from material card,2=Euler angle from history card)
Txflag = nint(props(8))! Texture flag (1=Euler angle from material card,2=Euler angle from history card)
phi1 = props(9)*Pi/halfCirc! Euler angle phi1 in radians
PHI = props(10)*Pi/halfCirc! Euler angle PHI in radians
phi2 = props(11)*Pi/halfCirc! Euler angle phi2 in radians
hflag = int(props(12))! Hardening type (1=Voce,2=Kalidindi)
hflag = nint(props(12))! Hardening type (1=Voce,2=Kalidindi)
!-----------------------------------------------------------------------
! Determine the hardening law based on hflag
!-----------------------------------------------------------------------
Expand Down Expand Up @@ -206,7 +206,7 @@ subroutine Hypo(stressNew,stateNew,defgradNew,
!-----------------------------------------------------------------------
! This material subroutine is only for solid elements
!-----------------------------------------------------------------------
if (ndir+nshr .ne. 6) then
if (ndir+nshr.ne.6)then
write(*,*) 'This material subroutine is only for
+ solid elements'
stop
Expand Down
2 changes: 1 addition & 1 deletion HypoExp.f
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ subroutine vumat(
!-----------------------------------------------------------------------
! Initial step
!-----------------------------------------------------------------------
if((steptime.eq.zero).and.(totaltime.eq.zero))then
if(totaltime.eq.zero)then
!-----------------------------------------------------------------------
! Read parameters from ABAQUS material card
!-----------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

Copyright (C) 2019 Bjørn Håkon Frodal
1 change: 1 addition & 0 deletions SCMMhypo-Manual
Submodule SCMMhypo-Manual added at bb2e2e

0 comments on commit 296e199

Please sign in to comment.