diff --git a/src/config.f90 b/src/config.f90 index cd67c4641..bb4d82bb9 100644 --- a/src/config.f90 +++ b/src/config.f90 @@ -26,13 +26,12 @@ module config config_numerics, & config_debug - !ToDo: bad names (how should one know that those variables are defined in config?) character(len=64), dimension(:), allocatable, public, protected :: & - phase_name, & !< name of each phase - homogenization_name, & !< name of each homogenization - crystallite_name, & !< name of each crystallite setting - microstructure_name, & !< name of each microstructure - texture_name !< name of each texture + config_name_phase, & !< name of each phase + config_name_homogenization, & !< name of each homogenization + config_name_crystallite, & !< name of each crystallite setting + config_name_microstructure, & !< name of each microstructure + config_name_texture !< name of each texture ! ToDo: Remove, use size(config_phase) etc @@ -81,19 +80,19 @@ subroutine config_init select case (trim(part)) case (trim('phase')) - call parse_materialConfig(phase_name,config_phase,line,fileContent(i+1:)) + call parse_materialConfig(config_name_phase,config_phase,line,fileContent(i+1:)) if (verbose) write(6,'(a)') ' Phase parsed'; flush(6) case (trim('microstructure')) - call parse_materialConfig(microstructure_name,config_microstructure,line,fileContent(i+1:)) + call parse_materialConfig(config_name_microstructure,config_microstructure,line,fileContent(i+1:)) if (verbose) write(6,'(a)') ' Microstructure parsed'; flush(6) case (trim('crystallite')) - call parse_materialConfig(crystallite_name,config_crystallite,line,fileContent(i+1:)) + call parse_materialConfig(config_name_crystallite,config_crystallite,line,fileContent(i+1:)) if (verbose) write(6,'(a)') ' Crystallite parsed'; flush(6) case (trim('homogenization')) - call parse_materialConfig(homogenization_name,config_homogenization,line,fileContent(i+1:)) + call parse_materialConfig(config_name_homogenization,config_homogenization,line,fileContent(i+1:)) if (verbose) write(6,'(a)') ' Homogenization parsed'; flush(6) case (trim('texture')) diff --git a/src/constitutive.f90 b/src/constitutive.f90 index 72798e399..cf4f3706b 100644 --- a/src/constitutive.f90 +++ b/src/constitutive.f90 @@ -149,7 +149,7 @@ subroutine constitutive_init case default plasticityType knownPlasticity = .false. end select plasticityType - write(FILEUNIT,'(/,a,/)') '['//trim(phase_name(ph))//']' + write(FILEUNIT,'(/,a,/)') '['//trim(config_name_phase(ph))//']' if (knownPlasticity) then write(FILEUNIT,'(a)') '(plasticity)'//char(9)//trim(outputName) if (phase_plasticity(ph) /= PLASTICITY_NONE_ID) then @@ -794,8 +794,8 @@ subroutine constitutive_results integer :: p character(len=256) :: group #if defined(PETSc) || defined(DAMASK_HDF5) - do p=1,size(phase_name) - group = trim('current/constituent')//'/'//trim(phase_name(p)) + do p=1,size(config_name_phase) + group = trim('current/constituent')//'/'//trim(config_name_phase(p)) call HDF5_closeGroup(results_addGroup(group)) group = trim(group)//'/plastic' diff --git a/src/crystallite.f90 b/src/crystallite.f90 index e47eac4df..a779c3223 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -364,7 +364,7 @@ subroutine crystallite_init do r = 1,size(config_crystallite) if (any(microstructure_crystallite(discretization_microstructureAt) == r)) then - write(FILEUNIT,'(/,a,/)') '['//trim(crystallite_name(r))//']' + write(FILEUNIT,'(/,a,/)') '['//trim(config_name_crystallite(r))//']' do o = 1,crystallite_Noutput(r) write(FILEUNIT,'(a,i4)') trim(crystallite_output(o,r))//char(9),crystallite_sizePostResult(o,r) enddo @@ -982,9 +982,6 @@ end function crystallite_postResults !-------------------------------------------------------------------------------------------------- subroutine crystallite_results #if defined(PETSc) || defined(DAMASK_HDF5) - use config, only: & - config_name_phase => phase_name ! anticipate logical name - integer :: p,o real(pReal), allocatable, dimension(:,:,:) :: selected_tensors type(rotation), allocatable, dimension(:) :: selected_rotations diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 4c90f1c38..93227bf6b 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -164,7 +164,7 @@ subroutine homogenization_init call IO_write_jobFile(FILEUNIT,'outputHomogenization') do p = 1,size(config_homogenization) if (any(material_homogenizationAt == p)) then - write(FILEUNIT,'(/,a,/)') '['//trim(homogenization_name(p))//']' + write(FILEUNIT,'(/,a,/)') '['//trim(config_name_homogenization(p))//']' write(FILEUNIT,'(a)') '(type) n/a' write(FILEUNIT,'(a,i4)') '(ngrains)'//char(9),homogenization_Ngrains(p) @@ -797,8 +797,6 @@ end function postResults !-------------------------------------------------------------------------------------------------- subroutine homogenization_results #if defined(PETSc) || defined(DAMASK_HDF5) - use config, only: & - config_name_homogenization => homogenization_name ! anticipate logical name use material, only: & material_homogenization_type => homogenization_type diff --git a/src/material.f90 b/src/material.f90 index be2985fff..e01735b05 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -297,17 +297,17 @@ subroutine material_init write(6,'(/,a,/)') ' MATERIAL configuration' write(6,'(a32,1x,a16,1x,a6)') 'homogenization ','type ','grains' do h = 1,size(config_homogenization) - write(6,'(1x,a32,1x,a16,1x,i6)') homogenization_name(h),homogenization_type(h),homogenization_Ngrains(h) + write(6,'(1x,a32,1x,a16,1x,i6)') config_name_homogenization(h),homogenization_type(h),homogenization_Ngrains(h) enddo write(6,'(/,a14,18x,1x,a11,1x,a12,1x,a13)') 'microstructure','crystallite','constituents' do m = 1,size(config_microstructure) - write(6,'(1x,a32,1x,i11,1x,i12)') microstructure_name(m), & + write(6,'(1x,a32,1x,i11,1x,i12)') config_name_microstructure(m), & microstructure_crystallite(m), & microstructure_Nconstituents(m) if (microstructure_Nconstituents(m) > 0) then do c = 1,microstructure_Nconstituents(m) - write(6,'(a1,1x,a32,1x,a32,1x,f7.4)') '>',phase_name(microstructure_phase(c,m)),& - texture_name(microstructure_texture(c,m)),& + write(6,'(a1,1x,a32,1x,a32,1x,f7.4)') '>',config_name_phase(microstructure_phase(c,m)),& + config_name_texture(microstructure_texture(c,m)),& microstructure_fraction(c,m) enddo write(6,*) @@ -366,8 +366,8 @@ subroutine material_init #if defined(PETSc) || defined(DAMASK_HDF5) call results_openJobFile - call results_mapping_constituent(material_phaseAt,material_phaseMemberAt,phase_name) - call results_mapping_materialpoint(material_homogenizationAt,material_homogenizationMemberAt,homogenization_name) + call results_mapping_constituent(material_phaseAt,material_phaseMemberAt,config_name_phase) + call results_mapping_materialpoint(material_homogenizationAt,material_homogenizationMemberAt,config_name_homogenization) call results_closeJobFile #endif @@ -545,7 +545,7 @@ subroutine material_parseMicrostructure enddo enddo - if (dNeq(sum(microstructure_fraction(:,m)),1.0_pReal)) call IO_error(153,ext_msg=microstructure_name(m)) + if (dNeq(sum(microstructure_fraction(:,m)),1.0_pReal)) call IO_error(153,ext_msg=config_name_microstructure(m)) enddo