diff --git a/src/CLI.f90 b/src/CLI.f90 index 0d60daf45..d73e74c12 100644 --- a/src/CLI.f90 +++ b/src/CLI.f90 @@ -117,7 +117,7 @@ subroutine CLI_init() print'(a,/)',' Valid command line switches:' print'(a)', ' --geom (-g, --geometry)' print'(a)', ' --load (-l, --loadcase)' - print'(a)', ' --material (-m, --materialConfig)' + print'(a)', ' --material (-m, --materialconfig)' print'(a)', ' --workingdir (-w, --wd, --workingdirectory)' print'(a)', ' --restart (-r, --rs)' print'(a)', ' --help (-h)' diff --git a/src/IO.f90 b/src/IO.f90 index 5b3cae71c..39a48e1e5 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -345,7 +345,7 @@ function IO_glueDiffering(first,second,glue) character(len=*), optional, intent(in) :: glue character(len=:), allocatable :: IO_glueDiffering - character(len=pSTRLEN) :: glue_ + character(len=:), allocatable :: glue_ glue_ = misc_optional(glue,'<--') diff --git a/src/config.f90 b/src/config.f90 index 5d0d6e222..9006839bf 100644 --- a/src/config.f90 +++ b/src/config.f90 @@ -102,17 +102,16 @@ subroutine parse_material() fileContent, fname 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) - fileContent = IO_read(CLI_materialFile) fname = CLI_materialFile #else - fileContent = IO_read('material.yaml') fname = 'material.yaml' #endif + fileContent = IO_read(fname) if (scan(fname,'/') /= 0) fname = fname(scan(fname,'/',.true.)+1:) 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() end if call parallelization_bcast_str(fileContent)