From 174ddce102ae560f13b189251bc207dd3f5aed56 Mon Sep 17 00:00:00 2001 From: Chris Leaman Date: Fri, 7 Dec 2018 11:58:39 +1100 Subject: [PATCH] Update Makefile --- Makefile | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b6f17fd..74643fe 100644 --- a/Makefile +++ b/Makefile @@ -11,20 +11,25 @@ CURRENT_DIR = $(shell pwd) ############################### # Create python virtual environment -. PHONY: venv_init - +.PHONY: venv-init venv-init: ##@environment Setup virtual environment - conda env create -f environment.yml --prefix=.venv python=3.7 + conda env create -f environment.yml --prefix=.venv python=3.6 +.PHONY: venv-activate venv-activate: ##@environment Activates the virtual environment activate $(CURRENT_DIR)/.venv +.PHONY: venv-update venv-update: ##@environment Updates to latest packages conda update ipykernel && conda update --prefix .venv --all +.PHONY: venv-requirements-install venv-requirements-install: ##@environment Ensures environment.yml packages are installed conda env update +# The environment.yml file should really be created by hand, but +# this provides a good starting point. +.PHONY: venv-requirements-export venv-requirements-export: ##@environment Exports current environment to environment.yml conda env export --file environment.yml @@ -125,6 +130,17 @@ impacts: ./data/interim/impacts_forecasted_foreshore_slope_sto06.csv ./data/inte --slope "mean" \ --output-file "./data/interim/twl_mean_slope_sto06.csv" +./data/interim/twl_poststorm_mean_slope_sto06.csv: ./data/interim/waves.csv ./data/interim/tides.csv ./data/interim/profiles.csv ./data/interim/sites.csv ./data/interim/profile_features.csv + activate ./.venv && python ./src/cli.py create-twl-forecast \ + --waves-csv "./data/interim/waves.csv" \ + --tides-csv "./data/interim/tides.csv" \ + --profiles-csv "./data/interim/profiles.csv" \ + --profile-features-csv "./data/interim/profile_features.csv" \ + --runup-function "sto06" \ + --slope "mean" \ + --profile-type "poststorm" \ + --output-file "./data/interim/twl_poststorm_mean_slope_sto06.csv" + ./data/interim/impacts_observed.csv: ./data/interim/profiles.csv ./data/interim/profile_features.csv activate ./.venv && python ./src/cli.py create-observed-impacts \ --profiles-csv "./data/interim/profiles.csv" \ @@ -143,6 +159,12 @@ impacts: ./data/interim/impacts_forecasted_foreshore_slope_sto06.csv ./data/inte --forecasted-twl-csv "./data/interim/twl_foreshore_slope_sto06.csv" \ --output-file "./data/interim/impacts_forecasted_foreshore_slope_sto06.csv" +./data/interim/impacts_forecasted_poststorm_mean_slope_sto06.csv: ./data/interim/profile_features.csv ./data/interim/twl_foreshore_slope_sto06.csv + activate ./.venv && python ./src/cli.py create-forecasted-impacts \ + --profile-features-csv "./data/interim/profile_features.csv" \ + --forecasted-twl-csv "./data/interim/twl_poststorm_mean_slope_sto06.csv" \ + --output-file "./data/interim/impacts_forecasted_poststorm_mean_slope_sto06.csv" + ############################### # Misc commands