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

changed keyword for texture component/ODF simulation 

kewyword "origin" with possible values "center/voxelcenter" and "boundary/boundarycenter" is always needed
This commit is contained in:
Martin Diehl 2015-04-14 12:45:20 +00:00
parent 64764b0902
commit e29628b459
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
code/IO.f90
View File

@ -589,7 +589,7 @@ function IO_hybridIA(Nast,ODFfileName)
gotRange = .false. gotRange = .false.
gotDelta = .false. gotDelta = .false.
IO_hybridIA = -1.0_pReal ! initialize return value for case of error IO_hybridIA = -1.0_pReal ! initialize return value for case of error
center = 0.0_pReal center = -1.0_pReal
headerLength = 0_pInt headerLength = 0_pInt
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -637,22 +637,25 @@ function IO_hybridIA(Nast,ODFfileName)
end select end select
enddo enddo
deltas = deltas*INRAD deltas = deltas*INRAD
case ('voxelboundary') case ('origin')
if ((IO_lc(IO_stringValue(line,positions,2_pInt))) == 'origin') & if (IO_lc(IO_stringValue(line,positions,2_pInt)) == 'voxelboundary' .or. &
center = 0.5_pReal IO_lc(IO_stringValue(line,positions,2_pInt)) == 'boundary') center = 0.5_pReal
if (IO_lc(IO_stringValue(line,positions,2_pInt)) == 'voxelcenter' .or. &
IO_lc(IO_stringValue(line,positions,2_pInt)) == 'center') center = 0.0_pReal
end select end select
enddo enddo
if (.not. gotRange) & if (.not. gotRange) &
call IO_error(error_ID = 156_pInt, ext_msg='no range') call IO_error(error_ID = 156_pInt, ext_msg='no range information found')
if (.not. gotDelta) & if (.not. gotDelta) &
call IO_error(error_ID = 156_pInt, ext_msg='no delta') call IO_error(error_ID = 156_pInt, ext_msg='no delta information found')
if (center < 0.0_pReal) &
call IO_error(error_ID = 156_pInt, ext_msg='no origin information found')
if (any(limits<=0.0_pReal)) & if (any(limits<=0.0_pReal)) &
call IO_error(error_ID = 156_pInt, ext_msg='invalid range') call IO_error(error_ID = 156_pInt, ext_msg='invalid range')
if (any(deltas<=0.0_pReal)) & if (any(deltas<=0.0_pReal)) &
call IO_error(error_ID = 156_pInt, ext_msg='invalid deltas') call IO_error(error_ID = 156_pInt, ext_msg='invalid deltas')
steps = nint(limits/deltas,pInt) steps = nint(limits/deltas,pInt)
allocate(dV_V(steps(3),steps(2),steps(1)),source=0.0_pReal) allocate(dV_V(steps(3),steps(2),steps(1)),source=0.0_pReal)

2
code/config/example.linearODF
View File

@ -1,7 +1,7 @@
3 header 3 header
range phi1 90 PHI 90 phi2 90 range phi1 90 PHI 90 phi2 90
delta phi1 5 PHI 5 phi2 5 delta phi1 5 PHI 5 phi2 5
voxelBoundary origin origin voxelBoundary
0.905 0.905
0.4025 0.4025
0.1925 0.1925