Do not ouptut individual load parameters if not in original network (#112)

* Only output individual load costs if they are read (#109)

* If needed, initialize individual load cost parameters (#109)

* Apply pre-commmit fixes

Author: wperkins

include/private/psimpl.h

@@ -451,6 +451,8 @@ struct _p_PS {
 
   PSSystemSummary sys_info;
 
+  PetscBool read_load_cost; /* are individual load costs assigned? */
+
   PetscBool setupcalled; /* Is setup called on PS? */
 
   PetscLogDouble solve_real_time;

src/opflow/interface/opflow.cpp

@@ -1644,20 +1644,22 @@ PetscErrorCode OPFLOWSetUp(OPFLOW opflow) {
     ierr = OPFLOWGetLinesMonitored(opflow);
     CHKERRQ(ierr);
   }
+
+  /* Set individual load cost parameters to the blanket values if they
+     were not read from the input network */
   if (opflow->include_loadloss_variables) {
     PS ps;
-    PSBUS bus;
-    PSLOAD load;
-
     ierr = OPFLOWGetPS(opflow, &ps);
     CHKERRQ(ierr);
 
-    for (int i = 0; i < ps->nbus; i++) {
-      bus = &(ps->bus[i]);
-      for (int l = 0; l < bus->nload; l++) {
-        ierr = PSBUSGetLoad(bus, l, &load);
-        CHKERRQ(ierr);
-        if (load->loss_cost == BOGUSLOSSCOST) {
+    if (!ps->read_load_cost) {
+      for (int i = 0; i < ps->nbus; i++) {
+        PSBUS bus = &(ps->bus[i]);
+        for (int l = 0; l < bus->nload; l++) {
+          PSLOAD load;
+          ierr = PSBUSGetLoad(bus, l, &load);
+          CHKERRQ(ierr);
+          load->loss_frac = 1.0;
           load->loss_cost = opflow->loadloss_penalty;
         }
       }

src/ps/psoutput.cpp

@@ -232,21 +232,24 @@ PetscErrorCode PSSaveSolution_MATPOWER(PS ps, const char outfile[]) {
     fprintf(fd, "\n};\n");
   }
 
-  /* Load cost data */
-  fprintf(fd, "\n%%%% load cost data\n");
-  fprintf(fd, "%% %%maxallowedloadshed loadshedcost\n");
-  fprintf(fd, "mpc.loadcost = [\n");
-  for (i = 0; i < ps->nbus; i++) {
-    bus = &ps->bus[i];
-    for (k = 0; k < bus->nload; k++) {
-      PSLOAD load;
-      ierr = PSBUSGetLoad(bus, k, &load);
-      CHKERRQ(ierr);
-      fprintf(fd, "%10.5g %10.5g; \n", load->loss_frac * 100.0,
-              load->loss_cost);
+  if (ps->read_load_cost) {
+
+    /* Load cost data */
+    fprintf(fd, "\n%%%% load cost data\n");
+    fprintf(fd, "%% %%maxallowedloadshed loadshedcost\n");
+    fprintf(fd, "mpc.loadcost = [\n");
+    for (i = 0; i < ps->nbus; i++) {
+      bus = &ps->bus[i];
+      for (k = 0; k < bus->nload; k++) {
+        PSLOAD load;
+        ierr = PSBUSGetLoad(bus, k, &load);
+        CHKERRQ(ierr);
+        fprintf(fd, "%10.5g %10.5g; \n", load->loss_frac * 100.0,
+                load->loss_cost);
+      }
     }
+    fprintf(fd, "];\n");
   }
-  fprintf(fd, "];\n");
 
   /* Solution summary info */
   fprintf(fd, "\n%%%% summary data\n");

src/ps/psreaddata.cpp

@@ -539,6 +539,7 @@ PetscErrorCode PSReadMatPowerData(PS ps, const char netfile[]) {
 
   ps->Nload = 0;
   ps->maxbusnum = -1;
+  ps->read_load_cost = PETSC_FALSE;
   while ((out = fgets(line, MAXLINE, fp)) != NULL) {
     if (strstr(line, "mpc.baseMVA")) {
       /* Read base MVA */
@@ -557,6 +558,7 @@ PetscErrorCode PSReadMatPowerData(PS ps, const char netfile[]) {
       gencost_start_line =
           line_counter + 1; /* Gen cost data starts from next line */
     if (strstr(line, "mpc.loadcost") != NULL) {
+      ps->read_load_cost = PETSC_TRUE;
       loadcost_start_line =
           line_counter + 1; /* Load cost data starts from next line */
     }