Merge branch 'main' into release

NCAR · Jan 8, 2024 · d5ecb80 · d5ecb80
2 parents 00035cf + b36c5f8
commit d5ecb80
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.21)
 
 project(
   micm
-  VERSION 3.3.0
+  VERSION 3.3.1
   LANGUAGES CXX
 )
 

diff --git a/README.md b/README.md
@@ -178,7 +178,7 @@ int main(const int argc, const char *argv[])
 
 To build and run the example using GNU (assuming the default install location):
 ```
-g++ -o foo_chem foo_chem.cpp -I/usr/local/micm-3.3.0/include -std=c++20
+g++ -o foo_chem foo_chem.cpp -I/usr/local/micm-3.3.1/include -std=c++20
 ./foo_chem
 ```
 

diff --git a/docs/source/_static/switcher.json b/docs/source/_static/switcher.json
@@ -1,7 +1,7 @@
 [
   {
-      "name": "v3.3.0 (stable)",
-      "version": "v3.3.0 (stable)",
+      "name": "v3.3.1 (stable)",
+      "version": "v3.3.1 (stable)",
       "url": "https://ncar.github.io/micm"
   },
   {
@@ -14,6 +14,11 @@
     "version": "3.3.0",
     "url": "https://ncar.github.io/micm/versions/3.3.0"
   },
+  {
+    "name": "v3.3.1",
+    "version": "3.3.1",
+    "url": "https://ncar.github.io/micm/versions/3.3.1"
+  },
   {
     "name": "dev",
     "version": "dev",

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -23,7 +23,7 @@
 
 suffix = os.getenv("SWITCHER_SUFFIX", "")
 # the suffix is required. This is controlled by the dockerfile that builds the docs
-release = f'v3.3.0{suffix}'
+release = f'v3.3.1{suffix}'
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/include/micm/process/process_set.hpp b/include/micm/process/process_set.hpp
@@ -342,7 +342,7 @@ namespace micm
     }
   }
 
-  std::set<std::string> ProcessSet::SpeciesUsed(const std::vector<Process>& processes)
+  inline std::set<std::string> ProcessSet::SpeciesUsed(const std::vector<Process>& processes)
   {
     std::set<std::string> used_species;
     for (auto& process : processes)

diff --git a/include/micm/version.hpp b/include/micm/version.hpp
@@ -8,7 +8,7 @@ extern "C" {
 
   const char* getMicmVersion()
   {
-    return "3.3.0";
+    return "3.3.1";
   }
   unsigned getMicmVersionMajor()
   {
@@ -20,7 +20,7 @@ extern "C" {
   }
   unsigned getMicmVersionPatch()
   {
-    return 0+0;
+    return 1+0;
   }
   unsigned getMicmVersionTweak()
   {

diff --git a/test/integration/cmake/find_package/CMakeLists.txt b/test/integration/cmake/find_package/CMakeLists.txt
@@ -8,7 +8,7 @@ project(
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-find_package(micm 3.3.0 REQUIRED)
+find_package(micm 3.3.1 REQUIRED)
 
 ################################################################################
 # Tests