Skip to content

Commit 4ee1368

Browse files
dguittetsjanzoucpaulgilman
authored
Develop merge (#1799)
* Update lhs.bin and stepwise.bin to address #1417 * Not sure why GitHub Actions failing when Mac binaries only thing updated * Fix base branch for GitHub Actions - patch * Rerun defaults on Windows for failing GitHub Actions * Fix indifference point macro description (#1788) * Update PV PDF report templates (#1789) * Fix Federal depreciation calculation in host_developer.xlsx (#1793) Cell CashFlow!B398 incorrectly referred to $C$141 for federal custom depreciation allocation which caused divide by zero errors that propagated through workbook all the way to LCOE and NPV results. This issue only affected Host Developer send-to-Excel with equations when 20-yr SL allocation (Inputs!C141) is set to zero. Checked that all other FOM spreadsheets do not have this problem. * UI message for battery grid charging with PBI (#1792) Also trigger message on_change so message appears when you switch to Battery Dispatch pages. * Marine Energy documentation revisions (#1790) * Fix base branch in Github CI (#1779) * fix base branch * fix ref name * set default branch to patch * update test results --------- Co-authored-by: sjanzou <[email protected]> Co-authored-by: Steven Janzou <[email protected]> Co-authored-by: Paul Gilman <[email protected]>
1 parent d4a6cfe commit 4ee1368

36 files changed

+352
-213
lines changed

Sandia/osx/lhs.bin

669 KB
Binary file not shown.

Sandia/osx/stepwise.bin

721 KB
Binary file not shown.

deploy/runtime/help/html/cc_marine_energy.html

+8-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8" />
1515
<meta name="generator" content="Help+Manual" />
1616
<meta name="keywords" content="" />
17-
<meta name="description" content="SAM's marine energy models for wave and tidal power use a fixed-charge-rate (FCR) method to calculate the levelized cost of energy (LCOE) from inputs on the Financial..." />
17+
<meta name="description" content="When you use the marine energy wave or marine energy tidal performance model with the LCOE calculator financial model, SAM uses a fixed-charge-rate (FCR) method to calculate..." />
1818
<meta name="ZOOMIMAGE" content="./images/zoomimage.jpg" />
1919
<meta name="author" content="National Renewable Energy Laboratory" />
2020
<meta name="msapplication-tap-highlight" content="no" />
@@ -512,10 +512,15 @@ <h1 class="topictitle" title="Marine Energy Installation Costs">Marine Energy In
512512
<div id="hmpagebody">
513513
<div id="hmpagebody_scroller">
514514
<!--ZOOMRESTART-->
515-
<p class="p_Text"><span class="f_Text">SAM's marine energy models for wave and tidal power use a fixed-charge-rate (FCR) method to calculate the levelized cost of energy (LCOE) from inputs on the <a href="fin_lcoefcr.html" class="topiclink">Financial Parameters</a> page. The FCR method requires a total installed cost and annual operating cost value as input, along with a fixed charge rate representing the financial assumptions for the project.</span></p>
516-
<p class="p_Text"><span class="f_Text">For the marine energy models, each Capital Costs page and the O&amp;M (operation and maintenance) Cost page provide a detailed cost structure that SAM uses to calculate the total capital cost and fixed annual operating cost for the LCOE calculation:</span></p>
515+
<p class="p_Text"><span class="f_Text">When you use the marine energy wave or marine energy tidal performance model with the LCOE calculator financial model, SAM uses a fixed-charge-rate (FCR) method to calculate the levelized cost of energy (LCOE) from inputs on the <a href="fin_lcoefcr.html" class="topiclink">Financial Parameters</a> page. The FCR method requires a total installed cost and annual operating cost value as input, along with a fixed charge rate representing the financial assumptions for the project. </span></p>
516+
<p class="p_Text"><span class="f_Text">When you use the single owner financial model with either the wave or wave battery performance model, SAM uses an annual cash flow model to calculate financial metrics such as the net present value (NPV), internal rate of return (IRR), power purchase price (PPA), LCOE, and other metrics.</span></p>
517+
<p class="p_Text"><span class="f_Text">Each Capital Costs page and the O&amp;M (operation and maintenance) Cost page provide a detailed cost structure that SAM uses to calculate the total capital cost and fixed annual operating cost for the financial model calculations:</span></p>
517518
<p class="p_List" style="text-indent: 0; padding-left: 1.5000rem; margin-left: 1.5000rem;"><span class="f_List" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:1.5000rem;margin-left:-1.5000rem">&#8226;</span><span class="f_List">The total capital cost is the sum of the total device cost, total balance-of-system (BOS) cost, and total financial cost.</span></p>
518519
<p class="p_ListLast" style="text-indent: 0; page-break-inside: avoid; padding-left: 1.5000rem; margin-left: 1.5000rem;"><span class="f_List" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:1.5000rem;margin-left:-1.5000rem">&#8226;</span><span class="f_ListLast">The fixed operating cost is the sum of the O&amp;M costs.</span></p>
520+
<p class="p_Text"><span class="f_Text">SAM's marine energy models are based on the U.S Department of Energy (DOE) Reference Model Project (RMP). You can find links to documents for the RMP on the Sandia National Laboratories website at <a href="https://energy.sandia.gov/programs/renewable-energy/water-power/projects/reference-model-project-rmp/" target="_blank" class="weblink">https://energy.sandia.gov/programs/renewable-energy/water-power/projects/reference-model-project-rmp/</a>. Excel workbooks with cost category details are available for each technology:</span></p>
521+
<p class="p_List" style="text-indent: 0; padding-left: 1.5000rem; margin-left: 1.5000rem;"><span class="f_List" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:1.5000rem;margin-left:-1.5000rem">&#8226;</span><span class="f_List">Mirko Previsic (2012). <a href="https://energy.sandia.gov/download/21275/" class="weblink">Reference Model 1 Cost Breakdown Structure for Tidal Current Device</a></span></p>
522+
<p class="p_List" style="text-indent: 0; padding-left: 1.5000rem; margin-left: 1.5000rem;"><span class="f_List" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:1.5000rem;margin-left:-1.5000rem">&#8226;</span><span class="f_ListLast">Mirko Previsic (2012). <a href="https://energy.sandia.gov/download/23667/" class="weblink">Cost Breakdown Structure for WEC Rated at 286 kW</a></span></p>
523+
<h4 class="p_Heading4"><span class="f_Heading4">Marine Energy Cost Structure</span></h4>
519524
<p class="p_Text"><span class="f_Text">The cost structure has several levels, so you can specify each cost as a single value, or break it down into more detailed categories and subcategories.</span></p>
520525
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Override cost structure</span></p>
521526
<p class="p_VariableDescription"><span class="f_VariableDescription">This is the highest level in the cost structure. Use this option to enter a total cost at the Device, BOS, Financial, or O&amp;M Cost level. When you check </span><span class="f_CHInterfaceElement">Override cost structure</span><span class="f_VariableDescription">, SAM uses the value you type and ignores the detailed cost values.</span></p>

deploy/runtime/help/html/electricity_rates.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ <h3 class="p_Heading3_atocs_" style="page-break-inside: avoid; page-break-after:
662662
<p class="p_VariableDescription"><span class="f_VariableDescription">If an annual true-up payment applies, specify the </span><span class="f_CHInterfaceElement">Compensation rate for excess generation</span><span class="f_VariableDescription"> and choose a </span><span class="f_CHInterfaceElement">Month for end of true-up period</span><span class="f_VariableDescription">. If the true-up amount is rolled over to future months instead of treated as a monthly payment to the electricity customer, check </span><span class="f_CHInterfaceElement">Roll over net excess compensation to future bills</span><span class="f_VariableDescription">.</span></p>
663663
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Net energy metering with $ credits</span></p>
664664
<p class="p_VariableDescription"><span class="f_VariableDescription">For this option, specify the buy rate(s) and sell rate(s) in the Energy Charges table and use the weekday/weekend schedules to define any time-of-use periods as described below.</span></p>
665-
<p class="p_VariableDescription"><span class="f_VariableDescription">If an annual true-up payment applies, choose a </span><span class="f_CHInterfaceElement">Month for end of true-up period</span><span class="f_VariableDescription">.</span></p>
665+
<p class="p_VariableDescription"><span class="f_VariableDescription">Choose a </span><span class="f_CHInterfaceElement">Month for end of true-up period</span><span class="f_VariableDescription"> when the annual true-up payment applies.</span></p>
666666
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Net billing</span></p>
667667
<p class="p_VariableDescription"><span class="f_VariableDescription">For the net billing option, specify the buy rate(s) and sell rate(s) in the Energy Charges table and use the weekday/weekend schedules to define any time-of-use periods as described below.</span></p>
668668
<p class="p_VariableDescription"><span class="f_VariableDescription">Alternatively, you can provide time series buy and sell rates to use instead of the rates in the Energy Charges table. Note that you can combine time series buy rates with TOU sell rates and vice versa: </span></p>

deploy/runtime/help/html/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8" />
1515
<meta name="generator" content="Help+Manual" />
1616
<meta name="keywords" content="" />
17-
<meta name="description" content="This Help system describes SAM 2023.12.17 Revision 2 Dev and was last revised on 5/9/2024." />
17+
<meta name="description" content="This Help system describes SAM 2023.12.17 Revision 1 and was last revised on 6/11/2024." />
1818
<meta name="ZOOMIMAGE" content="./images/zoomimage.jpg" />
1919
<meta name="author" content="National Renewable Energy Laboratory" />
2020
<meta name="msapplication-tap-highlight" content="no" />
@@ -512,7 +512,7 @@ <h1 class="topictitle" title="Introduction">Introduction<h1>
512512
<div id="hmpagebody">
513513
<div id="hmpagebody_scroller">
514514
<!--ZOOMRESTART-->
515-
<p class="p_Text"><span class="f_Text">This Help system describes SAM 2023.12.17 Revision 2 Dev and was last revised on 5/9/2024.</span></p>
515+
<p class="p_Text"><span class="f_Text">This Help system describes SAM 2023.12.17 Revision 1 and was last revised on 6/11/2024.</span></p>
516516
<p class="p_Text"><span class="f_Text">The System Advisor Model (SAM) is a performance and financial model designed to facilitate decision making for people involved in the renewable energy industry:</span></p>
517517
<p class="p_List" style="text-indent: 0; padding-left: 1.5000rem; margin-left: 1.5000rem;"><span class="f_List" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:1.5000rem;margin-left:-1.5000rem">&#8226;</span><span class="f_List">Project managers and engineers</span></p>
518518
<p class="p_List" style="text-indent: 0; padding-left: 1.5000rem; margin-left: 1.5000rem;"><span class="f_List" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:1.5000rem;margin-left:-1.5000rem">&#8226;</span><span class="f_List">Policy analysts</span></p>

deploy/runtime/help/html/installation.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -519,13 +519,13 @@ <h3 class="p_Heading3_atocs_" style="page-break-inside: avoid; page-break-after:
519519
<p class="p_Text"><span class="f_Text">Your SAM installation contains the SAM executable file and supporting files and folders. You may need to access the SAM installation to find resource data files, SAM libraries, or to <a href="installation.html#removesam" class="topiclink">remove SAM</a> from your computer. Be careful not to modify, move, or delete any files in the folder unless you understand how SAM uses the file.</span></p>
520520
<p class="p_Text"><span class="f_Text">The SAM installation folder is the folder that contains the SAM executable and its supporting files:</span></p>
521521
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Windows</span></p>
522-
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">By default, the SAM installation is in </span><span class="f_CHFileName">c:\SAM\SAM 2023.12.17 Revision 2 Dev</span><span class="f_VariableDescription">, although you can install SAM in any folder on your computer.</span></p>
522+
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">By default, the SAM installation is in </span><span class="f_CHFileName">c:\SAM\SAM 2023.12.17 Revision 1</span><span class="f_VariableDescription">, although you can install SAM in any folder on your computer.</span></p>
523523
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Mac</span></p>
524-
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">On a Mac, the SAM installation is the SAM application bundle, which is distributed on a disk image named </span><span class="f_CHFileName">sam-osx-5/9/2024.dmg</span><span class="f_VariableDescription">.</span></p>
524+
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">On a Mac, the SAM installation is the SAM application bundle, which is distributed on a disk image named </span><span class="f_CHFileName">sam-osx-6/11/2024.dmg</span><span class="f_VariableDescription">.</span></p>
525525
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">SAM runs directly from the disk image, which can be in the Applications folder, desktop, or other folder on your computer.</span></p>
526526
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">To open the application bundle, in Finder, control-click (or right-click) the SAM name and click </span><span class="f_CHInterfaceElement">Show Contents</span><span class="f_VariableDescription">. If SAM is in your Applications folder, command-click the name to open it in Finder.</span></p>
527527
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Linux</span></p>
528-
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_CHFileName" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">In Linux, SAM installs by default in </span><span class="f_CHFileName">home/&lt;user&gt;/SAM/SAM 2023.12.17 Revision 2 Dev, although you can install SAM in any folder on your computer.</span></p>
528+
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_CHFileName" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">In Linux, SAM installs by default in </span><span class="f_CHFileName">home/&lt;user&gt;/SAM/SAM 2023.12.17 Revision 1, although you can install SAM in any folder on your computer.</span></p>
529529
<h3 class="p_Heading3_atocs_" style="page-break-inside: avoid; page-break-after: avoid; border-top: none; border-right: none; border-left: none;"><a id="removesam" class="hmanchor"></a><span class="f_Heading3_atocs_">Removing SAM from your computer</span></h3>
530530
<p class="p_Text"><span class="f_Text">When you install a new version of SAM or no longer need the software, you can remove it from your computer:</span></p>
531531
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Windows</span></p>
@@ -535,7 +535,7 @@ <h3 class="p_Heading3_atocs_" style="page-break-inside: avoid; page-break-after:
535535
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Mac</span></p>
536536
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">Drag the SAM application bundle to the Trash.</span></p>
537537
<p class="p_VariableName" style="page-break-inside: avoid; page-break-after: avoid;"><span class="f_VariableName">Linux</span></p>
538-
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">Open a terminal window and run </span><span class="f_VariableDescription" style="font-style: italic;">rm -rf /path/to/SAM/SAM 2023.12.17 Revision 2 Dev</span><span class="f_VariableDescription">.</span></p>
538+
<p class="p_VariableDescription" style="text-indent: 0; padding-left: 0.8125rem; margin-left: 1.5000rem;"><span class="f_VariableDescription" style="font-family: Arial,'Lucida Sans Unicode','Lucida Grande','Lucida Sans';display:inline-block;width:0.8125rem;margin-left:-0.8125rem">&#8226;</span><span class="f_VariableDescription">Open a terminal window and run </span><span class="f_VariableDescription" style="font-style: italic;">rm -rf /path/to/SAM/SAM 2023.12.17 Revision 1</span><span class="f_VariableDescription">.</span></p>
539539
<h3 class="p_Heading3_atocs_" style="page-break-inside: avoid; page-break-after: avoid; border-top: none; border-right: none; border-left: none;"><span class="f_Heading3_atocs_">Running multiple versions of SAM</span></h3>
540540
<p class="p_Text"><span class="f_Text">You can keep different versions of SAM installed on your computer and run them simultaneously as separate pieces of software. When you install a new version of SAM, unless you install it in the same folder as another version of SAM, it installs as a separate installation. You may want to keep multiple versions of SAM on your computer to compare results between versions or if your work with SAM requires that you use a specific version.</span></p>
541541
<h3 class="p_Heading3_atocs_" style="page-break-inside: avoid; page-break-after: avoid; border-top: none; border-right: none; border-left: none;"><span class="f_Heading3_atocs_">Installing SAM in a laboratory environment</span></h3>

deploy/runtime/help/html/js/hmXtopic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ hmProjectInfo = {
66
copyright: "© 2024 National Renewable Energy Laboratory",
77
summary: "&nbsp;",
88
version: "0.0.1",
9-
date: "Thursday, May 9, 2024",
9+
date: "Tuesday, June 11, 2024",
1010
language: "en-us",
1111
mainfile: "index.html"
1212
}

0 commit comments

Comments
 (0)