From dc78cb4cca5874fd8ac5926eb68454ef30ae4397 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Fri, 29 Mar 2024 11:19:05 -0600 Subject: [PATCH 1/9] Add a HERON_DATA variable that can be used to find heron data. --- src/Placeholders.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Placeholders.py b/src/Placeholders.py index eb99e5ec..b5662b87 100644 --- a/src/Placeholders.py +++ b/src/Placeholders.py @@ -70,6 +70,20 @@ def read_input(self, xml): # magic word for "relative to FARM root" farm_path = hutils.get_farm_loc() self._target_file = os.path.abspath(self._source.replace('%FARM%', farm_path)) + elif self._source.startswith('%HERON_DATA%'): + #magic word to try and find HERON data files + #note that this first checks for a HERON_DATA environment variable + heron_data = os.environ.get("HERON_DATA") + if heron_data is None: + heron_path = hutils.get_heron_loc() + possible_path = os.path.join(heron_path,"data") + if os.path.exists(possible_path): + heron_data = possible_path + else: + self.raiseAnError(IOError,"ERROR trying to find %HERON_DATA% and not found at", possible_path, "and no HERON_DATA environmental variable found") + elif not os.path.exists(heron_data): + self.raiseAnError(IOError, "ERROR path", heron_data, "found in HERON_DATA environment variable does not seem to exist") + self._target_file = os.path.abspath(self._source.replace('%HERON_DATA%', heron_data)) else: # check absolute path rel_interp = os.path.abspath(os.path.join(self._workingDir, self._source)) From 657eb5bef412ec4a44a44d2015ce650ffe755c38 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 1 Apr 2024 14:01:51 -0600 Subject: [PATCH 2/9] Moved TSA/Sine/arma.pk to data directory. --- {tests/integration_tests => data}/TSA/Sine/arma.pk | Bin data/orig_locations.txt | 1 + .../optimization_type_VaR_NPV/heron_input.xml | 2 +- .../heron_input__opt_LC_Capex.xml | 2 +- .../optimization_type_mean_NPV/heron_input.xml | 2 +- .../mechanics/ROM_source/heron_input.xml | 2 +- .../mechanics/debug_mode/heron_input.xml | 2 +- .../LC_Price/heron_input__LC_Price.xml | 2 +- .../LC_Storage/heron_input__LC_Storage.xml | 2 +- .../levelized_cost/LC_VOM/heron_input__LC_VOM.xml | 2 +- .../heron_input__LC_VariablePrice.xml | 2 +- .../Opt_LC_Price/heron_input__opt_LC_Price.xml | 2 +- .../mechanics/min_demand/heron_input.xml | 2 +- .../mechanics/multimarket_fix_price/heron_input.xml | 2 +- .../mechanics/optimization_settings/heron_input.xml | 2 +- .../optimizedDispatch2Hybrid/heron_input.xml | 2 +- .../mechanics/pyomo_options/heron_input.xml | 2 +- .../return_multiple_metrics/heron_input.xml | 2 +- .../mechanics/storage_func/heron_input.xml | 2 +- .../mechanics/transfer_funcs/heron_input.xml | 2 +- .../mechanics/validator/heron_input.xml | 2 +- .../mechanics/var_demand_fix_price/heron_input.xml | 2 +- .../mechanics/var_demand_var_price/heron_input.xml | 2 +- .../HERD/nuclearCase_Sine/dispatches_sine_input.xml | 2 +- .../workflows/MOPED/consumption/moped_input.xml | 2 +- .../workflows/MOPED/storage/moped_input.xml | 2 +- .../workflows/production_flex/heron_input.xml | 2 +- .../workflows/storage/heron_input.xml | 2 +- 28 files changed, 27 insertions(+), 26 deletions(-) rename {tests/integration_tests => data}/TSA/Sine/arma.pk (100%) create mode 100644 data/orig_locations.txt diff --git a/tests/integration_tests/TSA/Sine/arma.pk b/data/TSA/Sine/arma.pk similarity index 100% rename from tests/integration_tests/TSA/Sine/arma.pk rename to data/TSA/Sine/arma.pk diff --git a/data/orig_locations.txt b/data/orig_locations.txt new file mode 100644 index 00000000..ba4a76b6 --- /dev/null +++ b/data/orig_locations.txt @@ -0,0 +1 @@ +renamed: tests/integration_tests/TSA/Sine/arma.pk -> data/TSA/Sine/arma.pk diff --git a/tests/integration_tests/XML_check/optimization_type_VaR_NPV/heron_input.xml b/tests/integration_tests/XML_check/optimization_type_VaR_NPV/heron_input.xml index b64e5a90..368add1a 100644 --- a/tests/integration_tests/XML_check/optimization_type_VaR_NPV/heron_input.xml +++ b/tests/integration_tests/XML_check/optimization_type_VaR_NPV/heron_input.xml @@ -120,7 +120,7 @@ - + %BASE_WORKING_DIR%/../../transfers.py diff --git a/tests/integration_tests/XML_check/optimization_type_mean_LC/heron_input__opt_LC_Capex.xml b/tests/integration_tests/XML_check/optimization_type_mean_LC/heron_input__opt_LC_Capex.xml index 2dd45914..d1c3dda6 100644 --- a/tests/integration_tests/XML_check/optimization_type_mean_LC/heron_input__opt_LC_Capex.xml +++ b/tests/integration_tests/XML_check/optimization_type_mean_LC/heron_input__opt_LC_Capex.xml @@ -121,6 +121,6 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/XML_check/optimization_type_mean_NPV/heron_input.xml b/tests/integration_tests/XML_check/optimization_type_mean_NPV/heron_input.xml index 2a6fed16..8fe8af6d 100644 --- a/tests/integration_tests/XML_check/optimization_type_mean_NPV/heron_input.xml +++ b/tests/integration_tests/XML_check/optimization_type_mean_NPV/heron_input.xml @@ -120,7 +120,7 @@ - + %BASE_WORKING_DIR%/../../transfers.py diff --git a/tests/integration_tests/mechanics/ROM_source/heron_input.xml b/tests/integration_tests/mechanics/ROM_source/heron_input.xml index 7f1e2213..ef157405 100644 --- a/tests/integration_tests/mechanics/ROM_source/heron_input.xml +++ b/tests/integration_tests/mechanics/ROM_source/heron_input.xml @@ -71,7 +71,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk %BASE_WORKING_DIR%/../../../ROM/linear_rom.pk diff --git a/tests/integration_tests/mechanics/debug_mode/heron_input.xml b/tests/integration_tests/mechanics/debug_mode/heron_input.xml index de1b1316..e7a312c8 100644 --- a/tests/integration_tests/mechanics/debug_mode/heron_input.xml +++ b/tests/integration_tests/mechanics/debug_mode/heron_input.xml @@ -106,7 +106,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/levelized_cost/LC_Price/heron_input__LC_Price.xml b/tests/integration_tests/mechanics/levelized_cost/LC_Price/heron_input__LC_Price.xml index 4db545de..55deba58 100644 --- a/tests/integration_tests/mechanics/levelized_cost/LC_Price/heron_input__LC_Price.xml +++ b/tests/integration_tests/mechanics/levelized_cost/LC_Price/heron_input__LC_Price.xml @@ -97,6 +97,6 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/mechanics/levelized_cost/LC_Storage/heron_input__LC_Storage.xml b/tests/integration_tests/mechanics/levelized_cost/LC_Storage/heron_input__LC_Storage.xml index d12d5c71..b6e7c79d 100644 --- a/tests/integration_tests/mechanics/levelized_cost/LC_Storage/heron_input__LC_Storage.xml +++ b/tests/integration_tests/mechanics/levelized_cost/LC_Storage/heron_input__LC_Storage.xml @@ -122,6 +122,6 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/mechanics/levelized_cost/LC_VOM/heron_input__LC_VOM.xml b/tests/integration_tests/mechanics/levelized_cost/LC_VOM/heron_input__LC_VOM.xml index d4e11ec4..0719920b 100644 --- a/tests/integration_tests/mechanics/levelized_cost/LC_VOM/heron_input__LC_VOM.xml +++ b/tests/integration_tests/mechanics/levelized_cost/LC_VOM/heron_input__LC_VOM.xml @@ -97,6 +97,6 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/mechanics/levelized_cost/LC_VariablePrice/heron_input__LC_VariablePrice.xml b/tests/integration_tests/mechanics/levelized_cost/LC_VariablePrice/heron_input__LC_VariablePrice.xml index 47b6f7f1..2e8c71e0 100644 --- a/tests/integration_tests/mechanics/levelized_cost/LC_VariablePrice/heron_input__LC_VariablePrice.xml +++ b/tests/integration_tests/mechanics/levelized_cost/LC_VariablePrice/heron_input__LC_VariablePrice.xml @@ -98,6 +98,6 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/mechanics/levelized_cost/Opt_LC_Price/heron_input__opt_LC_Price.xml b/tests/integration_tests/mechanics/levelized_cost/Opt_LC_Price/heron_input__opt_LC_Price.xml index 1b1f66a1..f56bc39a 100644 --- a/tests/integration_tests/mechanics/levelized_cost/Opt_LC_Price/heron_input__opt_LC_Price.xml +++ b/tests/integration_tests/mechanics/levelized_cost/Opt_LC_Price/heron_input__opt_LC_Price.xml @@ -123,6 +123,6 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/mechanics/min_demand/heron_input.xml b/tests/integration_tests/mechanics/min_demand/heron_input.xml index 8d77ef42..0d2d877c 100644 --- a/tests/integration_tests/mechanics/min_demand/heron_input.xml +++ b/tests/integration_tests/mechanics/min_demand/heron_input.xml @@ -102,7 +102,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/multimarket_fix_price/heron_input.xml b/tests/integration_tests/mechanics/multimarket_fix_price/heron_input.xml index c1897b2b..e151127f 100644 --- a/tests/integration_tests/mechanics/multimarket_fix_price/heron_input.xml +++ b/tests/integration_tests/mechanics/multimarket_fix_price/heron_input.xml @@ -97,7 +97,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/optimization_settings/heron_input.xml b/tests/integration_tests/mechanics/optimization_settings/heron_input.xml index 019afa4a..4c4519f2 100644 --- a/tests/integration_tests/mechanics/optimization_settings/heron_input.xml +++ b/tests/integration_tests/mechanics/optimization_settings/heron_input.xml @@ -122,7 +122,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/optimizedDispatch2Hybrid/heron_input.xml b/tests/integration_tests/mechanics/optimizedDispatch2Hybrid/heron_input.xml index de1b1316..e7a312c8 100644 --- a/tests/integration_tests/mechanics/optimizedDispatch2Hybrid/heron_input.xml +++ b/tests/integration_tests/mechanics/optimizedDispatch2Hybrid/heron_input.xml @@ -106,7 +106,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/pyomo_options/heron_input.xml b/tests/integration_tests/mechanics/pyomo_options/heron_input.xml index 19333834..e732a223 100644 --- a/tests/integration_tests/mechanics/pyomo_options/heron_input.xml +++ b/tests/integration_tests/mechanics/pyomo_options/heron_input.xml @@ -146,7 +146,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/return_multiple_metrics/heron_input.xml b/tests/integration_tests/mechanics/return_multiple_metrics/heron_input.xml index 6818e003..31078f52 100644 --- a/tests/integration_tests/mechanics/return_multiple_metrics/heron_input.xml +++ b/tests/integration_tests/mechanics/return_multiple_metrics/heron_input.xml @@ -123,7 +123,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/storage_func/heron_input.xml b/tests/integration_tests/mechanics/storage_func/heron_input.xml index ed7ed0b0..f52d74c0 100644 --- a/tests/integration_tests/mechanics/storage_func/heron_input.xml +++ b/tests/integration_tests/mechanics/storage_func/heron_input.xml @@ -121,7 +121,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py run_storage.py diff --git a/tests/integration_tests/mechanics/transfer_funcs/heron_input.xml b/tests/integration_tests/mechanics/transfer_funcs/heron_input.xml index 4674d490..33d925de 100644 --- a/tests/integration_tests/mechanics/transfer_funcs/heron_input.xml +++ b/tests/integration_tests/mechanics/transfer_funcs/heron_input.xml @@ -162,7 +162,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/mechanics/validator/heron_input.xml b/tests/integration_tests/mechanics/validator/heron_input.xml index aacd9b06..88257611 100644 --- a/tests/integration_tests/mechanics/validator/heron_input.xml +++ b/tests/integration_tests/mechanics/validator/heron_input.xml @@ -109,7 +109,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/var_demand_fix_price/heron_input.xml b/tests/integration_tests/mechanics/var_demand_fix_price/heron_input.xml index a44b316c..65317401 100644 --- a/tests/integration_tests/mechanics/var_demand_fix_price/heron_input.xml +++ b/tests/integration_tests/mechanics/var_demand_fix_price/heron_input.xml @@ -71,7 +71,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/mechanics/var_demand_var_price/heron_input.xml b/tests/integration_tests/mechanics/var_demand_var_price/heron_input.xml index 9b1fae87..987acbce 100644 --- a/tests/integration_tests/mechanics/var_demand_var_price/heron_input.xml +++ b/tests/integration_tests/mechanics/var_demand_var_price/heron_input.xml @@ -71,7 +71,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/workflows/HERD/nuclearCase_Sine/dispatches_sine_input.xml b/tests/integration_tests/workflows/HERD/nuclearCase_Sine/dispatches_sine_input.xml index 16a0b51d..9c45f320 100644 --- a/tests/integration_tests/workflows/HERD/nuclearCase_Sine/dispatches_sine_input.xml +++ b/tests/integration_tests/workflows/HERD/nuclearCase_Sine/dispatches_sine_input.xml @@ -268,7 +268,7 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/workflows/MOPED/consumption/moped_input.xml b/tests/integration_tests/workflows/MOPED/consumption/moped_input.xml index 9f3e9ff1..1e6150b9 100644 --- a/tests/integration_tests/workflows/MOPED/consumption/moped_input.xml +++ b/tests/integration_tests/workflows/MOPED/consumption/moped_input.xml @@ -105,7 +105,7 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/workflows/MOPED/storage/moped_input.xml b/tests/integration_tests/workflows/MOPED/storage/moped_input.xml index cdc5697f..243f1b47 100644 --- a/tests/integration_tests/workflows/MOPED/storage/moped_input.xml +++ b/tests/integration_tests/workflows/MOPED/storage/moped_input.xml @@ -115,7 +115,7 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk diff --git a/tests/integration_tests/workflows/production_flex/heron_input.xml b/tests/integration_tests/workflows/production_flex/heron_input.xml index 2b5ad5b7..e051d25c 100644 --- a/tests/integration_tests/workflows/production_flex/heron_input.xml +++ b/tests/integration_tests/workflows/production_flex/heron_input.xml @@ -106,7 +106,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py diff --git a/tests/integration_tests/workflows/storage/heron_input.xml b/tests/integration_tests/workflows/storage/heron_input.xml index ba8d204c..34d229bc 100644 --- a/tests/integration_tests/workflows/storage/heron_input.xml +++ b/tests/integration_tests/workflows/storage/heron_input.xml @@ -128,7 +128,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine/arma.pk + %HERON_DATA%/TSA/Sine/arma.pk transfers.py From e169ad8872bdf5dc54029742ba238fd5c1210c45 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 1 Apr 2024 14:36:25 -0600 Subject: [PATCH 3/9] Moving TSA/NYISO/nyiso_arma_2yr.pk to data --- .../TSA/NYISO/nyiso_arma_2yr.pk | Bin data/orig_locations.txt | 1 + .../mechanics/result_statistics/heron_input.xml | 2 +- .../workflows/MOPED/simple/moped_input.xml | 2 +- .../MOPED/synthetic_cashflows/moped_input.xml | 2 +- .../workflows/MOPED/wind/moped_input.xml | 2 +- tests/workshop/ies/heron_input.xml | 2 +- tests/workshop/simple/heron_input.xml | 2 +- .../NPP_Wind/opt_heron_input.xml | 2 +- .../NPP_Wind_Storage/opt_heron_input_storage.xml | 2 +- tests/workshop/wind/heron_input.xml | 2 +- tests/workshop/wind/heron_input_storage.xml | 2 +- 12 files changed, 11 insertions(+), 10 deletions(-) rename {tests/integration_tests => data}/TSA/NYISO/nyiso_arma_2yr.pk (100%) diff --git a/tests/integration_tests/TSA/NYISO/nyiso_arma_2yr.pk b/data/TSA/NYISO/nyiso_arma_2yr.pk similarity index 100% rename from tests/integration_tests/TSA/NYISO/nyiso_arma_2yr.pk rename to data/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/data/orig_locations.txt b/data/orig_locations.txt index ba4a76b6..e76d3a4c 100644 --- a/data/orig_locations.txt +++ b/data/orig_locations.txt @@ -1 +1,2 @@ renamed: tests/integration_tests/TSA/Sine/arma.pk -> data/TSA/Sine/arma.pk +renamed: tests/integration_tests/TSA/NYISO/nyiso_arma_2yr.pk -> data/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/integration_tests/mechanics/result_statistics/heron_input.xml b/tests/integration_tests/mechanics/result_statistics/heron_input.xml index 126f89c2..295c4fa4 100644 --- a/tests/integration_tests/mechanics/result_statistics/heron_input.xml +++ b/tests/integration_tests/mechanics/result_statistics/heron_input.xml @@ -87,7 +87,7 @@ - %BASE_WORKING_DIR%/../../../TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/integration_tests/workflows/MOPED/simple/moped_input.xml b/tests/integration_tests/workflows/MOPED/simple/moped_input.xml index c395d14d..00862539 100644 --- a/tests/integration_tests/workflows/MOPED/simple/moped_input.xml +++ b/tests/integration_tests/workflows/MOPED/simple/moped_input.xml @@ -109,7 +109,7 @@ - %BASE_WORKING_DIR%/../../../../TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/integration_tests/workflows/MOPED/synthetic_cashflows/moped_input.xml b/tests/integration_tests/workflows/MOPED/synthetic_cashflows/moped_input.xml index 3842325c..bcea4964 100644 --- a/tests/integration_tests/workflows/MOPED/synthetic_cashflows/moped_input.xml +++ b/tests/integration_tests/workflows/MOPED/synthetic_cashflows/moped_input.xml @@ -118,7 +118,7 @@ - %BASE_WORKING_DIR%/../../../../TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/integration_tests/workflows/MOPED/wind/moped_input.xml b/tests/integration_tests/workflows/MOPED/wind/moped_input.xml index f773e6e1..085c2fbb 100644 --- a/tests/integration_tests/workflows/MOPED/wind/moped_input.xml +++ b/tests/integration_tests/workflows/MOPED/wind/moped_input.xml @@ -164,7 +164,7 @@ - %BASE_WORKING_DIR%/../../../../TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/workshop/ies/heron_input.xml b/tests/workshop/ies/heron_input.xml index 4d7babfd..614132a4 100644 --- a/tests/workshop/ies/heron_input.xml +++ b/tests/workshop/ies/heron_input.xml @@ -203,7 +203,7 @@ - %BASE_WORKING_DIR%/../../../integration_tests/TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/workshop/simple/heron_input.xml b/tests/workshop/simple/heron_input.xml index 4a5a66ef..b3116277 100644 --- a/tests/workshop/simple/heron_input.xml +++ b/tests/workshop/simple/heron_input.xml @@ -109,7 +109,7 @@ - %BASE_WORKING_DIR%/../../../integration_tests/TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/workshop/wind/gold/OptimizationSolutions/NPP_Wind/opt_heron_input.xml b/tests/workshop/wind/gold/OptimizationSolutions/NPP_Wind/opt_heron_input.xml index a1a9ae40..75e8487f 100644 --- a/tests/workshop/wind/gold/OptimizationSolutions/NPP_Wind/opt_heron_input.xml +++ b/tests/workshop/wind/gold/OptimizationSolutions/NPP_Wind/opt_heron_input.xml @@ -171,7 +171,7 @@ - %BASE_WORKING_DIR%/../../../integration_tests/TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/workshop/wind/gold/OptimizationSolutions/NPP_Wind_Storage/opt_heron_input_storage.xml b/tests/workshop/wind/gold/OptimizationSolutions/NPP_Wind_Storage/opt_heron_input_storage.xml index 336d2288..1549a9c1 100644 --- a/tests/workshop/wind/gold/OptimizationSolutions/NPP_Wind_Storage/opt_heron_input_storage.xml +++ b/tests/workshop/wind/gold/OptimizationSolutions/NPP_Wind_Storage/opt_heron_input_storage.xml @@ -243,7 +243,7 @@ - %BASE_WORKING_DIR%/../../../integration_tests/TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/workshop/wind/heron_input.xml b/tests/workshop/wind/heron_input.xml index 2530f3fe..deb7a8a5 100644 --- a/tests/workshop/wind/heron_input.xml +++ b/tests/workshop/wind/heron_input.xml @@ -159,7 +159,7 @@ - %BASE_WORKING_DIR%/../../../integration_tests/TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk diff --git a/tests/workshop/wind/heron_input_storage.xml b/tests/workshop/wind/heron_input_storage.xml index a14488ed..f6c6173a 100644 --- a/tests/workshop/wind/heron_input_storage.xml +++ b/tests/workshop/wind/heron_input_storage.xml @@ -228,7 +228,7 @@ - %BASE_WORKING_DIR%/../../../integration_tests/TSA/NYISO/nyiso_arma_2yr.pk + %HERON_DATA%/TSA/NYISO/nyiso_arma_2yr.pk From 1a95f4a6d57d4bc595995c0221fe0b3b6be36ebc Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 1 Apr 2024 14:52:33 -0600 Subject: [PATCH 4/9] Moving tests/integration_tests/TSA/Sine30yr/arma_30yr.pk to tests --- .../TSA/Sine30yr/arma_30yr.pk | Bin .../mechanics/cashflows/heron_input.xml | 2 +- .../mechanics/depreciate/heron_input.xml | 2 +- .../mechanics/hybrid_load/pre_heron_input.xml | 2 +- .../LC_CAPEX/heron_input__LC_CAPEX.xml | 2 +- .../multirun_sweep_opt/heron_input_opt.xml | 2 +- .../multirun_sweep_opt/heron_input_sweep.xml | 2 +- .../mechanics/npv_exempt/heron_input.xml | 2 +- .../mechanics/test_cashplot/heron_input.xml | 2 +- .../mechanics/uncertainty/heron_input.xml | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename {tests/integration_tests => data}/TSA/Sine30yr/arma_30yr.pk (100%) diff --git a/tests/integration_tests/TSA/Sine30yr/arma_30yr.pk b/data/TSA/Sine30yr/arma_30yr.pk similarity index 100% rename from tests/integration_tests/TSA/Sine30yr/arma_30yr.pk rename to data/TSA/Sine30yr/arma_30yr.pk diff --git a/tests/integration_tests/mechanics/cashflows/heron_input.xml b/tests/integration_tests/mechanics/cashflows/heron_input.xml index b6f59712..3350ea7e 100644 --- a/tests/integration_tests/mechanics/cashflows/heron_input.xml +++ b/tests/integration_tests/mechanics/cashflows/heron_input.xml @@ -102,7 +102,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk functions.py diff --git a/tests/integration_tests/mechanics/depreciate/heron_input.xml b/tests/integration_tests/mechanics/depreciate/heron_input.xml index e6f569d9..fe2e717e 100644 --- a/tests/integration_tests/mechanics/depreciate/heron_input.xml +++ b/tests/integration_tests/mechanics/depreciate/heron_input.xml @@ -102,7 +102,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk diff --git a/tests/integration_tests/mechanics/hybrid_load/pre_heron_input.xml b/tests/integration_tests/mechanics/hybrid_load/pre_heron_input.xml index dd6298be..ba366e07 100644 --- a/tests/integration_tests/mechanics/hybrid_load/pre_heron_input.xml +++ b/tests/integration_tests/mechanics/hybrid_load/pre_heron_input.xml @@ -53,7 +53,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk functions.py diff --git a/tests/integration_tests/mechanics/levelized_cost/LC_CAPEX/heron_input__LC_CAPEX.xml b/tests/integration_tests/mechanics/levelized_cost/LC_CAPEX/heron_input__LC_CAPEX.xml index 94f5eee6..3c634abd 100644 --- a/tests/integration_tests/mechanics/levelized_cost/LC_CAPEX/heron_input__LC_CAPEX.xml +++ b/tests/integration_tests/mechanics/levelized_cost/LC_CAPEX/heron_input__LC_CAPEX.xml @@ -95,6 +95,6 @@ - %BASE_WORKING_DIR%/../../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk diff --git a/tests/integration_tests/mechanics/multirun_sweep_opt/heron_input_opt.xml b/tests/integration_tests/mechanics/multirun_sweep_opt/heron_input_opt.xml index fcedd33e..1ea0ce8e 100644 --- a/tests/integration_tests/mechanics/multirun_sweep_opt/heron_input_opt.xml +++ b/tests/integration_tests/mechanics/multirun_sweep_opt/heron_input_opt.xml @@ -102,7 +102,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk functions.py diff --git a/tests/integration_tests/mechanics/multirun_sweep_opt/heron_input_sweep.xml b/tests/integration_tests/mechanics/multirun_sweep_opt/heron_input_sweep.xml index f35ee3ea..f2e1f57e 100644 --- a/tests/integration_tests/mechanics/multirun_sweep_opt/heron_input_sweep.xml +++ b/tests/integration_tests/mechanics/multirun_sweep_opt/heron_input_sweep.xml @@ -102,7 +102,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk functions.py diff --git a/tests/integration_tests/mechanics/npv_exempt/heron_input.xml b/tests/integration_tests/mechanics/npv_exempt/heron_input.xml index 43f8efcf..9ecaaadc 100644 --- a/tests/integration_tests/mechanics/npv_exempt/heron_input.xml +++ b/tests/integration_tests/mechanics/npv_exempt/heron_input.xml @@ -110,6 +110,6 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk diff --git a/tests/integration_tests/mechanics/test_cashplot/heron_input.xml b/tests/integration_tests/mechanics/test_cashplot/heron_input.xml index d40d60ad..37313bad 100644 --- a/tests/integration_tests/mechanics/test_cashplot/heron_input.xml +++ b/tests/integration_tests/mechanics/test_cashplot/heron_input.xml @@ -107,7 +107,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk diff --git a/tests/integration_tests/mechanics/uncertainty/heron_input.xml b/tests/integration_tests/mechanics/uncertainty/heron_input.xml index 6faebfda..b04d0609 100644 --- a/tests/integration_tests/mechanics/uncertainty/heron_input.xml +++ b/tests/integration_tests/mechanics/uncertainty/heron_input.xml @@ -116,7 +116,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine30yr/arma_30yr.pk + %HERON_DATA%/TSA/Sine30yr/arma_30yr.pk From eaa92f1cc77923323aa1654f42203ca5941b9439 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 1 Apr 2024 15:02:04 -0600 Subject: [PATCH 5/9] Moving tests/integration_tests/ARMA/Sine/arma.pk to data --- {tests/integration_tests => data}/ARMA/Sine/arma.pk | Bin data/orig_locations.txt | 2 ++ .../integration_tests/cluster_check/heron_input.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) rename {tests/integration_tests => data}/ARMA/Sine/arma.pk (100%) diff --git a/tests/integration_tests/ARMA/Sine/arma.pk b/data/ARMA/Sine/arma.pk similarity index 100% rename from tests/integration_tests/ARMA/Sine/arma.pk rename to data/ARMA/Sine/arma.pk diff --git a/data/orig_locations.txt b/data/orig_locations.txt index e76d3a4c..68f193a8 100644 --- a/data/orig_locations.txt +++ b/data/orig_locations.txt @@ -1,2 +1,4 @@ renamed: tests/integration_tests/TSA/Sine/arma.pk -> data/TSA/Sine/arma.pk renamed: tests/integration_tests/TSA/NYISO/nyiso_arma_2yr.pk -> data/TSA/NYISO/nyiso_arma_2yr.pk +renamed: tests/integration_tests/TSA/Sine30yr/arma_30yr.pk -> data/TSA/Sine30yr/arma_30yr.pk +renamed: tests/integration_tests/ARMA/Sine/arma.pk -> data/ARMA/Sine/arma.pk diff --git a/tests/integration_tests/cluster_check/heron_input.xml b/tests/integration_tests/cluster_check/heron_input.xml index ef19284e..adb5e2f1 100644 --- a/tests/integration_tests/cluster_check/heron_input.xml +++ b/tests/integration_tests/cluster_check/heron_input.xml @@ -110,7 +110,7 @@ - %BASE_WORKING_DIR%/../../ARMA/Sine/arma.pk + %HERON_DATA%/ARMA/Sine/arma.pk transfers.py From b34f009791049bd6239e3329505cc7a527b4d9b7 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 1 Apr 2024 15:18:57 -0600 Subject: [PATCH 6/9] Moving tests/integration_tests/{ROM/linear_rom.pk,TSA/Sine_Hour/arma.pk} to data --- {tests/integration_tests => data}/ROM/linear_rom.pk | Bin .../TSA/Sine_Hour/arma.pk | Bin data/orig_locations.txt | 2 ++ .../mechanics/ROM_source/heron_input.xml | 2 +- .../mechanics/labels/heron_input.xml | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) rename {tests/integration_tests => data}/ROM/linear_rom.pk (100%) rename {tests/integration_tests => data}/TSA/Sine_Hour/arma.pk (100%) diff --git a/tests/integration_tests/ROM/linear_rom.pk b/data/ROM/linear_rom.pk similarity index 100% rename from tests/integration_tests/ROM/linear_rom.pk rename to data/ROM/linear_rom.pk diff --git a/tests/integration_tests/TSA/Sine_Hour/arma.pk b/data/TSA/Sine_Hour/arma.pk similarity index 100% rename from tests/integration_tests/TSA/Sine_Hour/arma.pk rename to data/TSA/Sine_Hour/arma.pk diff --git a/data/orig_locations.txt b/data/orig_locations.txt index 68f193a8..8101ff58 100644 --- a/data/orig_locations.txt +++ b/data/orig_locations.txt @@ -2,3 +2,5 @@ renamed: tests/integration_tests/TSA/Sine/arma.pk -> data/TSA/Sine/arma.pk renamed: tests/integration_tests/TSA/NYISO/nyiso_arma_2yr.pk -> data/TSA/NYISO/nyiso_arma_2yr.pk renamed: tests/integration_tests/TSA/Sine30yr/arma_30yr.pk -> data/TSA/Sine30yr/arma_30yr.pk renamed: tests/integration_tests/ARMA/Sine/arma.pk -> data/ARMA/Sine/arma.pk +renamed: tests/integration_tests/ROM/linear_rom.pk -> data/ROM/linear_rom.pk +renamed: tests/integration_tests/TSA/Sine_Hour/arma.pk -> data/TSA/Sine_Hour/arma.pk diff --git a/tests/integration_tests/mechanics/ROM_source/heron_input.xml b/tests/integration_tests/mechanics/ROM_source/heron_input.xml index ef157405..dee55de5 100644 --- a/tests/integration_tests/mechanics/ROM_source/heron_input.xml +++ b/tests/integration_tests/mechanics/ROM_source/heron_input.xml @@ -72,7 +72,7 @@ %HERON_DATA%/TSA/Sine/arma.pk - %BASE_WORKING_DIR%/../../../ROM/linear_rom.pk + %HERON_DATA%/ROM/linear_rom.pk diff --git a/tests/integration_tests/mechanics/labels/heron_input.xml b/tests/integration_tests/mechanics/labels/heron_input.xml index 6c1c0870..e490004e 100644 --- a/tests/integration_tests/mechanics/labels/heron_input.xml +++ b/tests/integration_tests/mechanics/labels/heron_input.xml @@ -104,7 +104,7 @@ - %BASE_WORKING_DIR%/../../../TSA/Sine_Hour/arma.pk + %HERON_DATA%/TSA/Sine_Hour/arma.pk transfers.py From 1066eb7307d768a8c65a05591fc99e36d0731211 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 1 Apr 2024 15:36:27 -0600 Subject: [PATCH 7/9] Moving tests/integration_tests/XML_check/transfers.py to data --- {tests/integration_tests => data}/XML_check/transfers.py | 0 data/orig_locations.txt | 1 + .../XML_check/gold/optimization_type_VaR_NPV_o/outer.xml | 2 +- .../XML_check/gold/optimization_type_mean_NPV_o/outer.xml | 2 +- .../XML_check/optimization_type_VaR_NPV/heron_input.xml | 2 +- .../XML_check/optimization_type_mean_NPV/heron_input.xml | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) rename {tests/integration_tests => data}/XML_check/transfers.py (100%) diff --git a/tests/integration_tests/XML_check/transfers.py b/data/XML_check/transfers.py similarity index 100% rename from tests/integration_tests/XML_check/transfers.py rename to data/XML_check/transfers.py diff --git a/data/orig_locations.txt b/data/orig_locations.txt index 8101ff58..584150f1 100644 --- a/data/orig_locations.txt +++ b/data/orig_locations.txt @@ -4,3 +4,4 @@ renamed: tests/integration_tests/TSA/Sine30yr/arma_30yr.pk -> data/TSA/Sine30 renamed: tests/integration_tests/ARMA/Sine/arma.pk -> data/ARMA/Sine/arma.pk renamed: tests/integration_tests/ROM/linear_rom.pk -> data/ROM/linear_rom.pk renamed: tests/integration_tests/TSA/Sine_Hour/arma.pk -> data/TSA/Sine_Hour/arma.pk +renamed: tests/integration_tests/XML_check/transfers.py -> data/XML_check/transfers.py diff --git a/tests/integration_tests/XML_check/gold/optimization_type_VaR_NPV_o/outer.xml b/tests/integration_tests/XML_check/gold/optimization_type_VaR_NPV_o/outer.xml index eb05c6e7..00fd7024 100644 --- a/tests/integration_tests/XML_check/gold/optimization_type_VaR_NPV_o/outer.xml +++ b/tests/integration_tests/XML_check/gold/optimization_type_VaR_NPV_o/outer.xml @@ -113,7 +113,7 @@ ../inner.xml ../heron.lib - ../%BASE_WORKING_DIR%/../../transfers.py + ../%HERON_DATA%/XML_check/transfers.py diff --git a/tests/integration_tests/XML_check/gold/optimization_type_mean_NPV_o/outer.xml b/tests/integration_tests/XML_check/gold/optimization_type_mean_NPV_o/outer.xml index 3dee2ad3..4122b7fa 100644 --- a/tests/integration_tests/XML_check/gold/optimization_type_mean_NPV_o/outer.xml +++ b/tests/integration_tests/XML_check/gold/optimization_type_mean_NPV_o/outer.xml @@ -113,7 +113,7 @@ ../inner.xml ../heron.lib - ../%BASE_WORKING_DIR%/../../transfers.py + ../%HERON_DATA%/XML_check/transfers.py diff --git a/tests/integration_tests/XML_check/optimization_type_VaR_NPV/heron_input.xml b/tests/integration_tests/XML_check/optimization_type_VaR_NPV/heron_input.xml index 368add1a..cccf2bd0 100644 --- a/tests/integration_tests/XML_check/optimization_type_VaR_NPV/heron_input.xml +++ b/tests/integration_tests/XML_check/optimization_type_VaR_NPV/heron_input.xml @@ -121,7 +121,7 @@ - %BASE_WORKING_DIR%/../../transfers.py + %HERON_DATA%/XML_check/transfers.py diff --git a/tests/integration_tests/XML_check/optimization_type_mean_NPV/heron_input.xml b/tests/integration_tests/XML_check/optimization_type_mean_NPV/heron_input.xml index 8fe8af6d..1e2fcd90 100644 --- a/tests/integration_tests/XML_check/optimization_type_mean_NPV/heron_input.xml +++ b/tests/integration_tests/XML_check/optimization_type_mean_NPV/heron_input.xml @@ -121,7 +121,7 @@ - %BASE_WORKING_DIR%/../../transfers.py + %HERON_DATA%/XML_check/transfers.py From 206acdc0cd687f99ce94195b5548f0bf39483a92 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 1 Apr 2024 16:03:02 -0600 Subject: [PATCH 8/9] Moved two Static.csv to data tests/integration_tests/mechanics/capacity_factors/Static.csv tests/integration_tests/mechanics/static_history/Static.csv --- .../mechanics/capacity_factors/Static.csv | 0 .../mechanics/static_history/Static.csv | 0 data/orig_locations.txt | 2 ++ .../mechanics/capacity_factors/gold/heron_input_gold.xml | 2 +- .../mechanics/capacity_factors/heron_input.xml | 2 +- .../integration_tests/mechanics/static_history/heron_input.xml | 2 +- 6 files changed, 5 insertions(+), 3 deletions(-) rename {tests/integration_tests => data}/mechanics/capacity_factors/Static.csv (100%) rename {tests/integration_tests => data}/mechanics/static_history/Static.csv (100%) diff --git a/tests/integration_tests/mechanics/capacity_factors/Static.csv b/data/mechanics/capacity_factors/Static.csv similarity index 100% rename from tests/integration_tests/mechanics/capacity_factors/Static.csv rename to data/mechanics/capacity_factors/Static.csv diff --git a/tests/integration_tests/mechanics/static_history/Static.csv b/data/mechanics/static_history/Static.csv similarity index 100% rename from tests/integration_tests/mechanics/static_history/Static.csv rename to data/mechanics/static_history/Static.csv diff --git a/data/orig_locations.txt b/data/orig_locations.txt index 584150f1..ce244fb2 100644 --- a/data/orig_locations.txt +++ b/data/orig_locations.txt @@ -5,3 +5,5 @@ renamed: tests/integration_tests/ARMA/Sine/arma.pk -> data/ARMA/Sine/arma.pk renamed: tests/integration_tests/ROM/linear_rom.pk -> data/ROM/linear_rom.pk renamed: tests/integration_tests/TSA/Sine_Hour/arma.pk -> data/TSA/Sine_Hour/arma.pk renamed: tests/integration_tests/XML_check/transfers.py -> data/XML_check/transfers.py +renamed: tests/integration_tests/mechanics/static_history/Static.csv -> data/mechanics/static_history/Static.csv +renamed: tests/integration_tests/mechanics/static_history/Static.csv -> data/mechanics/static_history/Static.csv diff --git a/tests/integration_tests/mechanics/capacity_factors/gold/heron_input_gold.xml b/tests/integration_tests/mechanics/capacity_factors/gold/heron_input_gold.xml index 746b0cb7..38546655 100644 --- a/tests/integration_tests/mechanics/capacity_factors/gold/heron_input_gold.xml +++ b/tests/integration_tests/mechanics/capacity_factors/gold/heron_input_gold.xml @@ -159,7 +159,7 @@ - %BASE_WORKING_DIR%/../../Static.csv + %HERON_DATA%/mechanics/capacity_factors/Static.csv diff --git a/tests/integration_tests/mechanics/capacity_factors/heron_input.xml b/tests/integration_tests/mechanics/capacity_factors/heron_input.xml index 1a3327df..ab57ae08 100644 --- a/tests/integration_tests/mechanics/capacity_factors/heron_input.xml +++ b/tests/integration_tests/mechanics/capacity_factors/heron_input.xml @@ -161,7 +161,7 @@ - %BASE_WORKING_DIR%/../../../mechanics/capacity_factors/Static.csv + %HERON_DATA%/mechanics/capacity_factors/Static.csv diff --git a/tests/integration_tests/mechanics/static_history/heron_input.xml b/tests/integration_tests/mechanics/static_history/heron_input.xml index 179ca18c..879f8d64 100644 --- a/tests/integration_tests/mechanics/static_history/heron_input.xml +++ b/tests/integration_tests/mechanics/static_history/heron_input.xml @@ -102,6 +102,6 @@ - %BASE_WORKING_DIR%/../../../mechanics/static_history/Static.csv + %HERON_DATA%/mechanics/static_history/Static.csv From 1ee33e7d87df74f6b12989058124590ad90e70b3 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 8 Apr 2024 15:30:03 -0600 Subject: [PATCH 9/9] Adding documentation in input specs to HERON_DATA --- src/Placeholders.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Placeholders.py b/src/Placeholders.py index b5662b87..1eca5f42 100644 --- a/src/Placeholders.py +++ b/src/Placeholders.py @@ -166,6 +166,7 @@ def get_input_specs(cls): The RAVEN ARMA ROM should be trained and serialized before using it in HERON. The text of this node indicates the location of the serialized ROM. This location is usually relative with respect to the HERON XML input file; however, a full absolute path can be used, + or the path can be prepended with ``\%HERON_DATA\%'' to be relative to the HERON data directory (``HERON/data'' in the git repository, but the location of ``\%HERON_DATA\%'' can be overridden by exporting a ``HERON_DATA'' environmental variable), or the path can be prepended with ``\%HERON\%'' to be relative to the installation directory of HERON.""") specs.addParam('name', param_type=InputTypes.StringType, required=True, @@ -261,6 +262,7 @@ def get_input_specs(cls): Python functions have access to the variables within the dispatcher. The text of this node indicates the location of the python file. This location is usually relative with respect to the HERON XML input file; however, a full absolute path can be used, + or the path can be prepended with ``\%HERON_DATA\%'' to be relative to the HERON data directory (``HERON/data'' in the git repository, but the location of ``\%HERON_DATA\%'' can be overridden by exporting a ``HERON_DATA'' environmental variable), or the path can be prepended with ``\%HERON\%'' to be relative to the installation directory of HERON.""") specs.addParam('name', param_type=InputTypes.StringType, required=True,