Merge remote-tracking branch 'origin/master' into fix-relationship-operations

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  
-

VERSION

@@ -1 +1 @@
-3.0.0-alpha7-901-ga25d1b1b9
+3.0.0-alpha7-908-g8ff6e28c9

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
 

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

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