Skip to content

Commit

Permalink
Maint 9.1.x patch annotation copyright (#3722)
Browse files Browse the repository at this point in the history
* Corrected wrong annotation

* Updated copyright year

* Updated users guide
  • Loading branch information
mwetter authored Mar 24, 2024
1 parent 75455c3 commit 6fe3c0f
Show file tree
Hide file tree
Showing 35 changed files with 42 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Equations and algorithms

.. code-block::
Hidden.PrintFailureToDifferentiate = true;
Advanced.PrintFailureToDifferentiate = true;
Next, translate the model again to see what functions cannot be
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Copyright and License
=====================

Copyright (c) 2012-2020, The Regents of the University of California, Department
Copyright (c) 2012-2024, The Regents of the University of California, Department
of Energy contract-operators of the Lawrence Berkeley National Laboratory.
All rights reserved.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ <h1><span class="section-number">8. </span>Acknowledgments<a class="headerlink"

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ <h2><span class="section-number">2.6. </span>Start values of iteration variables

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ <h3><span class="section-number">5.3.3. </span>Equations and algorithms<a class=
</pre></div>
</div>
<p>(or any number other than zero), then enter on the command line</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">Hidden</span><span class="o">.</span><span class="n">PrintFailureToDifferentiate</span> <span class="o">=</span> <span class="n">true</span><span class="p">;</span>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">Advanced</span><span class="o">.</span><span class="n">PrintFailureToDifferentiate</span> <span class="o">=</span> <span class="n">true</span><span class="p">;</span>
</pre></div>
</div>
<p>Next, translate the model again to see what functions cannot be
Expand Down Expand Up @@ -866,7 +866,7 @@ <h3><span class="section-number">5.4.3. </span>Control sequences using the Contr

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ <h1><span class="section-number">9. </span>Disclaimers<a class="headerlink" href

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ <h2 id="V">V</h2>

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ <h2><span class="section-number">1.5. </span>References<a class="headerlink" hre

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ <h1><span class="section-number">7. </span>Glossary<a class="headerlink" href="#

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ <h1><span class="section-number">6. </span>Help<a class="headerlink" href="#help

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ <h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Pe

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@

<section id="copyright-and-license">
<h1><span class="section-number">10. </span>Copyright and License<a class="headerlink" href="#copyright-and-license" title="Permalink to this headline"></a></h1>
<p>Copyright (c) 2012-2020, The Regents of the University of California, Department
<p>Copyright (c) 2012-2024, The Regents of the University of California, Department
of Energy contract-operators of the Lawrence Berkeley National Laboratory.
All rights reserved.</p>
<p>1. Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -213,7 +213,7 @@ <h1><span class="section-number">10. </span>Copyright and License<a class="heade

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ <h2><span class="section-number">3.4. </span>Numerical solvers<a class="headerli

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ <h1><span class="section-number">4. </span>Pre- and Post-Processing<a class="hea

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ <h1 id="search-documentation">Search</h1>

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Buildings/Resources/Documentation/userGuide/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

# General information about the project.
project = u'Modelica Buildings library'
copyright = u'2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory)'
copyright = u'2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory)'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Equations and algorithms

.. code-block::
Hidden.PrintFailureToDifferentiate = true;
Advanced.PrintFailureToDifferentiate = true;
Next, translate the model again to see what functions cannot be
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Copyright and License
=====================

Copyright (c) 2012-2020, The Regents of the University of California, Department
Copyright (c) 2012-2024, The Regents of the University of California, Department
of Energy contract-operators of the Lawrence Berkeley National Laboratory.
All rights reserved.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ <h1>Generate performance data from heat pump model<a class="headerlink" href="#g

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ <h1>Calibrate heat pump model from performance data<a class="headerlink" href="#

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ <h2 id="W">W</h2>

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ <h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Pe

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ <h1>Python Module Index</h1>

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ <h1 id="search-documentation">Search</h1>

</p>
<p>
&copy; Copyright 2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
&copy; Copyright 2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory).<br/>
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.3.2.<br/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

# General information about the project.
project = u'Heat pump calibration'
copyright = u'2012-2020, The Regents of the University of California (through Lawrence Berkeley National Laboratory)'
copyright = u'2012-2024, The Regents of the University of California (through Lawrence Berkeley National Laboratory)'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ protected
annotation (Placement(transformation(extent={{140,460},{160,480}})));
Buildings.Controls.OBC.CDL.Continuous.Sources.Constant qGai_flow[3](
k={0,0,0})
"Internal heat gain (computed already in EnergyPlus"
"Internal heat gain (computed already in EnergyPlus)"
annotation (Placement(transformation(extent={{-140,-40},{-120,-20}})));

initial equation
Expand Down Expand Up @@ -368,11 +368,7 @@ equation
extent={{2,166},{296,174}},
lineColor={95,95,95},
fillColor={170,213,255},
fillPattern=FillPattern.Solid),
Bitmap(
extent={{192,-58},{342,-18}},
fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus/spawn_icon_darkbluetxmedres.png",
visible=not usePrecompiledFMU)}),
fillPattern=FillPattern.Solid)}),
Documentation(
info="<html>
<p>
Expand Down Expand Up @@ -422,6 +418,10 @@ Renewable Energy, Office of Building Technologies, Washington, DC, 2009.
revisions="<html>
<ul>
<li>
March 23, 2024, by Michael Wetter:<br/>
Corrected wrong annotation.
</li>
<li>
February 16, 2022, by Michael Wetter:<br/>
Removed assertion on <code>opeWesCor.wOpe</code> as there is no need to enforce this width.
</li>
Expand Down
2 changes: 1 addition & 1 deletion Buildings/legal.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<h1>License</h1>
<p>
Modelica Buildings Library. Copyright (c) 1998-2022
Modelica Buildings Library. Copyright (c) 1998-2024
Modelica Association,
International Building Performance Simulation Association (IBPSA),
The Regents of the University of California, through Lawrence Berkeley National Laboratory
Expand Down
2 changes: 1 addition & 1 deletion Buildings/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -11738,7 +11738,7 @@ The following people have directly contributed to the implementation of the Buil
Documentation(info="<html>
<h4>License</h4>
<p>
Modelica Buildings Library. Copyright (c) 1998-2022
Modelica Buildings Library. Copyright (c) 1998-2024
Modelica Association,
International Building Performance Simulation Association (IBPSA),
The Regents of the University of California, through Lawrence Berkeley National Laboratory
Expand Down

0 comments on commit 6fe3c0f

Please sign in to comment.