Merge pull request #1 from OMS-NetZero/branch_1.1.0

Merge changes from multi_gas (v1.1)

README.md

@@ -1,19 +1,33 @@
 # FAIR
 Finite Amplitude Impulse-Response simple climate-carbon-cycle model 
 
-Reference: Millar, R. J., Nicholls, Z. R., Friedlingstein, P., and Allen, M. R.: A modified impulse-response representation of the global near-surface air temperature and atmospheric concentration response to carbon dioxide emissions, Atmos. Chem. Phys., 17, 7213-7228, https://doi.org/10.5194/acp-17-7213-2017, 2017.
+References:
+Smith, C. J., Forster, P. M., Allen, M., Leach, N., Millar, R. J., Passerello, G. A., and Regayre, L. A.: FAIR v1.1: A simple emissions-based impulse response and carbon cycle model, Geosci. Model Dev. Discuss., https://doi.org/10.5194/gmd-2017-266, in review, 2017
 
-Bibtex reference: 
-@Article{acp-17-7213-2017,
-AUTHOR = {Millar, R. J. and Nicholls, Z. R. and Friedlingstein, P. and Allen, M. R.},
-TITLE = {A modified impulse-response representation of the global near-surface air temperature and atmospheric concentration response to carbon dioxide emissions},
-JOURNAL = {Atmospheric Chemistry and Physics},
-VOLUME = {17},
-YEAR = {2017},
-NUMBER = {11},
-PAGES = {7213--7228},
-URL = {http://www.atmos-chem-phys.net/17/7213/2017/},
-DOI = {10.5194/acp-17-7213-2017}
+Millar, R. J., Nicholls, Z. R., Friedlingstein, P., and Allen, M. R.: A modified impulse-response representation of the global near-surface air temperature and atmospheric concentration response to carbon dioxide emissions, Atmos. Chem. Phys., 17, 7213-7228, https://doi.org/10.5194/acp-17-7213-2017, 2017.
+
+Bibtex references:  
+@Article{gmd-2017-266,  
+AUTHOR = {Smith, C. J. and Forster, P. M. and Allen, M. and Leach, N. and Millar, R. J. and Passerello, G. A. and Regayre, L. A.},  
+TITLE = {FAIR v1.1: A simple emissions-based impulse response and carbon cycle model},  
+JOURNAL = {Geoscientific Model Development Discussions},  
+VOLUME = {2017},  
+YEAR = {2017},  
+PAGES = {1--45},  
+URL = {https://www.geosci-model-dev-discuss.net/gmd-2017-266/},  
+DOI = {10.5194/gmd-2017-266}  
+}
+
+@Article{acp-17-7213-2017,  
+AUTHOR = {Millar, R. J. and Nicholls, Z. R. and Friedlingstein, P. and Allen, M. R.},  
+TITLE = {A modified impulse-response representation of the global near-surface air temperature and atmospheric concentration response to carbon dioxide emissions},  
+JOURNAL = {Atmospheric Chemistry and Physics},  
+VOLUME = {17},  
+YEAR = {2017},  
+NUMBER = {11},  
+PAGES = {7213--7228},  
+URL = {https://www.atmos-chem-phys.net/17/7213/2017/},  
+DOI = {10.5194/acp-17-7213-2017}  
 }
 
 ## Installation

_version.py

@@ -3,4 +3,4 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into a module
-__version__ = '1.0.0'
+__version__ = '1.1.0'