Skip to content

Commit

Permalink
updated changelog and comments in fair/forward.py
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisroadmap committed Nov 26, 2018
1 parent 312feb2 commit b5a8278
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Changelog
master
------

(`#52 <https://github.com/OMS-NetZero/FAIR/pull/52>`) Fixed bug that didn't pick up first year of CO2 concentrations and radiative forcing after restart_in
(`#52 <https://github.com/OMS-NetZero/FAIR/pull/52>`) Fixed bug that didn't pick up first year of CO2 concentrations and radiative forcing after restart_in. Changed internal book-keeping of CO2 concentrations to be absolute, rather than anomaly from pre-industrial, to be consistent with other GHGs.

(`#49 <https://github.com/OMS-NetZero/FAIR/issues/49>`) Change name of model to FaIR in docs, README and example notebooks

(`#47 <https://github.com/OMS-NetZero/FAIR/pull/47>`_) Remove ``requirements.txt`` and add ``.readthedocs.yml`` to put install requirements all in one place
6 changes: 3 additions & 3 deletions fair/forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def fair_scm(
tau_new = tau * time_scale_sf

R_i[0,:] = R_minus1*np.exp(-1.0/tau_new) + a*emissions[0] / ppm_gtc
# Sum the boxes to get the total concentration anomaly
# Sum the boxes to get the total concentration
C[0,0] = np.sum(R_i[0,:],axis=-1) + C_0[0]
# Calculate the additional carbon uptake
C_acc[0] = C_acc_minus1 + 0.5*(emissions[0] + E_minus1) - (
Expand Down Expand Up @@ -481,7 +481,7 @@ def fair_scm(
# decay of the previous year and the additional emissions
R_i[t,:] = R_i[t-1,:]*np.exp(-1.0/tau_new) + a*(np.sum(
emissions[t,1:3]) + oxidised_CH4) / ppm_gtc
# Sum the boxes to get the total concentration anomaly
# Sum the boxes to get the total concentration
C[t,0] = np.sum(R_i[...,t,:],axis=-1) + C_0[0]
# Calculate the additional carbon uptake
C_acc[t] = C_acc[t-1] + 0.5*(np.sum(
Expand Down Expand Up @@ -545,7 +545,7 @@ def fair_scm(
else:
R_i[t,:] = R_i[t-1,:]*np.exp(-1.0/tau_new) + a*(np.sum(
emissions[t])) / ppm_gtc
# Sum the boxes to get the total concentration anomaly
# Sum the boxes to get the total concentration
C[t,0] = np.sum(R_i[...,t,:],axis=-1) + C_0[0]
# Calculate the additional carbon uptake
C_acc[t] = C_acc[t-1] + 0.5*(np.sum(emissions[t-1:t+1])) - (
Expand Down

0 comments on commit b5a8278

Please sign in to comment.