Added zone and area info to JSON output

Author: abhyshr

include/private/psimpl.h

@@ -298,6 +298,9 @@ struct _p_PSLINE {
   PetscScalar kvlevel; /* Kv level for lines, for transformers uses the HV side
                           voltage */
 
+  PetscInt areaf,areat;  /**< Areas for from and to buses */
+  PetscInt zonef,zonet;  /**< Zones for from and to buses */
+
   PSBUS connbuses[2]; /**< From and to buses */
 
   /****** For DC lines **********/
@@ -371,6 +374,7 @@ typedef struct {
   PSConngroupi *ci;
 } PSConngroup;
 
+/* Substation data */
 struct _p_PSSUBST {
   PetscInt num;             /* Substation number */
   PetscInt intnum;          /* Internal number */
@@ -380,6 +384,8 @@ struct _p_PSSUBST {
   PSBUS bus[20];            /* Pointers for buses */
   PetscInt nkvlevels;       /* Number of KV levels at this substation */
   PetscScalar kvlevels[10]; /* Substation KV levels */
+  PetscInt zone;            /* zone number */
+  PetscInt area;            /* area number */
 };
 
 /* Struct to save system summary stats */
@@ -484,6 +490,11 @@ struct _p_PS {
 
   PetscBool read_load_cost; /* are individual load costs assigned? */
 
+  PetscInt  nzones; /* Number of zones */
+  PetscInt  nareas; /* Number of areas */
+  PetscInt  *areas; /* Areas */
+  PetscInt  *zones; /* Zones */
+
   PetscBool setupcalled; /* Is setup called on PS? */
 
   PetscLogDouble solve_real_time;

src/ps/ps.cpp

@@ -858,6 +858,12 @@ PetscErrorCode PSDestroy(PS *ps) {
     CHKERRQ(ierr);
   }
 
+  ierr = PetscFree((*ps)->zones);
+  CHKERRQ(ierr);
+
+  ierr = PetscFree((*ps)->areas);
+  CHKERRQ(ierr);
+
   ierr = PetscFree((*ps)->busext2intmap);
   CHKERRQ(ierr);
   ierr = DMDestroy(&(*ps)->networkdm);

src/ps/psoutput.cpp

@@ -443,6 +443,23 @@ static void PrintJSONArray(FILE *fd, const char *name, int nvals,
   PrintJSONArrayEnd(fd, trail_comma);
 }
 
+static void PrintJSONArrayInt(FILE *fd, int value, bool trail_comma) {
+  std::string str = trail_comma ? "," : "";
+  fprintf(fd, "%s%d%s\n", tabstring, value, str.c_str());
+}
+
+static void PrintJSONIntArray(FILE *fd, const char *name, int nvals,
+                           int *values, bool trail_comma) {
+  PrintJSONArrayBegin(fd, name);
+
+  for (int i = 0; i < nvals - 1; i++) {
+    PrintJSONArrayInt(fd, values[i], true);
+  }
+  PrintJSONArrayInt(fd, values[nvals - 1], false);
+
+  PrintJSONArrayEnd(fd, trail_comma);
+}
+
 static void PrintGenData(FILE *fd, PSBUS bus, bool trail_comma,
                          PetscScalar MVAbase) {
   PSGEN gen;
@@ -522,6 +539,19 @@ static void PrintLineData(FILE *fd, PSLINE line, bool trail_comma,
   PrintJSONDouble(fd, "RATE_A", (line->rateA > 1e5) ? 10000 : line->rateA,
                   true);
 
+  // Zones for from and to bus
+  // Zone from bus
+  PrintJSONInt(fd, "ZONE_FBUS", line->zonef, true);
+
+  // Zone to bus
+  PrintJSONInt(fd, "ZONE_TBUS", line->zonet, true);
+
+  // Area from bus
+  PrintJSONInt(fd, "AREA_FBUS", line->areaf, true);
+
+  // Zone to bus
+  PrintJSONInt(fd, "AREA_TBUS", line->areat, true);
+
   // PF,QF, PT, QT
   PrintJSONDouble(fd, "PF", line->pf * MVAbase, true);
   PrintJSONDouble(fd, "QF", line->qf * MVAbase, true);
@@ -573,6 +603,12 @@ static void PrintBusData(FILE *fd, PSSUBST subst, bool trail_comma,
     // Base KV
     PrintJSONDouble(fd, "BASE_KV", bus->basekV, true);
 
+    // Zone
+    PrintJSONInt(fd, "ZONE", bus->zone, true);
+
+    // Area
+    PrintJSONInt(fd,"AREA",bus->area, true);
+
     // PD
     if (bus->nload) {
       PSBUSGetLoad(bus, 0, &load);
@@ -665,6 +701,8 @@ PetscErrorCode PSSaveSolution_JSON(PS ps, const char outfile[]) {
       snprintf(subst->name, 64, "%d", ps->bus[i].bus_i);
       subst->nbus = 1;
       subst->nkvlevels = 1;
+      subst->zone = ps->bus[i].zone;
+      subst->area = ps->bus[i].area;
       /* Circular distribution of lats and long from some location with .5
        * degrees deviation. This is completely random baseless lat/long creation
        */
@@ -714,6 +752,12 @@ PetscErrorCode PSSaveSolution_JSON(PS ps, const char outfile[]) {
     PrintJSONString(fd, "gicfile", "not given", true);
   }
 
+  /* Print number of zones */
+  PrintJSONInt(fd, "nzones", ps->nzones, true);
+
+  /* Print number of zones */
+  PrintJSONInt(fd, "nareas", ps->nareas, true);
+
   /* Print number of lines */
   PrintJSONInt(fd, "nbranch", ps->Nline, true);
 
@@ -723,6 +767,12 @@ PetscErrorCode PSSaveSolution_JSON(PS ps, const char outfile[]) {
   /* Print Number of bus */
   PrintJSONInt(fd, "nbus", ps->Nbus, true);
 
+  /* Print zones */
+  PrintJSONIntArray(fd, "zones", ps->nzones, ps->zones, true);
+
+  /* Print areas */
+  PrintJSONIntArray(fd, "areas", ps->nareas, ps->areas, true);
+  
   /* Print KV levels */
   PrintJSONArray(fd, "KVlevels", ps->nkvlevels, ps->kvlevels, true);
 
@@ -757,6 +807,12 @@ PetscErrorCode PSSaveSolution_JSON(PS ps, const char outfile[]) {
     // Name
     PrintJSONString(fd, "NAME", ps->substations[i].name, true);
 
+    // Zone number
+    PrintJSONInt(fd, "zone", ps->substations[i].zone, true);
+
+    // Area number
+    PrintJSONInt(fd, "area", ps->substations[i].area, true);
+
     // Number of buses
     PrintJSONInt(fd, "nbus", ps->substations[i].nbus, true);
 
@@ -883,6 +939,8 @@ PetscErrorCode PSSaveSolution_MINIMAL(PS ps, const char outfile[]) {
   fprintf(fd, "\tTotal Load Shed P, Q: %9g, %9g\n",
           ps->sys_info.total_loadshed[0], ps->sys_info.total_loadshed[1]);
   fprintf(fd, "\tSolve Time: %5g\n", ps->solve_real_time);
+  fprintf(fd, "\tNzones: %d\n",ps->nzones);
+  fprintf(fd, "\tNareas: %d\n",ps->nareas);
 
   fclose(fd);
 

src/ps/psreaddata.cpp

@@ -572,6 +572,10 @@ PetscErrorCode PSReadMatPowerData(PS ps, const char netfile[]) {
   ps->Nload = 0;
   ps->maxbusnum = -1;
   ps->read_load_cost = PETSC_FALSE;
+
+  ps->nzones = ps->nareas = 0;
+  ierr = PetscCalloc1(100,&ps->zones);CHKERRQ(ierr);
+  ierr = PetscCalloc1(100,&ps->areas);CHKERRQ(ierr);
   while ((out = fgets(line, MAXLINE, fp)) != NULL) {
     if (strstr(line, "mpc.baseMVA")) {
       /* Read base MVA */
@@ -764,6 +768,26 @@ PetscErrorCode PSReadMatPowerData(PS ps, const char netfile[]) {
       ps->nbus++;
       ps->Nbus++;
 
+      /* Save zone and area information to PS struct */
+      int area_found = 0;
+      for(int num=0; num < ps->nareas; num++) {
+	if(Bus[busi].area == ps->areas[num]) {
+	  area_found = 1;
+	  break;
+	}
+      }
+      if(!area_found) ps->areas[ps->nareas++] = Bus[busi].area;
+
+      int zone_found = 0;
+      for(int num=0; num < ps->nzones; num++) {
+	if(Bus[busi].zone == ps->zones[num]) {
+	  zone_found = 1;
+	  break;
+	}
+      }
+      if(!zone_found) ps->zones[ps->nzones++] = Bus[busi].zone;
+      
+
       Bus[busi].Vmax = Bus[busi].Vmax == 0 ? 1.1 : Bus[busi].Vmax;
       Bus[busi].Vmin = Bus[busi].Vmin == 0 ? 0.9 : Bus[busi].Vmin;
       /* Sanity check for voltage limits */
@@ -1249,6 +1273,12 @@ PetscErrorCode PSReadMatPowerData(PS ps, const char netfile[]) {
       Bus[Branch[bri].internal_i].nconnlines++;
       Bus[Branch[bri].internal_j].nconnlines++;
 
+      /* Set from and to bus areas and zones for the line */
+      Branch[bri].areaf = Bus[Branch[bri].internal_i].area;
+      Branch[bri].areat = Bus[Branch[bri].internal_j].area;
+      Branch[bri].zonef = Bus[Branch[bri].internal_i].zone;
+      Branch[bri].zonet = Bus[Branch[bri].internal_j].zone;
+      
       PetscInt lineididx = 0;
       for (linenum = 0; linenum < bri - 1; linenum++) {
         if (Branch[bri].internal_i == Branch[linenum].internal_i &&
@@ -1380,6 +1410,9 @@ PetscErrorCode PSReadGICData(PS ps) {
       bus = &ps->bus[ps->busext2intmap[bus_num]];
       subst->bus[subst->nbus++] = bus;
 
+      subst->zone = bus->zone;
+      subst->area = bus->area;
+
       for (int j = 0; j < subst->nkvlevels; j++) {
         if (PetscAbsScalar(bus->basekV - subst->kvlevels[j]) < 1e-6) {
           found = true;