From 7309079b021fa03c0f506e4cd9d035cb629f79b8 Mon Sep 17 00:00:00 2001 From: Chris Tessum Date: Mon, 9 Aug 2021 10:32:38 -0500 Subject: [PATCH] Prepare to release v1.9.0 --- CHANGELOG.md | 75 -------------------- README.md | 2 +- RELEASE.md | 2 - cmd/inmap/build.sh | 2 +- framework.go | 2 +- website/static/blog/2019-04-20-sr/sr_util.py | 4 +- 6 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 04af6792a..000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,75 +0,0 @@ -# Release 1.6.1 (2019-9-10) -* Bug fixes - -# Release 1.6.0 (2019-4-3) -* Update documentation -* Add output variable capability to srpredict -* Fix bugs in inmap cloud - -# Release 1.5.1 (2019-1-25) -* Update go.mod dependencies - -# Release 1.5.0 (2018-11-30) -* Add emissions processing tools and user interfaces -* Add the capability to run simulations in the cloud -* Many minor changes and bug fixes - -# Release 1.4.2 (2018-5-16) -* Fixed configuration bugs -* Removed default health impact function to clarify calculations -* Improved (still experimental) graphical user interface -* Fixed bug in preprocessor (which did not effect existing evaluation data) - -# Release 1.4.1 (2018-1-10) -* Configuration and GUI bug fixes - -# Release 1.4.0 (2017-12-05) -* Bug fixes for GEOS-Chem preprocessor -* Added graphical user interface https://github.com/ctessum/gobra -* Made configuration more flexible using https://github.com/spf13/viper - -# Release 1.3.0 (2017-10-20) -* Removed vendored libraries -* A log file containing information about each model run is now automatically created -* Added a GEOS-Chem preprocessor -* Allowed new output variables to be defined as expressions of existing output variables -* Added "Outputter", a holder for output parameters. -* Allowed output variable expressions to now be evaluated at the grid level in addition to the grid cell level -* Incorporated the preprocessor into the main program -* Added ug/s option for emissions units -* Added a command for using an SR matrix to make concentration predictions -* Allowed the use of population-specific mortality rates -* Changed dependency manager to dep (https://github.com/golang/dep) - -# Release 1.2.1 (2016-11-15) -* Changed the time step calculation algorithm to work with larger grid cell sizes -* Changed the "Total PM2.5" and "Primary PM2.5" output variables to "TotalPM25" and "PrimaryPM25" to allow opening in ArcGIS -* Changed SR matrix generator to allow variable startup time -* Removed the population concentration threshold adjuster -* Fixed bug in time step calculation that was causing very occasional crashes -* Fixed bugs in source-receptor matrix reader -* Added additional evaluations and evaluation data - -# Release 1.2.0 (2016-8-22) -* Allowed the input emissions data shapefiles to have arbitrary spatial projections instead of requiring them to be the same as the InMAP grid -* Changed the program to be able to create the variable grid at runtime from user supplied population and mortality data -* Fixed a bug involving the the loss of mass conservation in adjacent cells with different heights -* Population in output files is now population per grid cell instead of population per square km -* The user can now specify which variables to output -* Added option to dynamically vary grid resolution during the simulation based on spatial gradients in concentration and population density -* Changed the command line interface for the executable program to be more flexible -* Changed the allocation from CTM cells to InMAP cells so that the InMAP cell sizes no longer have to be multiples of the CTM cell sizes -* Added a source-receptor (SR) matrix generator -* Fixed bug in stability calculation for plume rise -* Temporarily removed the HTML user interface - -# Release 1.1.0 (2016-2-12) -* Fixed a bug related to molar mass conversions -* Changed the advection algorithim to use Reynolds averaging instead of an empirical adjustment coefficient -* Removed the empirical correction factor for ammonia chemistry -* Changed the dry-deposition algorithm - -# Release 1.0.0 (2015-6-18) -This is the version of the model documented in the journal discussion article: - -[C. W. Tessum, J. D. Hill, J. D. Marshall (2015) "InMAP: A New Model for Air Pollution Interventions", Geosci. Model Dev. Discuss., 8, 9281-9321, 2015](http://www.geosci-model-dev-discuss.net/8/9281/2015/gmdd-8-9281-2015.html) diff --git a/README.md b/README.md index 64f3c0de6..f587d7dbc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Code check](https://github.com/spatialmodel/inmap/actions/workflows/check.yml/badge.svg)](https://github.com/spatialmodel/inmap/actions/workflows/check.yml) [![Coverage Status](https://coveralls.io/repos/github/spatialmodel/inmap/badge.svg?branch=master)](https://coveralls.io/github/spatialmodel/inmap?branch=master) [![Go Reference](https://pkg.go.dev/badge/github.com/spatialmodel/inmap.svg)](https://pkg.go.dev/github.com/spatialmodel/inmap) [![Go Report Card](https://goreportcard.com/badge/github.com/spatialmodel/inmap)](https://goreportcard.com/report/github.com/spatialmodel/inmap) -_Note: This is the documentation for InMAP v1.8.0. Documentation for other versions is available [here](https://github.com/spatialmodel/inmap/releases)._ +_Note: This is the documentation for InMAP v1.9.0. Documentation for other versions is available [here](https://github.com/spatialmodel/inmap/releases)._ ## About InMAP diff --git a/RELEASE.md b/RELEASE.md index b2a018512..02a7b64cd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,8 +10,6 @@ This file contains a checklist for steps to take to release a new version of InM 1. If the input data format has changed since the last release, change the `DataVersion` and/or `VarGridDataVersion` variables in `framework.go` and regenerate the input data with the new version number. -1. Set the release date in `CHANGELOG.md`. - 1. Commit the results. 1. Run `cmd/inmap/build.sh` to create executables for different platforms. diff --git a/cmd/inmap/build.sh b/cmd/inmap/build.sh index b708089e1..bab49e33e 100755 --- a/cmd/inmap/build.sh +++ b/cmd/inmap/build.sh @@ -2,7 +2,7 @@ # This script compiles InMAP for different systems. -version=1.8.0 +version=1.9.0 env GOOS=linux GOARCH=amd64 go build -v mv inmap inmap${version}linux-amd64 diff --git a/framework.go b/framework.go index fced47cfb..c5e31678f 100644 --- a/framework.go +++ b/framework.go @@ -29,7 +29,7 @@ import ( const ( // Version gives the version number. - Version = "1.8.0" + Version = "1.9.0" // VarGridDataVersion gives the version of the variable grid data reuquired by // this version of the software. diff --git a/website/static/blog/2019-04-20-sr/sr_util.py b/website/static/blog/2019-04-20-sr/sr_util.py index d0954433d..3855acbd2 100644 --- a/website/static/blog/2019-04-20-sr/sr_util.py +++ b/website/static/blog/2019-04-20-sr/sr_util.py @@ -71,7 +71,7 @@ def run_sr(emis, model, output_variables, emis_units="tons/year"): emis_file = os.path.join(_tmpdir.name, "%s.shp"%(job_name)) emis.to_file(emis_file) - version = "1.8.0" + version = "1.9.0" if _inmap_exe == None: ost = platform.system() @@ -93,7 +93,7 @@ def run_sr(emis, model, output_variables, emis_units="tons/year"): "--cmds=srpredict", "--version=v%s"%version, "--job_name=%s"%job_name, - "--memory_gb=2", + "--memory_gb=3", "--EmissionUnits=%s"%emis_units, "--EmissionsShapefiles=%s"%emis_file, "--OutputVariables=%s"%json.dumps(output_variables),