Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
parser-wien2k
Commits
b3ecd039
Commit
b3ecd039
authored
Apr 11, 2018
by
Pardini, Lorenzo (lopa)
Browse files
added support for older wien2k versions
parent
8086a2af
Changes
2
Hide whitespace changes
Inline
Side-by-side
parser/parser-wien2k/wien2k_parser.py
View file @
b3ecd039
...
...
@@ -49,9 +49,15 @@ class Wien2kContext(object):
self
.
initialize_values
()
def
onClose_x_wien2k_header
(
self
,
backend
,
gIndex
,
section
):
backend
.
addValue
(
"program_version"
,
section
[
"x_wien2k_version"
][
0
]
+
" "
+
section
[
"x_wien2k_release_date"
][
0
])
version_check
=
section
[
"x_wien2k_version"
]
# riprova = section["x_wien2k_release_date"][0]
# print("prova=",prova," riprova=",riprova)
if
version_check
:
backend
.
addValue
(
"program_version"
,
section
[
"x_wien2k_version"
][
0
]
+
" "
+
section
[
"x_wien2k_release_date"
][
0
])
else
:
backend
.
addValue
(
"program_version"
,
"Before_wien2k11"
)
def
onOpen_section_system
(
self
,
backend
,
gIndex
,
section
):
self
.
secSystemIndex
=
gIndex
...
...
@@ -193,20 +199,21 @@ mainFileDescription = SM(
name
=
'root'
,
weak
=
True
,
startReStr
=
""
,
sections
=
[
'section_run'
,
'x_wien2k_header'
],
subMatchers
=
[
SM
(
r
"\s*:LABEL[0-9]+: using WIEN2k_(?P<x_wien2k_version>[0-9.]+) \(Release (?P<x_wien2k_release_date>[0-9/.]+)\) in "
),
SM
(
name
=
'newRun'
,
startReStr
=
r
"\s*:LABEL[0-9]+: using WIEN2k_(?:[0-9.]+) \(Release (?:[0-9/.]+)\) in "
,
# subMatchers=[
# SM(r"\s*:LABEL[0-9]+: using WIEN2k_(?P<x_wien2k_version>[0-9.]+) \(Release (?P<x_wien2k_release_date>[0-9/.]+)\) in ")
# ],
startReStr
=
r
"\s*:ITE[0-9]+:\s*[0-9]+.\s*ITERATION"
,
repeats
=
True
,
required
=
True
,
forwardMatch
=
True
,
sections
=
[
'section_run'
,
'section_method'
,
'section_system'
,
'section_single_configuration_calculation'
],
sections
=
[
'section_method'
,
'section_system'
,
'section_single_configuration_calculation'
],
fixedStartValues
=
{
'program_name'
:
'WIEN2k'
,
'program_basis_set_type'
:
'(L)APW+lo'
},
#, 'program_version': 'Before WIEN2k_11'},
subMatchers
=
[
SM
(
name
=
'header'
,
startReStr
=
r
"\s*:LABEL[0-9]+: using WIEN2k_(?P<x_wien2k_version>[0-9.]+) \(Release (?P<x_wien2k_release_date>[0-9/.]+)\) in "
,
sections
=
[
"x_wien2k_header"
],
fixedStartValues
=
{
'program_name'
:
'WIEN2k'
,
'program_basis_set_type'
:
'(L)APW+lo'
}
),
SM
(
name
=
"scf iteration"
,
startReStr
=
r
"\s*:ITE(?P<x_wien2k_iteration_number>[0-9]+):\s*[0-9]*. ITERATION"
,
sections
=
[
"section_scf_iteration"
],
...
...
src/main/scala/eu/nomad_lab/parsers/Wien2kParser.scala
View file @
b3ecd039
...
...
@@ -37,7 +37,7 @@ object Wien2kParser extends SimpleExternalParserGenerator(
))
::
Nil
),
mainFileTypes
=
Seq
(
"text/.*"
),
mainFileRe
=
""":
LABEL
[0-9]+:
using WIEN2k_(?<version>[0-9.]+) \(Release (?<release>[0-9/.]+)\) in
"""
.
r
,
mainFileRe
=
""":
ITE
[0-9]+:
1. ITERATION
"""
.
r
,
cmd
=
Seq
(
DefaultPythonInterpreter
.
pythonExe
(),
"${envDir}/parsers/wien2k/parser/parser-wien2k/wien2k_parser.py"
,
"--uri"
,
"${mainFileUri}"
,
"${mainFilePath}"
),
resList
=
Seq
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment