From 44d5e513bbaf90c088a108bcbf5f818421248dac Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de>
Date: Fri, 25 Jan 2019 13:08:00 +0100
Subject: [PATCH] fixing tests
---
parser/parser-abinit/parser-abinit.py | 2 +-
src/main/scala/eu/nomad_lab/parsers/AbinitParser.scala | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/parser/parser-abinit/parser-abinit.py b/parser/parser-abinit/parser-abinit.py
index 4353167..0ec3c21 100644
--- a/parser/parser-abinit/parser-abinit.py
+++ b/parser/parser-abinit/parser-abinit.py
@@ -490,7 +490,7 @@ class ABINITContext(object):
if section["x_abinit_var_ixc"] is None:
backend.addValue(varname, backend.convertScalarStringValue(varname, varvalue))
- elif len(meta_info.shape) == 0:
+ elif not meta_info.shape or len(meta_info.shape) == 0:
# This is a simple scalar
backend.addValue(varname, backend.convertScalarStringValue(varname, varvalue))
diff --git a/src/main/scala/eu/nomad_lab/parsers/AbinitParser.scala b/src/main/scala/eu/nomad_lab/parsers/AbinitParser.scala
index b21c019..e3378b9 100644
--- a/src/main/scala/eu/nomad_lab/parsers/AbinitParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/AbinitParser.scala
@@ -45,8 +45,8 @@ object AbinitParser extends SimpleExternalParserGenerator(
"parser-abinit/parser-abinit.py",
"nomad_meta_info/public.nomadmetainfo.json",
"nomad_meta_info/common.nomadmetainfo.json",
- "nomad_meta_info/meta_types.nomadmetainfo.json",
- "nomad_meta_info/abinit.autogenerated.nomadmetainfo.json",
+ "nomad_meta_info/meta.nomadmetainfo.json",
+ "nomad_meta_info/abinit_autogenerated.nomadmetainfo.json",
"nomad_meta_info/abinit.nomadmetainfo.json"
) ++ DefaultPythonInterpreter.commonFiles(),
dirMap = Map(
--
GitLab