Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some miscellaneous small stuff #192

Merged
merged 4 commits into from
Dec 13, 2023
Merged

Fix some miscellaneous small stuff #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe70157
Fatal error if `pkg-config` is not found (#161).
wperkins Dec 12, 2023
db2ab9c
Remove unnecessary CMake find package files (left over from #182)
wperkins Dec 12, 2023
7b14a22
Fix input data files using old PETSc options (left over from #164)
wperkins Dec 12, 2023
374591a
Contingency analysis really should set `PETScPrefix` (#191)
wperkins Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,10 @@ message(STATUS "Checking PETSc ...")

include(FindPkgConfig)

if (NOT PKG_CONFIG_FOUND)
message(FATAL_ERROR "The pkg-config facility is required to build GridPACK")
endif()

if (NOT PETSC_DIR)
message(FATAL_ERROR "PETSC_DIR is not set, do so with -D PETSC_DIR=...")
endif()
Expand Down
3 changes: 2 additions & 1 deletion src/applications/data_sets/input/ca/input.euro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PETScOptions>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand All @@ -28,6 +28,7 @@
more than 1 processor per group.
-->
<LinearSolver>
<PETScPrefix>pre_</PETScPrefix>
<PETScOptions>
-pc_type lu
-pc_factor_mat_solver_type klu
Expand Down
3 changes: 2 additions & 1 deletion src/applications/data_sets/input/ca/input.polish.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@
the klu solver can only be used for a group size of 1.
-->
<LinearSolver>
<PETScPrefix>pre_</PETScPrefix>
<PETScOptions>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
3 changes: 2 additions & 1 deletion src/applications/data_sets/input/ca/input_118.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
<maxIteration>50</maxIteration>
<tolerance>1.0e-3</tolerance>
<LinearSolver>
<PETScPrefix>pre_</PETScPrefix>
<PETScOptions>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
3 changes: 2 additions & 1 deletion src/applications/data_sets/input/ca/input_14.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
<maxIteration>50</maxIteration>
<tolerance>1.0e-3</tolerance>
<LinearSolver>
<PETScPrefix>pre_</PETScPrefix>
<PETScOptions>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/input/ds/input_145.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down Expand Up @@ -85,7 +85,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/ds/input_3000.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/ds/input_300_cmpld.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/input/ds/input_twoarea.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down Expand Up @@ -85,7 +85,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/input/ds/input_twoarea_renewable_mech.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down Expand Up @@ -90,7 +90,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/hadrec/input_3g9b_gensal_esst1a_wsieg1_1acmotor_withob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/hadrec/input_tamu500_step005.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- -ksp_view -->
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/input/kalman/input_14.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down Expand Up @@ -78,7 +78,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/input/kalman/input_145.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down Expand Up @@ -78,7 +78,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/powerflow/input_118.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/input/powerflow/input_14.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand All @@ -44,7 +44,7 @@
<PETScOptions>
-ksp_view
-pc_type lu
-pc_factor_mat_solver_package superlu
-pc_factor_mat_solver_type superlu
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/input/powerflow/input_european.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand All @@ -44,7 +44,7 @@
<PETScOptions>
-ksp_view
-pc_type lu
-pc_factor_mat_solver_package superlu
-pc_factor_mat_solver_type superlu
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/input/powerflow/input_polish.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand All @@ -44,7 +44,7 @@
<PETScOptions>
-ksp_view
-pc_type lu
-pc_factor_mat_solver_package superlu
-pc_factor_mat_solver_type superlu
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/rtpr/input_14.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<PETScOptions>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/rtpr/input_14_classic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<PETScOptions>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/rtpr/input_tamu500.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/se/input_118.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/data_sets/input/se/input_14.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/data_sets/petscoptions/.petscrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

# Use SuperLU_Dist package for doing the linear solve (Note: PETSc must be configured with --download-superlu_dist --download-metis --download-parmetis)
#-dsim_pc_type lu
#-dsim_pc_factor_mat_solver_package superlu_dist
#-dsim_pc_factor_mat_solver_type superlu_dist

# Use finite-difference Jacobian
#-dsim_snes_fd
Expand All @@ -63,7 +63,7 @@
-sub_pc_type lu
-sub_pc_factor_mat_ordering_type qmd
#-pc_type lu
#-pc_factor_mat_solver_package superlu_dist
#-pc_factor_mat_solver_type superlu_dist



2 changes: 1 addition & 1 deletion src/applications/examples/powerflow/118.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/examples/powerflow/input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand All @@ -44,7 +44,7 @@
<PETScOptions>
-ksp_view
-pc_type lu
-pc_factor_mat_solver_package superlu
-pc_factor_mat_solver_type superlu
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/examples/resistor_grid/input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/modules/dynamic_simulation_full_y/test/input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down Expand Up @@ -84,7 +84,7 @@
<!-ksp_view>
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
4 changes: 2 additions & 2 deletions src/applications/modules/powerflow/test/input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand All @@ -44,7 +44,7 @@
<PETScOptions>
-ksp_view
-pc_type lu
-pc_factor_mat_solver_package superlu
-pc_factor_mat_solver_type superlu
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
2 changes: 1 addition & 1 deletion src/applications/modules/state_estimation/test/input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-ksp_view
-ksp_type richardson
-pc_type lu
-pc_factor_mat_solver_package superlu_dist
-pc_factor_mat_solver_type superlu_dist
-ksp_max_it 1
</PETScOptions>
</LinearSolver>
Expand Down
Loading