Merge pull request #575 from EPIC-model/release-0.14.2

Update version string from 0.14.1 to 0.14.2

docs/generate_manual.sh → .hooks/generate_manual.sh

@@ -1,8 +1,10 @@
 #!/bin/env bash
 
+echo "Create manual for latest release."
+
 version=$(sed -nre 's/AC_INIT\(\[epic\], \[([0-9]+\.[0-9]+\.[0-9]+)\], (.*)\)/\1/p' ../configure.ac)
 
-cd manual
+cd ../docs/manual
 
 sed -i "s:@VERSION@:$version:g" intro.adoc
 
@@ -13,3 +15,5 @@ asciidoctor intro.adoc --destination-dir=../html
 asciidoctor-pdf -r asciidoctor-mathematical -a allow-uri-read intro.adoc --destination-dir=../pdf
 
 sed -i "s:$version:@VERSION@:g" intro.adoc
+
+cd ../../.hooks

.hooks/make_release.sh

@@ -33,6 +33,8 @@ echo "Update version string from ${current_version} to ${new_version}"
 
 sed -i "s:${current_version}:${new_version}:g" ${fname}
 
+bash generate_manual.sh
+
 git add ${fname}
 git commit -m "Update version string from ${current_version} to ${new_version}"
 git push

CHANGELOG.md

@@ -1,3 +1,19 @@
+## EPIC version 0.14.2
+* [Optimise nearest algorithm tree resolve step](https://github.com/EPIC-model/epic/pull/561)
+* [Implement generalised damping, including surface damping](https://github.com/EPIC-model/epic/pull/562)
+* [Add optimised rejection method](https://github.com/EPIC-model/epic/pull/563)
+* [Update webpage](https://github.com/EPIC-model/epic/pull/564)
+* [Add labels to code](https://github.com/EPIC-model/epic/pull/565)
+* [Reset labels and dilution when writing to netCDF](https://github.com/EPIC-model/epic/pull/566)
+* [Support for 64-bit integers](https://github.com/EPIC-model/epic/pull/560)
+* [Set total number of parcels before parcel_communicate](https://github.com/EPIC-model/epic/pull/567)
+* [Fix input to acos](https://github.com/EPIC-model/epic/pull/568)
+* [Fix rejection method](https://github.com/EPIC-model/epic/pull/570)
+* [Explicitly set the attributes to write](https://github.com/EPIC-model/epic/pull/571)
+* [Bugfixes to labelling](https://github.com/EPIC-model/epic/pull/569)
+* [Move GitHub page to organisation](https://github.com/EPIC-model/epic/pull/573)
+* [Add index.html which is a symbolic link to html/intro.html](https://github.com/EPIC-model/epic/pull/574)
+
 ## EPIC version 0.14.1
 * [Added/changed ifort style flags](https://github.com/EPIC-model/epic/pull/494)
 * [Fix .zenodo.json](https://github.com/EPIC-model/epic/pull/542)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([epic], [0.14.1], [[email protected]], [], [https://github.com/matt-frey/epic])
+AC_INIT([epic], [0.14.2], [[email protected]], [], [https://github.com/matt-frey/epic])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AC_PROG_FC([gfortran])
 AC_LANG(Fortran)

docs/html/intro.html

@@ -4,7 +4,7 @@
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Asciidoctor 2.0.17">
+<meta name="generator" content="Asciidoctor 2.0.18">
 <meta name="author" content="Matthias Frey (Univ. of St Andrews), David G. Dritschel (Univ. of St Andrews), Steven J. Böing (Univ. of Leeds)">
 <title>EPIC - Elliptical Parcel-In-Cell</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
@@ -85,10 +85,10 @@
 ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
 ul,ol{margin-left:1.5em}
 ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
-ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
-ul.square{list-style-type:square}
 ul.circle{list-style-type:circle}
 ul.disc{list-style-type:disc}
+ul.square{list-style-type:square}
+ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
 ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
 dl dt{margin-bottom:.3125em;font-weight:bold}
 dl dd{margin-bottom:1.25em}
@@ -444,7 +444,7 @@ <h1>EPIC - Elliptical Parcel-In-Cell</h1>
 <span id="author" class="author">Matthias Frey (Univ. of St Andrews)</span><br>
 <span id="author2" class="author">David G. Dritschel (Univ. of St Andrews)</span><br>
 <span id="author3" class="author">Steven J. Böing (Univ. of Leeds)</span><br>
-<span id="revnumber">version 0.12.3</span>
+<span id="revnumber">version 0.14.2</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -458,7 +458,11 @@ <h1>EPIC - Elliptical Parcel-In-Cell</h1>
 </ul>
 </li>
 <li><a href="#_conventions_and_units">2. Conventions and Units</a></li>
-<li><a href="#_model">3. Model</a></li>
+<li><a href="#_model">3. Model</a>
+<ul class="sectlevel2">
+<li><a href="#_vorticity_inversion">3.1. Vorticity inversion</a></li>
+</ul>
+</li>
 <li><a href="#_input">4. Input</a>
 <ul class="sectlevel2">
 <li><a href="#_configuration_file">4.1. Configuration File</a></li>
@@ -665,6 +669,10 @@ <h2 id="_model">3. Model</h2>
     &amp; \frac{\mathrm{D} q}{\mathrm{D} t} = 0 \,,
 \end{align}\]
 </div>
+</div>
+<div class="sect2">
+<h3 id="_vorticity_inversion">3.1. Vorticity inversion</h3>
+
 </div>
 </div>
 </div>
@@ -1050,8 +1058,8 @@ <h2 id="_citation">6. Citation</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.12.3<br>
-Last updated 2023-05-11 15:59:17 +0200
+Version 0.14.2<br>
+Last updated 2024-07-29 10:17:06 +0100
 </div>
 </div>
 <script type="text/x-mathjax-config">

docs/manual/intro.adoc

@@ -1,5 +1,5 @@
 = EPIC - Elliptical Parcel-In-Cell
-Matthias Frey (Univ. of St Andrews); David G. Dritschel (Univ. of St Andrews); Steven J. Böing (Univ. of Leeds);
+Matthias Frey (Univ. of St Andrews); David G. Dritschel (Univ. of St Andrews); Steven J. Böing (Univ. of Leeds); Rui F. G. Apóstolo (EPCC, Univ. of Edinburgh);
 v@VERSION@
 :version-label: Version
 :page-layout: default