Update RCo2L to accesss load variable directly rather than rhs of bus…

… constraint

.gitignore

@@ -266,5 +266,6 @@ TSWLatexianTemp*
 
 # Exceptions to gitignore
 connect.sh
+/workflow/config/config.cluster.yaml
 /workflow/repo_data/dag.png
 !.pre-commit-config.yaml

workflow/run_slurm.sh

@@ -1,2 +1,2 @@
 # SLURM specifications made in default.cluster.yaml & the individual rules
-snakemake --cluster "sbatch -A {cluster.account} --mail-type ALL --mail-user {cluster.email} -p {cluster.partition} -t {cluster.walltime} -o {cluster.output} -e {cluster.error} -c {threads} --mem {resources.mem_mb}" --cluster-config config/config.cluster.yaml --jobs 10 --latency-wait 60 --configfile config/tests/config.test_simple.yaml
+snakemake --cluster "sbatch -A {cluster.account} --mail-type ALL --mail-user {cluster.email} -p {cluster.partition} -t {cluster.walltime} -o {cluster.output} -e {cluster.error} -c {threads} --mem {resources.mem_mb}" --cluster-config config/config.cluster.yaml --jobs 4 --latency-wait 60 --configfile config/config.default.yaml

workflow/scripts/solve_network.py

@@ -507,7 +507,7 @@ def add_regional_co2limit(n, sns, config):
     for idx, emmission_lim in regional_co2_lims.iterrows():
         region_list = [region.strip() for region in emmission_lim.regions.split(",")]
         region_buses = n.buses[n.buses.country.isin(region_list)]
-
+        
         if region_buses.empty:
             continue
 
@@ -534,7 +534,8 @@ def add_regional_co2limit(n, sns, config):
             lhs = (p * em_pu).sum()
 
             #Imports
-            region_demand = n.model.constraints['Bus-nodal_balance'].rhs.loc[region_buses.index, :].sum()
+            # region_demand = n.model.constraints['Bus-nodal_balance'].rhs.loc[region_buses.index, :].sum()
+            region_demand = n.loads_t.p_set.loc[:, n.loads.bus.isin(region_buses.index)].sum().sum()
             lhs -= (p * EF_imports).sum()
 
             rhs = region_co2lim - (region_demand * EF_imports)