diff --git a/examples/SpectralMethod/Polycrystal/material.yaml b/examples/SpectralMethod/Polycrystal/material.yaml index 16c6042a6..9da5a1358 100644 --- a/examples/SpectralMethod/Polycrystal/material.yaml +++ b/examples/SpectralMethod/Polycrystal/material.yaml @@ -1,6 +1,8 @@ +--- homogenization: SX: - mech: {type: none} + mech: {type: +none} microstructure: - constituents: - fraction: 1.0 @@ -9,7 +11,8 @@ microstructure: homogenization: SX - constituents: - fraction: 1.0 - orientation: [0.7936696712125002, -0.28765777461664166, -0.3436487135089419, 0.4113964260949434] + orientation: [0.7936696712125002, -0.28765777461664166, + -0.3436487135089419, 0.4113964260949434] phase: Aluminum homogenization: SX - constituents: @@ -19,7 +22,12 @@ microstructure: homogenization: SX - constituents: - fraction: 1.0 - orientation: [0.28645844315788244, -0.022571491243423537, -0.467933059311115, -0.8357456192708106] + orientation: [0.28645844315788244, + + + +-0.022571491243423537, + -0.467933059311115, -0.8357456192708106] phase: Aluminum homogenization: SX - constituents: diff --git a/src/YAML_parse.f90 b/src/YAML_parse.f90 index 2beab6fe8..d8d320ad1 100644 --- a/src/YAML_parse.f90 +++ b/src/YAML_parse.f90 @@ -810,19 +810,35 @@ subroutine selfTest if (.not. to_flow(flow_mixed_braces) == flow) error stop 'to_flow' end block basic_flow - multi_line_flow: block + multi_line_flow1: block character(len=*), parameter :: flow_multi = & "%YAML 1.1"//IO_EOL//& "---"//IO_EOL//& "a: [b,"//IO_EOL//& "c: "//IO_EOL//& "d, e]"//IO_EOL + character(len=*), parameter :: flow = & "{a: [b, {c: d}, e]}" if( .not. to_flow(flow_multi) == flow) error stop 'to_flow' - end block multi_line_flow + end block multi_line_flow1 + multi_line_flow2: block + character(len=*), parameter :: flow_multi = & + "%YAML 1.1"//IO_EOL//& + "---"//IO_EOL//& + "-"//IO_EOL//& + " a: {b:"//IO_EOL//& + "[c,"//IO_EOL//& + "d"//IO_EOL//& + "e, f]}"//IO_EOL + + character(len=*), parameter :: flow = & + "[{a: {b: [c, d e, f]}}]" + + if( .not. to_flow(flow_multi) == flow) error stop 'to_flow' + end block multi_line_flow2 basic_mixed: block character(len=*), parameter :: block_flow = &