diff --git a/message_ix_buildings/chilled/core/climate.py b/message_ix_buildings/chilled/core/climate.py index 94cdd4c..884a111 100644 --- a/message_ix_buildings/chilled/core/climate.py +++ b/message_ix_buildings/chilled/core/climate.py @@ -44,19 +44,25 @@ from message_ix_buildings.chilled.preprocess.message_raster import ( create_message_raster, # type: ignore ) -from message_ix_buildings.chilled.util.config import Config # type: ignore -from message_ix_buildings.chilled.util.util import ( +from message_ix_buildings.chilled.util.base import ( get_archs, - get_logger, + get_paths, load_all_scenarios_data, load_parametric_analysis_data, ) +from message_ix_buildings.chilled.util.common import get_logger +from message_ix_buildings.chilled.util.config import Config # type: ignore log = get_logger(__name__) def create_climate_variables_maps(config: "Config", start_time: datetime.datetime): - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + dle_path = get_paths(config, "dle_path") + isimip_bias_adj_path = get_paths(config, "isimip_bias_adj_path") + isimip_ewembi_path = get_paths(config, "isimip_ewembi_path") + + out_path = os.path.join(project_path, "out", "version", config.vstr) archetype_path = os.path.join(out_path, "rasters") save_path = os.path.join(out_path, "VDD_ene_calcs") @@ -105,10 +111,10 @@ def map_calculated_variables(args): endstr = ".nc" if str(clim) == "hist": - isi_folder = config.isimip_ewemib_path + isi_folder = isimip_ewembi_path filestr = climate_filestr_hist else: - isi_folder = config.isimip_bias_adj_path + isi_folder = isimip_bias_adj_path filestr = climate_filestr_future filepath = os.path.join( @@ -135,12 +141,12 @@ def map_calculated_variables(args): t_oa_gbm = t_out_ave.groupby("time.month") i_sol_v = xr.open_dataarray( - os.path.join(config.dle_path, "EWEMBI_vert_irrad_1980-2009_avg.nc") + os.path.join(dle_path, "EWEMBI_vert_irrad_1980-2009_avg.nc") ) # Values in daily Wh/m2 # Horizontal irradiation i_sol_h = xr.open_dataarray( - os.path.join(config.dle_path, "EWEMBI_horiz_irrad_1980-2009_avg.nc") + os.path.join(dle_path, "EWEMBI_horiz_irrad_1980-2009_avg.nc") ) # Values in daily Wh/m2 if config.arch_setting == "regional": @@ -756,7 +762,8 @@ def read_netcdf_files(input_args): def aggregate_urban_rural_files(config: "Config"): - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + out_path = os.path.join(project_path, "out", "version", config.vstr) save_path = os.path.join(out_path, "VDD_ene_calcs") output_path_vdd = os.path.join( @@ -834,7 +841,8 @@ def aggregate_urban_rural_files(config: "Config"): def make_vdd_total_maps(config: "Config"): - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + out_path = os.path.join(project_path, "out", "version", config.vstr) save_path = os.path.join(out_path, "VDD_ene_calcs") output_path_vdd = os.path.join( @@ -1133,7 +1141,9 @@ def make_map( def process_construction_shares(config: "Config"): - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + dle_path = get_paths(config, "dle_path") + out_path = os.path.join(project_path, "out", "version", config.vstr) floorarea_path = os.path.join(out_path, "floorarea_country") output_path = os.path.join( @@ -1153,7 +1163,7 @@ def process_construction_shares(config: "Config"): # If constr_setting == 1, then process construction shares. Otherwise, skip if config.constr_setting == 1: - input_path = config.dle_path + input_path = dle_path dsc = xr.Dataset() for urt in config.urts: @@ -1226,8 +1236,10 @@ def process_construction_shares(config: "Config"): def process_floor_area_maps(config: "Config"): - input_path = config.dle_path - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + dle_path = get_paths(config, "dle_path") + input_path = dle_path + out_path = os.path.join(project_path, "out", "version", config.vstr) save_path = os.path.join(out_path, "floorarea_country") output_path = os.path.join( @@ -1354,8 +1366,11 @@ def process_floor_area_maps(config: "Config"): def process_country_maps(config: "Config"): - input_path = config.dle_path - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + dle_path = get_paths(config, "dle_path") + + input_path = dle_path + out_path = os.path.join(project_path, "out", "version", config.vstr) save_path = os.path.join(out_path, "floorarea_country") output_path = os.path.join( @@ -1436,8 +1451,11 @@ def process_country_maps(config: "Config"): def process_final_maps(config: "Config"): - input_path = config.dle_path - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + dle_path = get_paths(config, "dle_path") + + input_path = dle_path + out_path = os.path.join(project_path, "out", "version", config.vstr) vdd_path = os.path.join( out_path, "VDD_ene_calcs", @@ -1835,8 +1853,11 @@ def process_final_maps(config: "Config"): def process_iso_tables(config: "Config"): start = datetime.datetime.now() - input_path = config.dle_path - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + dle_path = get_paths(config, "dle_path") + + input_path = dle_path + out_path = os.path.join(project_path, "out", "version", config.vstr) vdd_path = os.path.join(out_path, "VDD_ene_calcs", config.gcm, config.rcp) floorarea_path = os.path.join(out_path, "floorarea_country", config.gcm, config.rcp) finalmaps_path = os.path.join(out_path, "final_maps", config.gcm, config.rcp) @@ -2140,7 +2161,11 @@ def aggregate_ncfile(args: tuple) -> xr.Dataset: def create_climate_outputs(config: "Config", start_time: datetime.datetime): - out_path = os.path.join(config.project_path, "out", "version", config.vstr) + project_path = get_paths(config, "project_path") + dle_path = get_paths(config, "dle_path") + isimip_bias_adj_path = get_paths(config, "isimip_bias_adj_path") + isimip_ewemib_path = get_paths(config, "isimip_ewemib_path") + out_path = os.path.join(project_path, "out", "version", config.vstr) archetype_path = os.path.join(out_path, "rasters") save_path = os.path.join(out_path, "VDD_ene_calcs") @@ -2180,10 +2205,10 @@ def create_climate_outputs(config: "Config", start_time: datetime.datetime): nyrs_clim = int(years_clim[1]) - int(years_clim[0]) + 1 if str(clim) == "hist": - isi_folder = config.isimip_ewemib_path + isi_folder = isimip_ewemib_path filestr = config.climate_filestr_hist else: - isi_folder = config.isimip_bias_adj_path + isi_folder = isimip_bias_adj_path filestr = config.climate_filestr_future filepath = os.path.join( @@ -2226,12 +2251,12 @@ def create_climate_outputs(config: "Config", start_time: datetime.datetime): # Vertical irradiation # i_sol_v = xr.open_dataarray(input_folder+'CERES_vert_irrad_2001-13_avg.nc') #Values in daily Wh/m2 i_sol_v = xr.open_dataarray( - os.path.join(config.dle_path, "EWEMBI_vert_irrad_1980-2009_avg.nc") + os.path.join(dle_path, "EWEMBI_vert_irrad_1980-2009_avg.nc") ) # Values in daily Wh/m2 # Horizontal irradiation i_sol_h = xr.open_dataarray( - os.path.join(config.dle_path, "EWEMBI_horiz_irrad_1980-2009_avg.nc") + os.path.join(dle_path, "EWEMBI_horiz_irrad_1980-2009_avg.nc") ) # Values in daily Wh/m2 # i_sol = i_sol.sel(time=slice(years_clim[0],years_clim[1])) diff --git a/message_ix_buildings/chilled/functions/regression.py b/message_ix_buildings/chilled/functions/regression.py index 2b13577..7b3c2da 100644 --- a/message_ix_buildings/chilled/functions/regression.py +++ b/message_ix_buildings/chilled/functions/regression.py @@ -4,7 +4,7 @@ import pyam # type: ignore import statsmodels.formula.api as smf # type: ignore -from message_ix_buildings.chilled.util.util import get_logger +from message_ix_buildings.chilled.util.common import get_logger log = get_logger(__name__) diff --git a/message_ix_buildings/chilled/postprocess/postprocess.py b/message_ix_buildings/chilled/postprocess/postprocess.py index fd4316f..2d7464b 100644 --- a/message_ix_buildings/chilled/postprocess/postprocess.py +++ b/message_ix_buildings/chilled/postprocess/postprocess.py @@ -2,11 +2,13 @@ import pandas as pd +from message_ix_buildings.chilled.util.base import get_paths +from message_ix_buildings.chilled.util.common import get_logger from message_ix_buildings.chilled.util.config import Config -from message_ix_buildings.chilled.util.util import get_logger log = get_logger(__name__) -cfg = Config() +cfg = Config(user="MEAS") +dle_path = get_paths(cfg, "dle_path") def get_sturm_data(input_path, input_version_name): @@ -196,6 +198,14 @@ def postprocess_electricity_demand(input_path, input_version_name): ) # Save files + + df_chilled.to_csv( + os.path.join(version_output_path, "chilled_postprocessed.csv"), + index=False, + ) + + log.info("Saved: " + os.path.join(version_output_path, "chilled_postprocessed.csv")) + df_sturm.to_csv( os.path.join(version_output_path, "sturm_building_stock_inputs.csv"), index=False, @@ -254,4 +264,4 @@ def postprocess_electricity_demand(input_path, input_version_name): ) -postprocess_electricity_demand(cfg.dle_path, cfg.vstr) +postprocess_electricity_demand(dle_path, cfg.vstr2 + "_" + cfg.vstr) diff --git a/message_ix_buildings/chilled/preprocess/archetypes.py b/message_ix_buildings/chilled/preprocess/archetypes.py index 0e1ab0f..adef491 100644 --- a/message_ix_buildings/chilled/preprocess/archetypes.py +++ b/message_ix_buildings/chilled/preprocess/archetypes.py @@ -11,19 +11,22 @@ from functions.variable_dicts import VARS_ARCHETYPES # type: ignore from preprocess.message_raster import create_message_raster # type: ignore -from message_ix_buildings.chilled.util.config import Config # type: ignore -from message_ix_buildings.chilled.util.util import ( +from message_ix_buildings.chilled.util.base import ( get_archs, - get_logger, + get_paths, read_arch_inputs_df, read_arch_reg_df, ) +from message_ix_buildings.chilled.util.common import get_logger +from message_ix_buildings.chilled.util.config import Config # type: ignore log = get_logger(__name__) def create_archetypes(config: "Config"): - out_path = os.path.join(config.project_path, "out", "version") + project_path = get_paths(config, "dle_path") + + out_path = os.path.join(project_path, "out", "version") archetype_path = os.path.join(out_path, config.vstr, "rasters") # if archetypes folder does not exist, create it @@ -49,7 +52,7 @@ def create_archetypes(config: "Config"): ) for arch in vers_archs: - arch_reg = read_arch_reg_df(config, arch) + arch_reg = read_arch_reg_df(config).query("arch == @arch") # Create map of archetypes based on MESSAGE regions raster arch_map = xr.Dataset( @@ -101,7 +104,9 @@ def create_archetypes(config: "Config"): def create_archetype_variables(config: "Config"): - out_path = os.path.join(config.project_path, "out", "version") + project_path = get_paths(config, "dle_path") + + out_path = os.path.join(project_path, "out", "version") archetype_path = os.path.join(out_path, config.vstr, "rasters") # get archs @@ -115,7 +120,7 @@ def map_archetype_variables(args): ) # read in input files - arch_inputs = read_arch_inputs_df(config, arch) + arch_inputs = read_arch_inputs_df(config).query("arch == @arch") # read in relevant archetype raster map = xr.open_dataset( diff --git a/message_ix_buildings/chilled/preprocess/message_raster.py b/message_ix_buildings/chilled/preprocess/message_raster.py index 60b3c17..864bde2 100644 --- a/message_ix_buildings/chilled/preprocess/message_raster.py +++ b/message_ix_buildings/chilled/preprocess/message_raster.py @@ -9,6 +9,7 @@ import pandas as pd import xarray as xr +from message_ix_buildings.chilled.util.base import get_paths from message_ix_buildings.chilled.util.config import Config @@ -35,11 +36,12 @@ def create_message_raster(config: "Config"): ISO attributes in a dataframe """ - input_path = os.path.join(config.dle_path) + input_path = get_paths(config, "dle_path") + message_region_file = get_paths(config, "message_region_map_file") if config.node == "R11": msgregions = pd.read_excel( - config.message_region_file, + message_region_file, sheet_name="regional definition", ) diff --git a/message_ix_buildings/chilled/run_agg.py b/message_ix_buildings/chilled/run_agg.py index 7214b68..ec3f6cb 100644 --- a/message_ix_buildings/chilled/run_agg.py +++ b/message_ix_buildings/chilled/run_agg.py @@ -10,8 +10,8 @@ process_floor_area_maps, process_iso_tables, ) +from message_ix_buildings.chilled.util.common import get_logger from message_ix_buildings.chilled.util.config import Config # type: ignore -from message_ix_buildings.chilled.util.util import get_logger log = get_logger(__name__) diff --git a/message_ix_buildings/chilled/run_main.py b/message_ix_buildings/chilled/run_main.py index 08f34e6..989337e 100644 --- a/message_ix_buildings/chilled/run_main.py +++ b/message_ix_buildings/chilled/run_main.py @@ -14,8 +14,8 @@ process_floor_area_maps, process_iso_tables, ) +from message_ix_buildings.chilled.util.common import get_logger from message_ix_buildings.chilled.util.config import Config # type: ignore -from message_ix_buildings.chilled.util.util import get_logger log = get_logger(__name__) diff --git a/message_ix_buildings/chilled/run_preprocess.py b/message_ix_buildings/chilled/run_preprocess.py index d8f783f..b7da563 100644 --- a/message_ix_buildings/chilled/run_preprocess.py +++ b/message_ix_buildings/chilled/run_preprocess.py @@ -5,8 +5,8 @@ create_archetype_variables, create_archetypes, ) +from message_ix_buildings.chilled.util.common import get_logger from message_ix_buildings.chilled.util.config import Config -from message_ix_buildings.chilled.util.util import get_logger log = get_logger(__name__) diff --git a/message_ix_buildings/chilled/util/base.py b/message_ix_buildings/chilled/util/base.py new file mode 100644 index 0000000..8f76443 --- /dev/null +++ b/message_ix_buildings/chilled/util/base.py @@ -0,0 +1,121 @@ +import os + +import pandas as pd + +from message_ix_buildings.chilled.functions.user_settings import DICT_USER_SETTINGS +from message_ix_buildings.chilled.util.common import get_project_root # type: ignore +from message_ix_buildings.chilled.util.config import Config + + +def get_paths(config: "Config", selection): + # if selection is chunk_size, then return chunk_size as is + # else, return string version of the path + if selection == "chunk_size": + return DICT_USER_SETTINGS[config.user][selection] + else: + return str(DICT_USER_SETTINGS[config.user][selection]) + + +def get_archs(config: "Config"): + root_path = get_project_root() + version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) + + if config.arch_setting == "fixed": + input_file = os.path.join(version_path, "arch_input.csv") + elif config.arch_setting == "regional": + input_file = os.path.join(version_path, "arch_input_reg.csv") + + if os.path.exists(input_file): + archs = pd.read_csv(input_file).arch.unique().tolist() + + return archs + else: + raise FileNotFoundError( + "Archetypes input file " + + input_file + + " does not exist! Please create file for input." + ) + + +def read_arch_inputs_df(config: "Config"): + root_path = get_project_root() + version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) + + if config.arch_setting == "fixed": + input_file = os.path.join(version_path, "arch_input.csv") + elif config.arch_setting == "regional": + input_file = os.path.join(version_path, "arch_input_reg.csv") + + if os.path.exists(input_file): + arch_inputs = pd.read_csv(input_file) + + return arch_inputs + + else: + raise FileNotFoundError( + "Archetypes input file " + + input_file + + " does not exist! Please create file for input." + ) + + +def read_arch_reg_df(config: "Config"): + root_path = get_project_root() + version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) + + if config.arch_setting == "regional": + reg_file = os.path.join( + version_path, + "arch_regions.csv", + ) + + if os.path.exists(reg_file): + arch_reg = pd.read_csv(reg_file) + return arch_reg + else: + raise FileNotFoundError( + "Regional archetypes input file " + + reg_file + + " does not exist! Please create file for input." + ) + + else: + raise TypeError("Archetypes are not regional. No regional file to read.") + + +def load_all_scenarios_data(config: "Config"): + root_path = get_project_root() + version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) + + input_file = os.path.join(version_path, "runs.csv") + + if os.path.exists(input_file): + df = pd.read_csv(input_file, index_col="id") + return df + else: + raise FileNotFoundError( + "Scenarios file " + + input_file + + " does not exist! Please create file for input." + ) + + +def load_parametric_analysis_data(config: "Config"): + root_path = get_project_root() + version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) + + input_file = os.path.join(version_path, "par_var.csv") + + if os.path.exists(input_file): + df = pd.read_csv(input_file, index_col="id_run") + + if config.paranalysis_mode == 0: + df = df.loc[df.name_run == "ref", :] + + return df + else: + raise FileNotFoundError( + "Parametric analysis data file " + + input_file + + " does not exist! Please create file for input." + ) diff --git a/message_ix_buildings/chilled/util/common.py b/message_ix_buildings/chilled/util/common.py new file mode 100644 index 0000000..5d1e21d --- /dev/null +++ b/message_ix_buildings/chilled/util/common.py @@ -0,0 +1,24 @@ +import logging +import sys +from pathlib import Path + + +def get_project_root() -> Path: + return Path(__file__).parent.parent.parent + + +def get_logger(name: str): + log = logging.getLogger(name) + log.setLevel(logging.INFO) + + # configure the handler and formatter as needed + handler = logging.StreamHandler(sys.stdout) + formatter = logging.Formatter("%(name)s %(asctime)s %(levelname)s %(message)s") + + # add formatter to the handler + handler.setFormatter(formatter) + + # add handler to the logger + log.addHandler(handler) + + return log diff --git a/message_ix_buildings/chilled/util/config.py b/message_ix_buildings/chilled/util/config.py index f8ba6cb..cac5d17 100644 --- a/message_ix_buildings/chilled/util/config.py +++ b/message_ix_buildings/chilled/util/config.py @@ -4,8 +4,6 @@ import numpy as np -from message_ix_buildings.chilled.functions.user_settings import DICT_USER_SETTINGS - @dataclass class Config: @@ -20,6 +18,7 @@ class Config: #: #: This is used to name the output files and directories. vstr: str = "ALPS2023" + vstr2 = "v19" #: Select the climate model. #: @@ -128,14 +127,6 @@ class Config: #: TODO: In the future, support "R12". node: Literal["R11"] = "R11" - #: Paths settings by user - project_path: str = str(DICT_USER_SETTINGS[user]["project_path"]) - dle_path: str = str(DICT_USER_SETTINGS[user]["dle_path"]) - message_region_file: str = str(DICT_USER_SETTINGS[user]["message_region_map_file"]) - isimip_bias_adj_path: str = str(DICT_USER_SETTINGS[user]["isimip_bias_adj_path"]) - isimip_ewemib_path: str = str(DICT_USER_SETTINGS[user]["isimip_ewembi_path"]) - chunk_size = DICT_USER_SETTINGS[user]["chunk_size"] - #: NetCDF settings netcdf4_format = "NETCDF4_CLASSIC" comp = dict(zlib=True, complevel=5) # Compression between 0 and 9 (highest) diff --git a/message_ix_buildings/chilled/util/util.py b/message_ix_buildings/chilled/util/util.py deleted file mode 100644 index 061ab3f..0000000 --- a/message_ix_buildings/chilled/util/util.py +++ /dev/null @@ -1,161 +0,0 @@ -import logging -import os -from pathlib import Path - -import pandas as pd -from util.config import Config # type: ignore - - -def get_project_root() -> Path: - return Path(__file__).parent.parent.parent - - -def get_logger(name: str): - log = logging.getLogger(name) - log.setLevel(logging.INFO) - - # configure the handler and formatter as needed - handler = logging.FileHandler(f"{name}.log", mode="w") - formatter = logging.Formatter("%(name)s %(asctime)s %(levelname)s %(message)s") - - # add formatter to the handler - handler.setFormatter(formatter) - - # add handler to the logger - log.addHandler(handler) - - return log - - -def get_archs(config: "Config"): - root_path = get_project_root() - version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) - - if config.arch_setting == "fixed": - input_file = os.path.join(version_path, "arch_input.xlsx") - - if os.path.exists(input_file): - input_file = os.path.join(version_path, "arch_input.xlsx") - archs = pd.ExcelFile(input_file).sheet_names - - return archs - else: - raise FileNotFoundError( - "Archetypes input file " - + input_file - + " does not exist! Please create file for input." - ) - - elif config.arch_setting == "regional": - input_file = os.path.join( - version_path, - "arch_input_reg.xlsx", - ) - - if os.path.exists(input_file): - archs = pd.read_excel(input_file, sheet_name="arch").arch.unique().tolist() - - return archs - else: - raise FileNotFoundError( - "Archetypes input file " - + input_file - + " does not exist! Please create file for input" - ) - - -def read_arch_inputs_df(config: "Config", suff: str): - root_path = get_project_root() - version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) - - if config.arch_setting == "fixed": - input_file = os.path.join(version_path, "arch_input.xlsx") - - if os.path.exists(input_file): - arch_inputs = pd.read_excel(input_file, sheet_name=suff, index_col="id") - - return arch_inputs - else: - raise FileNotFoundError( - "Archetypes input file " - + input_file - + " does not exist! Please create file for input." - ) - elif config.arch_setting == "regional": - input_file = os.path.join( - version_path, - "arch_input_reg.xlsx", - ) - - if os.path.exists(input_file): - arch_inputs = pd.read_excel(input_file, sheet_name="arch") - - return arch_inputs - else: - raise FileNotFoundError( - "Archetypes input file " - + input_file - + " does not exist! Please create file for input." - ) - - -def read_arch_reg_df(config: "Config", arch: str): - root_path = get_project_root() - version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) - - if config.arch_setting == "regional": - reg_file = os.path.join( - version_path, - "arch_regions.xlsx", - ) - - if os.path.exists(reg_file): - arch_reg = pd.read_excel(reg_file, sheet_name=arch) - return arch_reg - else: - raise FileNotFoundError( - "Regional archetypes input file " - + reg_file - + " does not exist! Please create file for input." - ) - - else: - raise TypeError("Archetypes are not regional. No regional file to read.") - - -def load_all_scenarios_data(config: "Config"): - root_path = get_project_root() - version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) - - input_file = os.path.join(version_path, "runs.csv") - - if os.path.exists(input_file): - df = pd.read_csv(input_file, index_col="id") - return df - else: - raise FileNotFoundError( - "Scenarios file " - + input_file - + " does not exist! Please create file for input." - ) - - -def load_parametric_analysis_data(config: "Config"): - root_path = get_project_root() - version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr) - - input_file = os.path.join(version_path, "par_var.csv") - - if os.path.exists(input_file): - df = pd.read_csv(input_file, index_col="id_run") - - if config.paranalysis_mode == 0: - df = df.loc[df.name_run == "ref", :] - - return df - else: - raise FileNotFoundError( - "Parametric analysis data file " - + input_file - + " does not exist! Please create file for input." - ) diff --git a/message_ix_buildings/data/chilled/version/ALPS2023/arch_input_reg.csv b/message_ix_buildings/data/chilled/version/ALPS2023/arch_input_reg.csv new file mode 100644 index 0000000..a140e91 --- /dev/null +++ b/message_ix_buildings/data/chilled/version/ALPS2023/arch_input_reg.csv @@ -0,0 +1,45 @@ +id,name,urt,arch,permanent,area_env,gl_perc,vol,fl_cnd,u_val,ach_cl,ach_op,gn_int,gl_g,gl_sh,roof_area,roof_abs,u_roof +0,AFR_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +1,AFR_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +2,CPA_r_new,rur,new,1,3.7,0.125,3,1,1.525,0.5,1.5,2.14,0.85,0.8,1,0.6,0.7 +3,CPA_u_new,urb,new,1,1.52,0.125,3,1,1.525,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.7 +4,EEU_r_new,rur,new,1,3.7,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,1,0.6,0.23 +5,EEU_u_new,urb,new,1,1.52,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.23 +6,FSU_r_new,rur,new,1,3.7,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,1,0.6,0.23 +7,FSU_u_new,urb,new,1,1.52,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.23 +8,LAC_r_new,rur,new,1,3.7,0.125,3,1,2.65,0.5,1.5,2.14,0.85,0.8,1,0.6,1.6 +9,LAC_u_new,urb,new,1,1.52,0.125,3,1,2.65,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.6 +10,MEA_r_new,rur,new,1,3.7,0.125,3,1,2.5,0.5,1.5,2.14,0.85,0.8,1,0.6,1 +11,MEA_r_new,urb,new,1,1.52,0.125,3,1,2.5,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1 +12,NAM_r_new,rur,new,1,3.7,0.125,3,1,1.39,0.5,1.5,2.14,0.85,0.8,1,0.6,0.34 +13,NAM_u_new,urb,new,1,1.52,0.125,3,1,1.39,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.34 +14,PAO_r_new,rur,new,1,3.7,0.125,3,1,0.940,0.5,1.5,2.14,0.85,0.8,1,0.6,0.35 +15,PAO_u_new,urb,new,1,1.52,0.125,3,1,0.940,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.35 +16,PAS_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +17,PAS_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +18,SAS_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +19,SAS_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +20,WEU_r_new,rur,new,1,3.7,0.125,3,1,0.57875,0.5,1.5,2.14,0.85,0.8,1,0.6,0.2 +21,WEU_u_new,urb,new,1,1.52,0.125,3,1,0.57875,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.2 +22,AFR_r_new,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +23,AFR_u_new,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +24,CPA_r_new,rur,exist,1,3.7,0.125,3,1,1.925,0.5,1.5,2.14,0.85,0.8,1,0.6,0.900 +25,CPA_u_new,urb,exist,1,1.52,0.125,3,1,1.925,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.900 +26,EEU_r_new,rur,exist,1,3.7,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,1,0.6,0.800 +27,EEU_u_new,urb,exist,1,1.52,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.800 +28,FSU_r_new,rur,exist,1,3.7,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,1,0.6,0.800 +29,FSU_u_new,urb,exist,1,1.52,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.800 +30,LAC_r_new,rur,exist,1,3.7,0.125,3,1,2.763,0.5,1.5,2.14,0.85,0.8,1,0.6,1.750 +31,LAC_u_new,urb,exist,1,1.52,0.125,3,1,2.763,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.750 +32,MEA_r_new,rur,exist,1,3.7,0.125,3,1,2.863,0.5,1.5,2.14,0.85,0.8,1,0.6,1.750 +33,MEA_r_new,urb,exist,1,1.52,0.125,3,1,2.863,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.750 +34,NAM_r_new,rur,exist,1,3.7,0.125,3,1,1.560,0.5,1.5,2.14,0.85,0.8,1,0.6,0.369 +35,NAM_u_new,urb,exist,1,1.52,0.125,3,1,1.560,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.369 +36,PAO_r_new,rur,exist,1,3.7,0.125,3,1,1.330,0.5,1.5,2.14,0.85,0.8,1,0.6,0.700 +37,PAO_u_new,urb,exist,1,1.52,0.125,3,1,1.330,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.700 +38,PAS_r_new,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +39,PAS_u_new,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +40,SAS_r_new,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +41,SAS_u_new,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +42,WEU_r_new,rur,exist,1,3.7,0.125,3,1,1.103,0.5,1.5,2.14,0.85,0.8,1,0.6,0.697 +43,WEU_u_new,urb,exist,1,1.52,0.125,3,1,1.103,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.697 \ No newline at end of file diff --git a/message_ix_buildings/data/chilled/version/ALPS2023/arch_input_reg.xlsx b/message_ix_buildings/data/chilled/version/ALPS2023/arch_input_reg.xlsx deleted file mode 100755 index a97cff8..0000000 Binary files a/message_ix_buildings/data/chilled/version/ALPS2023/arch_input_reg.xlsx and /dev/null differ diff --git a/message_ix_buildings/data/chilled/version/ALPS2023/arch_regions.csv b/message_ix_buildings/data/chilled/version/ALPS2023/arch_regions.csv new file mode 100644 index 0000000..15a8b74 --- /dev/null +++ b/message_ix_buildings/data/chilled/version/ALPS2023/arch_regions.csv @@ -0,0 +1,23 @@ +REGION_GEA,RegNum,arch,rural,urban +AFR,1,new,0,1 +CPA,2,new,2,3 +EEU,3,new,4,5 +FSU,4,new,6,7 +LAC,5,new,8,9 +MEA,6,new,10,11 +NAM,7,new,12,13 +PAO,8,new,14,15 +PAS,9,new,16,17 +SAS,10,new,18,19 +WEU,11,new,20,21 +AFR,1,exist,22,23 +CPA,2,exist,24,25 +EEU,3,exist,26,27 +FSU,4,exist,28,29 +LAC,5,exist,30,31 +MEA,6,exist,32,33 +NAM,7,exist,34,35 +PAO,8,exist,36,37 +PAS,9,exist,38,39 +SAS,10,exist,40,41 +WEU,11,exist,42,43 \ No newline at end of file diff --git a/message_ix_buildings/data/chilled/version/ALPS2023/arch_regions.xlsx b/message_ix_buildings/data/chilled/version/ALPS2023/arch_regions.xlsx deleted file mode 100755 index 803bbe6..0000000 Binary files a/message_ix_buildings/data/chilled/version/ALPS2023/arch_regions.xlsx and /dev/null differ diff --git a/message_ix_buildings/data/chilled/version/dle_coolssp/arch_input_reg.csv b/message_ix_buildings/data/chilled/version/dle_coolssp/arch_input_reg.csv new file mode 100644 index 0000000..8ea1f43 --- /dev/null +++ b/message_ix_buildings/data/chilled/version/dle_coolssp/arch_input_reg.csv @@ -0,0 +1,67 @@ +id,name,urt,arch,permanent,area_env,gl_perc,vol,fl_cnd,u_val,ach_cl,ach_op,gn_int,gl_g,gl_sh,roof_area,roof_abs,u_roof +0,AFR_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +1,AFR_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +2,CPA_r_new,rur,new,1,3.7,0.125,3,1,1.525,0.5,1.5,2.14,0.85,0.8,1,0.6,0.7 +3,CPA_u_new,urb,new,1,1.52,0.125,3,1,1.525,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.7 +4,EEU_r_new,rur,new,1,3.7,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,1,0.6,0.23 +5,EEU_u_new,urb,new,1,1.52,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.23 +6,FSU_r_new,rur,new,1,3.7,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,1,0.6,0.23 +7,FSU_u_new,urb,new,1,1.52,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.23 +8,LAC_r_new,rur,new,1,3.7,0.125,3,1,2.65,0.5,1.5,2.14,0.85,0.8,1,0.6,1.6 +9,LAC_u_new,urb,new,1,1.52,0.125,3,1,2.65,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.6 +10,MEA_r_new,rur,new,1,3.7,0.125,3,1,2.5,0.5,1.5,2.14,0.85,0.8,1,0.6,1 +11,MEA_r_new,urb,new,1,1.52,0.125,3,1,2.5,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1 +12,NAM_r_new,rur,new,1,3.7,0.125,3,1,1.39,0.5,1.5,2.14,0.85,0.8,1,0.6,0.34 +13,NAM_u_new,urb,new,1,1.52,0.125,3,1,1.39,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.34 +14,PAO_r_new,rur,new,1,3.7,0.125,3,1,0.94,0.5,1.5,2.14,0.85,0.8,1,0.6,0.35 +15,PAO_u_new,urb,new,1,1.52,0.125,3,1,0.94,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.35 +16,PAS_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +17,PAS_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +18,SAS_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +19,SAS_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +20,WEU_r_new,rur,new,1,3.7,0.125,3,1,0.57875,0.5,1.5,2.14,0.85,0.8,1,0.6,0.2 +21,WEU_u_new,urb,new,1,1.52,0.125,3,1,0.57875,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.2 +22,AFR_r_exist,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +23,AFR_u_exist,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +24,CPA_r_exist,rur,exist,1,3.7,0.125,3,1,1.925,0.5,1.5,2.14,0.85,0.8,1,0.6,0.900 +25,CPA_u_exist,urb,exist,1,1.52,0.125,3,1,1.925,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.900 +26,EEU_r_exist,rur,exist,1,3.7,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,1,0.6,0.800 +27,EEU_u_exist,urb,exist,1,1.52,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.800 +28,FSU_r_exist,rur,exist,1,3.7,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,1,0.6,0.800 +29,FSU_u_exist,urb,exist,1,1.52,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.800 +30,LAC_r_exist,rur,exist,1,3.7,0.125,3,1,2.763,0.5,1.5,2.14,0.85,0.8,1,0.6,1.750 +31,LAC_u_exist,urb,exist,1,1.52,0.125,3,1,2.763,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.750 +32,MEA_r_exist,rur,exist,1,3.7,0.125,3,1,2.863,0.5,1.5,2.14,0.85,0.8,1,0.6,1.750 +33,MEA_r_exist,urb,exist,1,1.52,0.125,3,1,2.863,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.750 +34,NAM_r_exist,rur,exist,1,3.7,0.125,3,1,1.560,0.5,1.5,2.14,0.85,0.8,1,0.6,0.369 +35,NAM_u_exist,urb,exist,1,1.52,0.125,3,1,1.560,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.369 +36,PAO_r_exist,rur,exist,1,3.7,0.125,3,1,1.330,0.5,1.5,2.14,0.85,0.8,1,0.6,0.700 +37,PAO_u_exist,urb,exist,1,1.52,0.125,3,1,1.330,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.700 +38,PAS_r_exist,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +39,PAS_u_exist,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +40,SAS_r_exist,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +41,SAS_u_exist,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +42,WEU_r_exist,rur,exist,1,3.7,0.125,3,1,1.103,0.5,1.5,2.14,0.85,0.8,1,0.6,0.697 +43,WEU_u_exist,urb,exist,1,1.52,0.125,3,1,1.103,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.697 +44,AFR_r_low,rur,low,1,3.7,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,1,0.6,0.230 +45,AFR_u_low,urb,low,1,1.52,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.230 +46,CPA_r_low,rur,low,1,3.7,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,1,0.6,0.230 +47,CPA_u_low,urb,low,1,1.52,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.230 +48,EEU_r_low,rur,low,1,3.7,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,1,0.6,0.150 +49,EEU_u_low,urb,low,1,1.52,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.150 +50,FSU_r_low,rur,low,1,3.7,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,1,0.6,0.150 +51,FSU_u_low,urb,low,1,1.52,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.150 +52,LAC_r_low,rur,low,1,3.7,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,1,0.6,0.230 +53,LAC_u_low,urb,low,1,1.52,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.230 +54,MEA_r_low,rur,low,1,3.7,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,1,0.6,0.230 +55,MEA_r_low,urb,low,1,1.52,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.230 +56,NAM_r_low,rur,low,1,3.7,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,1,0.6,0.150 +57,NAM_u_low,urb,low,1,1.52,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.150 +58,PAO_r_low,rur,low,1,3.7,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,1,0.6,0.150 +59,PAO_u_low,urb,low,1,1.52,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.150 +60,PAS_r_low,rur,low,1,3.7,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,1,0.6,0.230 +61,PAS_u_low,urb,low,1,1.52,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.230 +62,SAS_r_low,rur,low,1,3.7,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,1,0.6,0.230 +63,SAS_u_low,urb,low,1,1.52,0.125,3,1,0.591,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.230 +64,WEU_r_low,rur,low,1,3.7,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,1,0.6,0.150 +65,WEU_u_low,urb,low,1,1.52,0.125,3,1,0.380,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.150 \ No newline at end of file diff --git a/message_ix_buildings/data/chilled/version/dle_coolssp/arch_input_reg.xlsx b/message_ix_buildings/data/chilled/version/dle_coolssp/arch_input_reg.xlsx deleted file mode 100644 index 69dcfe9..0000000 Binary files a/message_ix_buildings/data/chilled/version/dle_coolssp/arch_input_reg.xlsx and /dev/null differ diff --git a/message_ix_buildings/data/chilled/version/dle_coolssp/arch_regions.csv b/message_ix_buildings/data/chilled/version/dle_coolssp/arch_regions.csv new file mode 100644 index 0000000..d1ac6d7 --- /dev/null +++ b/message_ix_buildings/data/chilled/version/dle_coolssp/arch_regions.csv @@ -0,0 +1,34 @@ +REGION_GEA,RegNum,arch,rural,urban +AFR,1,new,0,1 +CPA,2,new,2,3 +EEU,3,new,4,5 +FSU,4,new,6,7 +LAC,5,new,8,9 +MEA,6,new,10,11 +NAM,7,new,12,13 +PAO,8,new,14,15 +PAS,9,new,16,17 +SAS,10,new,18,19 +WEU,11,new,20,21 +AFR,1,exist,22,23 +CPA,2,exist,24,25 +EEU,3,exist,26,27 +FSU,4,exist,28,29 +LAC,5,exist,30,31 +MEA,6,exist,32,33 +NAM,7,exist,34,35 +PAO,8,exist,36,37 +PAS,9,exist,38,39 +SAS,10,exist,40,41 +WEU,11,exist,42,43 +AFR,1,low,44,45 +CPA,2,low,46,47 +EEU,3,low,48,49 +FSU,4,low,50,51 +LAC,5,low,52,53 +MEA,6,low,54,55 +NAM,7,low,56,57 +PAO,8,low,58,59 +PAS,9,low,60,61 +SAS,10,low,62,63 +WEU,11,low,64,65 \ No newline at end of file diff --git a/message_ix_buildings/data/chilled/version/dle_coolssp/arch_regions.xlsx b/message_ix_buildings/data/chilled/version/dle_coolssp/arch_regions.xlsx deleted file mode 100644 index e318634..0000000 Binary files a/message_ix_buildings/data/chilled/version/dle_coolssp/arch_regions.xlsx and /dev/null differ diff --git a/message_ix_buildings/data/chilled/version/test/arch_input_reg.csv b/message_ix_buildings/data/chilled/version/test/arch_input_reg.csv new file mode 100644 index 0000000..a140e91 --- /dev/null +++ b/message_ix_buildings/data/chilled/version/test/arch_input_reg.csv @@ -0,0 +1,45 @@ +id,name,urt,arch,permanent,area_env,gl_perc,vol,fl_cnd,u_val,ach_cl,ach_op,gn_int,gl_g,gl_sh,roof_area,roof_abs,u_roof +0,AFR_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +1,AFR_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +2,CPA_r_new,rur,new,1,3.7,0.125,3,1,1.525,0.5,1.5,2.14,0.85,0.8,1,0.6,0.7 +3,CPA_u_new,urb,new,1,1.52,0.125,3,1,1.525,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.7 +4,EEU_r_new,rur,new,1,3.7,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,1,0.6,0.23 +5,EEU_u_new,urb,new,1,1.52,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.23 +6,FSU_r_new,rur,new,1,3.7,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,1,0.6,0.23 +7,FSU_u_new,urb,new,1,1.52,0.125,3,1,0.705,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.23 +8,LAC_r_new,rur,new,1,3.7,0.125,3,1,2.65,0.5,1.5,2.14,0.85,0.8,1,0.6,1.6 +9,LAC_u_new,urb,new,1,1.52,0.125,3,1,2.65,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.6 +10,MEA_r_new,rur,new,1,3.7,0.125,3,1,2.5,0.5,1.5,2.14,0.85,0.8,1,0.6,1 +11,MEA_r_new,urb,new,1,1.52,0.125,3,1,2.5,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1 +12,NAM_r_new,rur,new,1,3.7,0.125,3,1,1.39,0.5,1.5,2.14,0.85,0.8,1,0.6,0.34 +13,NAM_u_new,urb,new,1,1.52,0.125,3,1,1.39,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.34 +14,PAO_r_new,rur,new,1,3.7,0.125,3,1,0.940,0.5,1.5,2.14,0.85,0.8,1,0.6,0.35 +15,PAO_u_new,urb,new,1,1.52,0.125,3,1,0.940,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.35 +16,PAS_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +17,PAS_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +18,SAS_r_new,rur,new,1,3.7,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,1,0.6,2.7 +19,SAS_u_new,urb,new,1,1.52,0.125,3,1,3.025,0.5,1.5,2.14,0.85,0.8,0.25,0.6,2.7 +20,WEU_r_new,rur,new,1,3.7,0.125,3,1,0.57875,0.5,1.5,2.14,0.85,0.8,1,0.6,0.2 +21,WEU_u_new,urb,new,1,1.52,0.125,3,1,0.57875,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.2 +22,AFR_r_new,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +23,AFR_u_new,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +24,CPA_r_new,rur,exist,1,3.7,0.125,3,1,1.925,0.5,1.5,2.14,0.85,0.8,1,0.6,0.900 +25,CPA_u_new,urb,exist,1,1.52,0.125,3,1,1.925,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.900 +26,EEU_r_new,rur,exist,1,3.7,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,1,0.6,0.800 +27,EEU_u_new,urb,exist,1,1.52,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.800 +28,FSU_r_new,rur,exist,1,3.7,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,1,0.6,0.800 +29,FSU_u_new,urb,exist,1,1.52,0.125,3,1,1.288,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.800 +30,LAC_r_new,rur,exist,1,3.7,0.125,3,1,2.763,0.5,1.5,2.14,0.85,0.8,1,0.6,1.750 +31,LAC_u_new,urb,exist,1,1.52,0.125,3,1,2.763,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.750 +32,MEA_r_new,rur,exist,1,3.7,0.125,3,1,2.863,0.5,1.5,2.14,0.85,0.8,1,0.6,1.750 +33,MEA_r_new,urb,exist,1,1.52,0.125,3,1,2.863,0.5,1.5,2.14,0.85,0.8,0.25,0.6,1.750 +34,NAM_r_new,rur,exist,1,3.7,0.125,3,1,1.560,0.5,1.5,2.14,0.85,0.8,1,0.6,0.369 +35,NAM_u_new,urb,exist,1,1.52,0.125,3,1,1.560,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.369 +36,PAO_r_new,rur,exist,1,3.7,0.125,3,1,1.330,0.5,1.5,2.14,0.85,0.8,1,0.6,0.700 +37,PAO_u_new,urb,exist,1,1.52,0.125,3,1,1.330,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.700 +38,PAS_r_new,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +39,PAS_u_new,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +40,SAS_r_new,rur,exist,1,3.7,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,1,0.6,3.300 +41,SAS_u_new,urb,exist,1,1.52,0.125,3,1,3.475,0.5,1.5,2.14,0.85,0.8,0.25,0.6,3.300 +42,WEU_r_new,rur,exist,1,3.7,0.125,3,1,1.103,0.5,1.5,2.14,0.85,0.8,1,0.6,0.697 +43,WEU_u_new,urb,exist,1,1.52,0.125,3,1,1.103,0.5,1.5,2.14,0.85,0.8,0.25,0.6,0.697 \ No newline at end of file diff --git a/message_ix_buildings/data/chilled/version/test/arch_input_reg.xlsx b/message_ix_buildings/data/chilled/version/test/arch_input_reg.xlsx deleted file mode 100755 index a97cff8..0000000 Binary files a/message_ix_buildings/data/chilled/version/test/arch_input_reg.xlsx and /dev/null differ diff --git a/message_ix_buildings/data/chilled/version/test/arch_regions.csv b/message_ix_buildings/data/chilled/version/test/arch_regions.csv new file mode 100644 index 0000000..15a8b74 --- /dev/null +++ b/message_ix_buildings/data/chilled/version/test/arch_regions.csv @@ -0,0 +1,23 @@ +REGION_GEA,RegNum,arch,rural,urban +AFR,1,new,0,1 +CPA,2,new,2,3 +EEU,3,new,4,5 +FSU,4,new,6,7 +LAC,5,new,8,9 +MEA,6,new,10,11 +NAM,7,new,12,13 +PAO,8,new,14,15 +PAS,9,new,16,17 +SAS,10,new,18,19 +WEU,11,new,20,21 +AFR,1,exist,22,23 +CPA,2,exist,24,25 +EEU,3,exist,26,27 +FSU,4,exist,28,29 +LAC,5,exist,30,31 +MEA,6,exist,32,33 +NAM,7,exist,34,35 +PAO,8,exist,36,37 +PAS,9,exist,38,39 +SAS,10,exist,40,41 +WEU,11,exist,42,43 \ No newline at end of file diff --git a/message_ix_buildings/data/chilled/version/test/arch_regions.xlsx b/message_ix_buildings/data/chilled/version/test/arch_regions.xlsx deleted file mode 100755 index 803bbe6..0000000 Binary files a/message_ix_buildings/data/chilled/version/test/arch_regions.xlsx and /dev/null differ