ion-CSP 2.1.9__py3-none-any.whl → 2.2.0__py3-none-any.whl

ion_CSP/__init__.py

@@ -1,7 +1,7 @@
 __author__ = "Ze Yang"
 __contact__ = "yangze1995007@163.com"
 __license__ = "MIT"
-__version__ = "2.1.9"
+__version__ = "2.2.0"
 __date__ = "2025-06-27"
 
 

ion_CSP/empirical_estimate.py

@@ -79,11 +79,11 @@ class EmpiricalEstimation:
         self.folders = folders
         self.ratios = ratios
         self.sort_by = sort_by
-        if sort_by not in ("density", "nitrogen"):
-            raise ValueError(f"The sort_by parameter must be either 'density' or 'nitrogen', but got '{sort_by}'")
+        if sort_by not in ("density", "nitrogen", "NC_ratio"):
+            raise ValueError(f"The sort_by parameter must be either 'density' 'nitrogen' or 'NC_ratio', but got '{sort_by}'")
         self.density_csv = "sorted_density.csv"
         self.nitrogen_csv = "sorted_nitrogen.csv"
-        self.carbon_nitrogen_csv = "specific_C_N_ratio.csv"
+        self.NC_ratio_csv = "specific_NC_ratio.csv"
         # 检查Multiwfn可执行文件是否存在
         self.multiwfn_path = self._check_multiwfn_executable()
     
@@ -487,7 +487,7 @@ class EmpiricalEstimation:
         filtered_data.sort(key=lambda x: (-x[1], -x[2]))
 
         # 写入排序后的 .csv 文件
-        with open(self.carbon_nitrogen_csv, "w", newline="", encoding="utf-8") as csv_file:
+        with open(self.NC_ratio_csv, "w", newline="", encoding="utf-8") as csv_file:
             writer = csv.writer(csv_file)
             # 动态生成表头
             num_components = len(combinations[0]) if combinations else 0
@@ -642,6 +642,8 @@ class EmpiricalEstimation:
             base_csv = self.density_csv
         elif self.sort_by == 'nitrogen':
             base_csv = self.nitrogen_csv
+        elif self.sort_by == "NC_ratio":
+            base_csv = self.NC_ratio_csv
         if not target_dir:
             target_dir = f'../2_{self.sort_by}_combos'
         with open(base_csv, mode='r', newline='') as file:

ion_CSP/vasp_processing.py

@@ -140,9 +140,7 @@ class VaspProcessing:
             task_dir = os.path.join(self.for_vasp_opt_dir, f"{parent}pop{pop}")
             for job_i in node_jobs[pop]:
                 vasp_dir = mlp_contcar_files[job_i].split("CONTCAR_")[1]
-                shutil.copytree(
-                    f"{task_dir}/{vasp_dir}", f"{self.vasp_optimized_dir}/{vasp_dir}"
-                )
+                shutil.copytree(f"{task_dir}/{vasp_dir}", f"{self.vasp_optimized_dir}/{vasp_dir}", dirs_exist_ok=True)
             # 在成功完成 VASP 分步优化后，删除 3_for_vasp_opt/{parent}/pop{n} 文件夹以节省空间
             shutil.rmtree(task_dir)
         if machine_inform["context_type"] == "SSHContext":
@@ -256,10 +254,16 @@ class VaspProcessing:
             task_dir = os.path.join(self.vasp_optimized_dir, f"{parent}pop{pop}")
             for job_i in node_jobs[pop]:
                 vasp_dir = vasp_optimized_folders[job_i]
-                shutil.copytree(
-                    f"{task_dir}/{vasp_dir}/fine/final",
-                    f"{self.vasp_optimized_dir}/{vasp_dir}/fine/final",
-                )
+                try:
+                    shutil.copytree(
+                        f"{task_dir}/{vasp_dir}/fine/final",
+                        f"{self.vasp_optimized_dir}/{vasp_dir}/fine/final", 
+                        dirs_exist_ok=True,
+                    )
+                except FileNotFoundError:
+                    logging.error(
+                        f"No final optimization results found for {vasp_dir} in {task_dir}"
+                    )
             # 在成功完成 VASP 分步优化后，删除 4_vasp_optimized /{parent}/pop{n} 文件夹以节省空间
             shutil.rmtree(task_dir)
         if machine_inform["context_type"] == "SSHContext":
@@ -267,127 +271,6 @@ class VaspProcessing:
             shutil.rmtree(os.path.join(self.vasp_optimized_dir, parent))
         logging.info("Batch VASP optimization completed!!!")
 
-    def dpdisp_vasp_complete_tasks(
-        self,
-        machine: str,
-        resources: str,
-        nodes: int = 1,
-    ):
-        """
-        Based on the dpdispatcher module, prepare and submit files for optimization on remote server or local machine.
-        """
-        # 调整工作目录，减少错误发生
-        os.chdir(self.for_vasp_opt_dir)
-        # 读取machine.json和resources.json的参数
-        if machine.endswith(".json"):
-            machine = Machine.load_from_json(machine)
-        elif machine.endswith(".yaml"):
-            machine = Machine.load_from_yaml(machine)
-        else:
-            raise KeyError("Not supported machine file type")
-        if resources.endswith(".json"):
-            resources = Resources.load_from_json(resources)
-        elif resources.endswith(".yaml"):
-            resources = Resources.load_from_yaml(resources)
-        else:
-            raise KeyError("Not supported resources file type")
-        # 由于dpdispatcher对于远程服务器以及本地运行的forward_common_files的默认存放位置不同，因此需要预先进行判断，从而不改动优化脚本
-        machine_inform = machine.serialize()
-        if machine_inform["context_type"] == "SSHContext":
-            # 如果调用远程服务器，则创建二级目录
-            parent = "data/"
-        elif machine_inform["context_type"] == "LocalContext":
-            # 如果在本地运行作业，则只在后续创建一级目录
-            parent = ""
-
-        # 获取dir文件夹中所有以prefix_name开头的文件，在此实例中为POSCAR_
-        mlp_contcar_files = [
-            f for f in os.listdir(self.for_vasp_opt_dir) if f.startswith("CONTCAR_")
-        ]
-        # 创建一个嵌套列表来存储每个节点的任务并将文件平均依次分配给每个节点
-        # 例如：对于10个结构文件任务分发给4个节点的情况，则4个节点领到的任务分别[0, 4, 8], [1, 5, 9], [2, 6], [3, 7]
-        node_jobs = [[] for _ in range(nodes)]
-        for index, file in enumerate(mlp_contcar_files):
-            node_index = index % nodes
-            node_jobs[node_index].append(index)
-        task_list = []
-        for pop in range(nodes):
-            forward_files = [
-                "INCAR_1",
-                "INCAR_2",
-                "INCAR_3",
-                "POTCAR_H",
-                "POTCAR_C",
-                "POTCAR_N",
-                "POTCAR_O",
-                "sub_final.sh",
-            ]
-            backward_files = ["log", "err"]
-            # 将所有参数文件各复制一份到每个 task_dir 目录下
-            task_dir = os.path.join(self.for_vasp_opt_dir, f"{parent}pop{pop}")
-            os.makedirs(task_dir, exist_ok=True)
-            for file in forward_files:
-                shutil.copyfile(self.param_dir.joinpath(file), f"{task_dir}/{file}")
-            for job_i in node_jobs[pop]:
-                # 将分配好的POSCAR文件添加到对应的上传文件中
-                forward_files.append(mlp_contcar_files[job_i])
-                vasp_dir = mlp_contcar_files[job_i].split("CONTCAR_")[1]
-                # 每个POSCAR文件在优化后都取回对应的CONTCAR和OUTCAR输出文件
-                backward_files.append(f"{vasp_dir}/*")
-                backward_files.append(f"{vasp_dir}/fine/*")
-                backward_files.append(f"{vasp_dir}/fine/final/*")
-                shutil.copyfile(
-                    f"{self.for_vasp_opt_dir}/{mlp_contcar_files[job_i]}",
-                    f"{task_dir}/{mlp_contcar_files[job_i]}",
-                )
-
-            remote_task_dir = f"{parent}pop{pop}"
-            command = "chmod +x sub_final.sh && ./sub_final.sh"
-            task = Task(
-                command=command,
-                task_work_path=remote_task_dir,
-                forward_files=forward_files,
-                backward_files=backward_files,
-            )
-            task_list.append(task)
-
-        submission = Submission(
-            work_base=self.for_vasp_opt_dir,
-            machine=machine,
-            resources=resources,
-            task_list=task_list,
-        )
-        submission.run_submission()
-
-        # 创建用于存放优化后文件的 4_vasp_optimized 目录
-        os.makedirs(self.vasp_optimized_dir, exist_ok=True)
-        mlp_outcar_files = [
-            f for f in os.listdir(self.for_vasp_opt_dir) if f.startswith("OUTCAR_")
-        ]
-        for mlp_contcar, mlp_outcar in zip(mlp_contcar_files, mlp_outcar_files):
-            shutil.copyfile(
-                f"{self.for_vasp_opt_dir}/{mlp_contcar}",
-                f"{self.vasp_optimized_dir}/{mlp_contcar}",
-            )
-            shutil.copyfile(
-                f"{self.for_vasp_opt_dir}/{mlp_outcar}",
-                f"{self.vasp_optimized_dir}/{mlp_outcar}",
-            )
-        for pop in range(nodes):
-            # 从传回的 pop 文件夹中将结果文件取到 4_vasp_optimized 目录
-            task_dir = os.path.join(self.for_vasp_opt_dir, f"{parent}pop{pop}")
-            for job_i in node_jobs[pop]:
-                vasp_dir = mlp_contcar_files[job_i].split("CONTCAR_")[1]
-                shutil.copytree(
-                    f"{task_dir}/{vasp_dir}", f"{self.vasp_optimized_dir}/{vasp_dir}"
-                )
-            # 在成功完成 VASP 分步优化后，删除 3_for_vasp_opt/{parent}/pop{n} 文件夹以节省空间
-            shutil.rmtree(task_dir)
-        if machine_inform["context_type"] == "SSHContext":
-            # 如果调用远程服务器，则删除data级目录
-            shutil.rmtree(os.path.join(self.for_vasp_opt_dir, parent))
-        logging.info("Batch VASP optimization completed!!!")
-
     def read_vaspout_save_csv(self, molecules_prior: bool, relaxation: bool = False):
         """
         Read VASP output files in batches and save energy and density to corresponding CSV files in the directory
@@ -626,6 +509,17 @@ class VaspProcessing:
             writer.writerow(header)
             for data in datas:
                 writer.writerow(data)
+                
+        logging.info(
+            f"Maximum MLP Density: {max(mlp_densities)}, Structure Number: {numbers[mlp_densities.index(max(mlp_densities))]}"
+        )
+        logging.info(
+            f"Maximum Fine Density: {max(fine_densities)}, Structure Number: {numbers[fine_densities.index(max(fine_densities))]}"
+        )
+        if relaxation:
+            logging.info(
+                f"Maximum Final Density: {max(final_densities)}, Structure Number: {numbers[final_densities.index(max(final_densities))]}"
+            )
 
     def export_max_density_structure(self):
         """

{ion_csp-2.1.9.dist-info → ion_csp-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ion_CSP
-Version: 2.1.9
+Version: 2.2.0
 Summary: Crystal Structure Design Software Based on Molecular/Ionic Configuration.
 Home-page: https://github.com/bagabaga007/ion_CSP
 Author: Ze Yang
@@ -28,7 +28,7 @@ Dynamic: home-page
 Dynamic: license-file
 Dynamic: requires-python
 
-# 基于分子/离子构型的晶体结构设计软件 V2.1
+# 基于分子/离子构型的晶体结构设计软件 V2.2
 
 ## 项目概述
 

{ion_csp-2.1.9.dist-info → ion_csp-2.2.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-ion_CSP/__init__.py,sha256=3in4RkuAl_VL3kDHDz_CHQn3zEBtH1Z-H8aFniQbQI8,356
+ion_CSP/__init__.py,sha256=1WGzlZrB669L2oFjKynPwf89qMUaSmlCttuR4864M_Y,356
 ion_CSP/__main__.py,sha256=XlNCx5eMSrL7yld9ddSYXhjXvg2ZYGD_uk9LdqNabvs,74
 ion_CSP/convert_SMILES.py,sha256=HAexqf6HXZAqRuMww5BKmU68MIO3d7XIaUtPKv_QwMs,15595
-ion_CSP/empirical_estimate.py,sha256=oqZ-yPbcFCgc0MkOu2PU7JWRNm3fXHm6YRq-bozCZoo,37776
+ion_CSP/empirical_estimate.py,sha256=aSidH3jyoG39ky-kDNUY0ix8hPefeVVWmPABVjTmy0g,37866
 ion_CSP/gen_opt.py,sha256=F_gEopuOO-b-tHfS0V4OMeThktY2QvPGWCVRXOCemfk,21605
 ion_CSP/identify_molecules.py,sha256=GxDWq815Bk_Fq_SR8fe-dbrbEi1YgATVa7UINw3hAu4,5535
 ion_CSP/log_and_time.py,sha256=Db53LAM2KH_ty6M9_5FF8xDGiULgExh7pcKOvFtS7DQ,11697
@@ -10,7 +10,7 @@ ion_CSP/read_mlp_density.py,sha256=KwVgniroT46uFQ7_HROd5Fk9YxJCMip1jnufWvHHEiw,1
 ion_CSP/steps_opt_monitor.sh,sha256=1klPjnK0gqkDbvI9PtjdK5qidJ5G0Mo8q1SfrlLW5xM,3330
 ion_CSP/task_manager.py,sha256=JglPNDKpsv-bjbCm42D4k6GegDkSylX4oDWAdFa-oSU,16569
 ion_CSP/upload_download.py,sha256=HXxVQMUydEoHe2vV89wR7De4Ut1lEte6pmp8Q82decI,23800
-ion_CSP/vasp_processing.py,sha256=YhZxEg03n2lwDtoYzpXdUn329QzfOvp4XXm-qTIIIMA,33337
+ion_CSP/vasp_processing.py,sha256=Q4OotC5eK4RN4R3GZu5DnLk7wnkYSh-yC1oeGvrtT5U,28436
 ion_CSP/model/model.pt,sha256=5D9HTP5b7jUOv3kHltT71ORzhgt5p96awjbqC4oZVjQ,24649402
 ion_CSP/model/options/README.md,sha256=ifoeNXF2CfwqUjt3Xmh5qUl-e4hfP4eMV4EkqV7GU30,182
 ion_CSP/model/options/model.ckpt-4000000.pt,sha256=5D9HTP5b7jUOv3kHltT71ORzhgt5p96awjbqC4oZVjQ,24649402
@@ -35,9 +35,9 @@ ion_CSP/run/run_gen_opt.py,sha256=_Zcsu0FkuZTfiGKSWNaK17LiyQ3qrP30F66UN5QemCo,27
 ion_CSP/run/run_read_mlp_density.py,sha256=aSJjWS1jH-D7qzx7RnpMPSTH7KEZp2b35dg1b2OQSCM,1864
 ion_CSP/run/run_upload_download.py,sha256=wuTAdy4bgdduD7TJtgHwo_fTpHKlkAwmgRknClDLYDo,2436
 ion_CSP/run/run_vasp_processing.py,sha256=hziE4cZwmIWvVaZtwHn9Dl35apYSLlMvSVIbCyd5mFg,1612
-ion_csp-2.1.9.dist-info/licenses/LICENSE,sha256=yeL9PshY_rGAt3GKqn8U7NafHifpmZipb-Owu0DDrHo,1070
-ion_csp-2.1.9.dist-info/METADATA,sha256=OM9yIEVI-_77HaYxgA4qIfed2BRTs34mNgJbfLHYyFg,6314
-ion_csp-2.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ion_csp-2.1.9.dist-info/entry_points.txt,sha256=NexQJDs9f69kJA2DgoU6tsA3V8a66nadJRem1U_c_6g,54
-ion_csp-2.1.9.dist-info/top_level.txt,sha256=aYZa43dDebjLpWPN6bDIlBb6BVwA8gk4ajEjDDK9b9I,8
-ion_csp-2.1.9.dist-info/RECORD,,
+ion_csp-2.2.0.dist-info/licenses/LICENSE,sha256=yeL9PshY_rGAt3GKqn8U7NafHifpmZipb-Owu0DDrHo,1070
+ion_csp-2.2.0.dist-info/METADATA,sha256=7vO9oy9g9NEA_XQWdWBZSXda1VxTcE8NzuyCvr06VQ8,6314
+ion_csp-2.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ion_csp-2.2.0.dist-info/entry_points.txt,sha256=NexQJDs9f69kJA2DgoU6tsA3V8a66nadJRem1U_c_6g,54
+ion_csp-2.2.0.dist-info/top_level.txt,sha256=aYZa43dDebjLpWPN6bDIlBb6BVwA8gk4ajEjDDK9b9I,8
+ion_csp-2.2.0.dist-info/RECORD,,