merge with idaholab#214, update ARMA location, more specific dependency

GabrielSoto-INL · Sep 30, 2022 · 5041496 · 5041496
1 parent 4789c80
commit 5041496
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dependencies.xml b/dependencies.xml
@@ -1,7 +1,7 @@
 <dependencies>
   <main>
     <dill/>
-    <dispatches source='pip'/>
+    <dispatches source='pip'>1.0</dispatches>
     <pyomo source='forge'/>
     <pyutilib source='forge'/>
     <glpk source='forge' skip_check='True'/>

diff --git a/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/dispatches_input.xml b/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/dispatches_input.xml
@@ -269,7 +269,7 @@
 
   <DataGenerators>
     <!-- to trigger the use of the JSON LMP signal, name needs to be 'dispatches-test'-->
-    <ARMA name='dispatches-test' variable="TOTALLOAD">%HERON%/tests/workshop/arma_202112_nyiso_def.pk</ARMA>
+    <ARMA name='dispatches-test' variable="TOTALLOAD">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
   </DataGenerators>
 
 </HERON>
diff --git a/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/tests b/tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/tests
@@ -7,7 +7,7 @@
     type = OrderedCSV
     output = 'opt_solution__nuclearCase_notebook_match.csv'
     zero_threshold = 1e-6
-	rel_err = 1e-6
+    rel_err = 1e-6
   [../]
  [../]