Merge pull request #1762 from NREL/SAM_1563

Address issue #1563
NREL · Apr 19, 2024 · cddf732 · cddf732
2 parents cc0aca0 + e29343a
commit cddf732
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/deploy/runtime/cashflow.lk b/deploy/runtime/cashflow.lk
@@ -133,7 +133,7 @@ function cf_production()
 	{
 		cfline( 'cf_energy_net', 0);
 	}
-	if ( is_batt_tech() )
+	if ( is_batt_tech() && (varinfo('gen_without_battery')!= null))  // SAM issue 1563
 	{
 		cfline( 'cf_energy_without_battery',0);
 		cfline( 'batt_annual_discharge_energy',0);
@@ -1736,7 +1736,7 @@ function set_annual_values( xl )
 		}
 	}
 	// tech-dependent
-	if ( is_batt_tech() )
+	if ( is_batt_tech() && (varinfo('gen_without_battery')!= null))  // SAM issue 1563
 	{
 		xl_set_output( xl, 'cf_energy_without_battery' );
 		xl_set_output( xl, 'batt_annual_discharge_energy');

diff --git a/deploy/runtime/spreadsheets/residential_commercial.xlsx b/deploy/runtime/spreadsheets/residential_commercial.xlsx
diff --git a/src/invoke.cpp b/src/invoke.cpp
@@ -1735,10 +1735,16 @@ static void fcall_xl_set( lk::invoke_t &cxt )
 			wxArrayString list;
 			for( size_t i=0;i<cxt.arg(1).length();i++ )
 				list.Add( cxt.arg(1).index( i )->deref().as_string() );
-			xl->Excel().SetNamedRangeArray( cxt.arg(2).as_string(), list );
+			if (!xl->Excel().SetNamedRangeArray(cxt.arg(2).as_string(), list)) {
+				cxt.error(xl->Excel().GetLastError());
+			}
+
+		}
+		else if (cxt.arg_count() == 3) {
+			if (!xl->Excel().SetNamedRangeValue(cxt.arg(2).as_string(), cxt.arg(1).as_string())) {
+				cxt.error(xl->Excel().GetLastError());
+			}
 		}
-		else if ( cxt.arg_count() == 3 )
-			xl->Excel().SetNamedRangeValue( cxt.arg(2).as_string(), cxt.arg(1).as_string() );
 	}
 	else
 		cxt.error( "invalid xl-obj-ref" );