Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
parser-octopus
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This project is archived. Its data is
read-only
.
Show more breadcrumbs
nomad-lab
parser-octopus
Commits
a77d9e27
Commit
a77d9e27
authored
Nov 1, 2016
by
Ask Hjorth Larsen
Browse files
Options
Downloads
Patches
Plain Diff
remember to set datatype
parent
a7d3bf29
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
parser/parser-octopus/aseoct.py
+4
-4
4 additions, 4 deletions
parser/parser-octopus/aseoct.py
parser/parser-octopus/parser_octopus.py
+2
-1
2 additions, 1 deletion
parser/parser-octopus/parser_octopus.py
with
6 additions
and
5 deletions
parser/parser-octopus/aseoct.py
+
4
−
4
View file @
a77d9e27
...
@@ -118,7 +118,7 @@ def read_eigenvalues_file(fd):
...
@@ -118,7 +118,7 @@ def read_eigenvalues_file(fd):
nspins
=
len
(
eigs
[
0
])
nspins
=
len
(
eigs
[
0
])
nbands
=
len
(
eigs
[
0
][
spin
])
nbands
=
len
(
eigs
[
0
][
spin
])
kptsarr
=
np
.
array
(
kpts
)
kptsarr
=
np
.
array
(
kpts
,
float
)
eigsarr
=
np
.
empty
((
nkpts
,
nspins
,
nbands
))
eigsarr
=
np
.
empty
((
nkpts
,
nspins
,
nbands
))
occsarr
=
np
.
empty
((
nkpts
,
nspins
,
nbands
))
occsarr
=
np
.
empty
((
nkpts
,
nspins
,
nbands
))
...
@@ -732,8 +732,8 @@ def read_static_info_kpoints(fd):
...
@@ -732,8 +732,8 @@ def read_static_info_kpoints(fd):
kpts
.
append
(
kxyz
)
kpts
.
append
(
kxyz
)
weights
.
append
(
weight
)
weights
.
append
(
weight
)
ibz_k_points
=
np
.
array
(
kpts
)
ibz_k_points
=
np
.
array
(
kpts
,
float
)
k_point_weights
=
np
.
array
(
weights
)
k_point_weights
=
np
.
array
(
weights
,
float
)
return
dict
(
ibz_k_points
=
ibz_k_points
,
k_point_weights
=
k_point_weights
)
return
dict
(
ibz_k_points
=
ibz_k_points
,
k_point_weights
=
k_point_weights
)
...
@@ -760,7 +760,7 @@ def read_static_info_eigenvalues(fd, energy_unit):
...
@@ -760,7 +760,7 @@ def read_static_info_eigenvalues(fd, energy_unit):
val
=
[
values_sknx
[
'
--
'
]]
val
=
[
values_sknx
[
'
--
'
]]
else
:
else
:
val
=
[
values_sknx
[
'
up
'
],
values_sknx
[
'
dn
'
]]
val
=
[
values_sknx
[
'
up
'
],
values_sknx
[
'
dn
'
]]
val
=
np
.
array
(
val
)
val
=
np
.
array
(
val
)
.
astype
(
float
)
nkpts
,
remainder
=
divmod
(
len
(
val
[
0
]),
nbands
)
nkpts
,
remainder
=
divmod
(
len
(
val
[
0
]),
nbands
)
assert
remainder
==
0
assert
remainder
==
0
...
...
...
...
This diff is collapsed.
Click to expand it.
parser/parser-octopus/parser_octopus.py
+
2
−
1
View file @
a77d9e27
...
@@ -47,7 +47,8 @@ def normalize_names(names):
...
@@ -47,7 +47,8 @@ def normalize_names(names):
ENERGY_UNIT
=
'
usrOctEnergyUnit
'
ENERGY_UNIT
=
'
usrOctEnergyUnit
'
LENGTH_UNIT
=
'
usrOctLengthUnit
'
LENGTH_UNIT
=
'
usrOctLengthUnit
'
metaInfoPath
=
os
.
path
.
normpath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
)),
"
../../../../nomad-meta-info/meta_info/nomad_meta_info/octopus.nomadmetainfo.json
"
))
metaInfoPath
=
os
.
path
.
normpath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
)),
"
../../../../nomad-meta-info/meta_info/nomad_meta_info/octopus.nomadmetainfo.json
"
))
metaInfoEnv
,
warnings
=
loadJsonFile
(
filePath
=
metaInfoPath
,
metaInfoEnv
,
warnings
=
loadJsonFile
(
filePath
=
metaInfoPath
,
dependencyLoader
=
None
,
dependencyLoader
=
None
,
extraArgsHandling
=
InfoKindEl
.
ADD_EXTRA_ARGS
,
extraArgsHandling
=
InfoKindEl
.
ADD_EXTRA_ARGS
,
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment