mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

76_SolarForecast: version 1.47.2, add weatherid property

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29741 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2025-03-09 19:42:32 +00:00
parent 4c4fe8fdab
commit ddce47b1b6
2 changed files with 76 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it # Do not insert empty lines here, update check depends on it
- change: 76_SolarForecast: version 1.47.2, add weatherid property
- bugfix: 98_vitoconnect: Fix return value when using SVN or Roger - bugfix: 98_vitoconnect: Fix return value when using SVN or Roger
- feature: 76_SolarForecast: version 1.47.1 - feature: 76_SolarForecast: version 1.47.1
- bugfix: 98_vitoconnect: Adapt schedule data before sending - bugfix: 98_vitoconnect: Adapt schedule data before sending

46
fhem/FHEM/76_SolarForecast.pm
View File

@@ -160,6 +160,8 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"1.47.2" => "09.03.2025 __getDWDSolarData: change calc when af == 0, aiAddInstance: add weatherid property ".
"overwrite wcc = 0 if wid = 0 -> give wid priority over wcc ",
"1.47.1" => "07.03.2025 __substituteIcon: consider Tooltip content if ctrlBatSocManagementXX is set ", "1.47.1" => "07.03.2025 __substituteIcon: consider Tooltip content if ctrlBatSocManagementXX is set ",
"1.47.0" => "05.03.2025 aiInit: change AI init sequence, use Random Forest with Ensemble algorithm, use Scalar::Util ". "1.47.0" => "05.03.2025 aiInit: change AI init sequence, use Random Forest with Ensemble algorithm, use Scalar::Util ".
"_beamGraphic.*: change decimal places für battery SoC, set aiDecTree: change addInstances to addInstAndTrain ". "_beamGraphic.*: change decimal places für battery SoC, set aiDecTree: change addInstances to addInstAndTrain ".
@@ -1049,6 +1051,9 @@ my %htitles = (
DE => qq{Die Wetterdaten sind veraltet.\nPr&uuml;fen sie die Anlage mit 'set <NAME> plantConfiguration check'.} }, DE => qq{Die Wetterdaten sind veraltet.\nPr&uuml;fen sie die Anlage mit 'set <NAME> plantConfiguration check'.} },
); );
# Wetterintertretation
# https://www.dwd.de/DE/forschung/wettervorhersage/num_modellierung/01_num_vorhersagemodelle/01c_wetterinterpretation/wetter_interpretation.pdf?__blob=publicationFile&v=7
#################################################
my %weather_ids = ( my %weather_ids = (
# s => 0 , 0 - 3 DWD -> kein signifikantes Wetter # s => 0 , 0 - 3 DWD -> kein signifikantes Wetter
# s => 1 , 45 - 99 DWD -> signifikantes Wetter # s => 1 , 45 - 99 DWD -> signifikantes Wetter
@@ -3614,7 +3619,7 @@ sub __getDWDSolarData {
my ($af, $pv, $sdr, $wcc); my ($af, $pv, $sdr, $wcc);
if ($cafd =~ /track/xs) { # Flächenfaktor Sonnenstand geführt if ($cafd eq 'trackFlex') { # Flächenfaktor Sonnenstand geführt
($af, $sdr, $wcc) = ___areaFactorTrack ( { name => $name, ($af, $sdr, $wcc) = ___areaFactorTrack ( { name => $name,
day => $day, day => $day,
dday => $dday, dday => $dday,
@@ -3634,24 +3639,27 @@ sub __getDWDSolarData {
$af = 1.00 if(!isNumeric($af)); $af = 1.00 if(!isNumeric($af));
$sdr = 0.75 if(!isNumeric($sdr)); $sdr = 0.75 if(!isNumeric($sdr));
if ($cafd eq 'trackFlex' && $wcc >= 80) { # Direktstrahlung + Diffusstrahlung if ($wcc >= 80 || !$af) { # V 1.47.2 Anpassung Direktstrahlung + Diffusstrahlung
my $dirrad = $rad * $sdr; # Anteil Direktstrahlung an Globalstrahlung my $dirrad = $rad * $sdr; # Anteil Direktstrahlung an Globalstrahlung
my $difrad = $rad - $dirrad; # Anteil Diffusstrahlung an Globalstrahlung my $difrad = $rad - $dirrad; # Anteil Diffusstrahlung an Globalstrahlung
$pv = sprintf "%.1f", ((($dirrad * $af) + $difrad) * KJ2KWH * $peak * PRDEF); # Rad wird in kW/m2 erwartet $pv = (($dirrad * $af) + $difrad) * KJ2KWH * $peak * PRDEF; # Rad wird in kW/m2 erwartet
} }
else { # Flächenfaktor auf volle Rad1h anwenden else { # Flächenfaktor auf volle Rad1h anwenden
$pv = sprintf "%.1f", ($rad * $af * KJ2KWH * $peak * PRDEF); $pv = $rad * $af * KJ2KWH * $peak * PRDEF;
} }
} }
else { # Flächenfaktor Fix else { # Flächenfaktor Fix
$af = ___areaFactorFix ($ti, $az); # Flächenfaktor: https://wiki.fhem.de/wiki/Ertragsprognose_PV $af = ___areaFactorFix ($ti, $az); # Flächenfaktor: https://wiki.fhem.de/wiki/Ertragsprognose_PV
$pv = sprintf "%.1f", ($rad * $af * KJ2KWH * $peak * PRDEF); # Rad wird in kW/m2 erwartet $pv = $rad * $af * KJ2KWH * $peak * PRDEF; # Rad wird in kW/m2 erwartet
} }
$af = sprintf "%.2f", $af;
$pv = sprintf "%.1f", $pv;
$data{$name}{solcastapi}{$string}{$dateTime}{pv_estimate50} = $pv; # Startzeit wird verwendet, nicht laufende Stunde $data{$name}{solcastapi}{$string}{$dateTime}{pv_estimate50} = $pv; # Startzeit wird verwendet, nicht laufende Stunde
debugLog ($paref, "apiProcess", "DWD API - PV estimate String >$string< => $dateTime, $pv Wh, Afactor: $af ($cafd)"); debugLog ($paref, "apiProcess", "DWD API - PV estimate String >$string< => $dateTime, $pv Wh, AF: $af, dirfac: $sdr");
} }
} }
@@ -3682,7 +3690,7 @@ sub ___areaFactorFix {
$af = $af * $y - 0.00785953342909065 + 1.1197340251684106E-6 * $x2 - 8.99915952119488E-11 * $x4; $af = $af * $y - 0.00785953342909065 + 1.1197340251684106E-6 * $x2 - 8.99915952119488E-11 * $x4;
$af = $af * $y - 0.8432627150525525 + 0.00010392051567819936 * $x2 - 3.979206287671085E-9 * $x4; $af = $af * $y - 0.8432627150525525 + 0.00010392051567819936 * $x2 - 3.979206287671085E-9 * $x4;
$af = $af * $y + 99.49627151067648 - 0.006340200119196879 * $x2 + 2.052575360270524E-7 * $x4; $af = $af * $y + 99.49627151067648 - 0.006340200119196879 * $x2 + 2.052575360270524E-7 * $x4;
$af = sprintf "%.2f", ($af / 100); # Prozenz in Faktor $af = $af / 100; # Prozenz in Faktor
return $af; return $af;
} }
@@ -3752,7 +3760,6 @@ sub ___areaFactorTrack {
my $daf = $nx * $sx + $ny * $sy + $nz * $sz; my $daf = $nx * $sx + $ny * $sy + $nz * $sz;
$daf = max ($daf, 0); $daf = max ($daf, 0);
$daf += 1 if($daf); $daf += 1 if($daf);
$daf = sprintf "%.2f", $daf;
## Schätzung Anteil Direktstrahlung an Globalstrahlung ## Schätzung Anteil Direktstrahlung an Globalstrahlung
######################################################## ########################################################
@@ -8541,6 +8548,8 @@ sub _transferWeatherValues {
my $temp = $data{$name}{weatherdata}{"fc${fd}_${fh}"}{merge}{ttt}; # Außentemperatur my $temp = $data{$name}{weatherdata}{"fc${fd}_${fh}"}{merge}{ttt}; # Außentemperatur
my $don = $data{$name}{weatherdata}{"fc${fd}_${fh}"}{merge}{don}; # Tag/Nacht-Grenze my $don = $data{$name}{weatherdata}{"fc${fd}_${fh}"}{merge}{don}; # Tag/Nacht-Grenze
$wcc = 0 if(!$wid || $wid == 100); # V 1.47.2
my $nhtstr = "NextHour".sprintf "%02d", $num; my $nhtstr = "NextHour".sprintf "%02d", $num;
$data{$name}{nexthours}{$nhtstr}{weatherid} = $wid; $data{$name}{nexthours}{$nhtstr}{weatherid} = $wid;
$data{$name}{nexthours}{$nhtstr}{wcc} = $wcc; $data{$name}{nexthours}{$nhtstr}{wcc} = $wcc;
@@ -16447,7 +16456,7 @@ sub __substituteIcon {
BICONDEF; # nur Farbe angegeben BICONDEF; # nur Farbe angegeben
$color //= BICCOLNRCDDEF; $color //= BICCOLNRCDDEF;
$pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1\n".($cgbt ? "\n".$htitles{bncharel}{$lang} : ''); $pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1".($cgbt ? "\n".$htitles{bncharel}{$lang} : '');
} }
} }
@@ -17165,6 +17174,7 @@ sub aiAddInstance {
my $temp = AiRawdataVal ($hash, $idx, 'temp', undef); my $temp = AiRawdataVal ($hash, $idx, 'temp', undef);
my $wcc = AiRawdataVal ($hash, $idx, 'wcc', undef); my $wcc = AiRawdataVal ($hash, $idx, 'wcc', undef);
my $wid = AiRawdataVal ($name, $idx, 'weatherid', undef);
my $rr1c = AiRawdataVal ($hash, $idx, 'rr1c', undef); my $rr1c = AiRawdataVal ($hash, $idx, 'rr1c', undef);
my $sunalt = AiRawdataVal ($hash, $idx, 'sunalt', 0); my $sunalt = AiRawdataVal ($hash, $idx, 'sunalt', 0);
@@ -17172,7 +17182,7 @@ sub aiAddInstance {
my $cbin = cloud2bin ($wcc) if(defined $wcc); my $cbin = cloud2bin ($wcc) if(defined $wcc);
my $sabin = sunalt2bin ($sunalt); my $sabin = sunalt2bin ($sunalt);
push @pvhdata, { rad1h => $rad1h, temp => $tbin, wcc => $cbin, rr1c => $rr1c, sunalt => $sunalt, hod => $hod, pvrl => $pvrl }; push @pvhdata, { rad1h => $rad1h, temp => $tbin, wcc => $cbin, wid => $wid, rr1c => $rr1c, sunalt => $sunalt, hod => $hod, pvrl => $pvrl };
} }
if (!scalar @pvhdata) { if (!scalar @pvhdata) {
@@ -17210,6 +17220,7 @@ sub aiAddInstance {
eval { $dtree->add_instance (attributes => { rad1h => $instance->{rad1h}, eval { $dtree->add_instance (attributes => { rad1h => $instance->{rad1h},
temp => $instance->{temp}, temp => $instance->{temp},
wcc => $instance->{wcc}, wcc => $instance->{wcc},
wid => $instance->{wid},
rr1c => $instance->{rr1c}, rr1c => $instance->{rr1c},
sunalt => $instance->{sunalt}, sunalt => $instance->{sunalt},
hod => $instance->{hod} hod => $instance->{hod}
@@ -17234,6 +17245,7 @@ sub aiAddInstance {
"sunalt: $instance->{sunalt}, ". "sunalt: $instance->{sunalt}, ".
"rad1h: $instance->{rad1h}, pvrl: instance->{pvrl}, ". "rad1h: $instance->{rad1h}, pvrl: instance->{pvrl}, ".
"wcc: ".(defined $instance->{wcc} ? $instance->{wcc} : '-').", ". "wcc: ".(defined $instance->{wcc} ? $instance->{wcc} : '-').", ".
"wid: ".(defined $instance->{wid} ? $instance->{wid} : '-').", ".
"rr1c: ".(defined $instance->{rr1c} ? $instance->{rr1c} : '-').", ". "rr1c: ".(defined $instance->{rr1c} ? $instance->{rr1c} : '-').", ".
"temp: ".(defined $instance->{temp} ? $instance->{temp} : '-'), "temp: ".(defined $instance->{temp} ? $instance->{temp} : '-'),
4); 4);
@@ -17442,6 +17454,7 @@ sub aiGetResult {
debugLog ($paref, 'aiData', "Start AI result check for hod: $hod"); debugLog ($paref, 'aiData', "Start AI result check for hod: $hod");
my $wcc = NexthoursVal ($hash, $nhtstr, 'wcc', 0); my $wcc = NexthoursVal ($hash, $nhtstr, 'wcc', 0);
my $wid = NexthoursVal ($name, $nhtstr, 'weatherid', 0);
my $rr1c = NexthoursVal ($hash, $nhtstr, 'rr1c', 0); my $rr1c = NexthoursVal ($hash, $nhtstr, 'rr1c', 0);
my $temp = NexthoursVal ($hash, $nhtstr, 'temp', 20); my $temp = NexthoursVal ($hash, $nhtstr, 'temp', 20);
my $sunalt = NexthoursVal ($hash, $nhtstr, 'sunalt', 0); my $sunalt = NexthoursVal ($hash, $nhtstr, 'sunalt', 0);
@@ -17455,6 +17468,7 @@ sub aiGetResult {
rad1h => $rad1h, rad1h => $rad1h,
temp => $tbin, temp => $tbin,
wcc => $cbin, wcc => $cbin,
wid => $wid,
rr1c => $rr1c, rr1c => $rr1c,
sunalt => $sabin, sunalt => $sabin,
sunaz => $sunaz, sunaz => $sunaz,
@@ -17507,6 +17521,7 @@ sub aiGetResult {
# rad1h => $rad1h, # rad1h => $rad1h,
# temp => $tbin, # temp => $tbin,
# wcc => $cbin, # wcc => $cbin,
# wid => $wid,
# rr1c => $rr1c, # rr1c => $rr1c,
# sunalt => $sabin, # sunalt => $sabin,
# sunaz => $sunaz, # sunaz => $sunaz,
@@ -17544,6 +17559,7 @@ sub _aiGetSpread {
my $rad1h = $paref->{rad1h}; my $rad1h = $paref->{rad1h};
my $temp = $paref->{temp}; my $temp = $paref->{temp};
my $wcc = $paref->{wcc}; my $wcc = $paref->{wcc};
my $wid = $paref->{wid};
my $rr1c = $paref->{rr1c}; my $rr1c = $paref->{rr1c};
my $sunalt = $paref->{sunalt}; my $sunalt = $paref->{sunalt};
my $sunaz = $paref->{sunaz}; my $sunaz = $paref->{sunaz};
@@ -17558,6 +17574,7 @@ sub _aiGetSpread {
my $gra = { my $gra = {
temp => $temp, temp => $temp,
wcc => $wcc, wcc => $wcc,
wid => $wid,
rr1c => $rr1c, rr1c => $rr1c,
sunalt => $sunalt, sunalt => $sunalt,
sunaz => $sunaz, sunaz => $sunaz,
@@ -17669,6 +17686,10 @@ sub aiAddRawData {
last if(int $pvd > int $day); last if(int $pvd > int $day);
if (!$ood) { # V 1.47.2 -> für manuelles Auffüllen mit Setter
$dayname = HistoryVal ($hash, $pvd, 99, 'dayname', undef);
}
for my $hod (sort keys %{$data{$name}{pvhist}{$pvd}}) { for my $hod (sort keys %{$data{$name}{pvhist}{$pvd}}) {
next if(!$hod || $hod eq '99' || ($rho && $hod ne $rho)); next if(!$hod || $hod eq '99' || ($rho && $hod ne $rho));
@@ -17679,6 +17700,7 @@ sub aiAddRawData {
my $sunaz = HistoryVal ($hash, $pvd, $hod, 'sunaz', 0); my $sunaz = HistoryVal ($hash, $pvd, $hod, 'sunaz', 0);
my $con = HistoryVal ($hash, $pvd, $hod, 'con', undef); my $con = HistoryVal ($hash, $pvd, $hod, 'con', undef);
my $wcc = HistoryVal ($hash, $pvd, $hod, 'wcc', undef); my $wcc = HistoryVal ($hash, $pvd, $hod, 'wcc', undef);
my $wid = HistoryVal ($hash, $pvd, $hod, 'weatherid', undef); # Wetter ID
my $rr1c = HistoryVal ($hash, $pvd, $hod, 'rr1c', undef); my $rr1c = HistoryVal ($hash, $pvd, $hod, 'rr1c', undef);
my $rad1h = HistoryVal ($hash, $pvd, $hod, 'rad1h', undef); my $rad1h = HistoryVal ($hash, $pvd, $hod, 'rad1h', undef);
@@ -17689,6 +17711,7 @@ sub aiAddRawData {
$data{$name}{aidectree}{airaw}{$ridx}{temp} = sprintf "%.0f", $temp if(defined $temp); $data{$name}{aidectree}{airaw}{$ridx}{temp} = sprintf "%.0f", $temp if(defined $temp);
$data{$name}{aidectree}{airaw}{$ridx}{con} = $con if(defined $con && $con >= 0); $data{$name}{aidectree}{airaw}{$ridx}{con} = $con if(defined $con && $con >= 0);
$data{$name}{aidectree}{airaw}{$ridx}{wcc} = $wcc if(defined $wcc); $data{$name}{aidectree}{airaw}{$ridx}{wcc} = $wcc if(defined $wcc);
$data{$name}{aidectree}{airaw}{$ridx}{weatherid} = $wid >= 100 ? $wid - 100 : $wid if(defined $wid);
$data{$name}{aidectree}{airaw}{$ridx}{rr1c} = $rr1c if(defined $rr1c); $data{$name}{aidectree}{airaw}{$ridx}{rr1c} = $rr1c if(defined $rr1c);
$data{$name}{aidectree}{airaw}{$ridx}{rad1h} = $rad1h if(defined $rad1h && $rad1h > 0); $data{$name}{aidectree}{airaw}{$ridx}{rad1h} = $rad1h if(defined $rad1h && $rad1h > 0);
@@ -18067,6 +18090,7 @@ sub listDataPool {
my $sunaz = AiRawdataVal ($name, $idx, 'sunaz', '-'); my $sunaz = AiRawdataVal ($name, $idx, 'sunaz', '-');
my $rad1h = AiRawdataVal ($name, $idx, 'rad1h', '-'); my $rad1h = AiRawdataVal ($name, $idx, 'rad1h', '-');
my $wcc = AiRawdataVal ($name, $idx, 'wcc', '-'); my $wcc = AiRawdataVal ($name, $idx, 'wcc', '-');
my $wid = AiRawdataVal ($name, $idx, 'weatherid', '-');
my $rr1c = AiRawdataVal ($name, $idx, 'rr1c', '-'); my $rr1c = AiRawdataVal ($name, $idx, 'rr1c', '-');
my $pvrl = AiRawdataVal ($name, $idx, 'pvrl', '-'); my $pvrl = AiRawdataVal ($name, $idx, 'pvrl', '-');
my $temp = AiRawdataVal ($name, $idx, 'temp', '-'); my $temp = AiRawdataVal ($name, $idx, 'temp', '-');
@@ -18074,7 +18098,7 @@ sub listDataPool {
my $con = AiRawdataVal ($name, $idx, 'con', '-'); my $con = AiRawdataVal ($name, $idx, 'con', '-');
$sq .= "\n"; $sq .= "\n";
$sq .= "$idx => hod: $hod, nod: $nod, sunaz: $sunaz, sunalt: $sunalt, rad1h: $rad1h, wcc: $wcc, rr1c: $rr1c, pvrl: $pvrl, con: $con, temp: $temp"; $sq .= "$idx => hod: $hod, nod: $nod, sunaz: $sunaz, sunalt: $sunalt, rad1h: $rad1h, wcc: $wcc, wid: $wid, rr1c: $rr1c, pvrl: $pvrl, con: $con, temp: $temp";
} }
} }