Release version 1.1.6

CHANGELOG.md

@@ -12,6 +12,10 @@ The format is based on [Keep a Changelog][] by Olivier Lacan, and this project a
 [Keep a Changelog]: <https://keepachangelog.com/en/1.0.0/>
 [Semantic Versioning]: <https://semver.org/spec/v2.0.0.html>
 
+## [1.1.6] - 2023-10-27
+### Maintenance
+- Updated Catch test framework to version 2.13.10
+
 ## [1.1.5] - 2022-11-30
 ### Fixed
 - Floating point rounding error in `Fauna::GetForageDemands::add_eaten()`
@@ -275,7 +279,8 @@ The format is based on [Keep a Changelog][] by Olivier Lacan, and this project a
 [Illius & O’Connor (2000)]: <https://doi.org/10.2307/3800911>
 [Taylor et al. (1981)]: <https://doi.org/10.1017/S0003356100040617>
 
-[Unreleased]: https://github.com/wtraylor/modular_megafauna_model/compare/1.1.5...develop
+[Unreleased]: https://github.com/wtraylor/modular_megafauna_model/compare/1.1.6...develop
+[1.1.6]: https://github.com/wtraylor/modular_megafauna_model/compare/1.1.5...1.1.6
 [1.1.5]: https://github.com/wtraylor/modular_megafauna_model/compare/1.1.4...1.1.5
 [1.1.4]: https://github.com/wtraylor/modular_megafauna_model/compare/1.1.3...1.1.4
 [1.1.3]: https://github.com/wtraylor/modular_megafauna_model/compare/1.1.2...1.1.3

CITATION.cff

@@ -10,9 +10,9 @@ authors:
     affiliation: Senckenberg Biodiversity and Climate Research Centre
     orcid: https://orcid.org/0000-0002-4813-1072
 title: "Modular Megafauna Model"
-version: 1.1.5
+version: 1.1.6
 # This DOI represents all versions, and will always resolve to the latest one.
 doi: 10.5281/zenodo.4710254
-date-released: 2022-11-30
+date-released: 2023-10-27
 license: LGPL-3.0-or-later
 repository-code: https://github.com/wtraylor/modular_megafauna_model

CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required (VERSION 3.10)
 project ("Modular Megafauna Model"
   # This version must match exactly the Git tag!
   # Compare the "check_version" job in ".gitlab-ci.yml".
-  VERSION 1.1.5
+  VERSION 1.1.6
   DESCRIPTION "A physiological, dynamic herbivore simulator in C++."
   LANGUAGES CXX
   )

CONTRIBUTING.md

@@ -148,8 +148,23 @@ Here is a summary of the relevant parts:
 ### Code Format
 The C++ code layout follows the [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html).
 No worries, you don’t need to read everything.
-Just see that your IDE or text editor auto-formats your code using [Clang](http://clang.llvm.org/).
-The default Google layout is exported in the [.clang-format](.clang-format) file, ready to be read by `clang`.
+Perhaps your IDE or text editor cat automatically format your code using [Clang](http://clang.llvm.org/) in Google style.
+
+Alternatively, do the code formatting automatically in a Git pre-commit by adding this line to `.git/hooks/pre-commit` in each of your working copies:
+
+    #!/bin/bash
+    git-clang-format --extensions cpp,h --style Google --staged --quiet
+
+Make sure to make it executable: `chmod +x .git/hooks/pre-commit`.
+The command `git-clang-format` may be already installed with Clang, otherwise install it separately for your platform.
+
+Do the code formatting automatically in a Git pre-commit by adding this line to `.git/hooks/pre-commit` in each of your working copies:
+
+    #!/bin/bash
+    git-clang-format --quiet
+
+Make sure to make it executable: `chmod +x .git/hooks/pre-commit`.
+The command `git-clang-format` may be already installed with Clang, otherwise install it separately for your platform.
 
 This repository has a [.editorconfig](.editorconfig) file to define indentation rule for different file types.
 Please install the plugin for your text editor if available: [editorconfig.org/](https://editorconfig.org/)

codemeta.json

@@ -5,10 +5,10 @@
     "codeRepository": "git+https://github.com/wtraylor/modular_megafauna_model.git",
     "contIntegration": "https://gitlab.com/wtraylor/modular_megafauna_model/pipelines",
     "datePublished": "2021-04-26",
-    "dateModified": "2022-11-30",
+    "dateModified": "2023-10-27",
     "issueTracker": "https://github.com/wtraylor/modular_megafauna_model/issues/",
     "name": "Modular Megafauna Model (MMM)",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "identifier": "10.5281/zenodo.4710254. ",
     "description": "Extendable, dynamic, process-based herbivore simulator that can be integrated into a dynamic vegetation model. Written as a C++ library.\n",
     "applicationCategory": "Ecological Modeling",

include/Fauna/forage_values.h

@@ -15,6 +15,7 @@
 #include <cmath>
 #include <numeric>
 #include <stdexcept>
+
 #include "Fauna/average.h"
 #include "Fauna/forage_types.h"
 

include/Fauna/grass_forage.h

@@ -12,6 +12,7 @@
 #define FAUNA_GRASS_FORAGE_H
 
 #include <cassert>
+
 #include "Fauna/forage_base.h"
 
 namespace Fauna {

include/Fauna/habitat.h

@@ -14,6 +14,7 @@
 #include <cassert>
 #include <list>
 #include <memory>
+
 #include "Fauna/Output/habitat_data.h"
 
 namespace Fauna {

src/Fauna/Output/aggregator.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "aggregator.h"
+
 #include "date.h"
 #include "habitat.h"
 #include "herbivore_interface.h"

src/Fauna/Output/aggregator.test.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "aggregator.h"
+
 #include "catch.hpp"
 
 using namespace Fauna;

src/Fauna/Output/combined_data.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "combined_data.h"
+
 #include "grass_forage.h"
 
 using namespace Fauna::Output;

src/Fauna/Output/combined_data.test.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "combined_data.h"
+
 #include "catch.hpp"
 #include "dummy_hft.h"
 #include "parameters.h"

src/Fauna/Output/datapoint.h

@@ -12,6 +12,7 @@
 #define FAUNA_OUTPUT_DATA_POINT_H
 
 #include <string>
+
 #include "combined_data.h"
 #include "date_interval.h"
 

src/Fauna/Output/habitat_data.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "habitat_data.h"
+
 #include "average.h"
 
 using namespace Fauna::Output;

src/Fauna/Output/habitat_data.test.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "habitat_data.h"
+
 #include "catch.hpp"
 using namespace Fauna;
 using namespace Fauna::Output;

src/Fauna/Output/herbivore_data.h

@@ -12,6 +12,7 @@
 #define FAUNA_OUTPUT_HERBIVORE_DATA_H
 
 #include <map>
+
 #include "forage_values.h"
 #include "hft.h"
 

src/Fauna/Output/herbivore_data.test.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "herbivore_data.h"
+
 #include "catch.hpp"
 #include "dummy_hft.h"
 using namespace Fauna;

src/Fauna/Output/text_table_writer.cpp

@@ -9,7 +9,9 @@
  * \date 2019
  */
 #include "text_table_writer.h"
+
 #include <sstream>
+
 #include "datapoint.h"
 #include "fileystem.h"
 

src/Fauna/Output/text_table_writer.h

@@ -13,6 +13,7 @@
 
 #include <fstream>
 #include <vector>
+
 #include "parameters.h"
 #include "writer_interface.h"
 

src/Fauna/Output/text_table_writer.test.cpp

@@ -9,13 +9,16 @@
  * \date 2019
  */
 #include "text_table_writer.h"
+
 #include <unistd.h>
+
 #include <cstdio>
 #include <cstdlib>
 #include <ctime>
 #include <fstream>
 #include <iostream>
 #include <string>
+
 #include "catch.hpp"
 #include "datapoint.h"
 #include "dummy_hft.h"

src/Fauna/average.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "average.h"
+
 #include <cassert>
 #include <cmath>
 #include <numeric>

src/Fauna/average.test.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "average.h"
+
 #include "catch.hpp"
 
 using namespace Fauna;

src/Fauna/breeding_season.cpp

@@ -9,6 +9,7 @@
  * \date 2019
  */
 #include "breeding_season.h"
+
 #include <cassert>
 #include <stdexcept>