A few leftovers

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.
 **System (please complete the following information):**
 
  - OS: [e.g. Windows, Linux, macOS]
- - Python and FAIR version [e.g. Python 3.5]
+ - Python and FaIR version [e.g. Python 3.5]
 
 **Additional context**
 

docs/Makefile

@@ -4,7 +4,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-SPHINXPROJ    = FAIR
+SPHINXPROJ    = FaIR
 SOURCEDIR     = .
 BUILDDIR      = _build
 
@@ -17,4 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# FAIR documentation build configuration file, created by
+# FaIR documentation build configuration file, created by
 # sphinx-quickstart on Mon Mar 12 17:36:07 2018.
 #
 # This file is execfile()d with the current directory set to its
@@ -99,7 +99,7 @@
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'FAIRdoc'
+htmlhelp_basename = 'FaIRdoc'
 
 
 # -- Options for LaTeX output ---------------------------------------------

docs/index.rst

@@ -1,4 +1,4 @@
-.. FAIR documentation master file, created by
+.. FaIR documentation master file, created by
    sphinx-quickstart on Mon Mar 12 17:36:07 2018.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.

docs/make.bat

@@ -9,7 +9,7 @@ if "%SPHINXBUILD%" == "" (
 )
 set SOURCEDIR=.
 set BUILDDIR=_build
-set SPHINXPROJ=FAIR
+set SPHINXPROJ=FaIR
 
 if "%1" == "" goto help
 

fair/forcing/aerosols.py

@@ -48,7 +48,7 @@ def aerocom_direct(emissions,
 
     If inputs from an RCPs SCEN file are used, the units will be correct.
 
-    Inputs: 
+    Inputs:
         emissions: (nt x 40) emissions array
     Keywords:
         beta: 7-element array of forcing efficiencies in W m-2 (Mt yr-1)-1 for
@@ -80,7 +80,7 @@ def ghan_indirect(emissions, fix_pre1850_RCP=True, scale_AR5=False,
 
     This function is just an emulator - a full implementation in Python of the
     Ghan routine (originally coded in Fortran) exists, but will require
-    optimisation before it can be used in FAIR. I hope to make the full version
+    optimisation before it can be used in FaIR. I hope to make the full version
     available in a future version.
 
     A 500-member Latin Hypercube sample of emissions of SOx, NMVOC, BC and OC
@@ -120,7 +120,7 @@ def _ERFaci(em,
         return scale*np.log(1+b_SOx*em[0]+b_POM*em[1])
 
     # PI forcing was not zero as there were some emissions. Use estimates
-    # from Skeie et al, 2011 for 1750 forcing. 
+    # from Skeie et al, 2011 for 1750 forcing.
     E_1765 = np.array([1.0, 11.2])
     nt = len(year)
     F_pd = np.zeros(nt)
@@ -131,7 +131,7 @@ def _ERFaci(em,
         else:
             # linearly interpolate between 1765 and 1850
             E_1850 = np.array([r45e.sox[85], r45e.bc[85]+r45e.oc[85]])
-            F_pd[i] = _ERFaci((year[i]-1765)/85.*E_1850 + 
+            F_pd[i] = _ERFaci((year[i]-1765)/85.*E_1850 +
                               (1850-year[i])/85.*E_1765,
                               ghan_params=ghan_params)
 

fair/tools/magicc.py

@@ -32,8 +32,8 @@ def scen_open(filename,
     Keywords:
         include_cfcs: string, False, or nt x 16 numpy array
             MAGICC files do not come loaded with CFCs (indices 24-39).
-            They are given in the harmonised files at 
-            http://www.pik-potsdam.de/~mmalte/rcps/. 
+            They are given in the harmonised files at
+            http://www.pik-potsdam.de/~mmalte/rcps/.
             - Specify 'rcp3pd', 'rcp45', 'rcp6' or 'rcp85' to use these RCPs.
             - Use False to ignore and create a 24-species emission file.
             - Provide an array to tack your own chlorinated gases onto the SCEN
@@ -43,14 +43,14 @@ def scen_open(filename,
             Linearly interpolate between 2000 in the RCP file and the specified
             year. If None, do not harmonise
 
-    Returns: 
+    Returns:
         nt x 40 numpy emissions array
 
-    nt is defined as <last year of SCEN file> - 
+    nt is defined as <last year of SCEN file> -
         <earlier of startyear and first year of SCEN file> + 1
 
     It is assumed that the .SCEN files follow the formatting convention on
-    the MAGICC wiki at 
+    the MAGICC wiki at
     http://wiki.magicc.org/index.php?title=Creating_MAGICC_Scenario_Files.
     """
 
@@ -59,15 +59,15 @@ def scen_open(filename,
         str_nt = f.readline().strip()
         nt = int(str_nt)
 
-        # Next 6 lines are unused by FAIR.
+        # Next 6 lines are unused by FaIR.
         for i in range(6):
             f.readline()
 
         # Eighth line is the column headers. When object orientation is
         # implemented this will be important.
         headers = f.readline().split()
 
-        # Ninth line is the units. Again this will be important in OO-FAIR
+        # Ninth line is the units. Again this will be important in OO-FaIR
         units = f.readline().split()
 
     # Now the data!

setup.py

@@ -16,7 +16,7 @@ def readme():
 setup(name='fair',
       version=versioneer.get_version(),
       cmdclass=versioneer.get_cmdclass(),
-      description='Python package to perform calculations with the FAIR simple climate model',
+      description='Python package to perform calculations with the FaIR simple climate model',
       long_description=readme(),
       keywords='simple climate model temperature response carbon cycle emissions forcing',
       url='https://github.com/OMS-NetZero/FAIR',