From cf8777169f3d9b314c0b5377ab0ac4c6185463cf Mon Sep 17 00:00:00 2001
From: "Himanen, Lauri (himanel1)" <lauri.himanen@aalto.fi>
Date: Wed, 1 Jun 2016 17:54:25 +0300
Subject: [PATCH] Reverting to old filename...
---
parser/parser-cp2k/cp2kparser/parser.py | 2 +-
src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/parser/parser-cp2k/cp2kparser/parser.py b/parser/parser-cp2k/cp2kparser/parser.py
index 330281b..ba0c4d3 100644
--- a/parser/parser-cp2k/cp2kparser/parser.py
+++ b/parser/parser-cp2k/cp2kparser/parser.py
@@ -59,7 +59,7 @@ class CP2KParser(ParserInterface):
self.main_parser = get_main_parser(version_id, run_type)(self.parser_context.main_file, self.parser_context)
def get_metainfo_filename(self):
- return "cp2k.input.nomadmetainfo.json"
+ return "cp2k.nomadmetainfo.json"
def get_parser_info(self):
return {'name': 'cp2k-parser', 'version': '1.0'}
diff --git a/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala b/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
index c8888f2..c63b0fe 100644
--- a/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala
@@ -55,7 +55,7 @@ object Cp2kParser extends SimpleExternalParserGenerator(
"nomad_meta_info/public.nomadmetainfo.json",
"nomad_meta_info/common.nomadmetainfo.json",
"nomad_meta_info/meta_types.nomadmetainfo.json",
- "nomad_meta_info/cp2k.input.nomadmetainfo.json",
+ "nomad_meta_info/cp2k.nomadmetainfo.json",
"nomad_meta_info/cp2k.general.nomadmetainfo.json"
) ++ DefaultPythonInterpreter.commonFiles(),
dirMap = Map(
--
GitLab