Changeset 125

Timestamp:

08/31/11 12:09:03 (22 months ago)

Author:

joseba

Message:

Added the no supported options in the errors.

Location:

trunk/src

Files:

• pspio_error.c (modified) (1 diff)
• pspio_error.h (modified) (1 diff)
• read_upf.c (modified) (1 diff)

trunk/src/pspio_error.c

@@ -125 +125 @@
     case PSPIO_ENOMEM:
       return "malloc failed";
+    case PSPIO_NOSUPPORT:
+      return "No supported option in the pseudo-potential file";
     default:
       return "unknown error code" ;

trunk/src/pspio_error.h

@@ -43 +43 @@
 #define PSPIO_EGSL  6
 #define PSPIO_ENOMEM 7
-
+#define PSPIO_ENOSUPPORT 8
 
 /**********************************************************************

trunk/src/read_upf.c

@@ -66 +66 @@
   narg = sscanf (line, "%2c",&kind_ps[0]); // read the kind of pseudo-potentials US|NC|PAW    "Ultrasoft|Norm conserving|Projector-augmented" 
   PSPIO_ASSERT(narg==1, PSPIO_EIO);     
+  //LIBPSP_IO can only read norm-conserving pseudo-potentials from UPF format.
   if (!strncpm(kind_ps,"NC",2)) {
-    printf("LIBPSP_IO can only read norm-conserving pseudo-potentials from UPF format.");
-    return PSPIO_ETYPE;
-  }
-        
+    HANDLE_ERROR(PSPIO_ENOSUPPORT);
+  }
+  
   if(fgets(line, MAX_STRLEN, fp) == NULL) {
     HANDLE_ERROR(PSPIO_EIO);