From 3c8b242b1f29170764126b08345e540c6c1a6565 Mon Sep 17 00:00:00 2001 From: Francesco Lombardi Date: Mon, 4 Nov 2019 11:27:43 +0100 Subject: [PATCH] Further minor refinements --- RAMP_v02-pre/RAMP_run.py | 8 +++--- .../__pycache__/input_file_1.cpython-36.pyc | Bin 1459 -> 1468 bytes RAMP_v02-pre/input_file_1.py | 22 +++++++-------- RAMP_v02-pre/input_file_2.py | 24 ++++++++--------- RAMP_v02-pre/input_file_3.py | 25 +++++++++--------- .../time_series/building_archetypes.CSV | 2 +- RAMP_v02-pre/time_series/gw_temp_province.csv | 2 +- 7 files changed, 42 insertions(+), 41 deletions(-) diff --git a/RAMP_v02-pre/RAMP_run.py b/RAMP_v02-pre/RAMP_run.py index 17c150ee..d7ef3cfc 100644 --- a/RAMP_v02-pre/RAMP_run.py +++ b/RAMP_v02-pre/RAMP_run.py @@ -31,14 +31,16 @@ archetypes = pd.read_csv('time_series/building_archetypes.csv', sep=';', index_col=0) archetypes_ratio = {'single_family': 1, 'double_family': 1.2 , 'multi_family': 1.6 , 'apartment_block': 2.1 } n_dict = {'U1': 0.253, 'U2': 0.263, 'U3': 0.484} + +#provinces_lomb = profiles_dict = {} -for prov in [provinces[0]]: +for prov in provinces: profiles_dict[prov] = {} - for arch in [archetypes[prov].index[0]]: + for arch in archetypes[prov].index: profiles_dict[prov][arch] = {} - n = archetypes[prov].loc[arch]/1e2 + n = archetypes[prov].loc[arch]/1e3 for us in n_dict.keys(): profiles_dict[prov][arch][us] = {} for k in range(int(round(n_dict[us]*n))): diff --git a/RAMP_v02-pre/__pycache__/input_file_1.cpython-36.pyc b/RAMP_v02-pre/__pycache__/input_file_1.cpython-36.pyc index e5600c3c30fbee40658f5b8daa727ebae22f86bc..f9e4d8c701a9091f46e021c8b4cebf4ce80bcc7e 100644 GIT binary patch delta 218 zcmdnYy@#9An3tE!_{gr<4HG$Msmi5r)o@5Kh%nT0rYNNFK-pX=N^mxJipsZ0(MF`6?Z0(MF`6?6$q7u- zhNvp|!74;+L?J5DnSkmTL1Z&CBSQ^qFoUMb&276yjRi