Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development

code/DAMASK_marc.f90

@@ -384,6 +384,33 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, &
 end subroutine hypela2
 
 
+!--------------------------------------------------------------------------------------------------
+!> @brief calculate internal heat generated due to inelastic energy dissipation
+!--------------------------------------------------------------------------------------------------
+subroutine flux(f,ts,n,time)
+ use prec, only: &
+   pReal, &
+   pInt
+ use thermal_conduction, only: &
+   thermal_conduction_getSourceAndItsTangent
+ use mesh, only: &
+   mesh_FEasCP
+
+ implicit none
+ real(pReal),   dimension(6),           intent(in) :: &
+   ts
+ integer(pInt), dimension(10),          intent(in) :: &
+   n
+ real(pReal),                           intent(in) :: &
+   time
+ real(pReal),   dimension(2),           intent(out) :: &
+   f
+
+ call thermal_conduction_getSourceAndItsTangent(f(1), f(2), ts(3), n(3),mesh_FEasCP('elem',n(1)))
+
+ end subroutine flux
+
+
 !--------------------------------------------------------------------------------------------------
 !> @brief sets user defined output variables for Marc
 !> @details select a variable contour plotting (user subroutine).

code/lattice.f90

@@ -1283,11 +1283,9 @@ subroutine lattice_init
    a_fcc, &                                                                                         !< lattice parameter a for fcc austenite
    a_bcc                                                                                            !< lattice paramater a for bcc martensite
 
- mainProcess: if (worldrank == 0) then 
+ write(6,'(/,a)') ' <<<+-  lattice init  -+>>>'
-   write(6,'(/,a)') ' <<<+-  lattice init  -+>>>'
+ write(6,'(a15,a)')   ' Current time: ',IO_timeStamp()
-   write(6,'(a15,a)')   ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
- endif mainProcess
 
 !--------------------------------------------------------------------------------------------------
 ! consistency checks (required since ifort 15.0 does not support sum/maxval in parameter definition)