Commit: bd6acb96d2a4d9086b9a42ec2f6dce39db527f01 - fermisurfer (git)

fermisurfer Git

Commit MetaInfo

• Revision: bd6acb96d2a4d9086b9a42ec2f6dce39db527f01 (tree)
• Time: 2022-08-02 18:34:17
• Author: Mitsuaki Kawamura <kawamitsuaki@gmai...>
• Commiter: Mitsuaki Kawamura

Log Message

BXSF file was not read correctly when there is lank line.

Change Summary

• modified: examples/pb.bxsf
• modified: src/read_file.cpp

Incremental Difference

--- a/examples/pb.bxsf
+++ b/examples/pb.bxsf
@@ -9,7 +9,7 @@
  END_INFO
  BEGIN_BLOCK_BANDGRID_3D
  band_energies
- BANDGRID_3D_BANDS
+ BEGIN_BANDGRID_3D
     3
    17   17   17
   0.000000  0.000000  0.000000

--- a/src/read_file.cpp
+++ b/src/read_file.cpp
@@ -433,9 +433,9 @@ void read_bxsf()
   while (strstr(ctmp, "BEGIN_BLOCK_BANDGRID_3D") == NULL) {
     cerr = fgets(ctmp, 256, fp);
   }
-  cerr = fgets(ctmp, 256, fp);
-  cerr = fgets(ctmp, 256, fp);
-
+  while (strstr(ctmp, "BEGIN_BANDGRID_3D") == NULL) {
+    cerr = fgets(ctmp, 256, fp);
+  }
   cerr = fgets(ctmp, 256, fp);
   ierr = sscanf(ctmp, "%d", &nb);
   *terminal << wxString::Format(wxT("  Number of bands : %d\n"), nb);
@@ -456,6 +456,9 @@ void read_bxsf()
 
   for (ib = 0; ib < nb; ib++) {
     cerr = fgets(ctmp, 256, fp);
+    while (strstr(ctmp, "BAND:") == NULL) {
+      cerr = fgets(ctmp, 256, fp);
+    }
     *terminal << wxString::Format(wxT("  Reading %s"), ctmp);
 
     for (i0 = 0; i0 <= ng0[0]; i0++) {