Skip to content

Commit

Permalink
Didn't quite fix that completely in last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
espottesmith committed Nov 15, 2021
1 parent beefbc4 commit 8f50644
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mpcat/apprehend/jaguar_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from monty.json import MSONable, jsanitize

from pymatgen.core.periodic_table import DummySpecies
from pymatgen.core.periodic_table import DummySpecie

from schrodinger.application.jaguar.output import JaguarOutput
from schrodinger.application.jaguar.results import JaguarResults
Expand Down Expand Up @@ -255,10 +255,10 @@ def __init__(self, filename: str, allow_failure: Optional[bool] = False,
base_dir / self.data["output"]["output_file"])
self.data["output"]["molecule"] = self.data["molecule_trajectory"][-1]

self.data["input"]["molecule"].remove_species([DummySpecies("")])
self.data["input"]["molecule"].remove_species([DummySpecie("")])
for m in self.data["molecule_trajectory"]:
m.remove_species([DummySpecies("")])
self.data["output"]["molecule"].remove_species([DummySpecies("")])
m.remove_species([DummySpecie("")])
self.data["output"]["molecule"].remove_species([DummySpecie("")])

else:
self.data["input"]["molecule"] = None
Expand Down
4 changes: 4 additions & 0 deletions mpcat/automate/atomate/drones.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@

logger = get_logger(__name__)

#TODO: Parse charge properly
# Also as an int (rather than float)


class GSMDrone(AbstractDrone):
"""
Expand Down Expand Up @@ -86,6 +89,7 @@ def assimilate(self, path, molecule_file="input.xyz", template_file="qin",
logger.info("Getting task doc for base dir :{}".format(path))

all_files = os.listdir(path)
all_scratch_files = list()
if "scratch" in all_files:
all_scratch_files = os.listdir(os.path.join(path, "scratch"))

Expand Down

0 comments on commit 8f50644

Please sign in to comment.