Try another fix.

NREL · Feb 6, 2025 · 4430b00 · 4430b00
1 parent c4a3ef1
commit 4430b00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/buildstockbatch/workflow_generator/residential/latest/residential_hpxml_schema.yml b/buildstockbatch/workflow_generator/residential/latest/residential_hpxml_schema.yml
@@ -64,11 +64,13 @@ sim-output-report-spec:
     add_timeseries_dst_column: bool(required=False)
     add_timeseries_utc_column: bool(required=False)
     output_variables: list(include('output-var-spec'), required=False)
-    output_meters: list(include('output-var-spec'), required=False)
+    output_meters: list(include('output-meter-spec'), required=False)
     include_annual_bills: bool(required=False)
     include_monthly_bills: bool(required=False)
 output-var-spec:
     name: str(required=True)
+output-meter-spec:
+    name: str(required=True)
 measure-spec:
     measure_dir_name: str(required=True)
     arguments: map(required=False)

diff --git a/...kbatch/workflow_generator/residential/latest/tests/test_residential_workflow_generator.py b/...kbatch/workflow_generator/residential/latest/tests/test_residential_workflow_generator.py
@@ -157,15 +157,10 @@ def pytest_generate_tests(metafunc):
             if "simulation_output_report" not in blocks:
                 cfg = copy.deepcopy(cfg)
                 cfg["workflow_generator"]["args"]["simulation_output_report"]["output_variables"].pop()
-                cfg_variants.append(cfg)
-                cfg = copy.deepcopy(cfg)
-                del cfg["workflow_generator"]["args"]["simulation_output_report"]["output_variables"]
-                cfg_variants.append(cfg)
-
-                cfg = copy.deepcopy(cfg)
                 cfg["workflow_generator"]["args"]["simulation_output_report"]["output_meters"].pop()
                 cfg_variants.append(cfg)
                 cfg = copy.deepcopy(cfg)
+                del cfg["workflow_generator"]["args"]["simulation_output_report"]["output_variables"]
                 del cfg["workflow_generator"]["args"]["simulation_output_report"]["output_meters"]
                 cfg_variants.append(cfg)