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

simplified

This commit is contained in:
Martin Diehl 2023-06-23 00:06:44 +02:00
parent a38a860783
commit efc9391ca7
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CLI.f90
View File

@ -117,7 +117,7 @@ subroutine CLI_init()
print'(a,/)',' Valid command line switches:' print'(a,/)',' Valid command line switches:'
print'(a)', ' --geom (-g, --geometry)' print'(a)', ' --geom (-g, --geometry)'
print'(a)', ' --load (-l, --loadcase)' print'(a)', ' --load (-l, --loadcase)'
print'(a)', ' --material (-m, --materialConfig)' print'(a)', ' --material (-m, --materialconfig)'
print'(a)', ' --workingdir (-w, --wd, --workingdirectory)' print'(a)', ' --workingdir (-w, --wd, --workingdirectory)'
print'(a)', ' --restart (-r, --rs)' print'(a)', ' --restart (-r, --rs)'
print'(a)', ' --help (-h)' print'(a)', ' --help (-h)'

2
src/IO.f90
View File

@ -345,7 +345,7 @@ function IO_glueDiffering(first,second,glue)
character(len=*), optional, intent(in) :: glue character(len=*), optional, intent(in) :: glue
character(len=:), allocatable :: IO_glueDiffering character(len=:), allocatable :: IO_glueDiffering
character(len=pSTRLEN) :: glue_ character(len=:), allocatable :: glue_
glue_ = misc_optional(glue,'<--') glue_ = misc_optional(glue,'<--')

7
src/config.f90
View File

@ -102,17 +102,16 @@ subroutine parse_material()
fileContent, fname fileContent, fname
if (worldrank == 0) then if (worldrank == 0) then
print'(/,1x,a)', 'reading material.yaml'; flush(IO_STDOUT) print'(/,1x,a)', 'reading material configuration'; flush(IO_STDOUT)
#if defined(MESH) || defined(GRID) #if defined(MESH) || defined(GRID)
fileContent = IO_read(CLI_materialFile)
fname = CLI_materialFile fname = CLI_materialFile
#else #else
fileContent = IO_read('material.yaml')
fname = 'material.yaml' fname = 'material.yaml'
#endif #endif
fileContent = IO_read(fname)
if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:) if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:)
call result_openJobFile(parallel=.false.) call result_openJobFile(parallel=.false.)
call result_writeDataset_str(fileContent,'setup',fname,'main configuration') call result_writeDataset_str(fileContent,'setup',fname,'material configuration')
call result_closeJobFile() call result_closeJobFile()
end if end if
call parallelization_bcast_str(fileContent) call parallelization_bcast_str(fileContent)