Merge branch 'Marc-fix-format-bugfix' into 'development'

Marc fix format bugfix

See merge request damask/DAMASK!188

installation/mods_MarcMentat/2018.1/Marc_tools/comp_damask_hmp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2018.1/Marc_tools/comp_damask_lmp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2018.1/Marc_tools/comp_damask_mp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2018.1/Marc_tools/run_damask_hmp

@@ -3267,6 +3267,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3599,6 +3600,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3933,6 +3935,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

installation/mods_MarcMentat/2018.1/Marc_tools/run_damask_lmp

@@ -3267,6 +3267,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3599,6 +3600,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3933,6 +3935,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

installation/mods_MarcMentat/2018.1/Marc_tools/run_damask_mp

@@ -3267,6 +3267,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3599,6 +3600,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3933,6 +3935,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

installation/mods_MarcMentat/2018/Marc_tools/comp_damask_hmp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2018/Marc_tools/comp_damask_lmp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2018/Marc_tools/comp_damask_mp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2018/Marc_tools/run_damask_hmp

@@ -3267,6 +3267,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3599,6 +3600,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3933,6 +3935,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

installation/mods_MarcMentat/2018/Marc_tools/run_damask_lmp

@@ -3267,6 +3267,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3599,6 +3600,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3933,6 +3935,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

installation/mods_MarcMentat/2018/Marc_tools/run_damask_mp

@@ -3267,6 +3267,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3599,6 +3600,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3933,6 +3935,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

installation/mods_MarcMentat/2019/Marc_tools/comp_damask_hmp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2019/Marc_tools/comp_damask_lmp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2019/Marc_tools/comp_damask_mp

@@ -50,3 +50,4 @@ echo "program: $program"
     }
     /bin/rm $userobj
     /bin/rm $DIRJOB/*.mod
+    /bin/rm $DIRJOB/*.smod

installation/mods_MarcMentat/2019/Marc_tools/run_damask_hmp

@@ -3241,6 +3241,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3573,6 +3574,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3907,6 +3909,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

installation/mods_MarcMentat/2019/Marc_tools/run_damask_lmp

@@ -3241,6 +3241,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3573,6 +3574,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3907,6 +3909,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

installation/mods_MarcMentat/2019/Marc_tools/run_damask_mp

@@ -3241,6 +3241,7 @@ else
 fi
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3573,6 +3574,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 
 #
 # run marc
@@ -3907,6 +3909,7 @@ else # if test $link
 fi   # if test $link
 /bin/rm $userobj 2>/dev/null
 /bin/rm $DIRJOB/*.mod 2>/dev/null
+/bin/rm $DIRJOB/*.smod 2>/dev/null
 # done if no job id given
 if test -z "$jid"
 then

src/CPFEM.f90

@@ -248,7 +248,7 @@ subroutine CPFEM_general(mode, ffn, ffn1, temperature_inp, dt, elFE, ip, cauchyS
     endif validCalculation
 
     if (debugCPFEM%extensive &
-         .and. (debugCPFEM%element == elCP .and. debugCPFEM%ip == ip) .or. .not. debugCPFEM%selective) then
+         .and. ((debugCPFEM%element == elCP .and. debugCPFEM%ip == ip) .or. .not. debugCPFEM%selective)) then
         write(6,'(a,i8,1x,i2,/,12x,6(f10.3,1x)/)') &
           '<< CPFEM >> stress/MPa at elFE ip ',   elFE, ip, CPFEM_cs(1:6,ip,elCP)*1.0e-6_pReal
         write(6,'(a,i8,1x,i2,/,6(12x,6(f10.3,1x)/))') &

src/IO.f90

@@ -529,6 +529,8 @@ subroutine IO_error(error_ID,el,ip,g,instance,ext_msg)
       msg = 'unknown material parameter:'
     case (211)
       msg = 'material parameter out of bounds:'
+    case (212)
+      msg = 'nonlocal model not supported'
 
 !--------------------------------------------------------------------------------------------------
 ! numerics error messages

src/constitutive.f90

@@ -15,7 +15,8 @@ module constitutive
   use results
   use lattice
   use discretization
-  use geometry_plastic_nonlocal
+  use geometry_plastic_nonlocal, only: &
+    geometry_plastic_nonlocal_disable
   use source_thermal_dissipation
   use source_thermal_externalheat
   use source_damage_isoBrittle

src/constitutive_plastic_nonlocal.f90

@@ -387,6 +387,10 @@ module subroutine plastic_nonlocal_init
     call material_allocateState(plasticState(p),NipcMyPhase,sizeState,sizeDotState,sizeDeltaState)
 
     plasticState(p)%nonlocal = config%KeyExists('/nonlocal/')
+    if(plasticState(p)%nonlocal .and. .not. allocated(IPneighborhood)) &
+      call IO_error(212,ext_msg='IPneighborhood does not exist')
+
+
     plasticState(p)%offsetDeltaState = 0                                                            ! ToDo: state structure does not follow convention
 
     st0%rho => plasticState(p)%state0                             (0*prm%sum_N_sl+1:10*prm%sum_N_sl,:)

src/grid/discretization_grid.f90

@@ -118,6 +118,7 @@ subroutine discretization_grid_init(restart)
     call results_addAttribute('origin',origin,  'geometry')
     call results_closeJobFile
   endif
+
 !--------------------------------------------------------------------------------------------------
 ! geometry information required by the nonlocal CP model
   call geometry_plastic_nonlocal_setIPvolume(reshape([(product(mySize/real(myGrid,pReal)),j=1,product(myGrid))], &

src/marc/discretization_marc.f90

@@ -119,6 +119,7 @@ subroutine discretization_marc_init
   unscaledNormals = IPareaNormal(elem,nElems,connectivity_cell,node0_cell)
   call geometry_plastic_nonlocal_setIParea(norm2(unscaledNormals,1))
   call geometry_plastic_nonlocal_setIPareaNormal(unscaledNormals/spread(norm2(unscaledNormals,1),1,3))
+  !call geometry_plastic_nonlocal_setIPneighborhood                                                 ToDo: Support nonlocal
   call geometry_plastic_nonlocal_results
   
 end subroutine discretization_marc_init
@@ -492,8 +493,8 @@ subroutine inputRead_mapNodes(FEM2DAMASK, &
     chunkPos = IO_stringPos(fileContent(l))
     if(chunkPos(1) < 1) cycle
     if(IO_lc(IO_stringValue(fileContent(l),chunkPos,1)) == 'coordinates') then
+      chunkPos = [1,1,10]
       do i = 1,nNodes
-        chunkPos = IO_stringPos(fileContent(l+1+i))
         map_unsorted(:,i) = [IO_intValue(fileContent(l+1+i),chunkPos,1),i]
       enddo
       exit
@@ -528,8 +529,8 @@ subroutine inputRead_elemNodes(nodes, &
     chunkPos = IO_stringPos(fileContent(l))
     if(chunkPos(1) < 1) cycle
     if(IO_lc(IO_stringValue(fileContent(l),chunkPos,1)) == 'coordinates') then
+      chunkPos = [4,1,10,11,30,31,50,51,70]
       do i=1,nNode
-        chunkPos = IO_stringPos(fileContent(l+1+i))
         m = mesh_FEM2DAMASK_node(IO_intValue(fileContent(l+1+i),chunkPos,1))
         do j = 1,3
           nodes(j,m) = mesh_unitlength * IO_floatValue(fileContent(l+1+i),chunkPos,j+1)