Merge pull request #1233 from NREL/noct-taualpha

Noct taualpha
NREL · Nov 4, 2024 · 78a58ba · 78a58ba
2 parents 184e156 + 4ccc00a
commit 78a58ba
Show file tree

Hide file tree

Showing 20 changed files with 429 additions and 105,308 deletions.
diff --git a/shared/lib_cec6par.cpp b/shared/lib_cec6par.cpp
@@ -265,11 +265,10 @@ bool noct_celltemp_t::operator() ( pvinput_t &input, pvmodule_t &module, double
 		tau_al = std::abs(TauAlpha);  // Sev: What's the point of recalculating this??
 
 		W_spd = input.Wspd * ffv_wind; //added 1/11/12 to account for FFV_wind correction factor internally
-		if (W_spd < 0.001) W_spd = 0.001;		
-		if (G_total > 0) tau_al *= Geff_total/G_total;		
+		if (W_spd < 0.001) W_spd = 0.001;				
 
 		double Tnoct_adj = Tnoct + standoff_tnoct_adj; // added 1/11/12 for adjustment to NOCT as in the CECPV calculator based on standoff height, used in eqn below.
-		Tcell = (input.Tdry+273.15) + (G_total/I_noct * (Tnoct_adj - Tamb_noct) * (1.0-eff_ref/tau_al))*9.5/(5.7 + 3.8*W_spd);
+		Tcell = (input.Tdry+273.15) + (Geff_total/I_noct * (Tnoct_adj - Tamb_noct) * (1.0-eff_ref/tau_al))*9.5/(5.7 + 3.8*W_spd);
 		Tcell = Tcell-273.15;
 	}
 

diff --git a/...json/TechnologyModels/pvwattsv8/dc_ac_ratio_0.02_PVWatts_Single_Owner_cmod_pvwattsv8.json b/...json/TechnologyModels/pvwattsv8/dc_ac_ratio_0.02_PVWatts_Single_Owner_cmod_pvwattsv8.json
@@ -1,5 +1,5 @@
 {
-	"solar_resource_file" : "C:/Projects/Github/NREL/working/SAM/deploy/solar_resource/phoenix_az_33.450495_-111.983688_psmv3_60_tmy.csv",
+	"solar_resource_file" : "C:/Users/mprillim/sam_dev/SAM/deploy/solar_resource/phoenix_az_33.450495_-111.983688_psmv3_60_tmy.csv",
 	"albedo" : [ 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001, 0.20000000000000001 ],
     "use_wf_albedo" : 1,
     "system_use_lifetime_output" : 0,
@@ -31,13 +31,7 @@
     "adjust_en_timeindex" : 0,
     "adjust_en_periods" : 0,
 	"adjust_timeindex" : [ 0 ],
-    "adjust_periods": [
-        [
-            0.0,
-            0.0,
-            0.0
-        ]
-    ],
+	"adjust_periods" : [ [ 0,  0,  0 ] ],
 	"number_compute_modules" : 0,
 	"number_metrics" : 0
 }