Merge remote-tracking branch 'origin/development' into polishing-for-beta

This commit is contained in:
Martin Diehl 2021-07-03 22:19:19 +02:00
commit 58ec949941
8 changed files with 374807 additions and 323850 deletions

@ -1 +1 @@
Subproject commit d892259f0f15785b2393dee6fe015f8ba2b09809 Subproject commit 7280c9d891c735b6951e7e4670c748f8bd1b2a37

View File

@ -23,6 +23,11 @@ phase:
xi_inf_sl: [63.e+6] xi_inf_sl: [63.e+6]
material: material:
- constituents:
- O: [1., 0., 0., 0.] # dummy material
v: 1.0
phase: Aluminum
homogenization: SX
- constituents: - constituents:
- O: [0.12807292351503236, 0.22200469518411023, 0.6352813278477609, -0.7285114110750144] - O: [0.12807292351503236, 0.22200469518411023, 0.6352813278477609, -0.7285114110750144]
v: 1.0 v: 1.0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,13 @@
#initial elastic step #initial elastic step
$Loadcase 1 time 0.0005 incs 1 frequency 5 $Loadcase 1 time 0.0005 incs 1 frequency 5
Face 1 X 0.01 Face 1 X 0.01
Face 2 X 0.00 Face 2 X 0.0
Face 2 Y 0.0
Face 2 Z 0.0
$EndLoadcase $EndLoadcase
$Loadcase 2 time 10.0 incs 200 frequency 5 $Loadcase 2 time 10.0 incs 200 frequency 5
Face 1 X 0.01 Face 1 X 0.01
Face 2 X 0.00 Face 2 X 0.0
Face 2 Y 0.0
Face 2 Z 0.0
$EndLoadcase $EndLoadcase

View File

@ -1 +1 @@
v3.0.0-alpha4 v3.0.0-alpha4-10-g0ad4fd00b

View File

@ -372,6 +372,7 @@ program DAMASK_mesh
if (mod(inc,loadCases(currentLoadCase)%outputFrequency) == 0) then ! at output frequency if (mod(inc,loadCases(currentLoadCase)%outputFrequency) == 0) then ! at output frequency
print'(/,a)', ' ... writing results to file ......................................' print'(/,a)', ' ... writing results to file ......................................'
call FEM_mechanical_updateCoords
call CPFEM_results(totalIncsCounter,time) call CPFEM_results(totalIncsCounter,time)
endif endif

View File

@ -16,6 +16,7 @@ module mesh_mechanical_FEM
use prec use prec
use FEM_utilities use FEM_utilities
use discretization
use discretization_mesh use discretization_mesh
use DAMASK_interface use DAMASK_interface
use config use config
@ -67,7 +68,8 @@ module mesh_mechanical_FEM
public :: & public :: &
FEM_mechanical_init, & FEM_mechanical_init, &
FEM_mechanical_solution, & FEM_mechanical_solution, &
FEM_mechanical_forward FEM_mechanical_forward, &
FEM_mechanical_updateCoords
contains contains
@ -664,4 +666,40 @@ subroutine FEM_mechanical_converged(snes_local,PETScIter,xnorm,snorm,fnorm,reaso
end subroutine FEM_mechanical_converged end subroutine FEM_mechanical_converged
!--------------------------------------------------------------------------------------------------
!> @brief Calculate current coordinates (FEM nodal coordinates only at the moment)
!--------------------------------------------------------------------------------------------------
subroutine FEM_mechanical_updateCoords()
real(pReal), pointer, dimension(:) :: &
nodeCoords_linear !< nodal coordinates (dimPlex*Nnodes)
real(pReal), pointer, dimension(:,:) :: &
nodeCoords !< nodal coordinates (3,Nnodes)
DM :: dm_local
Vec :: x_local
PetscErrorCode :: ierr
PetscInt :: dimPlex, pStart, pEnd, p, s, e
PetscSection :: section
call SNESGetDM(mechanical_snes,dm_local,ierr); CHKERRQ(ierr)
call DMGetLocalSection(dm_local,section,ierr); CHKERRQ(ierr)
call DMGetLocalVector(dm_local,x_local,ierr); CHKERRQ(ierr)
call DMGetDimension(dm_local,dimPlex,ierr); CHKERRQ(ierr)
call DMPlexGetDepthStratum(dm_local,0,pStart,pEnd,ierr); CHKERRQ(ierr)
allocate(nodeCoords(3,pStart:pEnd-1),source=0.0_pReal)
call VecGetArrayF90(x_local,nodeCoords_linear,ierr); CHKERRQ(ierr)
do p=pStart, pEnd-1
call DMPlexGetPointLocal(dm_local, p, s, e, ierr); CHKERRQ(ierr)
nodeCoords(1:dimPlex,p)=nodeCoords_linear(s+1:e)
end do
call discretization_setNodeCoords(nodeCoords)
call VecRestoreArrayF90(x_local,nodeCoords_linear,ierr); CHKERRQ(ierr)
call DMRestoreLocalVector(dm_local,x_local,ierr); CHKERRQ(ierr)
end subroutine FEM_mechanical_updateCoords
end module mesh_mechanical_FEM end module mesh_mechanical_FEM