Changeset 112

Timestamp:

08/31/11 01:40:16 (21 months ago)

Author:

mjv500

Message:

error handling updates

Location:

trunk/src

Files:

• read_abinit5.c (modified) (3 diffs)
• read_abinit_header.c (modified) (4 diffs)

trunk/src/read_abinit5.c

@@ -53 +53 @@
   HANDLE_FUNC_ERROR (read_abinit_header(fp, psp_data, pspcod, rchrg, fchrg))
 
+  /// make core charge if needed
   if (rchrg > 0.0) {
     psp_data->has_nlcc = 1;
@@ -58 +59 @@
   }
 
+  /// read in 
   /**< read in psp code and xc code*/
   if(fgets(line, MAX_STRLEN, fp) == NULL) {
@@ -63 +65 @@
   }
   narg = sscanf (line, "%d %d %d %d %d", &pspcod, &pspxc, &(psp_data->l_max), &idum, &((psp_data->mesh)->np) );
-  ///check narg is equal to 5
+  PSPIO_ASSERT(narg==5, PSPIO_EIO)
 
   return PSPIO_SUCCESS;

trunk/src/read_abinit_header.c

@@ -66 +66 @@
   }
   narg = sscanf (line, "%lf %lf %d", &(psp_data->z), &(psp_data->zvalence), &idum);
-  ///check narg is equal to 2
+  PSPIO_ASSERT(narg==2, PSPIO_EIO)
  
   /**< read in psp code and xc code*/
@@ -73 +73 @@
   }
   narg = sscanf (line, "%d %d %d %d %d", &pspcod, &pspxc, &(psp_data->l_max), &(psp_data->l_local), &np);
-  ///check narg is equal to 5
+  PSPIO_ASSERT(narg==5, PSPIO_EIO)
+
 
   HANDLE_FUNC_ERROR(pspio_mesh_alloc(psp_data->mesh, np))
@@ -93 +94 @@
       break;
     default:
+      HANDLE_FUNC_ERROR(pspio_mesh_free(psp_data->mesh))
       HANDLE_ERROR(PSPIO_EVALUE)
   }
 
 
-  HANDLE_FUNC_ERROR( ab2libxc(pspxc,psp_data) )
+  ierr = ab2libxc(pspxc,psp_data);
+  if (ierr){
+    HANDLE_FUNC_ERROR(pspio_mesh_free(psp_data->mesh))
+    HANDLE_ERROR(ierr)
+  }
 
   /// if we have a NLCC data line to read
@@ -105 +111 @@
   /**< read in NLCC parameters */
     if(fgets(line, MAX_STRLEN, fp) == NULL) {
+      HANDLE_FUNC_ERROR(pspio_mesh_free(psp_data->mesh))
       HANDLE_ERROR(PSPIO_EIO)
     }
     narg = sscanf (line, "%lf %lf %lf", &rchrg, &fchrg, &qchrg);
-    ///check narg is equal to 3
+    PSPIO_ASSERT(narg==3, PSPIO_EIO)
   }