more file cleanup

NREL-Sienna · Oct 31, 2024 · 2f3564d · 2f3564d
1 parent 91afada
commit 2f3564d
Show file tree

Hide file tree

Showing 45 changed files with 55 additions and 16 deletions.
diff --git a/src/PRAS/CapacityCredit/CapacityCredit.jl → src/CapacityCredit/CapacityCredit.jl b/src/PRAS/CapacityCredit/CapacityCredit.jl → src/CapacityCredit/CapacityCredit.jl
diff --git a/...AS/CapacityCredit/CapacityCreditResult.jl → src/CapacityCredit/CapacityCreditResult.jl b/...AS/CapacityCredit/CapacityCreditResult.jl → src/CapacityCredit/CapacityCreditResult.jl
diff --git a/src/PRAS/CapacityCredit/EFC.jl → src/CapacityCredit/EFC.jl b/src/PRAS/CapacityCredit/EFC.jl → src/CapacityCredit/EFC.jl
diff --git a/src/PRAS/CapacityCredit/ELCC.jl → src/CapacityCredit/ELCC.jl b/src/PRAS/CapacityCredit/ELCC.jl → src/CapacityCredit/ELCC.jl
diff --git a/src/PRAS/LICENSE.md → src/CapacityCredit/LICENSE.md b/src/PRAS/LICENSE.md → src/CapacityCredit/LICENSE.md
diff --git a/src/PRAS/CapacityCredit/utils.jl → src/CapacityCredit/utils.jl b/src/PRAS/CapacityCredit/utils.jl → src/CapacityCredit/utils.jl
diff --git a/src/PRAS/PRAS.jl b/src/PRAS/PRAS.jl
diff --git a/src/main/PRAS2PSY.jl → src/PRAS2PSY.jl b/src/main/PRAS2PSY.jl → src/PRAS2PSY.jl
diff --git a/src/PRASBase/LICENSE.md b/src/PRASBase/LICENSE.md
@@ -0,0 +1,23 @@
+The PRAS package is licensed under a modified MIT "Expat" License:
+
+> Copyright 2020 Alliance for Sustainable Energy, LLC
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS, THE COPYRIGHT HOLDERS, THE UNITED STATES, THE UNITED STATES DEPARTMENT
+> OF ENERGY, OR ANY OF THEIR EMPLOYEES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+> SOFTWARE.
+>
diff --git a/src/PRAS/PRASBase/PRASBase.jl → src/PRASBase/PRASBase.jl b/src/PRAS/PRASBase/PRASBase.jl → src/PRASBase/PRASBase.jl
diff --git a/src/PRAS/PRASBase/SystemModel.jl → src/PRASBase/SystemModel.jl b/src/PRAS/PRASBase/SystemModel.jl → src/PRASBase/SystemModel.jl
diff --git a/src/PRAS/PRASBase/assets.jl → src/PRASBase/assets.jl b/src/PRAS/PRASBase/assets.jl → src/PRASBase/assets.jl
diff --git a/src/PRAS/PRASBase/collections.jl → src/PRASBase/collections.jl b/src/PRAS/PRASBase/collections.jl → src/PRASBase/collections.jl
diff --git a/src/PRAS/PRASBase/read.jl → src/PRASBase/read.jl b/src/PRAS/PRASBase/read.jl → src/PRASBase/read.jl
diff --git a/src/PRAS/PRASBase/units.jl → src/PRASBase/units.jl b/src/PRAS/PRASBase/units.jl → src/PRASBase/units.jl
diff --git a/src/PRAS/PRASBase/utils.jl → src/PRASBase/utils.jl b/src/PRAS/PRASBase/utils.jl → src/PRASBase/utils.jl
diff --git a/src/PRAS/PRASBase/write.jl → src/PRASBase/write.jl b/src/PRAS/PRASBase/write.jl → src/PRASBase/write.jl
diff --git a/src/PRASInterface.jl b/src/PRASInterface.jl
@@ -12,7 +12,7 @@ export make_generator_outage_draws!
 # Imports
 #################################################################################
 import PowerSystems
-import PRAS
+import .PRASBase
 import Dates
 import TimeZones
 import DataFrames
@@ -27,6 +27,12 @@ const PSY = PowerSystems
 #################################################################################
 # Includes
 #################################################################################
+const PRAS_VERSION = "v0.6.0"
+
+include("PRASBase/PRASBase.jl")
+include("ResourceAdequacy/ResourceAdequacy.jl")
+include("CapacityCredit/CapacityCredit.jl")
+
 include("parsers/power_system_table_data.jl") # Over-writes some PSY functions.
 
 include("util/definitions.jl")
@@ -40,7 +46,7 @@ include("util/sienna/add_csv_time_series_data.jl")
 include("util/draws/draw_helper_functions.jl")
 include("util/draws/sienna_draws.jl")
 
-include("main/PSY2PRAS.jl")
-include("main/PRAS2PSY.jl")
+include("PSY2PRAS.jl")
+include("PRAS2PSY.jl")
 
 end
diff --git a/src/main/PSY2PRAS.jl → src/PSY2PRAS.jl b/src/main/PSY2PRAS.jl → src/PSY2PRAS.jl
diff --git a/src/ResourceAdequacy/LICENSE.md b/src/ResourceAdequacy/LICENSE.md
@@ -0,0 +1,23 @@
+The PRAS package is licensed under a modified MIT "Expat" License:
+
+> Copyright 2020 Alliance for Sustainable Energy, LLC
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS, THE COPYRIGHT HOLDERS, THE UNITED STATES, THE UNITED STATES DEPARTMENT
+> OF ENERGY, OR ANY OF THEIR EMPLOYEES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+> SOFTWARE.
+>
diff --git a/...PRAS/ResourceAdequacy/ResourceAdequacy.jl → src/ResourceAdequacy/ResourceAdequacy.jl b/...PRAS/ResourceAdequacy/ResourceAdequacy.jl → src/ResourceAdequacy/ResourceAdequacy.jl
diff --git a/src/PRAS/ResourceAdequacy/metrics.jl → src/ResourceAdequacy/metrics.jl b/src/PRAS/ResourceAdequacy/metrics.jl → src/ResourceAdequacy/metrics.jl
diff --git a/.../ResourceAdequacy/results/availability.jl → src/ResourceAdequacy/results/availability.jl b/.../ResourceAdequacy/results/availability.jl → src/ResourceAdequacy/results/availability.jl
diff --git a/src/PRAS/ResourceAdequacy/results/energy.jl → src/ResourceAdequacy/results/energy.jl b/src/PRAS/ResourceAdequacy/results/energy.jl → src/ResourceAdequacy/results/energy.jl
diff --git a/src/PRAS/ResourceAdequacy/results/flow.jl → src/ResourceAdequacy/results/flow.jl b/src/PRAS/ResourceAdequacy/results/flow.jl → src/ResourceAdequacy/results/flow.jl
diff --git a/src/PRAS/ResourceAdequacy/results/results.jl → src/ResourceAdequacy/results/results.jl b/src/PRAS/ResourceAdequacy/results/results.jl → src/ResourceAdequacy/results/results.jl
diff --git a/...RAS/ResourceAdequacy/results/shortfall.jl → src/ResourceAdequacy/results/shortfall.jl b/...RAS/ResourceAdequacy/results/shortfall.jl → src/ResourceAdequacy/results/shortfall.jl
diff --git a/src/PRAS/ResourceAdequacy/results/surplus.jl → src/ResourceAdequacy/results/surplus.jl b/src/PRAS/ResourceAdequacy/results/surplus.jl → src/ResourceAdequacy/results/surplus.jl
diff --git a/...S/ResourceAdequacy/results/utilization.jl → src/ResourceAdequacy/results/utilization.jl b/...S/ResourceAdequacy/results/utilization.jl → src/ResourceAdequacy/results/utilization.jl
diff --git a/...cy/simulations/convolution/Convolution.jl → ...cy/simulations/convolution/Convolution.jl b/...cy/simulations/convolution/Convolution.jl → ...cy/simulations/convolution/Convolution.jl
diff --git a/...eAdequacy/simulations/convolution/conv.jl → ...eAdequacy/simulations/convolution/conv.jl b/...eAdequacy/simulations/convolution/conv.jl → ...eAdequacy/simulations/convolution/conv.jl
diff --git a/...mulations/convolution/result_shortfall.jl → ...mulations/convolution/result_shortfall.jl b/...mulations/convolution/result_shortfall.jl → ...mulations/convolution/result_shortfall.jl
diff --git a/...simulations/convolution/result_surplus.jl → ...simulations/convolution/result_surplus.jl b/...simulations/convolution/result_surplus.jl → ...simulations/convolution/result_surplus.jl
diff --git a/...s/sequentialmontecarlo/DispatchProblem.jl → ...s/sequentialmontecarlo/DispatchProblem.jl b/...s/sequentialmontecarlo/DispatchProblem.jl → ...s/sequentialmontecarlo/DispatchProblem.jl
diff --git a/...uentialmontecarlo/SequentialMonteCarlo.jl → ...uentialmontecarlo/SequentialMonteCarlo.jl b/...uentialmontecarlo/SequentialMonteCarlo.jl → ...uentialmontecarlo/SequentialMonteCarlo.jl
diff --git a/...tions/sequentialmontecarlo/SystemState.jl → ...tions/sequentialmontecarlo/SystemState.jl b/...tions/sequentialmontecarlo/SystemState.jl → ...tions/sequentialmontecarlo/SystemState.jl
diff --git a/...quentialmontecarlo/result_availability.jl → ...quentialmontecarlo/result_availability.jl b/...quentialmontecarlo/result_availability.jl → ...quentialmontecarlo/result_availability.jl
diff --git a/...ons/sequentialmontecarlo/result_energy.jl → ...ons/sequentialmontecarlo/result_energy.jl b/...ons/sequentialmontecarlo/result_energy.jl → ...ons/sequentialmontecarlo/result_energy.jl
diff --git a/...tions/sequentialmontecarlo/result_flow.jl → ...tions/sequentialmontecarlo/result_flow.jl b/...tions/sequentialmontecarlo/result_flow.jl → ...tions/sequentialmontecarlo/result_flow.jl
diff --git a/.../sequentialmontecarlo/result_shortfall.jl → .../sequentialmontecarlo/result_shortfall.jl b/.../sequentialmontecarlo/result_shortfall.jl → .../sequentialmontecarlo/result_shortfall.jl
diff --git a/...ns/sequentialmontecarlo/result_surplus.jl → ...ns/sequentialmontecarlo/result_surplus.jl b/...ns/sequentialmontecarlo/result_surplus.jl → ...ns/sequentialmontecarlo/result_surplus.jl
diff --git a/...equentialmontecarlo/result_utilization.jl → ...equentialmontecarlo/result_utilization.jl b/...equentialmontecarlo/result_utilization.jl → ...equentialmontecarlo/result_utilization.jl
diff --git a/...simulations/sequentialmontecarlo/utils.jl → ...simulations/sequentialmontecarlo/utils.jl b/...simulations/sequentialmontecarlo/utils.jl → ...simulations/sequentialmontecarlo/utils.jl
diff --git a/...sourceAdequacy/simulations/simulations.jl → ...sourceAdequacy/simulations/simulations.jl b/...sourceAdequacy/simulations/simulations.jl → ...sourceAdequacy/simulations/simulations.jl
diff --git a/src/PRAS/ResourceAdequacy/utils.jl → src/ResourceAdequacy/utils.jl b/src/PRAS/ResourceAdequacy/utils.jl → src/ResourceAdequacy/utils.jl