Merge remote-tracking branch 'origin/master' into fix-relationship-operations
This commit is contained in:
commit
fbfe2affb7
24
README.md
24
README.md
|
@ -1,6 +1,23 @@
|
||||||
# DAMASK - The Düsseldorf Advanced Material Simulation Kit
|
# DAMASK - The Düsseldorf Advanced Material Simulation Kit
|
||||||
|
|
||||||
Visit [damask.mpie.de](https://damask.mpie.de) for installation and usage instructions
|
- Usage, installation, and support: https://damask.mpie.de
|
||||||
|
- Code development: https://git.damask.mpie.de
|
||||||
|
- General inquiries: damask@mpie.de
|
||||||
|
|
||||||
|
|
||||||
|
## Repository Locations
|
||||||
|
|
||||||
|
### [git.damask.mpie.de](https://git.damask.mpie.de)
|
||||||
|
|
||||||
|
All code development is centralized in the principal DAMASK code repository hosted at [git.damask.mpie.de](https://git.damask.mpie.de).
|
||||||
|
Access to this GitLab instance requires registration and is granted to anyone with an interest in actively supporting the development of DAMASK.
|
||||||
|
|
||||||
|
### [github.com](https://github.com)
|
||||||
|
|
||||||
|
GitHub hosts the publicly accessible, but read-only, mirror of the principal DAMASK code repository and replicates its three top-level branches from [git.damask.mpie.de](https://git.damask.mpie.de).
|
||||||
|
|
||||||
|
The site is primarily meant to provide a forum for [Discussions](https://github.com/eisenforschung/DAMASK/discussions) and [Issues](https://github.com/eisenforschung/DAMASK/issues).
|
||||||
|
|
||||||
|
|
||||||
## Contact Information
|
## Contact Information
|
||||||
|
|
||||||
|
@ -8,8 +25,3 @@ Max-Planck-Institut für Eisenforschung GmbH
|
||||||
Max-Planck-Str. 1
|
Max-Planck-Str. 1
|
||||||
40237 Düsseldorf
|
40237 Düsseldorf
|
||||||
Germany
|
Germany
|
||||||
|
|
||||||
damask@mpie.de
|
|
||||||
https://damask.mpie.de
|
|
||||||
https://git.damask.mpie.de
|
|
||||||
|
|
||||||
|
|
|
@ -122,19 +122,20 @@ subroutine FEM_utilities_init(num_mesh)
|
||||||
flush(IO_STDOUT)
|
flush(IO_STDOUT)
|
||||||
call PetscOptionsClear(PETSC_NULL_OPTIONS,err_PETSc)
|
call PetscOptionsClear(PETSC_NULL_OPTIONS,err_PETSc)
|
||||||
CHKERRQ(err_PETSc)
|
CHKERRQ(err_PETSc)
|
||||||
CHKERRQ(err_PETSc)
|
|
||||||
|
|
||||||
petsc_options = misc_prefixOptions('-snes_type newtonls &
|
petsc_options = misc_prefixOptions('-snes_type newtonls &
|
||||||
&-snes_linesearch_type cp -snes_ksp_ew &
|
&-snes_linesearch_type cp -snes_ksp_ew &
|
||||||
&-snes_ksp_ew_rtol0 0.01 -snes_ksp_ew_rtolmax 0.01 &
|
&-snes_ksp_ew_rtol0 0.01 -snes_ksp_ew_rtolmax 0.01 &
|
||||||
&-ksp_type fgmres -ksp_max_it 25 ' // &
|
&-ksp_type fgmres -ksp_max_it 25 ' // &
|
||||||
num_mech%get_asStr('PETSc_options',defaultVal=''), 'mechanical_')
|
num_mech%get_asStr('PETSc_options',defaultVal=''), 'mechanical_')
|
||||||
|
|
||||||
write(petsc_optionsOrder,'(a,i0)') '-mechFE_petscspace_degree ', p_s
|
write(petsc_optionsOrder,'(a,i0)') '-mechFE_petscspace_degree ', p_s
|
||||||
petsc_options = petsc_options // ' ' // petsc_optionsOrder
|
petsc_options = petsc_options // ' ' // petsc_optionsOrder
|
||||||
call PetscOptionsInsertString(PETSC_NULL_OPTIONS,petsc_options,err_PETSc)
|
call PetscOptionsInsertString(PETSC_NULL_OPTIONS,petsc_options,err_PETSc)
|
||||||
CHKERRQ(err_PETSc)
|
CHKERRQ(err_PETSc)
|
||||||
|
|
||||||
|
call PetscOptionsSetValue(PETSC_NULL_OPTIONS,'-petscds_force_quad','0',err_PETSc)
|
||||||
|
CHKERRQ(err_PETSc)
|
||||||
|
|
||||||
wgt = real(mesh_maxNips*mesh_NcpElemsGlobal,pREAL)**(-1)
|
wgt = real(mesh_maxNips*mesh_NcpElemsGlobal,pREAL)**(-1)
|
||||||
|
|
||||||
end subroutine FEM_utilities_init
|
end subroutine FEM_utilities_init
|
||||||
|
|
|
@ -155,6 +155,8 @@ subroutine FEM_mechanical_init(fieldBC,num_mesh)
|
||||||
CHKERRQ(err_PETSc)
|
CHKERRQ(err_PETSc)
|
||||||
call DMGetDimension(mechanical_mesh,dimPlex,err_PETSc)
|
call DMGetDimension(mechanical_mesh,dimPlex,err_PETSc)
|
||||||
CHKERRQ(err_PETSc)
|
CHKERRQ(err_PETSc)
|
||||||
|
call DMSetFromOptions(mechanical_mesh,err_PETSc)
|
||||||
|
CHKERRQ(err_PETSc)
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
! Setup FEM mech discretization
|
! Setup FEM mech discretization
|
||||||
|
|
Loading…
Reference in New Issue