Use new parser in pflow

Author: PhilipFackler

include/private/psse.hpp

@@ -244,6 +244,9 @@ class BusMapping {
   void Resolve(std::size_t &bus_number, std::string &bus_name,
                Optional opt = Optional{false}) const;
 
+  const auto &GetIdToIdMap() const { return id_map_; }
+  const auto &GetNameToIdMap() const { return name_map_; }
+
 private:
   std::vector<Bus> &buses_;
   std::unordered_map<std::size_t, std::size_t> id_map_;

src/pflow/pflow.cpp

@@ -1,6 +1,7 @@
 #include "exago_config.h"
 #include <private/pflowimpl.h>
 #include <private/psimpl.h>
+#include <psse.hpp>
 
 const char *const PFLOWOutputFormatTypes[] = {
     "MATPOWER", "CSV", "JSON", "MINIMAL", "OutputFormat", "", NULL};
@@ -105,7 +106,8 @@ PetscErrorCode PFLOWReadPSSERawData(PFLOW pflow, const char netfile[]) {
 
   PetscFunctionBegin;
   /* Read MatPower data file and populate the PS data structure */
-  ierr = PSReadPSSERawData(pflow->ps, netfile);
+  auto nw = exago::psse::ParseNetwork(netfile);
+  ierr = exago::psse::ConvertToPS(pflow->ps, nw);
   CHKERRQ(ierr);
   PetscFunctionReturn(0);
 }

src/ps/psse.cpp

@@ -461,10 +461,12 @@ PetscErrorCode ConvertToPS(PS ps, const Network &nw) {
   ps->Nbus = ps->nbus = nw.buses.size();
   ierr = PetscCalloc1(ps->Nbus, &ps->bus);
   CHKERRQ(ierr);
+  std::size_t maxbusi = 0;
   for (int i = 0; i < ps->Nbus; ++i) {
     auto &dbus = ps->bus[i];
     const auto &sbus = nw.buses[i];
     dbus.bus_i = sbus.i;
+    maxbusi = std::max(maxbusi, sbus.i);
     strcpy(dbus.name, sbus.name.c_str());
     dbus.basekV = sbus.baskv;
     dbus.ide = sbus.ide;
@@ -496,6 +498,16 @@ PetscErrorCode ConvertToPS(PS ps, const Network &nw) {
     dbus.MVAbasetot = 0.0;
   }
 
+  ps->maxbusnum = maxbusi;
+  ierr = PetscCalloc1(ps->maxbusnum + 1, &ps->busext2intmap);
+  CHKERRQ(ierr);
+  for (int i = 0; i < ps->maxbusnum + 1; i++) {
+    ps->busext2intmap[i] = -1;
+  }
+  for (const auto& [ext_i, int_i] : nw.bus_mapping.GetIdToIdMap()) {
+    ps->busext2intmap[ext_i] = int_i;
+  }
+
   // loads
   ps->Nload = ps->nload = nw.loads.size();
   ierr = PetscCalloc1(ps->Nload, &ps->load);