Update metrics for hybrid single owner configuraiton

NREL · Jul 9, 2023 · 0fc6968 · 0fc6968
1 parent 7848268
commit 0fc6968
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/deploy/runtime/metrics.lk b/deploy/runtime/metrics.lk
@@ -482,9 +482,6 @@ function MEwave_metrics()
 
 function MEtidal_metrics()
 {
-
-
-
 	//metric_table('Table1', {'headers'='Metric,Value'});
 	//me_lcoefcr_metrics();
 	if(value('system_capacity') > 1) {
@@ -568,3 +565,11 @@ metrics{ 'Merchant Plant' } = define() { mp_metrics(); };
 metrics{ 'All Equity Partnership Flip' } = define() { aepf_metrics(); };
 metrics{ 'Leveraged Partnership Flip' } = define() { lpf_metrics(); };
 metrics{ 'Sale Leaseback' } = define() { sl_metrics(); };
+
+// hybrids - single table option
+metrics{ 'PVWatts Wind Battery Hybrid|Single Owner'}  = define() {
+		metric( 'PVWattsannual_energy', {'label'='PV annual energy production', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='Table1' } );
+		metric( 'Windannual_energy', {'label'='Wind annual energy production', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='Table1' } );
+		metric( 'annual_energy', {'label'='Annual energy production', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='Table1' } );
+		so_metrics();
+};
diff --git a/src/simulation.cpp b/src/simulation.cpp
@@ -1122,7 +1122,8 @@ bool Simulation::InvokeWithHandler(ISimulationHandler *ih, wxString folder)
 						wxString prepend_name;
 						if (i >= m_case->GetConfiguration()->Technology.size() - 1) {
 							vartable_name = m_case->GetConfiguration()->Technology[m_case->GetConfiguration()->Technology.size() - 1];
-							prepend_name = m_case->GetConfiguration()->Technology[m_case->GetConfiguration()->Technology.size() - 1];
+//							prepend_name = m_case->GetConfiguration()->Technology[m_case->GetConfiguration()->Technology.size() - 1];
+							prepend_name = ""; // change "Hybrid" to nothing for normal metric processing
 						}
 						else {
 							vartable_name = m_simlist[i];