update opflow to read RAW data files

Author: hambrickjc

applications/opflow_main.cpp

@@ -54,8 +54,13 @@ int main(int argc, char **argv) {
                                &flg);
   ExaGOCheckError(ierr);
   if (flg) {
-    ierr = OPFLOWReadMatPowerData(opflow, file);
-    ExaGOCheckError(ierr);
+    if (strcasestr(file, ".raw") != NULL) {
+      ierr = OPFLOWReadPSSERawData(opflow, file);
+      ExaGOCheckError(ierr);
+    } else {
+      ierr = OPFLOWReadMatPowerData(opflow, file);
+      ExaGOCheckError(ierr);
+    }
   } else {
     ierr = OPFLOWReadMatPowerData(opflow, "datafiles/case9/case9mod.m");
     ExaGOCheckError(ierr);

include/opflow.h

@@ -190,6 +190,7 @@ OPFLOWSolverRegister(OPFLOW, const char[], PetscErrorCode (*create)(OPFLOW));
 PETSC_EXTERN PetscErrorCode OPFLOWCreate(MPI_Comm, OPFLOW *);
 PETSC_EXTERN PetscErrorCode OPFLOWDestroy(OPFLOW *);
 PETSC_EXTERN PetscErrorCode OPFLOWReadMatPowerData(OPFLOW, const char[]);
+PETSC_EXTERN PetscErrorCode OPFLOWReadPSSERawData(OPFLOW, const char[]);
 PETSC_EXTERN PetscErrorCode OPFLOWSetGICData(OPFLOW, const char[]);
 
 PETSC_EXTERN PetscErrorCode OPFLOWSetUp(OPFLOW);

src/opflow/interface/opflow.cpp

@@ -1236,6 +1236,23 @@ PetscErrorCode OPFLOWReadMatPowerData(OPFLOW opflow, const char netfile[]) {
   //  data file %s\n",netfile);CHKERRQ(ierr);
   PetscFunctionReturn(0);
 }
+/*
+  OPFLOWReadPSSERawData - Reads the network data given in PSSE raw data format
+
+  Input Parameter
++  opflow - The OPFLOW object
+-  netfile - The name of the network file
+
+*/
+PetscErrorCode OPFLOWReadPSSERawData(OPFLOW opflow, const char netfile[]) {
+  PetscErrorCode ierr;
+
+  PetscFunctionBegin;
+  /* Read MatPower data file and populate the PS data structure */
+  ierr = PSReadPSSERawData(opflow->ps, netfile);
+  CHKERRQ(ierr);
+  PetscFunctionReturn(0);
+}
 
 /*
   OPFLOWSetGICData - Sets the GIC data file
@@ -2136,8 +2153,13 @@ PetscErrorCode OPFLOWSolve(OPFLOW opflow) {
       ierr = OPFLOWCreate(opflow->comm->type, &opflow2);
       CHKERRQ(ierr);
 
-      ierr = OPFLOWReadMatPowerData(opflow2, opflow->ps->net_file_name);
-      CHKERRQ(ierr);
+      if (strcasestr(opflow->ps->net_file_name, ".raw") != NULL) {
+        ierr = OPFLOWReadPSSERawData(opflow2, opflow->ps->net_file_name);
+        CHKERRQ(ierr);
+      } else {
+        ierr = OPFLOWReadMatPowerData(opflow2, opflow->ps->net_file_name);
+        CHKERRQ(ierr);
+      }
 
       ierr = OPFLOWSetModel(opflow2, opflow->modelname);
       CHKERRQ(ierr);