From 80061fafd6e6f2c846c59210b09ae93616e9f46d Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 27 Oct 2023 15:09:00 +0000 Subject: [PATCH 1/5] Update README.md with repository locations --- README.md | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5b5edf677..80cfea135 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,23 @@ # 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 @@ -8,8 +25,3 @@ Max-Planck-Institut für Eisenforschung GmbH Max-Planck-Str. 1 40237 Düsseldorf Germany - -damask@mpie.de -https://damask.mpie.de -https://git.damask.mpie.de - From 51526b6ae41781a20e9b86e09678c688016300ee Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 27 Oct 2023 19:56:50 +0200 Subject: [PATCH 2/5] [skip ci] updated version information after successful test of v3.0.0-alpha7-904-g2a00de5fb --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 133c77787..8e999f891 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-901-ga25d1b1b9 +3.0.0-alpha7-904-g2a00de5fb From 5a5f1cfc5b9faded92a80439f5e1b45696562a5c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 2 Nov 2023 15:41:20 +0100 Subject: [PATCH 3/5] mesh works again for PETSc >= 3.19 needs also bugfix in PETSc: https://gitlab.com/petsc/petsc/-/merge_requests/6986 --- src/mesh/FEM_utilities.f90 | 5 +++-- src/mesh/mesh_mech_FEM.f90 | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mesh/FEM_utilities.f90 b/src/mesh/FEM_utilities.f90 index 4480e412d..3af7b77ea 100644 --- a/src/mesh/FEM_utilities.f90 +++ b/src/mesh/FEM_utilities.f90 @@ -122,19 +122,20 @@ subroutine FEM_utilities_init(num_mesh) flush(IO_STDOUT) call PetscOptionsClear(PETSC_NULL_OPTIONS,err_PETSc) CHKERRQ(err_PETSc) - CHKERRQ(err_PETSc) petsc_options = misc_prefixOptions('-snes_type newtonls & &-snes_linesearch_type cp -snes_ksp_ew & &-snes_ksp_ew_rtol0 0.01 -snes_ksp_ew_rtolmax 0.01 & &-ksp_type fgmres -ksp_max_it 25 ' // & num_mech%get_asStr('PETSc_options',defaultVal=''), 'mechanical_') - write(petsc_optionsOrder,'(a,i0)') '-mechFE_petscspace_degree ', p_s petsc_options = petsc_options // ' ' // petsc_optionsOrder call PetscOptionsInsertString(PETSC_NULL_OPTIONS,petsc_options,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) end subroutine FEM_utilities_init diff --git a/src/mesh/mesh_mech_FEM.f90 b/src/mesh/mesh_mech_FEM.f90 index 67b7859ba..2d5556e63 100644 --- a/src/mesh/mesh_mech_FEM.f90 +++ b/src/mesh/mesh_mech_FEM.f90 @@ -155,6 +155,8 @@ subroutine FEM_mechanical_init(fieldBC,num_mesh) CHKERRQ(err_PETSc) call DMGetDimension(mechanical_mesh,dimPlex,err_PETSc) CHKERRQ(err_PETSc) + call DMSetFromOptions(mechanical_mesh,err_PETSc) + CHKERRQ(err_PETSc) !-------------------------------------------------------------------------------------------------- ! Setup FEM mech discretization From bb234938cc14a31ec804da359cee6ef1495db003 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 2 Nov 2023 15:43:11 +0100 Subject: [PATCH 4/5] whitespace polishing --- src/mesh/FEM_quadrature.f90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesh/FEM_quadrature.f90 b/src/mesh/FEM_quadrature.f90 index 891e0be0d..b618fad92 100644 --- a/src/mesh/FEM_quadrature.f90 +++ b/src/mesh/FEM_quadrature.f90 @@ -20,13 +20,13 @@ module FEM_quadrature -1.0_pREAL, 1.0_pREAL, -1.0_pREAL, & -1.0_pREAL, -1.0_pREAL, 1.0_pREAL], shape=[3,4]) - type :: group_real !< variable length datatype + type :: group_real !< variable length datatype real(pREAL), dimension(:), allocatable :: p end type group_real - integer, dimension(2:3,maxOrder), public, protected :: & + integer, dimension(2:3,maxOrder), public, protected :: & FEM_nQuadrature !< number of quadrature points for spatial dimension(2-3) and interpolation order (1-maxOrder) - type(group_real), dimension(2:3,maxOrder), public, protected :: & + type(group_real), dimension(2:3,maxOrder), public, protected :: & FEM_quadrature_weights, & !< quadrature weights for each quadrature rule FEM_quadrature_points !< quadrature point coordinates (in simplical system) for each quadrature rule From 7ea8f5a7dae67940ab574639b268c4f12d65c65b Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 6 Nov 2023 23:29:17 +0100 Subject: [PATCH 5/5] [skip ci] updated version information after successful test of v3.0.0-alpha7-908-g8ff6e28c9 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8e999f891..618224384 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-904-g2a00de5fb +3.0.0-alpha7-908-g8ff6e28c9