jobname.yaml not supported anymore

This commit is contained in:
Martin Diehl 2021-02-12 23:35:06 +01:00
parent 830d00fa67
commit 2b0b1aeffe
2 changed files with 8 additions and 17 deletions

@ -1 +1 @@
Subproject commit 07d125fe476621224d9f2ef73b0cf88f3b07bc60
Subproject commit 2a0f30ec47473f42e0da922055b72b527730378d

View File

@ -5,16 +5,10 @@
!! precedence over material.yaml.
!--------------------------------------------------------------------------------------------------
module config
use prec
use DAMASK_interface
use IO
use YAML_parse
use YAML_types
#ifdef PETSc
#include <petsc/finclude/petscsys.h>
use petscsys
#endif
implicit none
private
@ -50,17 +44,12 @@ end subroutine config_init
subroutine parse_material
logical :: fileExists
character(len=:), allocatable :: fname
fname = getSolverJobName()//'.yaml'
inquire(file=fname,exist=fileExists)
if(.not. fileExists) then
fname = 'material.yaml'
inquire(file=fname,exist=fileExists)
if(.not. fileExists) call IO_error(100,ext_msg=fname)
endif
print*, 'reading '//fname; flush(IO_STDOUT)
config_material => YAML_parse_file(fname)
inquire(file='material.yaml',exist=fileExists)
if(.not. fileExists) call IO_error(100,ext_msg='material.yaml')
print*, 'reading material.yaml'; flush(IO_STDOUT)
config_material => YAML_parse_file('material.yaml')
end subroutine parse_material
@ -72,6 +61,7 @@ subroutine parse_numerics
logical :: fexist
config_numerics => emptyDict
inquire(file='numerics.yaml', exist=fexist)
if (fexist) then
@ -89,6 +79,7 @@ subroutine parse_debug
logical :: fexist
config_debug => emptyDict
inquire(file='debug.yaml', exist=fexist)
fileExists: if (fexist) then