resolve conflicts

pypsa-meets-earth · Oct 12, 2023 · ae90de0 · ae90de0
2 parents 7167af4 + 2ee5b60
commit ae90de0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -115,4 +115,4 @@ jobs:
       run: |
         cd ../pypsa-earth
         snakemake -j1 run_all_scenarios
-        
+        
diff --git a/test/config_kz_default_test.yaml b/test/config_kz_default_test.yaml
@@ -18,6 +18,7 @@ scenario:
 
 countries: ["KZ"]
 
+
 snapshots:
   start: "2013-01-01"
   end: "2013-01-02"
@@ -44,7 +45,8 @@ cluster_options:
 build_shape_options:
   nprocesses: 1  # number of processes to be used in build_shapes
   nchunks: 3  # number of data chuncks for build_shapes. If not specified or smaller than nprocesses, specified as nprocesses
-  gadm_layer_id: 0
+  gadm_layer_id: 0  # set gadm level to 0 to simplify the case
+
 
 load_options:
   rescale_demand: true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -115,4 +115,4 @@ jobs:
		run: \|
		cd ../pypsa-earth
		snakemake -j1 run_all_scenarios