Change input file formats and input paths in chilled

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__)
 

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)

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, "project_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, "project_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(

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",
         )
 

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__)
 

message_ix_buildings/chilled/run_heat.py

@@ -0,0 +1,115 @@
+import datetime
+import sys
+from argparse import ArgumentParser
+
+from rich.progress import track  # type: ignore
+
+from message_ix_buildings.chilled.core.climate import (
+    aggregate_urban_rural_files,
+    create_climate_variables_maps,
+    make_vdd_total_maps,
+    process_construction_shares,
+    process_country_maps,
+    process_final_maps,
+    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
+
+log = get_logger(__name__)
+
+
+def parse_arguments(arguments):
+    """
+
+    :return:
+    """
+    parser = ArgumentParser(add_help=True)
+
+    parser.add_argument(
+        "-version",
+        "--version",
+        default="ALPS2023",
+        help="Version of inputs to run. Default: ALPS2023.",
+    )
+    parser.add_argument(
+        "-gcm",
+        "--gcm",
+        default="GFDL-ESM4",
+        help="GCM to run. Options: GFDL-ESM4, IPSL-CM6A-LR, MPI-ESM1-2-HR, MRI-ESM2-0, \
+            UKESM1-0-LL. Default: GFDL-ESM4.",
+    )
+    parser.add_argument(
+        "-rcp",
+        "--rcp",
+        default="baseline",
+        help="RCP to run. Options: ssp126, ssp370, ssp585, baseline. \
+            Default: baseline.",
+    )
+
+    # Parse arguments
+    parsed_arguments = parser.parse_known_args(args=arguments)[0]
+
+    return parsed_arguments
+
+
+def print_arguments(parsed_arguments):
+    """
+    :param parsed_arguments:
+
+    """
+
+    # Print arguments
+    log.info(
+        "\n"
+        + "---------- Parsed arguments ------------"
+        + "\n"
+        + "Selected version: "
+        + parsed_arguments.version
+        + "\n"
+        + "Selected GCM: "
+        + parsed_arguments.gcm
+        + "\n"
+        + "Selected RCP scenario: "
+        + parsed_arguments.rcp
+    )
+
+
+# create climate outputs
+def create_config(parsed_arguments):
+    cfg = Config(
+        vstr=parsed_arguments.version,
+        gcm=parsed_arguments.gcm,
+        rcp=parsed_arguments.rcp,
+        cool=0,
+        heat=1,
+    )
+
+    return cfg
+
+
+def main(args=None):
+    if args is None:
+        args = sys.argv[1:]
+
+    parsed_args = parse_arguments(arguments=args)
+
+    # Run the core functions
+    start = datetime.datetime.now()
+    print_arguments(parsed_arguments=parsed_args)
+    cfg = create_config(parsed_arguments=parsed_args)
+
+    for step in track([cfg], description="Running core functions..."):
+        (create_climate_variables_maps(step, start),)
+        (aggregate_urban_rural_files(step),)
+        (make_vdd_total_maps(step),)
+        (process_construction_shares(step),)
+        (process_floor_area_maps(step),)
+        (process_country_maps(step),)
+        (process_final_maps(step),)
+        (process_iso_tables(step),)
+
+
+if __name__ == "__main__":
+    main()

message_ix_buildings/chilled/run_iso.py

@@ -0,0 +1,104 @@
+import datetime
+import sys
+from argparse import ArgumentParser
+
+from rich.progress import track  # type: ignore
+
+from message_ix_buildings.chilled.core.climate import process_iso_tables
+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 parse_arguments(arguments):
+    """
+
+    :return:
+    """
+    parser = ArgumentParser(add_help=True)
+
+    parser.add_argument(
+        "-version",
+        "--version",
+        default="ALPS2023",
+        help="Version of inputs to run. Default: ALPS2023.",
+    )
+    parser.add_argument(
+        "-gcm",
+        "--gcm",
+        default="GFDL-ESM4",
+        help="GCM to run. Options: GFDL-ESM4, IPSL-CM6A-LR, MPI-ESM1-2-HR, MRI-ESM2-0, \
+            UKESM1-0-LL. Default: GFDL-ESM4.",
+    )
+    parser.add_argument(
+        "-rcp",
+        "--rcp",
+        default="baseline",
+        help="RCP to run. Options: ssp126, ssp370, ssp585, baseline. \
+            Default: baseline.",
+    )
+
+    # Parse arguments
+    parsed_arguments = parser.parse_known_args(args=arguments)[0]
+
+    return parsed_arguments
+
+
+def print_arguments(parsed_arguments):
+    """
+    :param parsed_arguments:
+
+    """
+
+    # Print arguments
+    log.info(
+        "\n"
+        + "---------- Parsed arguments ------------"
+        + "\n"
+        + "Selected version: "
+        + parsed_arguments.version
+        + "\n"
+        + "Selected GCM: "
+        + parsed_arguments.gcm
+        + "\n"
+        + "Selected RCP scenario: "
+        + parsed_arguments.rcp
+    )
+
+
+# create climate outputs
+def create_config(parsed_arguments):
+    cfg = Config(
+        vstr=parsed_arguments.version,
+        gcm=parsed_arguments.gcm,
+        rcp=parsed_arguments.rcp,
+        cool=0,
+        heat=1,
+    )
+
+    return cfg
+
+
+def main(args=None):
+    if args is None:
+        args = sys.argv[1:]
+
+    parsed_args = parse_arguments(arguments=args)
+
+    # Run the core functions
+    start = datetime.datetime.now()
+    print_arguments(parsed_arguments=parsed_args)
+    cfg = create_config(parsed_arguments=parsed_args)
+
+    for step in track([cfg], description="Running core functions..."):
+        # (make_vdd_total_maps(step),)
+        # (process_construction_shares(step),)
+        # (process_floor_area_maps(step),)
+        # (process_country_maps(step),)
+        # (process_final_maps(step),)
+        (process_iso_tables(step),)
+
+
+if __name__ == "__main__":
+    main()

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__)
 

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__)