move file transfer from write_input method of VaspInputSet to VaspInput

Author: esoteric-ephemera

pymatgen/io/vasp/inputs.py

@@ -19,6 +19,8 @@
 from enum import Enum, unique
 from glob import glob
 from hashlib import sha256
+from pathlib import Path
+from shutil import copyfileobj
 from typing import TYPE_CHECKING, NamedTuple, cast
 from zipfile import ZipFile
 
@@ -39,7 +41,6 @@
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
-    from pathlib import Path
     from typing import Any, ClassVar, Literal
 
     from numpy.typing import ArrayLike
@@ -2801,6 +2802,7 @@ def write_input(
         make_dir_if_not_present: bool = True,
         cif_name: str | None = None,
         zip_name: str | None = None,
+        files_to_transfer: dict | None = None,
     ) -> None:
         """
         Write VASP inputs to a directory.
@@ -2813,7 +2815,11 @@ def write_input(
             cif_name (str or None): If a str, the name of the CIF file
                 to write the POSCAR to (the POSCAR will also be written).
             zip_name (str or None): If a str, the name of the zip to
-                archive the vasp input set to.
+                archive the VASP input set to.
+            files_to_transfer (dict) : A dictionary of
+                    { < input filename >: < output filepath >}.
+                This allows the transfer of < input filename > files from
+                a previous calculation to < output filepath >.
         """
         if not os.path.isdir(output_dir) and make_dir_if_not_present:
             os.makedirs(output_dir)
@@ -2840,6 +2846,11 @@ def write_input(
                     except (FileNotFoundError, PermissionError, IsADirectoryError):
                         pass
 
+        files_to_transfer = files_to_transfer or {}
+        for key, val in files_to_transfer.items():
+            with zopen(val, "rb") as fin, zopen(str(Path(output_dir) / key), "wb") as fout:
+                copyfileobj(fin, fout)
+
     @classmethod
     def from_directory(
         cls,

pymatgen/io/vasp/sets/base.py

@@ -29,7 +29,6 @@
 from __future__ import annotations
 
 import abc
-import shutil
 import warnings
 from copy import deepcopy
 from dataclasses import dataclass, field
@@ -39,7 +38,6 @@
 
 import numpy as np
 from monty.dev import deprecated
-from monty.io import zopen
 from monty.json import MSONable
 from monty.serialization import loadfn
 
@@ -368,12 +366,9 @@ def write_input(
             make_dir_if_not_present=make_dir_if_not_present,
             cif_name=cif_name,
             zip_name=f"{type(self).__name__}.zip" if zip_output else None,
+            files_to_transfer=self.files_to_transfer,
         )
 
-        for key, val in self.files_to_transfer.items():
-            with zopen(val, "rb") as fin, zopen(str(Path(output_dir) / key), "wb") as fout:
-                shutil.copyfileobj(fin, fout)
-
     def as_dict(self, verbosity=2):
         """
         Args: