Merge pull request #1 from MilanSkocic/r0.1.1

New minor release.
MilanSkocic · May 3, 2023 · 2a97bad · 2a97bad
2 parents c7f601d + 9f62d75
commit 2a97bad
Show file tree

Hide file tree

Showing 43 changed files with 458 additions and 241 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project("iapws" VERSION "0.1.0" LANGUAGES "C" "Fortran" DESCRIPTION "IAPWS")
+project("iapws" VERSION "0.1.1" LANGUAGES "C" "Fortran" DESCRIPTION "IAPWS")
 configure_file("./app/config.h.in" "./app/config.h")
 
 if(NOT CMAKE_BUILD_TYPE)

diff --git a/README.rst b/README.rst
@@ -1,6 +1,9 @@
 Introduction
 ================
 
+.. image:: ./media/logo-iapws.png
+    :width: 200
+
 .. readme_inclusion_start
 
 `ipaws` is a  Fortran library providing the formulas for computing light and heavy water properties.
@@ -12,6 +15,9 @@ The compilation was tested on Linux (Debian), MacOS and Windows.
 
 .. readme_inclusion_end
 
+For now, I have implemented the technical report G7-04 for gas solubility. I plan to implement the 
+technical report R7-97. 
+
 
 Installation
 =================

diff --git a/docs/_downloads/c6590f1cb16fa3c0fab9a03d320b9284/iapws.pdf b/docs/_downloads/c6590f1cb16fa3c0fab9a03d320b9284/iapws.pdf
diff --git a/docs/_images/logo-iapws.png b/docs/_images/logo-iapws.png
diff --git a/docs/_modules/index.html b/docs/_modules/index.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; iapws 0.1.0 documentation</title>
+    <title>Overview: module code &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="../_static/classic.css" />
 
@@ -25,7 +25,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Overview: module code</a></li> 
       </ul>
     </div>  
@@ -68,7 +68,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Overview: module code</a></li> 
       </ul>
     </div>

diff --git a/docs/_modules/pyiapws/iapws.html b/docs/_modules/pyiapws/iapws.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>pyiapws.iapws &#8212; iapws 0.1.0 documentation</title>
+    <title>pyiapws.iapws &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="../../_static/classic.css" />
 
@@ -25,7 +25,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="../index.html" accesskey="U">Module code</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">pyiapws.iapws</a></li> 
       </ul>
@@ -122,7 +122,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../../py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">pyiapws.iapws</a></li> 
       </ul>

diff --git a/docs/_sources/getting_started/iapws.rst.txt b/docs/_sources/getting_started/iapws.rst.txt
@@ -1,6 +1,10 @@
 iapw
 ==============
 
+.. image:: ../media/logo-iapws.png
+  :width: 200
+  :align: center
+
 .. include:: ../../../README.rst
   :start-after: readme_inclusion_start
   :end-before: readme_inclusion_end

diff --git a/docs/_sources/releases/0.1.0-notes.rst.txt b/docs/_sources/releases/0.1.0-notes.rst.txt
@@ -2,27 +2,27 @@ iapws 0.1.0 Release Note
 ==================================
 
 Changes
-^^^^^^^^
+--------
 
 * Implementation of kH and kD from IAPWS G7-04 in fortran + C API
 * Python wrapper for kH and kD.
 * Documentation with sphinx.
 
 Download
-^^^^^^^^^^
+----------
 
 `iapws <https://github.com/MilanSkocic/iapws/releases>`_
 
 `pyiapws <https://pypi.org/pyiapws>`_
 
 
 Contributors
-^^^^^^^^^^^^^^^
+---------------
 
 Milan Skocic
 
 
 Commits
-^^^^^^^^
+--------
 
 Full Changelog: https://github.com/MilanSkocic/pyiapws/compare/....0.1.0
diff --git a/docs/_sources/releases/0.1.1-notes.rst.txt b/docs/_sources/releases/0.1.1-notes.rst.txt
@@ -0,0 +1,28 @@
+iapws 0.1.1 Release Note
+==================================
+
+Summary
+--------
+
+* Logo creation
+* Error handling in python wrapper for arrays with rank greater than 1
+* Tests in python wrapper for expected failures with rank-n arrays
+
+Download
+----------
+
+`iapws <https://github.com/MilanSkocic/iapws/releases>`_
+
+`pyiapws <https://pypi.org/pyiapws>`_
+
+
+Contributors
+---------------
+
+Milan Skocic
+
+
+Commits
+--------
+
+Full Changelog: https://github.com/MilanSkocic/pyiapws/compare/0.1.0...0.1.1
diff --git a/docs/_sources/releases/index.rst.txt b/docs/_sources/releases/index.rst.txt
@@ -4,4 +4,5 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    0.1.1-notes.rst
     0.1.0-notes.rst
diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.1.0',
+    VERSION: '0.1.1',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/docs/api/iapws.html b/docs/api/iapws.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>iapws &#8212; iapws 0.1.0 documentation</title>
+    <title>iapws &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="../_static/classic.css" />
 
@@ -34,7 +34,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="index.html" title="Autogenerated Documentation"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" accesskey="U">Autogenerated Documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">iapws</a></li> 
       </ul>
@@ -196,7 +196,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="index.html" title="Autogenerated Documentation"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" >Autogenerated Documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">iapws</a></li> 
       </ul>

diff --git a/docs/api/index.html b/docs/api/index.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>Autogenerated Documentation &#8212; iapws 0.1.0 documentation</title>
+    <title>Autogenerated Documentation &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="../_static/classic.css" />
 
@@ -34,7 +34,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../releases/0.1.0-notes.html" title="iapws 0.1.0 Release Note"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Autogenerated Documentation</a></li> 
       </ul>
     </div>  
@@ -111,7 +111,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../releases/0.1.0-notes.html" title="iapws 0.1.0 Release Note"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Autogenerated Documentation</a></li> 
       </ul>
     </div>

diff --git a/docs/api/pyiapws.html b/docs/api/pyiapws.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>pyipaws &#8212; iapws 0.1.0 documentation</title>
+    <title>pyipaws &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="../_static/classic.css" />
 
@@ -34,7 +34,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="iapws.html" title="iapws"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" accesskey="U">Autogenerated Documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">pyipaws</a></li> 
       </ul>
@@ -162,7 +162,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="iapws.html" title="iapws"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" >Autogenerated Documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">pyipaws</a></li> 
       </ul>

diff --git a/docs/genindex.html b/docs/genindex.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Index &#8212; iapws 0.1.0 documentation</title>
+    <title>Index &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/classic.css" />
 
@@ -25,7 +25,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">iapws 0.1.1 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Index</a></li> 
       </ul>
     </div>  
@@ -126,7 +126,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">iapws 0.1.1 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Index</a></li> 
       </ul>
     </div>

diff --git a/docs/getting_started/examples.html b/docs/getting_started/examples.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>Examples &#8212; iapws 0.1.0 documentation</title>
+    <title>Examples &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="../_static/classic.css" />
 
@@ -34,7 +34,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="pyiapws.html" title="pyiapws"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" accesskey="U">Getting Started</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Examples</a></li> 
       </ul>
@@ -175,7 +175,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="pyiapws.html" title="pyiapws"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" >Getting Started</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Examples</a></li> 
       </ul>

diff --git a/docs/getting_started/iapws.html b/docs/getting_started/iapws.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>iapw &#8212; iapws 0.1.0 documentation</title>
+    <title>iapw &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="../_static/classic.css" />
 
@@ -34,7 +34,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="index.html" title="Getting Started"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" accesskey="U">Getting Started</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">iapw</a></li> 
       </ul>
@@ -47,6 +47,7 @@ <h3>Navigation</h3>
 
   <section id="iapw">
 <h1>iapw<a class="headerlink" href="#iapw" title="Permalink to this heading">¶</a></h1>
+<a class="reference internal image-reference" href="../_images/logo-iapws.png"><img alt="../_images/logo-iapws.png" class="align-center" src="../_images/logo-iapws.png" style="width: 200px;" /></a>
 <p><cite>ipaws</cite> is a  Fortran library providing the formulas for computing light and heavy water properties.
 It also provides a API for the C language. The formulations are taken from <a class="reference external" href="http://iapws.org">http://iapws.org</a>.
 A shared and a static library <cite>libiapws</cite> are compiled (f2008+) with the Fortran and C headers.
@@ -174,7 +175,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="index.html" title="Getting Started"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" >Getting Started</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">iapw</a></li> 
       </ul>

diff --git a/docs/getting_started/index.html b/docs/getting_started/index.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>Getting Started &#8212; iapws 0.1.0 documentation</title>
+    <title>Getting Started &#8212; iapws 0.1.1 documentation</title>
     <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="../_static/classic.css" />
 
@@ -34,7 +34,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../index.html" title="Welcome to iapws documentation!"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Getting Started</a></li> 
       </ul>
     </div>  
@@ -123,7 +123,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="../index.html" title="Welcome to iapws documentation!"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.0 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">iapws 0.1.1 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Getting Started</a></li> 
       </ul>
     </div>