From b8196c52f80fe1e086c9cc3e3acdafb0e5e8d93b Mon Sep 17 00:00:00 2001
From: root <pxlppq007@163.com>
Date: Mon, 25 Dec 2023 16:19:36 +0800
Subject: [PATCH 1/2] fix a bug when reading the key block of STRU

---
 dpdata/abacus/scf.py | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/dpdata/abacus/scf.py b/dpdata/abacus/scf.py
index 11f8e4111..3c9393383 100644
--- a/dpdata/abacus/scf.py
+++ b/dpdata/abacus/scf.py
@@ -10,6 +10,15 @@
 ry2ev = EnergyConversion("rydberg", "eV").value()
 kbar2evperang3 = PressureConversion("kbar", "eV/angstrom^3").value()
 
+ABACUS_STRU_KEYS = [
+    "ATOMIC_SPECIES",
+    "NUMERICAL_ORBITAL",
+    "LATTICE_CONSTANT",
+    "LATTICE_VECTORS",
+    "ATOMIC_POSITIONS",
+    "NUMERICAL_DESCRIPTOR",
+    "PAW_FILES"
+]
 
 def CheckFile(ifile):
     if not os.path.isfile(ifile):
@@ -42,6 +51,27 @@ def get_block(lines, keyword, skip=0, nlines=None):
         return None
     return ret
 
+def get_stru_block(lines, keyword):
+    # return the block of lines after keyword in STRU file, and skip the blank lines
+    
+    def clean_comment(line):
+        return re.split("[#]", line)[0]
+        
+    ret = []
+    found = False
+    for i in range(len(lines)):
+        if clean_comment(lines[i]).strip() == keyword:
+            found = True
+            for j in range(i+1, len(lines)):
+                if clean_comment(lines[j]).strip() == '':
+                    continue
+                elif clean_comment(lines[j]).strip() in ABACUS_STRU_KEYS:
+                    break
+                else:
+                    ret.append(clean_comment(lines[j]))            
+    if not found:
+        return None
+    return ret
 
 def get_geometry_in(fname, inlines):
     geometry_path_in = os.path.join(fname, "STRU")
@@ -64,8 +94,8 @@ def get_path_out(fname, inlines):
 
 
 def get_cell(geometry_inlines):
-    cell_lines = get_block(geometry_inlines, "LATTICE_VECTORS", skip=0, nlines=3)
-    celldm_lines = get_block(geometry_inlines, "LATTICE_CONSTANT", skip=0, nlines=1)
+    cell_lines = get_stru_block(geometry_inlines, "LATTICE_VECTORS")
+    celldm_lines = get_stru_block(geometry_inlines, "LATTICE_CONSTANT")
 
     celldm = float(celldm_lines[0].split()[0]) * bohr2ang  # lattice const is in Bohr
     cell = []
@@ -76,7 +106,7 @@ def get_cell(geometry_inlines):
 
 
 def get_coords(celldm, cell, geometry_inlines, inlines=None):
-    coords_lines = get_block(geometry_inlines, "ATOMIC_POSITIONS", skip=0)
+    coords_lines = get_stru_block(geometry_inlines, "ATOMIC_POSITIONS")
     # assuming that ATOMIC_POSITIONS is at the bottom of the STRU file
     coord_type = coords_lines[0].split()[0].lower()  # cartisan or direct
     atom_names = []  # element abbr in periodic table

From 8e13d7d1b65e8c563e942ae6ca9811628b510604 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 08:20:58 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 dpdata/abacus/scf.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dpdata/abacus/scf.py b/dpdata/abacus/scf.py
index 3c9393383..975ef5397 100644
--- a/dpdata/abacus/scf.py
+++ b/dpdata/abacus/scf.py
@@ -17,9 +17,10 @@
     "LATTICE_VECTORS",
     "ATOMIC_POSITIONS",
     "NUMERICAL_DESCRIPTOR",
-    "PAW_FILES"
+    "PAW_FILES",
 ]
 
+
 def CheckFile(ifile):
     if not os.path.isfile(ifile):
         print("Can not find file %s" % ifile)
@@ -51,28 +52,30 @@ def get_block(lines, keyword, skip=0, nlines=None):
         return None
     return ret
 
+
 def get_stru_block(lines, keyword):
     # return the block of lines after keyword in STRU file, and skip the blank lines
-    
+
     def clean_comment(line):
         return re.split("[#]", line)[0]
-        
+
     ret = []
     found = False
     for i in range(len(lines)):
         if clean_comment(lines[i]).strip() == keyword:
             found = True
-            for j in range(i+1, len(lines)):
-                if clean_comment(lines[j]).strip() == '':
+            for j in range(i + 1, len(lines)):
+                if clean_comment(lines[j]).strip() == "":
                     continue
                 elif clean_comment(lines[j]).strip() in ABACUS_STRU_KEYS:
                     break
                 else:
-                    ret.append(clean_comment(lines[j]))            
+                    ret.append(clean_comment(lines[j]))
     if not found:
         return None
     return ret
 
+
 def get_geometry_in(fname, inlines):
     geometry_path_in = os.path.join(fname, "STRU")
     for line in inlines: