final book chapter commit

dcradu · dcradu · commit d292c1cff5ba · 2021-06-25T15:26:29.000+02:00
diff --git a/network/components/res.py b/network/components/res.py
@@ -53,7 +53,7 @@ def add_generators_from_file(net: pypsa.Network, technologies: List[str], use_ex
     countries = list(net.buses.country.dropna())
 
     # Load site data
-    resite_data_path = f"{data_path}../../resite_ip/output/APPLEN/{sites_dir}/"
+    resite_data_path = f"{data_path}../../resite_ip/output/{sites_dir}/"
     resite_data_fn = join(resite_data_path, sites_fn)
     tech_points_cap_factor_df = pickle.load(open(resite_data_fn, "rb"))
 
diff --git a/projects/tyndp2018/config.yaml b/projects/tyndp2018/config.yaml
@@ -17,9 +17,9 @@ solver_options:
 
 # Time
 time:
-  slice: ['2018-01-01T00:00', '2018-01-31T23:00']
+  slice: ['2017-01-01T00:00', '2019-12-31T23:00']
   resolution: 1
-  downsampling: 3
+  downsampling: 1
 
 # Space
 region: "EU"
@@ -30,7 +30,7 @@ res:
   # Give which technology should be installed using each strategy
   techs: ['wind_onshore', 'wind_offshore', 'pv_utility', 'pv_residential']
   strategies:
-    from_file: ['wind_onshore']
+    from_files: ['wind_onshore']
     bus: ['wind_offshore', 'pv_utility', 'pv_residential']
 
   min_cap_pot: [0., 0., 0., 0.]
diff --git a/projects/tyndp2018/main.py b/projects/tyndp2018/main.py
@@ -18,7 +18,7 @@
 
 import logging
 logging.basicConfig(level=logging.INFO, format=f"%(levelname)s %(name) %(asctime)s - %(message)s")
-# logging.disable(logging.CRITICAL)
+logging.disable(logging.CRITICAL)
 logger = logging.getLogger(__name__)
 
 NHoursPerYear = 8760.
@@ -45,7 +45,7 @@ def parse_args():
     # Main directories
     data_dir = f"{data_path}"
     tech_dir = f"{data_path}technologies/"
-    output_dir = f"{data_path}../output/BOOK/{strftime('%Y%m%d_%H%M%S')}/"
+    output_dir = f"{data_path}../output/{strftime('%Y%m%d_%H%M%S')}/"
 
     # Run config
     config_fn = join(dirname(abspath(__file__)), 'config.yaml')
@@ -133,7 +133,7 @@ def parse_args():
             logger.info(f"Adding RES {technologies} generation with strategy {strategy}.")
 
             if strategy == "from_files":
-                net = add_res_from_file(net, technologies,
+                net = add_res_from_file(net, technologies, config['res']['use_ex_cap'],
                                         config['res']['sites_dir'], config['res']['sites_fn'],
                                         config['res']['spatial_resolution'],
                                         tech_config)
