Skip to content

Commit

Permalink
Clean up and increment version 0.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
brian-rose committed Feb 19, 2018
1 parent 23e24e7 commit 5cbe552
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion climlab/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
has been documented for a comprehensive understanding and traceability.
'''

__version__ = '0.6.4.dev4'
__version__ = '0.6.4'

# this should ensure that we can still import constants.py as climlab.constants
from .utils import constants
Expand Down
6 changes: 6 additions & 0 deletions climlab/model/ebm.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
from climlab.domain.initial import surface_state
from scipy import integrate

# A lot of this should be re-written / simplified
# using more up-to-date climlab APIs for coupling processes together
# Making sure that each subprocess properly declares inputs and diagnostics

# For example, the basic EBM should be created with something like
# ebm = climlab.couple([asr,olr,diff])

class EBM(EnergyBudget):
"""A parent class for all Energy-Balance-Model classes.
Expand Down
6 changes: 4 additions & 2 deletions climlab/radiation/absorbed_shorwave.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
class SimpleAbsorbedShortwave(EnergyBudget):
'''A class for the shortwave radiation process in a one-layer EBM.
Computes the diagnostics `ASR` (absorbed shortwave radiation)
Computes the diagnostic `ASR` (absorbed shortwave radiation)
from the formula `self.ASR = (1-self.albedo) * self.insolation`
and applies this as a tendency on the surface temperature.
`albedo` and `insolation` are given as inputs.
`albedo` and `insolation` are given as inputs. These should either be scalars
or have same dimensions as state variable `Ts`
User can supply constants, or link to diagnostics of specific insolation
and albedo processes.
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "climlab" %}
{% set version = "0.6.4.dev4" %}
{% set version = "0.6.4" %}

package:
name: {{ name|lower }}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os, sys
import textwrap

VERSION = '0.6.4.dev4'
VERSION = '0.6.4'

# BEFORE importing setuptools, remove MANIFEST. Otherwise it may not be
# properly updated when the contents of directories change (true for distutils,
Expand Down

0 comments on commit 5cbe552

Please sign in to comment.