223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplified by using empty string list as default

This commit is contained in:
Martin Diehl 2018-06-21 23:49:07 +02:00
parent c5b00e7a6c
commit c5ebe3510f
1 changed files with 49 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/material.f90
View File

@ -811,59 +811,55 @@ subroutine material_parsePhase
allocate(phase_stiffnessDegradation(maxval(phase_NstiffnessDegradations),material_Nphase), & allocate(phase_stiffnessDegradation(maxval(phase_NstiffnessDegradations),material_Nphase), &
source=STIFFNESS_DEGRADATION_undefined_ID) source=STIFFNESS_DEGRADATION_undefined_ID)
do p=1_pInt, material_Nphase do p=1_pInt, material_Nphase
if (phase_Nsources(p) /= 0_pInt) then str = phaseConfig(p)%getStrings('(source)',defaultVal=[character(len=65536)::])
str = phaseConfig(p)%getStrings('(source)') do sourceCtr = 1_pInt, size(str)
do sourceCtr = 1_pInt, size(str) select case (trim(str(sourceCtr)))
select case (trim(str(sourceCtr))) case (SOURCE_thermal_dissipation_label)
case (SOURCE_thermal_dissipation_label) phase_source(sourceCtr,p) = SOURCE_thermal_dissipation_ID
phase_source(sourceCtr,p) = SOURCE_thermal_dissipation_ID case (SOURCE_thermal_externalheat_label)
case (SOURCE_thermal_externalheat_label) phase_source(sourceCtr,p) = SOURCE_thermal_externalheat_ID
phase_source(sourceCtr,p) = SOURCE_thermal_externalheat_ID case (SOURCE_damage_isoBrittle_label)
case (SOURCE_damage_isoBrittle_label) phase_source(sourceCtr,p) = SOURCE_damage_isoBrittle_ID
phase_source(sourceCtr,p) = SOURCE_damage_isoBrittle_ID case (SOURCE_damage_isoDuctile_label)
case (SOURCE_damage_isoDuctile_label) phase_source(sourceCtr,p) = SOURCE_damage_isoDuctile_ID
phase_source(sourceCtr,p) = SOURCE_damage_isoDuctile_ID case (SOURCE_damage_anisoBrittle_label)
case (SOURCE_damage_anisoBrittle_label) phase_source(sourceCtr,p) = SOURCE_damage_anisoBrittle_ID
phase_source(sourceCtr,p) = SOURCE_damage_anisoBrittle_ID case (SOURCE_damage_anisoDuctile_label)
case (SOURCE_damage_anisoDuctile_label) phase_source(sourceCtr,p) = SOURCE_damage_anisoDuctile_ID
phase_source(sourceCtr,p) = SOURCE_damage_anisoDuctile_ID case (SOURCE_vacancy_phenoplasticity_label)
case (SOURCE_vacancy_phenoplasticity_label) phase_source(sourceCtr,p) = SOURCE_vacancy_phenoplasticity_ID
phase_source(sourceCtr,p) = SOURCE_vacancy_phenoplasticity_ID case (SOURCE_vacancy_irradiation_label)
case (SOURCE_vacancy_irradiation_label) phase_source(sourceCtr,p) = SOURCE_vacancy_irradiation_ID
phase_source(sourceCtr,p) = SOURCE_vacancy_irradiation_ID case (SOURCE_vacancy_thermalfluc_label)
case (SOURCE_vacancy_thermalfluc_label) phase_source(sourceCtr,p) = SOURCE_vacancy_thermalfluc_ID
phase_source(sourceCtr,p) = SOURCE_vacancy_thermalfluc_ID end select
end select enddo
enddo
endif str = phaseConfig(p)%getStrings('(kinematics)',defaultVal=[character(len=65536)::])
if (phase_Nkinematics(p) /= 0_pInt) then do kinematicsCtr = 1_pInt, size(str)
str = phaseConfig(p)%getStrings('(kinematics)') select case (trim(str(kinematicsCtr)))
do kinematicsCtr = 1_pInt, size(str) case (KINEMATICS_cleavage_opening_label)
select case (trim(str(kinematicsCtr))) phase_kinematics(kinematicsCtr,p) = KINEMATICS_cleavage_opening_ID
case (KINEMATICS_cleavage_opening_label) case (KINEMATICS_slipplane_opening_label)
phase_kinematics(kinematicsCtr,p) = KINEMATICS_cleavage_opening_ID phase_kinematics(kinematicsCtr,p) = KINEMATICS_slipplane_opening_ID
case (KINEMATICS_slipplane_opening_label) case (KINEMATICS_thermal_expansion_label)
phase_kinematics(kinematicsCtr,p) = KINEMATICS_slipplane_opening_ID phase_kinematics(kinematicsCtr,p) = KINEMATICS_thermal_expansion_ID
case (KINEMATICS_thermal_expansion_label) case (KINEMATICS_vacancy_strain_label)
phase_kinematics(kinematicsCtr,p) = KINEMATICS_thermal_expansion_ID phase_kinematics(kinematicsCtr,p) = KINEMATICS_vacancy_strain_ID
case (KINEMATICS_vacancy_strain_label) case (KINEMATICS_hydrogen_strain_label)
phase_kinematics(kinematicsCtr,p) = KINEMATICS_vacancy_strain_ID phase_kinematics(kinematicsCtr,p) = KINEMATICS_hydrogen_strain_ID
case (KINEMATICS_hydrogen_strain_label) end select
phase_kinematics(kinematicsCtr,p) = KINEMATICS_hydrogen_strain_ID enddo
end select
enddo str = phaseConfig(p)%getStrings('(stiffness_degradation)',defaultVal=[character(len=65536)::])
endif do stiffDegradationCtr = 1_pInt, size(str)
if (phase_NstiffnessDegradations(p) /= 0_pInt) then select case (trim(str(stiffDegradationCtr)))
str = phaseConfig(p)%getStrings('(stiffness_degradation)') case (STIFFNESS_DEGRADATION_damage_label)
do stiffDegradationCtr = 1_pInt, size(str) phase_stiffnessDegradation(stiffDegradationCtr,p) = STIFFNESS_DEGRADATION_damage_ID
select case (trim(str(stiffDegradationCtr))) case (STIFFNESS_DEGRADATION_porosity_label)
case (STIFFNESS_DEGRADATION_damage_label) phase_stiffnessDegradation(stiffDegradationCtr,p) = STIFFNESS_DEGRADATION_porosity_ID
phase_stiffnessDegradation(stiffDegradationCtr,p) = STIFFNESS_DEGRADATION_damage_ID end select
case (STIFFNESS_DEGRADATION_porosity_label) enddo
phase_stiffnessDegradation(stiffDegradationCtr,p) = STIFFNESS_DEGRADATION_porosity_ID
end select
enddo
endif
enddo enddo
allocate(phase_plasticityInstance(material_Nphase), source=0_pInt) allocate(phase_plasticityInstance(material_Nphase), source=0_pInt)