Updated python version.

Author: mwetter

IBPSA/Resources/src/fluid/heatpumps/calibration/doc/build/html/compressors.html

@@ -296,7 +296,7 @@
 </dd>
 </dl>
 <dl>
-<dt>Usage: Type</dt><dd><div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span> <span class="nn">refrigerants</span>
+<dt>Usage: Type</dt><dd><div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span><span class="w"> </span><span class="nn">refrigerants</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">ref</span> <span class="o">=</span> <span class="n">refrigerants</span><span class="o">.</span><span class="n">R410A</span><span class="p">()</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">com</span> <span class="o">=</span> <span class="n">ReciprocatingCompressor</span><span class="p">([</span><span class="mf">0.00162</span><span class="p">,</span> <span class="mf">0.069</span><span class="p">,</span> <span class="mf">0.696</span><span class="p">,</span> <span class="mf">100.0</span><span class="p">,</span> <span class="mf">99.29e3</span><span class="p">,</span> <span class="mf">9.82</span><span class="p">])</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="s1">&#39;</span><span class="si">%.2f</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="n">com</span><span class="o">.</span><span class="n">get_Power</span><span class="p">(</span><span class="mf">0.0288</span><span class="p">,</span> <span class="n">ref</span><span class="p">,</span> <span class="mf">1978290.0</span><span class="p">,</span> <span class="mf">983710.0</span><span class="p">,</span> <span class="mf">292.97</span><span class="p">)</span>
@@ -326,7 +326,7 @@
 </dd>
 </dl>
 <dl>
-<dt>Usage: Type</dt><dd><div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span> <span class="nn">refrigerants</span>
+<dt>Usage: Type</dt><dd><div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span><span class="w"> </span><span class="nn">refrigerants</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">ref</span> <span class="o">=</span> <span class="n">refrigerants</span><span class="o">.</span><span class="n">R410A</span><span class="p">()</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">com</span> <span class="o">=</span> <span class="n">ReciprocatingCompressor</span><span class="p">([</span><span class="mf">0.00162</span><span class="p">,</span> <span class="mf">0.069</span><span class="p">,</span> <span class="mf">0.696</span><span class="p">,</span> <span class="mf">100.0</span><span class="p">,</span> <span class="mf">99.29e3</span><span class="p">,</span> <span class="mf">9.82</span><span class="p">])</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="s1">&#39;</span><span class="si">%.8f</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="n">com</span><span class="o">.</span><span class="n">get_RefrigerantMassFlowRate</span><span class="p">(</span><span class="mf">0.0288</span><span class="p">,</span> <span class="n">ref</span><span class="p">,</span> <span class="mf">1978290.0</span><span class="p">,</span> <span class="mf">983710.0</span><span class="p">,</span> <span class="mf">292.97</span><span class="p">)</span>
@@ -514,7 +514,7 @@
 </dd>
 </dl>
 <dl>
-<dt>Usage: Type</dt><dd><div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span> <span class="nn">refrigerants</span>
+<dt>Usage: Type</dt><dd><div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span><span class="w"> </span><span class="nn">refrigerants</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">ref</span> <span class="o">=</span> <span class="n">refrigerants</span><span class="o">.</span><span class="n">R410A</span><span class="p">()</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">com</span> <span class="o">=</span> <span class="n">ScrollCompressor</span><span class="p">([</span><span class="mf">2.362</span><span class="p">,</span> <span class="mf">0.00287</span><span class="p">,</span> <span class="mf">0.0041</span><span class="p">,</span> <span class="mf">0.922</span><span class="p">,</span> <span class="mf">398.7</span><span class="p">,</span> <span class="mf">6.49</span><span class="p">])</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="s1">&#39;</span><span class="si">%.2f</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="n">com</span><span class="o">.</span><span class="n">get_Power</span><span class="p">(</span><span class="mf">0.025</span><span class="p">,</span> <span class="n">ref</span><span class="p">,</span> <span class="mf">1.879e6</span><span class="p">,</span> <span class="mf">1.083e6</span><span class="p">,</span> <span class="mf">289.64</span><span class="p">)</span>

IBPSA/Resources/src/fluid/heatpumps/calibration/doc/build/html/dummy_performance_data.html

@@ -200,18 +200,18 @@ <h1>Generate performance data from heat pump model<a class="headerlink" href="#g
 <span class="linenos"> 7</span><span class="sd">and load sides. The resulting performance data is written to a text file.</span>
 <span class="linenos"> 8</span>
 <span class="linenos"> 9</span><span class="sd">&quot;&quot;&quot;</span>
-<span class="linenos">10</span><span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">division</span><span class="p">,</span> <span class="n">print_function</span><span class="p">,</span> <span class="n">absolute_import</span>
+<span class="linenos">10</span><span class="kn">from</span><span class="w"> </span><span class="nn">__future__</span><span class="w"> </span><span class="kn">import</span> <span class="n">division</span><span class="p">,</span> <span class="n">print_function</span><span class="p">,</span> <span class="n">absolute_import</span>
 <span class="linenos">11</span>
-<span class="linenos">12</span><span class="kn">import</span> <span class="nn">os</span>
-<span class="linenos">13</span><span class="kn">import</span> <span class="nn">sys</span>
+<span class="linenos">12</span><span class="kn">import</span><span class="w"> </span><span class="nn">os</span>
+<span class="linenos">13</span><span class="kn">import</span><span class="w"> </span><span class="nn">sys</span>
 <span class="linenos">14</span>
 <span class="linenos">15</span>
-<span class="linenos">16</span><span class="k">def</span> <span class="nf">main</span><span class="p">():</span>
+<span class="linenos">16</span><span class="k">def</span><span class="w"> </span><span class="nf">main</span><span class="p">():</span>
 <span class="linenos">17</span>    <span class="c1"># Add parent directory to system path</span>
 <span class="linenos">18</span>    <span class="n">parent_dir</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">abspath</span><span class="p">(</span><span class="vm">__file__</span><span class="p">)))</span>
 <span class="linenos">19</span>    <span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">parent_dir</span><span class="p">)</span>
 <span class="linenos">20</span>    <span class="c1"># Import Heat pump and calibration module</span>
-<span class="linenos">21</span>    <span class="kn">import</span> <span class="nn">PythonModel</span> <span class="k">as</span> <span class="nn">hp</span>
+<span class="linenos">21</span>    <span class="kn">import</span><span class="w"> </span><span class="nn">PythonModel</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">hp</span>
 <span class="linenos">22</span>    <span class="c1"># Change working directory to current directory</span>
 <span class="linenos">23</span>    <span class="n">os</span><span class="o">.</span><span class="n">chdir</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="vm">__file__</span><span class="p">))</span>
 <span class="linenos">24</span>    <span class="c1"># Set to True if calibrating for cooling mode</span>

IBPSA/Resources/src/fluid/heatpumps/calibration/doc/build/html/example_calibration.html

@@ -191,20 +191,20 @@ <h1>Calibrate heat pump model from performance data<a class="headerlink" href="#
 <span class="linenos">  8</span><span class="sd">heat pump parameters is generated.</span>
 <span class="linenos">  9</span>
 <span class="linenos"> 10</span><span class="sd">&quot;&quot;&quot;</span>
-<span class="linenos"> 11</span><span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">division</span><span class="p">,</span> <span class="n">print_function</span><span class="p">,</span> <span class="n">absolute_import</span>
+<span class="linenos"> 11</span><span class="kn">from</span><span class="w"> </span><span class="nn">__future__</span><span class="w"> </span><span class="kn">import</span> <span class="n">division</span><span class="p">,</span> <span class="n">print_function</span><span class="p">,</span> <span class="n">absolute_import</span>
 <span class="linenos"> 12</span>
-<span class="linenos"> 13</span><span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
-<span class="linenos"> 14</span><span class="kn">import</span> <span class="nn">os</span>
-<span class="linenos"> 15</span><span class="kn">import</span> <span class="nn">sys</span>
-<span class="linenos"> 16</span><span class="kn">import</span> <span class="nn">datetime</span>
+<span class="linenos"> 13</span><span class="kn">import</span><span class="w"> </span><span class="nn">numpy</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">np</span>
+<span class="linenos"> 14</span><span class="kn">import</span><span class="w"> </span><span class="nn">os</span>
+<span class="linenos"> 15</span><span class="kn">import</span><span class="w"> </span><span class="nn">sys</span>
+<span class="linenos"> 16</span><span class="kn">import</span><span class="w"> </span><span class="nn">datetime</span>
 <span class="linenos"> 17</span>
 <span class="linenos"> 18</span>
-<span class="linenos"> 19</span><span class="k">def</span> <span class="nf">main</span><span class="p">():</span>
+<span class="linenos"> 19</span><span class="k">def</span><span class="w"> </span><span class="nf">main</span><span class="p">():</span>
 <span class="linenos"> 20</span>    <span class="c1"># Add parent directory to system path</span>
 <span class="linenos"> 21</span>    <span class="n">parent_dir</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">abspath</span><span class="p">(</span><span class="vm">__file__</span><span class="p">)))</span>
 <span class="linenos"> 22</span>    <span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">parent_dir</span><span class="p">)</span>
 <span class="linenos"> 23</span>    <span class="c1"># Import Heat pump and calibration module</span>
-<span class="linenos"> 24</span>    <span class="kn">import</span> <span class="nn">PythonModel</span> <span class="k">as</span> <span class="nn">hp</span>
+<span class="linenos"> 24</span>    <span class="kn">import</span><span class="w"> </span><span class="nn">PythonModel</span><span class="w"> </span><span class="k">as</span><span class="w"> </span><span class="nn">hp</span>
 <span class="linenos"> 25</span>    <span class="c1"># Change working directory to current directory</span>
 <span class="linenos"> 26</span>    <span class="n">os</span><span class="o">.</span><span class="n">chdir</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="vm">__file__</span><span class="p">))</span>
 <span class="linenos"> 27</span>    <span class="c1"># Author info for record generation</span>
@@ -292,7 +292,7 @@ <h1>Calibrate heat pump model from performance data<a class="headerlink" href="#
 <span class="linenos">109</span>    <span class="k">return</span> <span class="n">optRes</span><span class="p">,</span> <span class="n">dymRes</span>
 <span class="linenos">110</span>
 <span class="linenos">111</span>
-<span class="linenos">112</span><span class="k">def</span> <span class="nf">write_record_scroll</span><span class="p">(</span><span class="n">author</span><span class="p">,</span> <span class="n">manufacturer</span><span class="p">,</span> <span class="n">model</span><span class="p">,</span> <span class="n">CoolingMode</span><span class="p">,</span>
+<span class="linenos">112</span><span class="k">def</span><span class="w"> </span><span class="nf">write_record_scroll</span><span class="p">(</span><span class="n">author</span><span class="p">,</span> <span class="n">manufacturer</span><span class="p">,</span> <span class="n">model</span><span class="p">,</span> <span class="n">CoolingMode</span><span class="p">,</span>
 <span class="linenos">113</span>                        <span class="n">refrigerant</span><span class="p">,</span> <span class="n">Q_nominal</span><span class="p">,</span> <span class="n">COP_nominal</span><span class="p">,</span>
 <span class="linenos">114</span>                        <span class="n">optPar</span><span class="p">):</span>
 <span class="linenos">115</span>    <span class="c1"># Evaluate current date</span>

IBPSA/Resources/src/fluid/heatpumps/calibration/doc/build/html/heatexchangers.html

@@ -235,7 +235,7 @@
 </dd>
 </dl>
 <dl>
-<dt>Usage: Type</dt><dd><div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span> <span class="nn">fluids</span>
+<dt>Usage: Type</dt><dd><div class="doctest highlight-default notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span><span class="w"> </span><span class="nn">fluids</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">flu</span> <span class="o">=</span> <span class="n">fluids</span><span class="o">.</span><span class="n">ConstantPropertyWater</span><span class="p">()</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="n">eva</span> <span class="o">=</span> <span class="n">EvaporatorCondenser</span><span class="p">([</span><span class="mi">21523</span><span class="p">])</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="s1">&#39;</span><span class="si">%.2f</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="n">eva</span><span class="o">.</span><span class="n">get_RefrigerantTemperature</span><span class="p">(</span><span class="mi">19300</span><span class="p">,</span> <span class="mf">0.71</span><span class="p">,</span> <span class="n">flu</span><span class="p">,</span> <span class="mf">298.75</span><span class="p">)</span>