223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

arguments are better than public variables

This commit is contained in:
Martin Diehl 2019-10-23 23:06:47 +02:00
parent 67228b46a6
commit 534073358e
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CPFEM2.f90
View File

@ -122,8 +122,10 @@ end subroutine CPFEM_init
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief forwards data after successful increment !> @brief forwards data after successful increment
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine CPFEM_age subroutine CPFEM_age(restartWrite)
logical :: restartWrite
integer :: i, ph, homog, mySource integer :: i, ph, homog, mySource
character(len=32) :: rankStr, PlasticItem, HomogItem character(len=32) :: rankStr, PlasticItem, HomogItem
integer(HID_T) :: fileHandle, groupPlastic, groupHomog integer(HID_T) :: fileHandle, groupPlastic, groupHomog

2
src/grid/grid_mech_FEM.f90
View File

@ -325,7 +325,7 @@ subroutine grid_mech_FEM_forward(guess,timeinc,timeinc_old,loadCaseTime,deformat
call HDF5_closeFile(fileHandle) call HDF5_closeFile(fileHandle)
endif endif
call CPFEM_age ! age state and kinematics call CPFEM_age(restartWrite) ! age state and kinematics
call utilities_updateCoords(F) call utilities_updateCoords(F)
C_volAvgLastInc = C_volAvg C_volAvgLastInc = C_volAvg

8
src/grid/grid_mech_spectral_basic.f90
View File

@ -303,7 +303,7 @@ subroutine grid_mech_spectral_basic_forward(guess,timeinc,timeinc_old,loadCaseTi
call HDF5_closeFile(fileHandle) call HDF5_closeFile(fileHandle)
endif endif
call CPFEM_age ! age state and kinematics call CPFEM_age(restartWrite) ! age state and kinematics
call utilities_updateCoords(F) call utilities_updateCoords(F)
C_volAvgLastInc = C_volAvg C_volAvgLastInc = C_volAvg
@ -314,13 +314,13 @@ subroutine grid_mech_spectral_basic_forward(guess,timeinc,timeinc_old,loadCaseTi
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! calculate rate for aim ! calculate rate for aim
if (deformation_BC%myType=='l') then ! calculate F_aimDot from given L and current F if (deformation_BC%myType=='l') then ! calculate F_aimDot from given L and current F
F_aimDot = & F_aimDot = &
F_aimDot + deformation_BC%maskFloat * matmul(deformation_BC%values, F_aim_lastInc) F_aimDot + deformation_BC%maskFloat * matmul(deformation_BC%values, F_aim_lastInc)
elseif(deformation_BC%myType=='fdot') then ! F_aimDot is prescribed elseif(deformation_BC%myType=='fdot') then ! F_aimDot is prescribed
F_aimDot = & F_aimDot = &
F_aimDot + deformation_BC%maskFloat * deformation_BC%values F_aimDot + deformation_BC%maskFloat * deformation_BC%values
elseif (deformation_BC%myType=='f') then ! aim at end of load case is prescribed elseif (deformation_BC%myType=='f') then ! aim at end of load case is prescribed
F_aimDot = & F_aimDot = &
F_aimDot + deformation_BC%maskFloat * (deformation_BC%values - F_aim_lastInc)/loadCaseTime F_aimDot + deformation_BC%maskFloat * (deformation_BC%values - F_aim_lastInc)/loadCaseTime
endif endif

2
src/grid/grid_mech_spectral_polarisation.f90
View File

@ -325,7 +325,7 @@ subroutine grid_mech_spectral_polarisation_forward(guess,timeinc,timeinc_old,loa
call HDF5_closeFile(fileHandle) call HDF5_closeFile(fileHandle)
endif endif
call CPFEM_age ! age state and kinematics call CPFEM_age(restartWrite) ! age state and kinematics
call utilities_updateCoords(F) call utilities_updateCoords(F)
C_volAvgLastInc = C_volAvg C_volAvgLastInc = C_volAvg