From 7231e03052aaf3fdfa85f534ff96b4463b7eb5ea Mon Sep 17 00:00:00 2001 From: mcflugen Date: Mon, 11 Nov 2019 11:48:33 -0700 Subject: [PATCH 1/2] remove deprecated FlowRouter component --- .travis.yml | 1 - pymt_landlab/bmi.py | 7 --- pymt_landlab/data/FlowRouter/api.yaml | 4 -- pymt_landlab/data/FlowRouter/flow_router.yaml | 18 ------- pymt_landlab/data/FlowRouter/info.yaml | 7 --- pymt_landlab/data/FlowRouter/parameters.yaml | 53 ------------------- pymt_landlab/data/FlowRouter/run.yaml | 1 - setup.py | 1 - 8 files changed, 92 deletions(-) delete mode 100644 pymt_landlab/data/FlowRouter/api.yaml delete mode 100644 pymt_landlab/data/FlowRouter/flow_router.yaml delete mode 100644 pymt_landlab/data/FlowRouter/info.yaml delete mode 100644 pymt_landlab/data/FlowRouter/parameters.yaml delete mode 100644 pymt_landlab/data/FlowRouter/run.yaml diff --git a/.travis.yml b/.travis.yml index dc6b357..488bf93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,6 @@ script: - bmi-test pymt_landlab.bmi:Vegetation -vvv - bmi-test pymt_landlab.bmi:SoilMoisture -vvv - bmi-test pymt_landlab.bmi:FlowDirectorSteepest -vvv -- bmi-test pymt_landlab.bmi:FlowRouter -vvv - bmi-test pymt_landlab.bmi:FlowAccumulator -vvv - bmi-test pymt_landlab.bmi:StreamPowerEroder -vvv - bmi-test pymt_landlab.bmi:FlowDirectorD8 -vvv diff --git a/pymt_landlab/bmi.py b/pymt_landlab/bmi.py index 1aa3452..96937af 100644 --- a/pymt_landlab/bmi.py +++ b/pymt_landlab/bmi.py @@ -14,7 +14,6 @@ from landlab.bmi.components import FlowDirectorSteepest as FlowDirectorSteepest from landlab.bmi.components import FlowAccumulator as FlowAccumulator from landlab.bmi.components import StreamPowerEroder as StreamPowerEroder -from landlab.bmi.components import FlowRouter as FlowRouter from landlab.bmi.components import FlowDirectorD8 as FlowDirectorD8 from landlab.bmi.components import FlowDirectorDINF as FlowDirectorDINF @@ -74,11 +73,6 @@ pkg_resources.resource_filename("pymt_landlab", "data/StreamPowerEroder") ) -FlowRouter.__name__ = "FlowRouter" -FlowRouter.METADATA = os.path.abspath( - pkg_resources.resource_filename("pymt_landlab", "data/FlowRouter") -) - FlowDirectorD8.__name__ = "FlowDirectorD8" FlowDirectorD8.METADATA = os.path.abspath( pkg_resources.resource_filename("pymt_landlab", "data/FlowDirectorD8") @@ -101,7 +95,6 @@ "FlowDirectorSteepest", "FlowAccumulator", "StreamPowerEroder", - "FlowRouter", "FlowDirectorD8", "FlowDirectorDINF", ] diff --git a/pymt_landlab/data/FlowRouter/api.yaml b/pymt_landlab/data/FlowRouter/api.yaml deleted file mode 100644 index d6d6faf..0000000 --- a/pymt_landlab/data/FlowRouter/api.yaml +++ /dev/null @@ -1,4 +0,0 @@ -name: FlowRouter -language: python -package: landlab -class: FlowRouter diff --git a/pymt_landlab/data/FlowRouter/flow_router.yaml b/pymt_landlab/data/FlowRouter/flow_router.yaml deleted file mode 100644 index 3bd1ba0..0000000 --- a/pymt_landlab/data/FlowRouter/flow_router.yaml +++ /dev/null @@ -1,18 +0,0 @@ -flow_router: - method: {{ method }} - runoff_rate: {{ runoff_rate }} - -clock: - start: {{ clock_start }} - stop: {{ clock_stop }} - step: {{ clock_step }} - units: "d" -grid: - RasterModelGrid: - args: [{{ grid_rows }}, {{ grid_columns }}] - xy_spacing: [{{ grid_column_spacing }}, {{ grid_row_spacing }}] - fields: - node: - topographic__elevation: - - constant: - value: 0.0 diff --git a/pymt_landlab/data/FlowRouter/info.yaml b/pymt_landlab/data/FlowRouter/info.yaml deleted file mode 100644 index 116e9ec..0000000 --- a/pymt_landlab/data/FlowRouter/info.yaml +++ /dev/null @@ -1,7 +0,0 @@ -summary: | - Single-path (steepest direction) flow routing, and calculates flow directions, drainage area, and (optionally) discharge. -url: https://landlab.readthedocs.io/en/release/landlab.components.html -author: kbarnhart -email: dev.null@gmail.com -version: "1.5.2" -license: MIT diff --git a/pymt_landlab/data/FlowRouter/parameters.yaml b/pymt_landlab/data/FlowRouter/parameters.yaml deleted file mode 100644 index d38db6b..0000000 --- a/pymt_landlab/data/FlowRouter/parameters.yaml +++ /dev/null @@ -1,53 +0,0 @@ -method: - description: | - Routing method ('D8' is the default). - value: - default: D8 - type: choice - choices: - - D4 - - D8 - -grid_rows: - description: Number of rows in the grid. - value: - default: 20 - type: int -grid_columns: - description: Number of columns in the grid. - value: - default: 40 - type: int -grid_row_spacing: - description: Spacing between rows. - value: - default: 100. - type: float - units: "m" -grid_column_spacing: - description: Spacing between columns. - value: - default: 100. - type: float - units: "m" - -clock_start: - description: Model start time. - value: - default: 0. - type: float - units: "s" - -clock_stop: - description: Model stop time. - value: - default: 3600 - type: float - units: "s" - -clock_step: - description: Model time step. - value: - default: 10. - type: float - units: "s" diff --git a/pymt_landlab/data/FlowRouter/run.yaml b/pymt_landlab/data/FlowRouter/run.yaml deleted file mode 100644 index dd2b531..0000000 --- a/pymt_landlab/data/FlowRouter/run.yaml +++ /dev/null @@ -1 +0,0 @@ -config_file: flow_router.yaml diff --git a/setup.py b/setup.py index d773ce0..b435faf 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ "Vegetation=pymt_landlab.bmi:Vegetation", "SoilMoisture=pymt_landlab.bmi:SoilMoisture", "FlowDirectorSteepest=pymt_landlab.bmi:FlowDirectorSteepest", - "FlowRouter=pymt_landlab.bmi:FlowRouter", "FlowAccumulator=pymt_landlab.bmi:FlowAccumulator", "StreamPowerEroder=pymt_landlab.bmi:StreamPowerEroder", "FlowDirectorD8=pymt_landlab.bmi:FlowDirectorD8", From 5f58f34b1cb95ad0539382611ab351fd30c07198 Mon Sep 17 00:00:00 2001 From: mcflugen Date: Mon, 11 Nov 2019 12:00:37 -0700 Subject: [PATCH 2/2] install dev versions of landlab and pymt --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 488bf93..00e0fa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,9 +43,7 @@ before_install: - source activate test_env install: - pip install numpy bmi-tester model_metadata standard_names pytest -- conda install pymt -c conda-forge -- conda uninstall --force landlab -- pip install git+https://github.com/landlab/landlab.git@mcflugen/add-bc-to-bmi +- conda install pymt -c conda-forge -c conda-forge/label/dev - pip install . -r requirements.txt script: - python -c 'import pymt_landlab'