Skip to content

Commit

Permalink
after report1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShayanNaderi
ShayanNaderi committed Jun 28, 2022
1 parent 6beb1a6 commit 2ce7262
Show file tree
Hide file tree
Showing 12 changed files with 1,838 additions and 1,315 deletions.
Binary file modified Data/Bioenergy quantification.xlsx
View file
Binary file not shown.
1,590 changes: 795 additions & 795 deletions Data/EnergyBalance/2019/all_countries_df.csv
View file

Large diffs are not rendered by default.

Binary file modified Data/RE potential_Prepared by Shayan Naderi.xlsx
View file
Binary file not shown.
9 changes: 3 additions & 6 deletions Decarbonization.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,19 +312,16 @@ def generate_card_deck_2():
),
]
),
generate_select('ComBattery-MWh', "Battery size (MWh):", 0, 50, 0.5, 3),
generate_select('ComBattery-cost', "Cost(M$/MWh):", 0, 10, 0.05, 1.3),
generate_select('ComBattery-installationYear', "Installation year:", 2022, 2050, 1,
2024),

generate_select('ComBattery-MWh', "Battery size (MWh):", 0, 10000, 0.5, 3),
generate_select('ComBattery-cost', "Cost(M$/MWh):", 0, 10, 0.05, 2),
html.Div(
[
dbc.Label("Geothermal parameters"),
dbc.Checklist(
options=[
{"label": "Geothermal", "value": 1},
],
value=[1],
value=[0],
id="switches-geothermal",
switch=True,
),
Expand Down
35 changes: 15 additions & 20 deletions EnergyFlows.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def generate_select_country_drpdwn():
options=[
{"label": i, "value": i} for i in Country_List
],
value='Solomon Islands',
value='New Caledonia',
style={'width': "15%", 'margin-left': "15px"}

),
Expand Down Expand Up @@ -64,19 +64,26 @@ def select_sankey_flows():
{"label": i, "value": i} for i in from_
],
value=from_[0],
style={'width': "25%", 'margin-left': "15px"}
style={'width': "20%", 'margin-left': "15px"}
),
dbc.Label("to",style={'margin-left': "15px"}
),
dbc.Select(
id="select-to",
# options=[
# {"label": i, "value": i}
# for i in to
# ],
# value=to[1],
style={'width': "25%", 'margin-left': "15px"}
style={'width': "20%", 'margin-left': "15px"}
),
html.Div([
dbc.RadioItems(
id="radio-normalization-sankey",
options=[
{"label": "Real values", "value": 1},
{"label": "Normalize with destination", "value": ' (to)'},
{"label": "Normalize with origin", "value": ' (from)'},
],
value=1,
inline=True,
style={"fontSize":14}
)]),
dbc.Button("Add Figure", color="danger", id='update-button-cross-country-figure', n_clicks=0, className="me-1"),
dbc.Button("Clear Canvas", color="primary", id='update-button-sankey-clear-canvas', n_clicks=0,
className="me-1"),
Expand Down Expand Up @@ -147,7 +154,6 @@ def generate_navbar(app):

),
),

MAPNAlogo,
],
color="dark",
Expand Down Expand Up @@ -210,7 +216,6 @@ def generate_navbar(app):
style={'margin-top': '15px', 'margin-left': '20px','margin-right': '20px'}),

html.Br(),
# html.Div(dcc.Graph(id="Sankey_elec_figure"),style=figure_border_style)

],
type="default",
Expand All @@ -220,19 +225,9 @@ def generate_navbar(app):
),
]


# buttons = html.Div(
# [
# dbc.Button("Clear Canvas", color="info", id='clear-canvas-button', n_clicks=0, className="mr-1"),
# dbc.Button("Update", id='add-chart', color="danger", n_clicks=0, className="mr-1"),
# # dbc.Button("Export Plots",id='export-plot-button', color="success", n_clicks=0, className="mr-1"),
# ]
# )

style = {'border': 'solid', 'padding-top': '10px', 'align': 'center', 'justify': 'center', 'padding-left': '1px',
'padding-right': '1px', }#'margin': "2px"


BODY = dbc.Container(
[
dbc.Row([dbc.Col(dbc.Card(Sankey)),], style={"marginTop": 30}),
Expand Down
46 changes: 42 additions & 4 deletions Summary.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,54 @@
]),
html.Br(),
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="transit_figure1",figure=figures.UNstats_plots(2019)[0]),style=figure_border_style),md=6),
dbc.Col(html.Div(dcc.Graph(id="transit_figure2",figure=figures.UNstats_plots(2019)[1]), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="final-demand", figure=figures.UNstats_plots(2019)[4]),
style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="transit_figure1", figure=figures.UNstats_plots(2019)[7]),
style=figure_border_style), md=6),
]),
html.Br(),
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="Oil-imports", figure=figures.UNstats_plots(2019)[3]),
style=figure_border_style), md=6),

dbc.Col(html.Div(dcc.Graph(id="transit_figure4", figure=figures.imports_to_GDP(2019)[0]),
style=figure_border_style), md=6),
]),
html.Br(),
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="import-per-capita", figure=figures.imports_to_GDP(2019)[1]),
style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="renewables-per-capita", figure=figures.UNstats_plots(2019)[8]),
style=figure_border_style), md=6),
]),
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="transit_figure3", figure=figures.UNstats_plots(2019)[2]),
style=figure_border_style), md=6),

dbc.Col(html.Div(dcc.Graph(id="transit_figure2", figure=figures.UNstats_plots(2019)[1]),
style=figure_border_style), md=6),
]),
html.Br(),
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="final-demand", figure=figures.UNstats_plots(2019)[0]),
style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="total renewables", figure=figures.UNstats_plots(2019)[5]),
style=figure_border_style), md=6),
# dbc.Col(html.Div(dcc.Graph(id="renewable electricity", figure=figures.UNstats_plots(2019)[6]),
# style=figure_border_style), md=6),
]),
html.Br(),
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="transit_figure3",figure=figures.UNstats_plots(2019)[2]), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="transit_figure4",figure=figures.imports_to_GDP(2019)), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="final-vs-non-re-demand", figure=figures.land_use_plot()[4]),
style=figure_border_style), md=6),

dbc.Col(html.Div(dcc.Graph(id="demand-per-capita", figure=figures.land_use_plot()[5]),
style=figure_border_style), md=6),
]),

html.Br(),


],
type="default",
)
Expand Down
35 changes: 30 additions & 5 deletions WindSolar.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,31 @@ def generate_single_country_drpdwn():
dbc.Col(html.Div(dcc.Graph(id="Wind_physical_resource",figure=figures.Solar_physical_resources()[1]), style=figure_border_style), md=6),
]),
html.Br(),

dbc.Row([
# dbc.Col(
# html.Div(dcc.Graph(id="PV_technical_GW", figure=figures.Solar_physical_resources()[6]),
# style=figure_border_style), md=6),

dbc.Col(
html.Div(dcc.Graph(id="PV_theoretical_GW", figure=figures.Solar_physical_resources()[3]),
style=figure_border_style), md=6),
dbc.Col(html.Div(
dcc.Graph(id="Wind_thechnical_MW", figure=figures.Solar_physical_resources()[5]),
style=figure_border_style), md=6),
]),
dbc.Row([
dbc.Col(html.Div(
dcc.Graph(id="PV_technical_GWh", figure=figures.Solar_physical_resources()[7]),
style=figure_border_style), md=6),
dbc.Col(html.Div(
dcc.Graph(id="PV_technical_GWh", figure=figures.Solar_physical_resources()[4]),
style=figure_border_style), md=6),

dbc.Col(html.Div(
dcc.Graph(id="Wind_thechnical_GWh", figure=figures.Solar_physical_resources()[2]),
style=figure_border_style), md=6),
]),
],
type="default",
)
Expand All @@ -91,7 +116,6 @@ def generate_single_country_drpdwn():
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="wind_to_non_RE",figure=figures.land_use_plot()[0]), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="Wind_to_final",figure=figures.land_use_plot()[2]), style=figure_border_style), md=6),

]),
],
type="default",
Expand All @@ -118,7 +142,6 @@ def generate_single_country_drpdwn():
dbc.Col(html.Div(dcc.Graph(id="Wind_to_final",figure=figures.land_use_plot()[1]), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="land-use", figure=figures.land_use_plot()[3]),
style=figure_border_style), md=6),

]),
],
type="default",
Expand Down Expand Up @@ -168,12 +191,14 @@ def generate_single_country_drpdwn():
style={"display": "none"},
),
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="Pop-and-famil-size",figure=figures.rooftop_PV_plot(0.75,2.5)[0]), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="number-of-buildings-PV-pot",figure=figures.rooftop_PV_plot(0.75,2.5)[1]), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="Pop-and-famil-size",figure=figures.rooftop_PV_plot(0.7,2.5)[0]), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="number-of-buildings-rooftop",figure=figures.rooftop_PV_plot(0.7,2.5)[1]), style=figure_border_style), md=6),
]),
html.Br(),
dbc.Row([
dbc.Col(html.Div(dcc.Graph(id="Wind_to_final",figure=figures.rooftop_PV_plot(0.75,2.5)[2]), style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="rooftop-capacity", figure=figures.rooftop_PV_plot(0.7, 2.5)[3]),
style=figure_border_style), md=6),
dbc.Col(html.Div(dcc.Graph(id="roofotp-generation",figure=figures.rooftop_PV_plot(0.7,2.5)[2]), style=figure_border_style), md=6),
]),
html.Br(),
],
Expand Down
Loading

0 comments on commit 2ce7262

Please sign in to comment.