diff --git a/Snakefile b/Snakefile index f6e581a4..7c16ff9f 100644 --- a/Snakefile +++ b/Snakefile @@ -125,7 +125,7 @@ rule sync: shell: """ rsync -uvarh --ignore-missing-args --files-from=.sync-send . {params.cluster} - rsync -uvarh --no-g {params.cluster}/resources . || echo "No resources directory, skipping rsync + rsync -uvarh --no-g {params.cluster}/resources . || echo "No resources directory, skipping rsync" rsync -uvarh --no-g {params.cluster}/results . || echo "No results directory, skipping rsync" rsync -uvarh --no-g {params.cluster}/logs . || echo "No logs directory, skipping rsync" """ diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index b0d0a4e6..4cfaa95f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -567,7 +567,7 @@ def add_co2_tracking(n, costs, options): bus="co2 atmosphere", ) - # this tracks CO2 stored, e.g. underground + # add CO2 tanks n.madd( "Bus", spatial.co2.nodes, @@ -576,13 +576,13 @@ def add_co2_tracking(n, costs, options): unit="t_co2", ) - # add CO2 tanks n.madd( "Store", spatial.co2.nodes, e_nom_extendable=True, - capital_cost=costs.loc["CO2 storage tank"], + capital_cost=costs.at["CO2 storage tank", "fixed"], carrier="co2 stored", + e_cyclic=True, bus=spatial.co2.nodes, ) n.add("Carrier", "co2 stored")