Minor edits during meeting with Lisa

dpinney · May 8, 2024 · 18e22ce · 18e22ce
1 parent 7b32713
commit 18e22ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/omf/models/derConsumer.html b/omf/models/derConsumer.html
@@ -1,6 +1,8 @@
 <head>
 	{{ omfHeaders }}
+	<!-- Include Highcharts -->
 	<script src="{{pathPrefix}}/static/highcharts4.src.js"></script>
+	<!-- Include Plotly -->
 	<script src="https://cdn.plot.ly/plotly-1.50.1.min.js"></script>		
 	<script type="text/javascript">
 		$(window).on('pageshow',function(){
@@ -209,12 +211,12 @@
 	{{ omfRunDebugBlock }}
 	{% if modelStatus == 'finished' %}
 	<!-- Output tables, graphs, etc -->
-	<div id="output">
-		{{ rawOutputFiles }}
-	</div>
 
 	<p class="reportTitle" style="page-break-before:always">Plotly Test Plot</p>
 	<div id="plotlyPlot" class="tightContent" style="width: 1000px; height: 600px;"></div>
 
+	<div id="output">
+		{{ rawOutputFiles }}
+	</div>
 	{% endif %}
 </body>
diff --git a/omf/models/derConsumer.py b/omf/models/derConsumer.py
@@ -44,7 +44,13 @@ def work(modelDir, inputDict):
 	# Delete output file every run if it exists
 	outData = {}	
 
-	## Read in a static REopt test file
+
+	## NOTE: This code will be used once reopt_jl is working
+	## Run REopt.jl 
+	#outage_flag = inputDict['outage'] #TODO: Add outage option to HTML
+	#reopt_jl.run_reopt_jl(modelDir, scenario, outages=outage_flag)
+
+	## Read in a static REopt test file (NOTE: This code is temporary)
 	with open(pJoin(__neoMetaModel__._omfDir,"static","testFiles","residential_REopt_results.json")) as f:
 		reoptResults = pd.json_normalize(json.load(f))
 		print('Successfully loaded REopt test file. \n')