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

clearly distiguish 

- DAMASK as a materialpoint model (CPFEM, not fitting name)
- solver
This commit is contained in:
Martin Diehl 2019-10-25 08:30:12 +02:00
parent 07d8379313
commit 10f2c53256
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/grid/DAMASK_grid.f90
View File

@ -137,7 +137,6 @@ program DAMASK_spectral
mech_age => grid_mech_spectral_polarisation_age
mech_restartWrite => grid_mech_spectral_polarisation_restartWrite
case ('fem')
if(iand(debug_level(debug_spectral),debug_levelBasic)/= 0) &
call IO_warning(42, ext_msg='debug Divergence')
@ -518,6 +517,8 @@ program DAMASK_spectral
if ( (all(solres(:)%converged .and. solres(:)%stagConverged)) & ! converged
.and. .not. solres(1)%termIll) then ! and acceptable solution found
call mech_age
call CPFEM_age
timeIncOld = timeinc
cutBack = .false.
guess = .true. ! start guessing after first converged (sub)inc
@ -570,8 +571,10 @@ program DAMASK_spectral
fileOffset = fileOffset + sum(outputSize) ! forward to current file position
call CPFEM_results(totalIncsCounter,time)
endif
if (mod(inc,loadCases(currentLoadCase)%restartFrequency) == 0) call mech_restartWrite
if (mod(inc,loadCases(currentLoadCase)%restartFrequency) == 0) then
call mech_restartWrite
call CPFEM_restartWrite
endif
endif skipping
enddo incLooping

4
src/grid/grid_mech_FEM.f90
View File

@ -303,7 +303,6 @@ subroutine grid_mech_FEM_forward(guess,timeinc,timeinc_old,loadCaseTime,deformat
if (cutBack) then
C_volAvg = C_volAvgLastInc
else
call grid_mech_FEM_age
C_volAvgLastInc = C_volAvg
F_aimDot = merge(stress_BC%maskFloat*(F_aim-F_aim_lastInc)/timeinc_old, 0.0_pReal, guess)
@ -352,7 +351,6 @@ end subroutine grid_mech_FEM_forward
subroutine grid_mech_FEM_age()
materialpoint_F0 = reshape(F, [3,3,1,product(grid(1:2))*grid3])
call CPFEM_age ! age state and kinematics
call utilities_updateCoords(F)
end subroutine grid_mech_FEM_age
@ -388,8 +386,6 @@ subroutine grid_mech_FEM_restartWrite()
call HDF5_write(fileHandle,C_volAvgLastInc,'C_volAvgLastInc')
call HDF5_closeFile(fileHandle)
call CPFEM_restartWrite
call DMDAVecRestoreArrayF90(mech_grid,solution_current,u_current,ierr);CHKERRQ(ierr)
call DMDAVecRestoreArrayF90(mech_grid,solution_lastInc,u_lastInc,ierr);CHKERRQ(ierr)

4
src/grid/grid_mech_spectral_basic.f90
View File

@ -275,7 +275,6 @@ subroutine grid_mech_spectral_basic_forward(guess,timeinc,timeinc_old,loadCaseTi
C_volAvg = C_volAvgLastInc
C_minMaxAvg = C_minMaxAvgLastInc
else
call grid_mech_spectral_basic_age
C_volAvgLastInc = C_volAvg
C_minMaxAvgLastInc = C_minMaxAvg
@ -321,7 +320,6 @@ subroutine grid_mech_spectral_basic_age()
call DMDAVecGetArrayF90(da,solution_vec,F,ierr); CHKERRQ(ierr)
materialpoint_F0 = reshape(F, [3,3,1,product(grid(1:2))*grid3])
call CPFEM_age ! age state and kinematics
call utilities_updateCoords(F)
call DMDAVecRestoreArrayF90(da,solution_vec,F,ierr); CHKERRQ(ierr)
@ -358,8 +356,6 @@ subroutine grid_mech_spectral_basic_restartWrite()
call HDF5_closeFile(fileHandle)
if (num%update_gamma) call utilities_saveReferenceStiffness
call CPFEM_restartWrite
call DMDAVecRestoreArrayF90(da,solution_vec,F,ierr); CHKERRQ(ierr)

7
src/grid/grid_mech_spectral_polarisation.f90
View File

@ -297,9 +297,7 @@ subroutine grid_mech_spectral_polarisation_forward(guess,timeinc,timeinc_old,loa
if (cutBack) then
C_volAvg = C_volAvgLastInc
C_minMaxAvg = C_minMaxAvgLastInc
else
call grid_mech_spectral_polarisation_age
else
C_volAvgLastInc = C_volAvg
C_minMaxAvgLastInc = C_minMaxAvg
@ -366,7 +364,6 @@ subroutine grid_mech_spectral_polarisation_age()
call DMDAVecGetArrayF90(da,solution_vec,FandF_tau,ierr); CHKERRQ(ierr)
F => FandF_tau(0: 8,:,:,:)
materialpoint_F0 = reshape(F,[3,3,1,product(grid(1:2))*grid3])
call CPFEM_age ! age state and kinematics
call utilities_updateCoords(F)
call DMDAVecRestoreArrayF90(da,solution_vec,FandF_tau,ierr); CHKERRQ(ierr)
@ -406,8 +403,6 @@ subroutine grid_mech_spectral_polarisation_restartWrite()
call HDF5_closeFile(fileHandle)
if(num%update_gamma) call utilities_saveReferenceStiffness
call CPFEM_restartWrite
call DMDAVecRestoreArrayF90(da,solution_vec,FandF_tau,ierr); CHKERRQ(ierr)