Skip to content

Commit b4edc7f

Browse files
committed
Synchronize updates v3.2
Changes are described in the version 2.2 release notes. Update fuels.csv Update code Revise datasets to match v2.2 Revise datasets to match v2.2 Remove pownet generated files Update .gitignore Update run_quickstart.py Update transmission.csv
1 parent 5d2f6df commit b4edc7f

File tree

80 files changed

+37424
-265910
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+37424
-265910
lines changed

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,7 @@ user_inputs/*
120120
src/analysis/decom_files/*
121121
src/analysis/results/*
122122
scripts/scratch.py
123-
model_library/dummy_hydro/pownet_hydropower.csv
124-
model_library/thailand/pownet_cycle_map.json
123+
124+
# Pownet generated files
125+
pownet_*.csv
126+
pownet_*.json

database/fuels.csv

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ solar,#fdbb84,
66
wind,#deebf7,
77
oil,#252525,
88
biomass,#33a02c,
9-
waste_heat,#d95f0e,
9+
solid_waste,#d95f0e,
1010
import,#54278f,
1111
shortfall,#fa9fb5,
1212
curtailment,#f768a1,
13+
charging,#238443,
14+
discharging,#f16913,
15+
undefined,#000000,

model_library/cambodia/demand_export.csv

Lines changed: 0 additions & 8761 deletions
This file was deleted.

model_library/cambodia/derate_factor.csv

Lines changed: 0 additions & 8761 deletions
This file was deleted.

model_library/cambodia/fuel_price.csv

Lines changed: 0 additions & 8761 deletions
This file was deleted.

model_library/cambodia/hydro.csv

Lines changed: 0 additions & 8761 deletions
This file was deleted.

0 commit comments

Comments
 (0)