Supporting setting GIC file for SCOPFLOW.

pnnl · Dec 20, 2024 · de87d9e · de87d9e
1 parent a25d58d
commit de87d9e
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 3 deletions.
diff --git a/applications/scopflow_main.cpp b/applications/scopflow_main.cpp
@@ -9,9 +9,10 @@ int main(int argc, char **argv) {
   SCOPFLOW scopflow;
   char file[PETSC_MAX_PATH_LEN];
   char ctgcfile[PETSC_MAX_PATH_LEN];
+  char gicfile[PETSC_MAX_PATH_LEN];
   char outputdir[PETSC_MAX_PATH_LEN];
   PetscBool outputdir_set;
-  PetscBool flg = PETSC_FALSE, flgctgc = PETSC_FALSE;
+  PetscBool flg = PETSC_FALSE, flgctgc = PETSC_FALSE, flggic = PETSC_FALSE;
   PetscBool print_output = PETSC_FALSE, save_output = PETSC_FALSE;
   PetscLogStage stages[3];
   char appname[] = "scopflow";
@@ -53,6 +54,11 @@ int main(int argc, char **argv) {
                                PETSC_MAX_PATH_LEN, &flgctgc);
   CHKERRQ(ierr);
 
+  /* Get gic data file from command line */
+  ierr = PetscOptionsGetString(NULL, NULL, "-gicfile", gicfile,
+                               PETSC_MAX_PATH_LEN, &flggic);
+  ExaGOCheckError(ierr);
+
   /* Stage 1 - Application creation and reading data */
   ierr = PetscLogStagePush(stages[0]);
   CHKERRQ(ierr);
@@ -86,6 +92,12 @@ int main(int argc, char **argv) {
     CHKERRQ(ierr);
   }
 
+  /* Set gicdata */
+  if (flggic) {
+    ierr = SCOPFLOWSetGICData(scopflow, gicfile);
+    ExaGOCheckError(ierr);
+  }
+
   /* Set a subset of contingencies to be selected. Can use the option
    * -scopflow_Nc instead */
   /*   ierr = SCOPFLOWSetNumContingencies(scopflow,2);CHKERRQ(ierr); */

diff --git a/include/private/scopflowimpl.h b/include/private/scopflowimpl.h
@@ -196,6 +196,10 @@ struct _p_SCOPFLOW {
 
   ContingencyFileInputFormat ctgcfileformat;
 
+  /* GIC data */
+  PetscBool gicfileset;  /* Is the GIC file set? */
+  char gicfile[PETSC_MAX_PATH_LEN];
+
   PetscBool ismultiperiod; /* Are we doing a multi-period OPF? */
 
   Scenario *scen; /* Used by SOPFLOW to pass the scenario information */

diff --git a/include/scopflow.h b/include/scopflow.h
@@ -148,6 +148,7 @@ PETSC_EXTERN PetscErrorCode
  */
 PETSC_EXTERN PetscErrorCode
 SCOPFLOWSetContingencyData(SCOPFLOW, ContingencyFileInputFormat, const char[]);
+PETSC_EXTERN PetscErrorCode SCOPFLOWSetGICData(SCOPFLOW, const char[]);
 PETSC_EXTERN PetscErrorCode SCOPFLOWSetPLoadData(SCOPFLOW, const char[]);
 PETSC_EXTERN PetscErrorCode SCOPFLOWSetQLoadData(SCOPFLOW, const char[]);
 PETSC_EXTERN PetscErrorCode SCOPFLOWSetWindGenProfile(SCOPFLOW, const char[]);

diff --git a/src/ps/psreaddata.cpp b/src/ps/psreaddata.cpp
@@ -767,8 +767,7 @@ PetscErrorCode PSReadMatPowerData(PS ps, const char netfile[]) {
       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 */
-      if ((Bus[busi].Vmax < Bus[busi].Vmin) || (Bus[busi].Vmax > 1.1) ||
-          (Bus[busi].Vmin < 0.9)) {
+      if ((Bus[busi].Vmax < Bus[busi].Vmin)) {
         bad_data = PETSC_TRUE;
         ierr = PetscPrintf(
             ps->comm->type,

diff --git a/src/scopflow/interface/scopflow.cpp b/src/scopflow/interface/scopflow.cpp
@@ -72,6 +72,8 @@ PetscErrorCode SCOPFLOWCreate(MPI_Comm mpicomm, SCOPFLOW *scopflowout) {
   scopflow->ctgclist = NULL;
   scopflow->ctgcfileset = PETSC_FALSE;
 
+  scopflow->gicfileset = PETSC_FALSE;
+
   /* Default subproblem model and solver */
 #if 0
   (void)std::strncpy(scopflow->subproblem_model,
@@ -769,6 +771,12 @@ PetscErrorCode SCOPFLOWSetUp(SCOPFLOW scopflow) {
         CHKERRQ(ierr);
       }
 
+      /* Set any GIC file data */
+      if(scopflow->gicfileset) {
+	ierr = OPFLOWSetGICData(scopflow->opflows[c],scopflow->gicfile);
+	CHKERRQ(ierr);
+      }
+
       /* Set contingencies */
       if (scopflow->ctgcfileset && scopflow->Nc > 1) {
         Contingency ctgc = scopflow->ctgclist->cont[scopflow->cstart + c];
@@ -1371,6 +1379,29 @@ SCOPFLOWSetContingencyData(SCOPFLOW scopflow,
   PetscFunctionReturn(0);
 }
 
+/*
+ * @brief Set the gic data file for SCOPFLOW
+ *
+ * @param[in] scopflow application object
+ * @param[in] name of the gic file
+ *
+ * gicfile has the coordinates and the substation information. Used for visualization
+ */
+PetscErrorCode SCOPFLOWSetGICData(SCOPFLOW scopflow,const char gicfile[])
+{
+  PetscErrorCode ierr;
+
+  PetscFunctionBegin;
+
+  ierr = PetscMemcpy(scopflow->gicfile, gicfile,
+                     PETSC_MAX_PATH_LEN * sizeof(char));
+  CHKERRQ(ierr);
+  scopflow->gicfileset = PETSC_TRUE;
+
+  PetscFunctionReturn(0);
+}
+
+
 /*
   SCOPFLOWSetSubproblemModel - Set subproblem model