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

added "-d", "--directory" as possible cmd switches for working directory. 

fixed (sometimes?) non-working check for valid working directory path.
This commit is contained in:
Philip Eisenlohr 2013-10-24 18:56:56 +00:00
parent 5c1c0028e0
commit c857381881
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/DAMASK_spectral_interface.f90
View File

@ -128,7 +128,7 @@ subroutine DAMASK_interface_init(loadCaseParameterIn,geometryParameterIn)
write(6,'(a,/)')' Valid command line switches:' write(6,'(a,/)')' Valid command line switches:'
write(6,'(a)') ' --geom (-g, --geometry)' write(6,'(a)') ' --geom (-g, --geometry)'
write(6,'(a)') ' --load (-l, --loadcase)' write(6,'(a)') ' --load (-l, --loadcase)'
write(6,'(a)') ' --workingdir (-w, --wd, --workingdirectory)' write(6,'(a)') ' --workingdir (-w, --wd, --workingdirectory, -d, --directory)'
write(6,'(a)') ' --restart (-r, --rs)' write(6,'(a)') ' --restart (-r, --rs)'
write(6,'(a)') ' --regrid (--rg)' write(6,'(a)') ' --regrid (--rg)'
write(6,'(a)') ' --help (-h)' write(6,'(a)') ' --help (-h)'
@ -178,7 +178,7 @@ subroutine DAMASK_interface_init(loadCaseParameterIn,geometryParameterIn)
loadcaseArg = IIO_stringValue(commandLine,positions,i+1_pInt) loadcaseArg = IIO_stringValue(commandLine,positions,i+1_pInt)
case ('-g', '--geom', '--geometry') case ('-g', '--geom', '--geometry')
geometryArg = IIO_stringValue(commandLine,positions,i+1_pInt) geometryArg = IIO_stringValue(commandLine,positions,i+1_pInt)
case ('-w', '--wd', '--workingdir', '--workingdirectory') case ('-w', '-d', '--wd', '--directory', '--workingdir', '--workingdirectory')
workingDirArg = IIO_stringValue(commandLine,positions,i+1_pInt) workingDirArg = IIO_stringValue(commandLine,positions,i+1_pInt)
case ('-r', '--rs', '--restart') case ('-r', '--rs', '--restart')
spectralRestartInc = IIO_IntValue(commandLine,positions,i+1_pInt) spectralRestartInc = IIO_IntValue(commandLine,positions,i+1_pInt)
@ -253,10 +253,10 @@ character(len=1024) function storeWorkingDirectory(workingDirectoryArg,geometryA
endif endif
if (storeWorkingDirectory(len(trim(storeWorkingDirectory)):len(trim(storeWorkingDirectory))) & ! if path seperator is not given, append it if (storeWorkingDirectory(len(trim(storeWorkingDirectory)):len(trim(storeWorkingDirectory))) & ! if path seperator is not given, append it
/= pathSep) storeWorkingDirectory = trim(storeWorkingDirectory)//pathSep /= pathSep) storeWorkingDirectory = trim(storeWorkingDirectory)//pathSep
inquire(file = storeWorkingDirectory, exist=dirExists) inquire(file = trim(storeWorkingDirectory)//'.', exist=dirExists)
if(.not. dirExists) then if(.not. dirExists) then ! check if the directory exists
write(6,'(a)') ' given working directory does not exist' write(6,'(a20,a,a16)') ' working directory "',trim(storeWorkingDirectory),'" does not exist'
call quit(1_pInt) ! check if the directory exists call quit(1_pInt)
endif endif
else ! using path to geometry file as working dir else ! using path to geometry file as working dir
if (geometryArg(1:1) == pathSep) then ! absolute path given as command line argument if (geometryArg(1:1) == pathSep) then ! absolute path given as command line argument