Merge remote-tracking branch 'upstream/master' into improver1538_tabu…

…lar_ingestion_cli4 * upstream/master: Move dataframe to cube utilities (metoppv#1593) Added constant for ultraviolet_index_daytime_max. (metoppv#1590)
gavinevans · Oct 25, 2021 · 1a5db0b · 1a5db0b
2 parents 9c98027 + 5a47356
commit 1a5db0b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/improver/calibration/__init__.py b/improver/calibration/__init__.py
@@ -28,13 +28,8 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-"""init for calibration that contains functionality to split forecast and truth
-inputs, and functionality to convert a pandas DataFrame in the expected format
-into an iris cube.
-
-.. Further information is available in:
-.. include:: extended_documentation/calibration/calibration_data_ingestion.rst
-
+"""init for calibration that contains functionality to split forecast, truth
+and coefficient inputs.
 """
 
 from collections import OrderedDict

diff --git a/improver/calibration/dataframe_utilities.py b/improver/calibration/dataframe_utilities.py
@@ -29,8 +29,12 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 """
-This module defines all the utilities used by the "plugins"
-specific for ensemble calibration.
+Functionality to convert a pandas DataFrame in the expected format
+into an iris cube.
+
+.. Further information is available in:
+.. include:: extended_documentation/calibration/calibration_data_ingestion.rst
+
 
 """
 from typing import List, Optional, Sequence, Tuple

diff --git a/improver/ensemble_copula_coupling/constants.py b/improver/ensemble_copula_coupling/constants.py
@@ -94,4 +94,5 @@
     "relative_humidity": Bounds((0, 1.2), "1"),
     "visibility_in_air": Bounds((0, 100000), "m"),
     "ultraviolet_index": Bounds((0, 25.0), "1"),
+    "ultraviolet_index_daytime_max": Bounds((0, 25.0), "1"),
 }
diff --git a/improver_tests/calibration/dataframe_utilities/test_dataframe_utilities.py b/improver_tests/calibration/dataframe_utilities/test_dataframe_utilities.py
@@ -29,7 +29,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 """
-Unit tests for the utilities within the `calibration.utilities`
+Unit tests for the utilities within the `calibration.dataframe_utilities`
 module.
 
 """