Merge branch 'main' into release

NCAR · Mar 20, 2024 · 16c710b · 16c710b
2 parents 4a9149d + 48ec78c
commit 16c710b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -1,7 +1,7 @@
 cff-version: 1.2.0
 message: If you use this software, please cite it as below.
 title: Model Independent Chemistry Model (MICM)
-version: v3.3.1
+version: v3.4.0
 doi: "10.5281/zenodo.10472189"
 authors:
   - family-names: Dawson

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.21)
 
 project(
   micm
-  VERSION 3.3.1
+  VERSION 3.4.0
   LANGUAGES CXX
 )
 

diff --git a/docs/source/_static/switcher.json b/docs/source/_static/switcher.json
@@ -1,7 +1,7 @@
 [
   {
-      "name": "v3.3.1 (stable)",
-      "version": "v3.3.1 (stable)",
+      "name": "v3.4.0 (stable)",
+      "version": "v3.4.0 (stable)",
       "url": "https://ncar.github.io/micm"
   },
   {
@@ -19,6 +19,11 @@
     "version": "3.3.1",
     "url": "https://ncar.github.io/micm/versions/3.3.1"
   },
+  {
+    "name": "v3.4.0",
+    "version": "3.4.0",
+    "url": "https://ncar.github.io/micm/versions/3.4.0"
+  },
   {
     "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.1{suffix}'
+release = f'v3.4.0{suffix}'
 
 # -- General configuration ---------------------------------------------------
 

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