Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Noct taualpha #1233

Merged
merged 11 commits into from
Nov 4, 2024
Merged

Noct taualpha #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
733cbff
Update NOCT equation to evaluate test changes
mjprilliman Oct 22, 2024
810ffd6
Merge branch 'develop' into noct-taualpha
mjprilliman Oct 28, 2024
df3df36
Updated tests (need to run lk scripts for defaults, json tests)
mjprilliman Oct 29, 2024
551b93b
Update battery tests
mjprilliman Oct 29, 2024
55c6512
Update json tests
mjprilliman Oct 29, 2024
59101ca
Reset lk script to generate jsons
mjprilliman Oct 29, 2024
588fd81
Remove commented code
mjprilliman Oct 30, 2024
3a0e8e3
Merge branch 'develop' into noct-taualpha
mjprilliman Oct 31, 2024
25065d0
Remove solesca test, upgrade save as json sam file, update json pvwatts
mjprilliman Oct 31, 2024
9a1d72d
Update battery test tolerances with changing answers on mac
mjprilliman Nov 4, 2024
4ccc00a
Update test tolerance
mjprilliman Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions shared/lib_cec6par.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
10 changes: 2 additions & 8 deletions ...json/TechnologyModels/pvwattsv8/dc_ac_ratio_0.02_PVWatts_Single_Owner_cmod_pvwattsv8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this line was specific to Steve's computer before, and is now specific to yours, but flagging in case it should be set to a common file... but I don't think there's an easy way to use environment variables in JSON, is there @sjanzou ? I don't require this to be fixed before merging though.

Copy link
Collaborator

@sjanzou sjanzou Nov 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this line was specific to Steve's computer before, and is now specific to yours, but flagging in case it should be set to a common file... but I don't think there's an easy way to use environment variables in JSON, is there @sjanzou ? I don't require this to be fixed before merging though.

@janinefreeman , thanks for flagging this - the JSON generated always has the specific test machine path... However, in the test body, the weather file is updated to use
image

the "Test" function, where the weather file is set based on the SSCDIR/test/input_cases/general_data folder as
image

"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,
Expand Down Expand Up @@ -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
}
Loading