From 85211963baef5f3ece1396a19487357cbcb2b4ba Mon Sep 17 00:00:00 2001 From: Lauri Himanen <lauri.himanen@gmail.com> Date: Wed, 17 Jun 2020 09:46:25 +0300 Subject: [PATCH] Reinstated system type check in encyclopedia processing. --- nomad/normalizing/encyclopedia/encyclopedia.py | 4 +++- nomad/processing/data.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nomad/normalizing/encyclopedia/encyclopedia.py b/nomad/normalizing/encyclopedia/encyclopedia.py index 1a7bc4ec1e..5a88c70cf6 100644 --- a/nomad/normalizing/encyclopedia/encyclopedia.py +++ b/nomad/normalizing/encyclopedia/encyclopedia.py @@ -249,8 +249,10 @@ class EncyclopediaNormalizer(Normalizer): "unsupported material type for encyclopedia", enc_status=status, ) + return - # Get the method type + # Get the method type. For now, we allow unknown method type to + # allow phonon calculations through. representative_method, method_type = self.method_type(method) if method_type == config.services.unavailable_value: status = status_enums.unsupported_method_type diff --git a/nomad/processing/data.py b/nomad/processing/data.py index 193d215dff..540bd0e078 100644 --- a/nomad/processing/data.py +++ b/nomad/processing/data.py @@ -1032,9 +1032,9 @@ class Upload(Proc): # calculations. TODO: This should be replaced by a more # extensive mechamism that supports more complex dependencies # between calculations. - phonon_calculations = Calc.objects(upload_id=self.upload_id, parser="parsers/phonopy") - for calc in phonon_calculations: - calc.process_phonon() + # phonon_calculations = Calc.objects(upload_id=self.upload_id, parser="parsers/phonopy") + # for calc in phonon_calculations: + # calc.process_phonon() self.cleanup() else: -- GitLab