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

use new structure

This commit is contained in:
Martin Diehl 2021-01-17 15:19:36 +01:00
parent 9a7017484d
commit d2ae859b1c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DAMASK_marc.f90
View File

@ -365,7 +365,7 @@ subroutine flux(f,ts,n,time)
f f
f(2) = 0.0_pReal f(2) = 0.0_pReal
call thermal_conduction_getSource(f(1), ts(3), n(3),mesh_FEM2DAMASK_elem(n(1))) call thermal_conduction_getSource(f(1), n(3),mesh_FEM2DAMASK_elem(n(1)))
end subroutine flux end subroutine flux

3
src/grid/grid_thermal_spectral.f90
View File

@ -16,6 +16,7 @@ module grid_thermal_spectral
use spectral_utilities use spectral_utilities
use discretization_grid use discretization_grid
use thermal_conduction use thermal_conduction
use homogenization
use YAML_types use YAML_types
use config use config
use material use material
@ -190,6 +191,7 @@ function grid_thermal_spectral_solution(timeinc) result(solution)
call thermal_conduction_putTemperatureAndItsRate(T_current(i,j,k), & call thermal_conduction_putTemperatureAndItsRate(T_current(i,j,k), &
(T_current(i,j,k)-T_lastInc(i,j,k))/params%timeinc, & (T_current(i,j,k)-T_lastInc(i,j,k))/params%timeinc, &
1,ce) 1,ce)
homogenization_T(ce) = T_current(i,j,k)
enddo; enddo; enddo enddo; enddo; enddo
call VecMin(solution_vec,devNull,T_min,ierr); CHKERRQ(ierr) call VecMin(solution_vec,devNull,T_min,ierr); CHKERRQ(ierr)
@ -231,6 +233,7 @@ subroutine grid_thermal_spectral_forward(cutBack)
(T_current(i,j,k) - & (T_current(i,j,k) - &
T_lastInc(i,j,k))/params%timeinc, & T_lastInc(i,j,k))/params%timeinc, &
1,ce) 1,ce)
homogenization_T(ce) = T_current(i,j,k)
enddo; enddo; enddo enddo; enddo; enddo
else else
T_lastInc = T_current T_lastInc = T_current