diff --git a/run_analysis_cbc.sh b/run_analysis_cbc.sh old mode 100644 new mode 100755 diff --git a/run_analysis_cplex.sh b/run_analysis_cplex.sh old mode 100644 new mode 100755 diff --git a/scripts/generate_results.py b/scripts/generate_results.py index 4d7444c..47466ac 100644 --- a/scripts/generate_results.py +++ b/scripts/generate_results.py @@ -696,7 +696,7 @@ def hfo_lfo_chart(Country): if tech_exists in gen_df.columns: gen_agg_df[each] = gen_agg_df[each] + gen_df[tech_exists] gen_agg_df[each] = gen_agg_df[each].round(2) - total_gen_df = gen_agg_df+total_gen_df + total_gen_df = gen_agg_df + total_gen_df total_gen_df['y'] = years total_gen_df['y'] = total_gen_df['y'].astype('float64') total_cap_df['y'] = total_cap_df['y'].astype('float64') diff --git a/snakefile b/snakefile index 7c66359..413c41b 100644 --- a/snakefile +++ b/snakefile @@ -1,5 +1,4 @@ -MODELRUNS = ["TEMBA_28_08_2oC_2020RET", "TEMBA_28_08_1.5C_2020RET", - "TEMBA_29_08_2oC_2020RET", "TEMBA_29_08_1.5C_2020RET"] +MODELRUNS = ["TEMBA_29_08_Refer", "TEMBA_29_08_2oC_2020RET", "TEMBA_29_08_1.5C_2020RET"] rule all: # input: ["results/{model_run}.pickle".format(model_run=model_run) for model_run in MODELRUNS]