Skip to content

Commit f39f640

Browse files
tsmblandtsmbland
authored
Add default_adhoc example model and regression test (#649)
* Add default_adhoc example model * Add debug configuration * Suppress warning * Add note to examples readme * Update results
1 parent 2d24c1a commit f39f640

File tree

9 files changed

+270
-10
lines changed

9 files changed

+270
-10
lines changed

‎.vscode/launch.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
"module": "muse",
1919
"args": ["--model", "default_retro"]
2020
},
21+
{
22+
"name": "Model: default_adhoc",
23+
"type": "debugpy",
24+
"request": "launch",
25+
"module": "muse",
26+
"args": ["--model", "default_adhoc"]
27+
},
2128
{
2229
"name": "Model: multiple_agents",
2330
"type": "debugpy",

‎src/muse/__main__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
parser.add_argument(
1919
"--model",
2020
default=None,
21-
choices=examples.available_examples(),
21+
choices=examples.available_examples,
2222
help="Runs a model distributed with MUSE. "
2323
"If provided, the 'settings' input is ignored.",
2424
)

‎src/muse/data/README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ It contains a residential, conversion, and gas supply sectors.
77
The time framework covers 2020-2050.
88
It uses 6 timeslices.
99

10+
## default_adhoc
11+
12+
Same as the default model, but uses the adhoc solver instead of the scipy solver.
13+
14+
## default_retro
15+
16+
Same as the default model, but uses retrofit agents.
17+
1018
## default_timeslice
1119

1220
This is developed from the default model.

‎src/muse/examples.py‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@
4040

4141
__all__ = ["model", "technodata"]
4242

43+
available_examples = [
44+
"default",
45+
"default_retro",
46+
"default_adhoc",
47+
"default_timeslice",
48+
"medium",
49+
"multiple_agents",
50+
"minimum_service",
51+
"trade",
52+
]
53+
4354

4455
def example_data_dir() -> Path:
4556
"""Gets the examples folder."""
@@ -48,11 +59,6 @@ def example_data_dir() -> Path:
4859
return Path(muse.__file__).parent / "data" / "example"
4960

5061

51-
def available_examples() -> list[str]:
52-
"""List examples available in the examples folder."""
53-
return [d.stem for d in example_data_dir().iterdir() if d.is_dir()]
54-
55-
5662
def model(name: str = "default", test: bool = False) -> MCA:
5763
"""Fully constructs a given example model.
5864
@@ -96,7 +102,7 @@ def copy_model(
96102
"""
97103
from shutil import rmtree
98104

99-
if name.lower() not in available_examples():
105+
if name.lower() not in available_examples:
100106
raise ValueError(f"Unknown model {name}")
101107

102108
path = Path() if path is None else Path(path)
@@ -116,6 +122,8 @@ def copy_model(
116122
_copy_default(path)
117123
elif name.lower() == "default_retro":
118124
_copy_default_retro(path)
125+
elif name.lower() == "default_adhoc":
126+
_copy_default_adhoc(path)
119127
elif name.lower() == "default_timeslice":
120128
_copy_default_timeslice(path)
121129
elif name.lower() == "medium":
@@ -306,6 +314,24 @@ def _copy_default_retro(path: Path):
306314
)
307315

308316

317+
def _copy_default_adhoc(path: Path):
318+
from shutil import copyfile, copytree
319+
320+
from muse.wizard import modify_toml
321+
322+
copytree(example_data_dir() / "default" / "input", path / "input")
323+
copytree(example_data_dir() / "default" / "technodata", path / "technodata")
324+
copyfile(example_data_dir() / "default" / "settings.toml", path / "settings.toml")
325+
326+
def update_lpsolver(data):
327+
for sector in data.get("sectors", {}):
328+
subsectors = data["sectors"][sector].get("subsectors", {})
329+
for sub in subsectors:
330+
subsectors[sub]["lpsolver"] = "adhoc"
331+
332+
modify_toml(path / "settings.toml", update_lpsolver)
333+
334+
309335
def _copy_default_timeslice(path: Path):
310336
from shutil import copyfile, copytree
311337

‎tests/conftest.py‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ def drop_optionals(settings):
526526

527527
@fixture(autouse=True)
528528
def warnings_as_errors(request):
529-
from warnings import simplefilter
529+
from warnings import filterwarnings, simplefilter
530530

531531
# disable fixture for some tests
532532
if (
@@ -535,10 +535,21 @@ def warnings_as_errors(request):
535535
):
536536
return
537537

538+
# Fail test if the following warnings are raised
538539
simplefilter("error", FutureWarning)
539540
simplefilter("error", DeprecationWarning)
540541
simplefilter("error", PendingDeprecationWarning)
541542

543+
# The following warning is safe to ignore (raised by adhoc solver with Python 3.9)
544+
# TODO: may be able to remove this once support for Python 3.9 is dropped
545+
if request.module.__name__ == "test_fullsim_regression":
546+
filterwarnings(
547+
"ignore",
548+
message="__array__ implementation doesn't accept a copy keyword",
549+
category=DeprecationWarning,
550+
module="xarray.core.variable",
551+
)
552+
542553

543554
@fixture
544555
def save_registries():

‎tests/example_outputs/default_adhoc/Results/MCACapacity.csv‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
agent,capacity,dst_region,installed,region,sector,technology,type,year
2+
A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
3+
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
4+
A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
5+
A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
6+
A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
7+
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
8+
A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2025
9+
A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
10+
A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
11+
A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
12+
A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030
13+
A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2030
14+
A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
15+
A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
16+
A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
17+
A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035
18+
A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2035
19+
A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
20+
A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
21+
A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
22+
A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2040
23+
A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2040
24+
A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
25+
A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040
26+
A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
27+
A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
28+
A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2045
29+
A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2045
30+
A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
31+
A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
32+
A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
33+
A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
34+
A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
35+
A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2050
36+
A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
37+
A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
38+
A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
39+
A1,22.75000000000,R1,2050,R1,power,windturbine,newcapa,2050

‎tests/example_outputs/default_adhoc/Results/MCAPrices.csv‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
commodity,day,hour,month,prices,region,timeslice,units_prices,year
2+
electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
3+
gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
4+
heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
5+
CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
6+
electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
7+
gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
8+
heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
9+
CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
10+
electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
11+
gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
12+
heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
13+
CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
14+
electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
15+
gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
16+
heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
17+
CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
18+
electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
19+
gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
20+
heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
21+
CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
22+
electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
23+
gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
24+
heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
25+
CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
26+
electricity,all-week,night,all-year,18.26000000000,R1,0,MUS$2010/PJ,2025
27+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
28+
heat,all-week,night,all-year,10.65340000000,R1,0,MUS$2010/PJ,2025
29+
CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
30+
electricity,all-week,morning,all-year,18.26000000000,R1,1,MUS$2010/PJ,2025
31+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
32+
heat,all-week,morning,all-year,10.65340000000,R1,1,MUS$2010/PJ,2025
33+
CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
34+
electricity,all-week,afternoon,all-year,18.26000000000,R1,2,MUS$2010/PJ,2025
35+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
36+
heat,all-week,afternoon,all-year,10.65340000000,R1,2,MUS$2010/PJ,2025
37+
CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
38+
electricity,all-week,early-peak,all-year,18.26000000000,R1,3,MUS$2010/PJ,2025
39+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
40+
heat,all-week,early-peak,all-year,10.65340000000,R1,3,MUS$2010/PJ,2025
41+
CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
42+
electricity,all-week,late-peak,all-year,18.26000000000,R1,4,MUS$2010/PJ,2025
43+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
44+
heat,all-week,late-peak,all-year,10.65340000000,R1,4,MUS$2010/PJ,2025
45+
CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
46+
electricity,all-week,evening,all-year,18.26000000000,R1,5,MUS$2010/PJ,2025
47+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
48+
heat,all-week,evening,all-year,10.65340000000,R1,5,MUS$2010/PJ,2025
49+
CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
50+
electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2030
51+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
52+
heat,all-week,night,all-year,9.90140000000,R1,0,MUS$2010/PJ,2030
53+
CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
54+
electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2030
55+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
56+
heat,all-week,morning,all-year,9.90140000000,R1,1,MUS$2010/PJ,2030
57+
CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
58+
electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2030
59+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
60+
heat,all-week,afternoon,all-year,9.90140000000,R1,2,MUS$2010/PJ,2030
61+
CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
62+
electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2030
63+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
64+
heat,all-week,early-peak,all-year,9.90140000000,R1,3,MUS$2010/PJ,2030
65+
CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
66+
electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2030
67+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
68+
heat,all-week,late-peak,all-year,9.90140000000,R1,4,MUS$2010/PJ,2030
69+
CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
70+
electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2030
71+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
72+
heat,all-week,evening,all-year,9.90140000000,R1,5,MUS$2010/PJ,2030
73+
CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
74+
electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2035
75+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
76+
heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2035
77+
CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
78+
electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2035
79+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
80+
heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2035
81+
CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
82+
electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2035
83+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
84+
heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2035
85+
CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
86+
electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2035
87+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
88+
heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2035
89+
CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
90+
electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2035
91+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
92+
heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2035
93+
CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
94+
electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2035
95+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
96+
heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2035
97+
CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
98+
electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2040
99+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
100+
heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2040
101+
CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
102+
electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2040
103+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
104+
heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2040
105+
CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
106+
electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2040
107+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
108+
heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2040
109+
CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
110+
electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2040
111+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
112+
heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2040
113+
CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
114+
electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2040
115+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
116+
heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2040
117+
CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
118+
electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2040
119+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
120+
heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2040
121+
CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
122+
electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2045
123+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
124+
heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2045
125+
CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
126+
electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2045
127+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
128+
heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2045
129+
CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
130+
electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2045
131+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
132+
heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2045
133+
CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
134+
electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2045
135+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
136+
heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2045
137+
CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
138+
electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2045
139+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
140+
heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2045
141+
CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
142+
electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2045
143+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144+
heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2045
145+
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
146+
electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2050
147+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
148+
heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2050
149+
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
150+
electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2050
151+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
152+
heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2050
153+
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
154+
electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2050
155+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
156+
heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2050
157+
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
158+
electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2050
159+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
160+
heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2050
161+
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
162+
electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2050
163+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
164+
heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2050
165+
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
166+
electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2050
167+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
168+
heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2050
169+
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

‎tests/example_outputs/run_models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def run_model(name: str) -> Union[str, None]:
3434

3535
if __name__ == "__main__":
3636
with ProcessPoolExecutor() as executor:
37-
futures = {executor.submit(run_model, model) for model in available_examples()}
37+
futures = {executor.submit(run_model, model) for model in available_examples}
3838
for future in futures:
3939
error_message = future.result()
4040
if error_message:

‎tests/test_fullsim_regression.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@mark.regression
99
@mark.example
10-
@mark.parametrize("model", available_examples())
10+
@mark.parametrize("model", available_examples)
1111
def test_fullsim_regression(model, tmpdir, compare_dirs):
1212
from warnings import simplefilter
1313

0 commit comments

Comments
 (0)