Merge branch 'main' into olex/more-tim-benchmarks

etsap-TIMES · Jan 17, 2025 · e9cf962 · e9cf962
2 parents bc65498 + acc0ed9
commit e9cf962
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/benchmarks.yml b/benchmarks.yml
@@ -443,7 +443,7 @@ benchmarks:
       - "SuppXLS/Scen_B_TRA_Emissions.xlsx"
       - "SuppXLS/Scen_B_TRA_EV_Parity.xlsx"
       - "SuppXLS/Scen_B_TRA_F_ModalShares.xlsx"
-    dd_folder: TIM
+    dd_folder: TIM/model
     dd_files:
       - "base"
       - "pwr_dh"
@@ -483,7 +483,7 @@ benchmarks:
       - "milestonyr"
     include_dummy_imports: true
   - name: TIMES-IE-MCB
-    input_folder: TIM
+    input_folder: TIM/model
     regions: "IE"
     inputs:
       - "VT_IE_AGR.xlsx"
@@ -545,7 +545,7 @@ benchmarks:
       - "SuppXLS/Scen_B_TRA_Emissions.xlsx"
       - "SuppXLS/Scen_B_TRA_EV_Parity.xlsx"
       - "SuppXLS/Scen_B_TRA_F_ModalShares.xlsx"
-    dd_folder: TIM
+    dd_folder: TIM/model
     dd_files:
       - "base-bulk"
       - "ind_ccs"

diff --git a/xl2times/dd_to_csv.py b/xl2times/dd_to_csv.py
@@ -232,7 +232,7 @@ def main(arg_list: None | list[str] = None):
         help="List of .dd file stems to process.",
     )
     args = args_parser.parse_args(arg_list)
-    dd_files = [p for p in Path(args.input_dir).rglob("*.dd")]
+    dd_files = [p for p in Path(args.input_dir).glob("*.dd")]
     if args.include_files:
         valid_stems = {stem.lower() for stem in args.include_files}
         dd_files = [p for p in dd_files if p.stem.lower() in valid_stems]