Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dpinney/omf
Browse files Browse the repository at this point in the history
  • Loading branch information
@jenny-nyx
jenny-nyx committed May 29, 2024
2 parents c94d898 + 4200679 commit 317c483
Show file tree
Hide file tree
Showing 10 changed files with 597 additions and 420 deletions.
53 changes: 39 additions & 14 deletions omf/models/derConsumer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<form name="inputForm" action="/runModel/" onsubmit="event.preventDefault(); return isFormValid();" method="post">
<!-- Required Inputs -->
<div class="shortInput">
<label>Model Type <a href="https://github.com/dpinney/omf/wiki/Models:-derConsumer" target="blank">Help?</a></label>
<label>Model Type <a href="https://github.com/dpinney/omf/wiki/Models-~-derConsumer" target="blank">Help?</a></label>
<input type="text" id="modelType" name="modelType" value="{{modelName}}" readonly/>
</div>
<div class="shortInput">
Expand All @@ -41,7 +41,7 @@
</div>
<!-- Model Specific Inputs -->
<div class="wideInput">
<p class="inputSectionHeader">Specific REopt Model Inputs</p>
<p class="inputSectionHeader">General Model Inputs</p>
</div>
<hr style="border-style: solid; border-color: #196b12; margin-top: 10px;">
<div class="shortInput">
Expand Down Expand Up @@ -80,28 +80,24 @@
</div>
<div class="shortInput">
<label class="tooltip">Analysis Period (years)<span class="classic">Specify the length of financial analysis in years.</span></label>
<input type="number" id="analysisYears" name="analysisYears" value="{{allInputDataDict.analysisYears}}" step="1" min="2" max="75" required="required"/>
</div>
<hr>
<div class="wideInput"> <!-- REopt technologies-->
<p class="inputSectionHeader" style="font-size: medium;">Model DER technologies</p>
<input type="number" id="analysis_years" name="analysis_years" value="{{allInputDataDict.analysis_years}}" step="1" min="2" max="75" required="required"/>
</div>
<div class="shortInput">
<label class="tooltip">PV<span class="classic">Include PV in DER analysis.</span></label>
<label class="tooltip">Photovoltaic<span class="classic">Include PV in DER analysis?</span></label>
<select id="PV" name="PV" value="{{allInputDataDict.PV}}"/>
<option value="Yes" {{ 'selected' if allInputDataDict.solar == 'Yes' }}>Yes</option>
<option value="No" {{ 'selected' if allInputDataDict.solar == 'No' }}>No</option>
</select>
</div>
<div class="shortInput">
<label class="tooltip">Battery<span class="classic">Include battery energy storage in DER analysis.</span></label>
<select id="battery" name="battery" value="{{allInputDataDict.BESS}}"/>
<label class="tooltip">Battery<span class="classic">Include battery energy storage in DER analysis?</span></label>
<select id="BESS" name="BESS" value="{{allInputDataDict.BESS}}"/>
<option value="Yes" {{ 'selected' if allInputDataDict.BESS == 'Yes' }}>Yes</option>
<option value="No" {{ 'selected' if allInputDataDict.BESS == 'No' }}>No</option>
</select>
</div>
<div class="shortInput">
<label class="tooltip">Diesel Generator<span class="classic">Include diesel generator in DER analysis.</span></label>
<label class="tooltip">Diesel Generator<span class="classic">Include diesel generator in DER analysis?</span></label>
<select id="generator" name="generator" value="{{allInputDataDict.generator}}"/>
<option value="Yes" {{ 'selected' if allInputDataDict.generator == 'Yes' }}>Yes</option>
<option value="No" {{ 'selected' if allInputDataDict.generator == 'No' }}>No</option>
Expand All @@ -111,8 +107,8 @@
<div class="shortInput">
<label>Simulate Outage</label>
<select id="outage" name="outage" value="{{allInputDataDict.outage}}">
<option value="True" {{ 'selected' if allInputDataDict.outage == 'True' }}>On</option>
<option value="False" {{ 'selected' if allInputDataDict.outage == 'False' }}>Off</option>
<option value="True" {{ 'selected' if allInputDataDict.outage == 'Yes' }}>Yes</option>
<option value="False" {{ 'selected' if allInputDataDict.outage == 'No' }}>No</option>
</select>
</div>
<div class="shortInput">
Expand All @@ -124,7 +120,7 @@
<input type="number" id="outage_duration" name="outage_duration" value="{{allInputDataDict.outage_duration}}" min="1" max="8760" required="required"/>
</div>
<div class="wideInput"> <!-- vbatDispatch Specific Inputs -->
<p class="inputSectionHeader">Specific vbatDispatch Model Inputs</p>
<p class="inputSectionHeader"> Thermal Model Inputs</p>
</div>
<hr style="border-style: solid; border-color: #196b12; margin-top: 10px;">
<div class="shortInput">
Expand Down Expand Up @@ -164,6 +160,7 @@
}
}
</script>
<option value="0" {{ 'selected' if allInputDataDict.load_type == '0' }}>None</option>
<option value="1" {{ 'selected' if allInputDataDict.load_type == '1' }}>Air Conditioner</option>
<option value="2" {{ 'selected' if allInputDataDict.load_type == '2' }}>Heat Pump</option>
<option value="3" {{ 'selected' if allInputDataDict.load_type == '3' }}>Refrigerator</option>
Expand Down Expand Up @@ -222,6 +219,32 @@
<label class="tooltip">Discount Rate (%)<span class="classic">Discount rate used in financial analysis.</span></label>
<input type="text" id="discountRate" name="discountRate" value="{{allInputDataDict.discountRate}}" pattern="[1-9][0-9]{0,2}" required="required">
</div>
<div class="wideInput">
<p class="inputSectionHeader">Distributed Energy Resource (DER) Program Design inputs</p>
</div>
<hr style="border-style: solid; border-color: #196b12; margin-top: 10px;">
<div class="shortInput">
<label>Consider Utility DER program?</label>
<select id="utilityProgram" name="utilityProgram" value="{{allInputDataDict.utilityProgram}}">
<option value="True" {{ 'selected' if allInputDataDict.outage == 'Yes' }}>Yes</option>
<option value="False" {{ 'selected' if allInputDataDict.outage == 'No' }}>No</option>
</select>
</div>
<div class="shortInput">
<label class="tooltip">Energy Compensation Rate ($/kWh)<span class="classic">The dollar amount per kWh compensated to the member-consumer.</span></label>
<input type="text" id="rateCompensation" name="rateCompensation" value="{{allInputDataDict.rateCompensation}}" pattern="^\d+\.?\d*?$" min="0" required="required"/>
</div>
<div class="shortInput">
<label class="tooltip">Fixed Compensation Amount ($)<span class="classic">A fixed dollar amount (e.g. A one-time enrollment reward, or yearly bonus compensation to the member-consumer.) </span></label>
<input type="text" id="fixedCompensation" name="fixedCompensation" value="{{allInputDataDict.fixedCompensation}}" pattern="^\d+\.?\d*?$" min="0" required="required">
</div>
<div class="shortInput">
<label class="tooltip">Fixed Compensation Frequency<span class="classic">If there is a fixed compensation amount, how often is it awarded?</span></label>
<select id="fixedCompensationFrequency" name="fixedCompensationFrequency">
<option value="0" {{ 'selected' if allInputDataDict.fixedCompensationFrequency == '0' }}>One-time only</option>
<option value="1" {{ 'selected' if allInputDataDict.fixedCompensationFrequency == '1' }}>Yearly</option>
</select>
</div>
{{ omfModelButtons }}
</form>

Expand Down Expand Up @@ -313,6 +336,8 @@
</script>
</div>
</div>

<!-- Raw Input and Output Files -->
{{ rawOutputFiles }}
{% endif %}
</body>
Loading

0 comments on commit 317c483

Please sign in to comment.