diff --git a/examples/MSC.Marc/rotation.mud b/examples/MSC.Marc/rotation.mud index bdcda99d4..21eff7974 100644 Binary files a/examples/MSC.Marc/rotation.mud and b/examples/MSC.Marc/rotation.mud differ diff --git a/processing/pre/mentat_spectralBox.py b/processing/pre/mentat_spectralBox.py index b0694ec4a..027240044 100755 --- a/processing/pre/mentat_spectralBox.py +++ b/processing/pre/mentat_spectralBox.py @@ -130,7 +130,7 @@ def geometry(): #------------------------------------------------------------------------------------------------- -def initial_conditions(homogenization,microstructures): +def initial_conditions(microstructures): elements = [] element = 0 for id in microstructures: @@ -148,13 +148,6 @@ def initial_conditions(homogenization,microstructures): "*icond_dof_value var 300", "*add_icond_elements", "all_existing", - "*new_icond", - "*icond_name _homogenization", - "*icond_type state_variable", - "*icond_param_value state_var_id 2", - "*icond_dof_value var %i"%homogenization, - "*add_icond_elements", - "all_existing", ] for grain,elementList in enumerate(elements): @@ -162,7 +155,7 @@ def initial_conditions(homogenization,microstructures): "*new_icond", "*icond_name microstructure_%i"%(grain+1), "*icond_type state_variable", - "*icond_param_value state_var_id 3", + "*icond_param_value state_var_id 2", "*icond_dof_value var %i"%(grain+1), "*add_icond_elements", elementList, @@ -211,7 +204,7 @@ for name in filenames: mesh(geom.grid,geom.size), material(), geometry(), - initial_conditions(geom.homogenization,microstructure), + initial_conditions(microstructure), '*identify_sets', '*show_model', '*redraw', diff --git a/src/marc/discretization_marc.f90 b/src/marc/discretization_marc.f90 index fd0852257..edf99523c 100644 --- a/src/marc/discretization_marc.f90 +++ b/src/marc/discretization_marc.f90 @@ -706,7 +706,7 @@ subroutine inputRead_microstructure(microstructureAt,& k = merge(2,1,initialcondTableStyle == 2) chunkPos = IO_stringPos(fileContent(l+k)) sv = IO_IntValue(fileContent(l+k),chunkPos,1) ! figure state variable index - if( (sv == 2) .or. (sv == 3) ) then ! only state vars 2 and 3 of interest + if( (sv == 2)) then ! state var 2 is used to identify material from material.yaml m = 1 chunkPos = IO_stringPos(fileContent(l+k+m)) do while (scan(IO_stringValue(fileContent(l+k+m),chunkPos,1),'+-',back=.true.)>1) ! is noEfloat value? @@ -715,7 +715,7 @@ subroutine inputRead_microstructure(microstructureAt,& contInts = continuousIntValues(fileContent(l+k+m+1:),nElem,nameElemSet,mapElemSet,size(nameElemSet)) ! get affected elements do i = 1,contInts(1) e = mesh_FEM2DAMASK_elem(contInts(1+i)) - if (sv == 3) microstructureAt(e) = myVal + microstructureAt(e) = myVal enddo if (initialcondTableStyle == 0) m = m + 1 enddo