Skip to content

Commit

Permalink
Merge pull request #188 from nismod/feature/multi-modal_network
Browse files Browse the repository at this point in the history
Multi-modal (road, rail, maritime) network integration
  • Loading branch information
thomas-fred authored Sep 13, 2024
2 parents 31ab67c + ba1eb31 commit e2c5cb0
Show file tree
Hide file tree
Showing 10 changed files with 910 additions and 100 deletions.
37 changes: 34 additions & 3 deletions config/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
##########################
### TRANSPORT WORKFLOW ###
##########################
##################################
### TRANSPORT DAMAGES WORKFLOW ###
##################################

# OSM datasets in PBF format, principally from: https://download.geofabrik.de/ #
infrastructure_datasets:
Expand Down Expand Up @@ -66,6 +66,37 @@ keep_tags:
# Number of slices to cut dataset into -- must be a square number
slice_count: 64

#####################################
### TRANSPORT DISRUPTION WORKFLOW ###
#####################################

# country for which trade OD has been prepared, and we are to route land trade flows
study_country_iso_a3: "THA"

# transport cost information
# road
road_cost_USD_t_km: 0.05
road_cost_USD_t_h: 0.48
road_default_speed_limit_km_h: 80
# rail
rail_cost_USD_t_km: 0.05
rail_cost_USD_t_h: 0.38
rail_average_freight_speed_km_h: 40

# cost of changing transport mode in USD per tonne
# from mistral/ccg-critical-minerals/processed_data/transport_costs/intermodal.xlsx, 20240611
intermodal_cost_USD_t:
road_rail: 5
maritime_road: 4
maritime_rail: 5

# drop trade flows with less volume than this (accelerate flow allocation)
# N.B. 50t threshold preserves 91% of total volume and 88% of total value
# for combined agriculture & manufacturing flows between Thailand road nodes -> partner countries
minimum_flow_volume_t: 50

# if disrupting a network, remove edges experiencing hazard values in excess of this
edge_failure_threshold: 0.5

#########################
### FLOODING WORKFLOW ###
Expand Down
8 changes: 4 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
name: open-gira
channels:
- conda-forge # majority of dependencies
- bioconda # snakemake
- defaults
dependencies:
- python=3.10
- pip
- pip: # delegate to pip for non-conda packages
- nismod-snail==0.3.1 # vector-raster intersections
- nismod-snail==0.5.2 # vector-raster intersections
- osmium==3.2.0 # OpenStreetMap protobuf handling
- snkit==1.8.1 # spatial network cleaning
# required zenodo_get version not available via conda-forge
Expand All @@ -23,8 +22,9 @@ dependencies:
- dask<2024.3.0 # larger-than-memory computing
- flake8 # linter
- gdal>=3.3 # command-line tools for spatial data
- geopandas==0.14.1 # geospatial dataframes
- geopandas==0.14.4 # geospatial dataframes
- geopy # geocoding client
- igraph # graph algorithms and data structures
- ipykernel # notebook support
- jupyter # notebook support
- jq # JSON processing tool
Expand All @@ -50,7 +50,7 @@ dependencies:
- rioxarray # xarray datasets from raster files
- scipy # scientific computing library
- spatialpandas # plotting large datasets
- snakemake==7.18.2 # workflow management
- bioconda::snakemake==7.18.2 # workflow management
# https://github.com/snakemake/snakemake/issues/1891
- tabulate==0.8.10 # snakemake dependency with bug in 9.0.0, pin previous
- tqdm==4.62.3 # progress bars
Expand Down
80 changes: 0 additions & 80 deletions src/open_gira/network.py

This file was deleted.

Loading

0 comments on commit e2c5cb0

Please sign in to comment.