Skip to content

Commit

Permalink
Printing stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
JosePizarro3 committed Sep 27, 2024
1 parent dea8302 commit 258398a
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 43 deletions.
82 changes: 42 additions & 40 deletions src/nomad_parser_wannier90/parsers/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,10 @@ def parse(

# Workflow section
workflow = SinglePoint()
self.archive.workflow2 = workflow
workflow.normalize(archive=archive, logger=logger)
print('TB')
print(workflow)
archive.workflow2 = workflow

# TODO extend to handle DFT+TB workflows using `self._dft_codes`
# Checking if other mainfiles are present, if the closest is a DFT code, tries to create the
Expand All @@ -546,45 +549,44 @@ def parse(
required=MetadataRequired(include=['entry_id', 'mainfile']),
).data
metadata = [[sid['entry_id'], sid['mainfile']] for sid in search_ids]
if len(metadata) > 1:
for entry_id, mainfile in metadata:
if (
mainfile == filepath_stripped
): # we skipped the current parsed mainfile
continue
entry_archive = self.archive.m_context.load_archive(
entry_id, upload_id, None
for entry_id, mainfile in metadata:
if (
mainfile == filepath_stripped
): # we skipped the current parsed mainfile
continue
entry_archive = self.archive.m_context.load_archive(
entry_id, upload_id, None
)
if dft_path == mainfile:
dft_archive = entry_archive

# ! commented out for now, until VASP parser is ready
# # check if the simulation cell is the same
# dft_cell = dft_archive.m_xpath(
# 'data.model_system[-1].cell[0]'
# )
# tb_cell = self.archive.m_xpath(
# 'data.model_system[-1].cell[0]'
# )
# if dft_cell is not None and tb_cell is not None:
# if dft_cell != tb_cell:
# logger.warning(
# 'The DFT and TB cells do not coincide. We might be connecting wrongly the DFT and TB tasks.'
# )
# else:
# logger.warning(
# 'Could not resolve the DFT and TB cells.'
# )
# return

# Parse the workflow information
dft_plus_tb_archive = self._child_archives.get(
'DFTPlusTB_workflow'
)
if dft_path == mainfile:
dft_archive = entry_archive

# ! commented out for now, until VASP parser is ready
# # check if the simulation cell is the same
# dft_cell = dft_archive.m_xpath(
# 'data.model_system[-1].cell[0]'
# )
# tb_cell = self.archive.m_xpath(
# 'data.model_system[-1].cell[0]'
# )
# if dft_cell is not None and tb_cell is not None:
# if dft_cell != tb_cell:
# logger.warning(
# 'The DFT and TB cells do not coincide. We might be connecting wrongly the DFT and TB tasks.'
# )
# else:
# logger.warning(
# 'Could not resolve the DFT and TB cells.'
# )
# return

# Parse the workflow information
dft_plus_tb_archive = self._child_archives.get(
'DFTPlusTB_workflow'
)
dft_plus_tb = parse_dft_plus_tb_workflow(
dft_archive=dft_archive, tb_archive=self.archive
)
dft_plus_tb_archive.workflow2 = dft_plus_tb
break
dft_plus_tb = parse_dft_plus_tb_workflow(
dft_archive=dft_archive, tb_archive=self.archive
)
dft_plus_tb_archive.workflow2 = dft_plus_tb
break
except Exception:
logger.warning('Could not resolve the DFT+TB workflow for Wannier90.')
10 changes: 7 additions & 3 deletions src/nomad_parser_wannier90/parsers/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,13 @@ def parse_dft_plus_tb_workflow(

dft_task = dft_archive.workflow2
tb_task = tb_archive.workflow2

dft_plus_tb.inputs = dft_task.inputs[0]
dft_plus_tb.outputs = tb_task.outputs[-1]
print(dft_task, tb_task, dft_task.inputs, tb_task.outputs)
print(dft_task.m_xpath('inputs'), dft_task.m_xpath('inputs', dict=False))
print(dft_task.m_xpath('inputs[0]'), dft_task.m_xpath('inputs[0]', dict=False))
print(tb_task.m_xpath('outputs'), dft_task.m_xpath('outputs', dict=False))
print(tb_task.m_xpath('outputs[-1]'), dft_task.m_xpath('outputs[-1]', dict=False))
dft_plus_tb.inputs = dft_task.m_xpath('inputs[0]', dict=False)
dft_plus_tb.outputs = tb_task.m_xpath('outputs[-1]', dict=False)
dft_plus_tb.tasks = [
TaskReference(task=dft_task),
TaskReference(task=tb_task),
Expand Down

1 comment on commit 258398a

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
src/nomad_parser_wannier90
   __init__.py4250%3–4
   _version.py11282%5–6
src/nomad_parser_wannier90/parsers
   __init__.py10280%24–26
   band_parser.py511571%4, 24, 50–51, 73–74, 77–78, 85–89, 98–99, 104–105
   dos_parser.py18194%13
   hr_parser.py48981%4, 28, 46–47, 59–60, 94–96
   parser.py2193086%8–9, 215, 269–270, 310, 367–368, 385, 402, 419, 475–478, 508, 542–590
   win_parser.py1082081%5, 35–36, 65, 162, 169–171, 210, 221–222, 252–255, 262, 264–265, 269, 286–290
src/nomad_parser_wannier90/parsers/utils
   utils.py341847%4, 35–37, 56–75
src/nomad_parser_wannier90/schema_packages
   __init__.py8275%9–11
   package.py550%1–11
TOTAL51710679% 

Tests Skipped Failures Errors Time
2 0 💤 0 ❌ 0 🔥 14.305s ⏱️

Please sign in to comment.