Skip to content

Commit 8f1f9ff

Browse files
author
IlkaCu
committed
change version number to v0.4.2 for REA
1 parent dbfc079 commit 8f1f9ff

13 files changed

Lines changed: 90 additions & 90 deletions

dataprocessing/sql_snippets/rea/ego_dp_conv.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ __author__ = "Ludee"
99

1010

1111
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
12-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' ');
12+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' ');
1313

1414
-- la_id
1515
ALTER TABLE model_draft.ego_dp_supply_conv_powerplant
@@ -31,4 +31,4 @@ UPDATE model_draft.ego_dp_supply_conv_powerplant AS t1
3131
WHERE t1.gid = t2.id;
3232

3333
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
34-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' ');
34+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' ');

dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CREATE TABLE model_draft.ego_lattice_500m (
2020
CONSTRAINT ego_lattice_500m_pkey PRIMARY KEY (id));
2121

2222
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
23-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_500m.sql',' ');
23+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_500m.sql',' ');
2424

2525
-- lattice on bbox of Germany with 500m
2626
INSERT INTO model_draft.ego_lattice_500m (geom_box)
@@ -52,7 +52,7 @@ ALTER TABLE model_draft.ego_lattice_500m OWNER TO oeuser;
5252
-- metadata
5353
COMMENT ON TABLE model_draft.ego_lattice_500m IS '{
5454
"comment": "eGoDP - Temporary table",
55-
"version": "v0.4.1" }';
55+
"version": "v0.4.2" }';
5656

5757
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
58-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_lattice_500m','ego_dp_lattice_500m.sql',' ');
58+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_500m','ego_dp_lattice_500m.sql',' ');

dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CREATE TABLE model_draft.ego_lattice_50m (
1919
CONSTRAINT ego_lattice_50m_pkey PRIMARY KEY (id));
2020

2121
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
22-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_50m.sql',' ');
22+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_50m.sql',' ');
2323

2424
-- insert lattice
2525
INSERT INTO model_draft.ego_lattice_50m (geom_box)
@@ -51,7 +51,7 @@ ALTER TABLE model_draft.ego_lattice_50m OWNER TO oeuser;
5151
-- metadata
5252
COMMENT ON TABLE model_draft.ego_lattice_50m IS '{
5353
"comment": "eGoDP - Temporary table",
54-
"version": "v0.4.1" }';
54+
"version": "v0.4.2" }';
5555

5656
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
57-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_lattice_50m','ego_dp_lattice_50m.sql',' ');
57+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_50m','ego_dp_lattice_50m.sql',' ');

dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ __author__ = "Ludee"
1313
*/
1414

1515
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
16-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_500m.sql',' ');
16+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_500m.sql',' ');
1717

1818
-- substation id from mv-griddistrict
1919
UPDATE model_draft.ego_lattice_500m AS t1
@@ -35,7 +35,7 @@ UPDATE model_draft.ego_lattice_500m AS t1
3535

3636

3737
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
38-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_lattice_per_area_500m.sql',' ');
38+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_lattice_per_area_500m.sql',' ');
3939

4040
-- area type for wind potential area (wpa)
4141
UPDATE model_draft.ego_lattice_500m AS t1
@@ -51,7 +51,7 @@ UPDATE model_draft.ego_lattice_500m AS t1
5151
WHERE t1.id = t2.id;
5252

5353
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
54-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_500m.sql',' ');
54+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_500m.sql',' ');
5555

5656
-- area type for loadarea (la)
5757
UPDATE model_draft.ego_lattice_500m AS t1
@@ -82,7 +82,7 @@ UPDATE model_draft.ego_lattice_500m AS t1
8282
WHERE t1.id = t2.id;
8383

8484
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
85-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_lattice_500m','ego_dp_rea_lattice_per_area_500m.sql',' ');
85+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_500m','ego_dp_rea_lattice_per_area_500m.sql',' ');
8686

8787

8888
-- mview points inside wpa
@@ -103,7 +103,7 @@ ALTER TABLE model_draft.ego_lattice_500m_wpa_mview OWNER TO oeuser;
103103
SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_wpa_mview');
104104

105105
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
106-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_lattice_500m_wpa_mview','ego_dp_rea_lattice_per_area_500m.sql',' ');
106+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_500m_wpa_mview','ego_dp_rea_lattice_per_area_500m.sql',' ');
107107

108108

109109
-- mview points inside la
@@ -124,7 +124,7 @@ ALTER TABLE model_draft.ego_lattice_500m_la_mview OWNER TO oeuser;
124124
SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_la_mview');
125125

126126
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
127-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_lattice_500m_la_mview','ego_dp_rea_lattice_per_area_500m.sql',' ');
127+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_lattice_500m_la_mview','ego_dp_rea_lattice_per_area_500m.sql',' ');
128128

129129

130130
-- mview points inside wpa and la
@@ -145,7 +145,7 @@ ALTER TABLE model_draft.ego_lattice_500m_x_mview OWNER TO oeuser;
145145
SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_x_mview');
146146

147147
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
148-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_lattice_500m_x_mview','ego_dp_rea_lattice_per_area_500m.sql',' ');
148+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_lattice_500m_x_mview','ego_dp_rea_lattice_per_area_500m.sql',' ');
149149

150150

151151
-- mview points outside area
@@ -166,4 +166,4 @@ ALTER TABLE model_draft.ego_lattice_500m_out_mview OWNER TO oeuser;
166166
SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_out_mview');
167167

168168
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
169-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_lattice_500m_out_mview','ego_dp_rea_lattice_per_area_500m.sql',' ');
169+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_lattice_500m_out_mview','ego_dp_rea_lattice_per_area_500m.sql',' ');

dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ __author__ = "Ludee"
1010
*/
1111

1212
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
13-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_50m.sql',' ');
13+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_50m.sql',' ');
1414

1515
-- substation id from mv-griddistrict
1616
UPDATE model_draft.ego_lattice_50m AS t1
@@ -26,7 +26,7 @@ UPDATE model_draft.ego_lattice_50m AS t1
2626
WHERE t1.id = t2.id;
2727

2828
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
29-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_50m.sql',' ');
29+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_50m.sql',' ');
3030

3131
-- area type for loadarea (la)
3232
UPDATE model_draft.ego_lattice_50m AS t1
@@ -42,7 +42,7 @@ UPDATE model_draft.ego_lattice_50m AS t1
4242
WHERE t1.id = t2.id;
4343

4444
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
45-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_lattice_50m','ego_dp_rea_lattice_per_area_50m.sql',' ');
45+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_50m','ego_dp_rea_lattice_per_area_50m.sql',' ');
4646

4747

4848
-- mview points inside la
@@ -63,4 +63,4 @@ ALTER TABLE model_draft.ego_lattice_50m_la_mview OWNER TO oeuser;
6363
SELECT copy_comment_mview('model_draft.ego_lattice_50m','model_draft.ego_lattice_50m_la_mview');
6464

6565
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
66-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_lattice_50m_la_mview','ego_dp_rea_lattice_per_area_50m.sql',' ');
66+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_50m_la_mview','ego_dp_rea_lattice_per_area_50m.sql',' ');

dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ __author__ = "Ludee"
1111

1212

1313
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
14-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m1.sql',' ');
14+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m1.sql',' ');
1515

1616
-- MView M1-1
1717
DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m1_1_a_mview CASCADE;
@@ -39,7 +39,7 @@ CREATE INDEX ego_supply_rea_m1_1_a_mview_geom_idx
3939
ALTER TABLE model_draft.ego_supply_rea_m1_1_a_mview OWNER TO oeuser;
4040

4141
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
42-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_supply_rea_m1_1_a_mview','ego_dp_rea_m1.sql',' ');
42+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_1_a_mview','ego_dp_rea_m1.sql',' ');
4343

4444

4545
-- rea_flag M1-1
@@ -70,7 +70,7 @@ CREATE INDEX ego_supply_rea_m1_1_dea_temp_geom_idx
7070
ON model_draft.ego_supply_rea_m1_1_dea_temp USING gist (geom);
7171

7272
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
73-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_supply_rea_m1_1_dea_temp','ego_dp_rea_m1.sql',' ');
73+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_1_dea_temp','ego_dp_rea_m1.sql',' ');
7474

7575
DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_osm_temp CASCADE;
7676
CREATE TABLE model_draft.ego_supply_rea_m1_1_osm_temp (
@@ -85,7 +85,7 @@ CREATE INDEX ego_supply_rea_m1_1_osm_temp_geom_idx
8585
ON model_draft.ego_supply_rea_m1_1_osm_temp USING gist (geom);
8686

8787
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
88-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_supply_rea_m1_1_osm_temp','ego_dp_rea_m1.sql',' ');
88+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_1_osm_temp','ego_dp_rea_m1.sql',' ');
8989

9090
DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_jnt_temp CASCADE;
9191
CREATE TABLE model_draft.ego_supply_rea_m1_1_jnt_temp (
@@ -99,10 +99,10 @@ CREATE INDEX ego_supply_rea_m1_1_jnt_temp_geom_idx
9999
ON model_draft.ego_supply_rea_m1_1_jnt_temp USING gist (geom);
100100

101101
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
102-
-- SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_supply_rea_m1_1_jnt_temp','ego_dp_rea_m1.sql',' ');
102+
-- SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_1_jnt_temp','ego_dp_rea_m1.sql',' ');
103103

104104
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
105-
SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_m1.sql',' ');
105+
SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_m1.sql',' ');
106106

107107
-- loop for grid_district
108108
DO
@@ -175,7 +175,7 @@ CREATE INDEX ego_supply_rea_m1_1_mview_rea_geom_new_idx
175175
ALTER TABLE model_draft.ego_supply_rea_m1_1_mview OWNER TO oeuser;
176176

177177
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
178-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_supply_rea_m1_1_mview','ego_dp_rea_m1.sql',' ');
178+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m1_1_mview','ego_dp_rea_m1.sql',' ');
179179

180180

181181
-- M1-1 rest
@@ -200,7 +200,7 @@ CREATE INDEX ego_supply_rea_m1_1_rest_mview_geom_idx
200200
ALTER TABLE model_draft.ego_supply_rea_m1_1_rest_mview OWNER TO oeuser;
201201

202202
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
203-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_supply_rea_m1_1_rest_mview','ego_dp_rea_m1.sql',' ');
203+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m1_1_rest_mview','ego_dp_rea_m1.sql',' ');
204204

205205
-- Drop temp
206206
DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_dea_temp CASCADE;
@@ -237,7 +237,7 @@ CREATE INDEX ego_supply_rea_m1_2_a_mview_geom_idx
237237
ALTER TABLE model_draft.ego_supply_rea_m1_2_a_mview OWNER TO oeuser;
238238

239239
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
240-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_supply_rea_m1_2_a_mview','ego_dp_rea_m1.sql',' ');
240+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_2_a_mview','ego_dp_rea_m1.sql',' ');
241241

242242

243243
-- rea_flag M1-2
@@ -266,7 +266,7 @@ CREATE INDEX ego_supply_rea_m1_2_dea_temp_geom_idx
266266
ON model_draft.ego_supply_rea_m1_2_dea_temp USING gist (geom);
267267

268268
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
269-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_supply_rea_m1_2_dea_temp','ego_dp_rea_m1.sql',' ');
269+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_2_dea_temp','ego_dp_rea_m1.sql',' ');
270270

271271
DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_2_osm_temp ;
272272
CREATE TABLE model_draft.ego_supply_rea_m1_2_osm_temp (
@@ -281,7 +281,7 @@ CREATE INDEX ego_supply_rea_m1_2_osm_temp_geom_idx
281281
ON model_draft.ego_supply_rea_m1_2_osm_temp USING gist (geom);
282282

283283
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
284-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_supply_rea_m1_2_osm_temp','ego_dp_rea_m1.sql',' ');
284+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_2_osm_temp','ego_dp_rea_m1.sql',' ');
285285

286286
DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_2_jnt_temp CASCADE;
287287
CREATE TABLE model_draft.ego_supply_rea_m1_2_jnt_temp (
@@ -301,7 +301,7 @@ CREATE INDEX ego_supply_rea_m1_2_jnt_temp_geom_idx
301301
ON model_draft.ego_supply_rea_m1_2_jnt_temp USING gist (geom);
302302

303303
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
304-
SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','ego_supply_rea_m1_2_jnt_temp','ego_dp_rea_m1.sql',' ');
304+
SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_2_jnt_temp','ego_dp_rea_m1.sql',' ');
305305

306306
-- loop for grid_district
307307
DO
@@ -381,7 +381,7 @@ GRANT ALL ON TABLE model_draft.ego_supply_rea_m1_2_mview TO oeuser WITH GRANT OP
381381
ALTER TABLE model_draft.ego_supply_rea_m1_2_mview OWNER TO oeuser;
382382

383383
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
384-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_supply_rea_m1_2_mview','ego_dp_rea_m1.sql',' ');
384+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m1_2_mview','ego_dp_rea_m1.sql',' ');
385385

386386
-- M1-2 rest
387387
DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m1_2_rest_mview CASCADE;
@@ -405,7 +405,7 @@ CREATE INDEX ego_supply_rea_m1_2_rest_mview_geom_idx
405405
ALTER TABLE model_draft.ego_supply_rea_m1_2_rest_mview OWNER TO oeuser;
406406

407407
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
408-
SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_supply_rea_m1_2_rest_mview','ego_dp_rea_m1.sql',' ');
408+
SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m1_2_rest_mview','ego_dp_rea_m1.sql',' ');
409409

410410

411411
-- Drop temp

0 commit comments

Comments
 (0)