NatLabRockies · mjprilliman · Feb 12, 2022 · Dec 3, 2021 · Dec 6, 2021 · Dec 9, 2021
diff --git a/deploy/runtime/defaults/Geothermal Power_All Equity Partnership Flip.txt b/deploy/runtime/defaults/Geothermal Power_All Equity Partnership Flip.txt
diff --git a/deploy/runtime/defaults/Geothermal Power_Leveraged Partnership Flip.txt b/deploy/runtime/defaults/Geothermal Power_Leveraged Partnership Flip.txt
diff --git a/deploy/runtime/defaults/Geothermal Power_Merchant Plant.txt b/deploy/runtime/defaults/Geothermal Power_Merchant Plant.txt
diff --git a/deploy/runtime/defaults/Geothermal Power_Sale Leaseback.txt b/deploy/runtime/defaults/Geothermal Power_Sale Leaseback.txt
diff --git a/deploy/runtime/defaults/Geothermal Power_Single Owner.txt b/deploy/runtime/defaults/Geothermal Power_Single Owner.txt
diff --git a/deploy/runtime/ui/Geothermal Costs.txt b/deploy/runtime/ui/Geothermal Costs.txt
diff --git a/deploy/runtime/ui/Geothermal Power Block.txt b/deploy/runtime/ui/Geothermal Power Block.txt
@@ -2522,7 +2522,7 @@ Geothermal Power Block
 0
 Default
 
-744
+750
 equations{ 'T_htf_hot_ref' } = define() {
 	return ${design_temp};
 };
@@ -2531,14 +2531,16 @@ equations{ 'CT' } = define() {
 	return ${geopowerblock.pwrb.condenser_type}+1; };
 
 equations{ 'geothermal_analysis_period' } = define() {
+
 	if ((financing() == "None") || (financing() == "LCOE Calculator"))
 	{
 		return 30;
 	}
 	else
 	{
 		return ${analysis_period};
-	}	
+	}
+
 };
 
 equations{ 'HTF' } = define() {
@@ -2547,14 +2549,14 @@ equations{ 'HTF' } = define() {
 
 equations{ 'degradation' } = define() {
 	return 0; };
-	
+/*
 equations{ 'system_use_lifetime_output' } = define() {
 	// if system_use_lifetime_output = 1, grid compute module expects analysis_period input, which is not available without a financial model
 	if ( financing() == 'None' || financing() == 'LCOE Calculator' )
 	{ return 0; } 
 	else
 	{ return 1; }
-};	
+};*/	
 645
 function update_hybrid_dispatch_inputs() {
 	bEnable = (${model_choice}==2 && ${geopowerblock.pwrb.condenser_type} == 2);

diff --git a/deploy/runtime/ui/Solar Resource Data.txt b/deploy/runtime/ui/Solar Resource Data.txt
@@ -2624,7 +2624,7 @@ equations{'ui_step_minutes'} = define() {
 	return(${step}/60);
 };
 
-32041
+32799
 on_load{'Solar Resource Data'} = define() {
 	//msgbox('on load');
 	//hide legacy data for 2020.2.29 Patch 3
@@ -3511,4 +3511,4 @@ function nsrdb_get()
 		show_log = yesno( 'Download Messages\n' + msg + '\nOpen log file?');
 		if ( show_log ) { browse( log_file ); }
 	}
-}
+}
diff --git a/test_results_win64.csv b/test_results_win64.csv
@@ -124,11 +124,11 @@ Wind Power,LCOE Calculator,818888256,NA,NA,;
 Wind Power,None,201595968,NA,NA,; 
 Fuel Cell,Commercial,1937201,7.40346,NA,; 
 Fuel Cell,Single Owner,1.98459e+06,42.8507,88.4939,; 
-Geothermal Power,Single Owner,261253360,6.57527,8.60782,; 
-Geothermal Power,Merchant Plant,261320320,7.05068,NA,; 
-Geothermal Power,Leveraged Partnership Flip,261253360,6.66369,8.60782,; 
-Geothermal Power,All Equity Partnership Flip,261320320,8.08216,8.61057,; 
-Geothermal Power,Sale Leaseback,261253360,8.35155,8.60782,; 
+Geothermal Power,Single Owner,261253360,7.61571,8.60782,; 
+Geothermal Power,Merchant Plant,261320320,8.40532,NA,; 
+Geothermal Power,Leveraged Partnership Flip,261253360,7.72677,8.60782,; 
+Geothermal Power,All Equity Partnership Flip,261320320,9.37706,8.61057,; 
+Geothermal Power,Sale Leaseback,261253360,9.34021,8.60782,; 
 Geothermal Power,LCOE Calculator,261253360,NA,NA,; 
 Geothermal Power,None,261253360,NA,NA,; 
 Solar Water Heating,Residential,2251.89,29.8746,NA,;