Skip to content

Commit e5d311f

Browse files
committed
update rad
1 parent 06ee3ea commit e5d311f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

agrolib/interpolation/spatialControl.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ float findThreshold(meteoVariable myVar, Crit3DMeteoSettings* meteoSettings,
6969
threshold += distWeight + stdDev * (nrStdDev + 1.f);
7070
}
7171
else if (myVar == atmTransmissivity)
72-
threshold = MAXVALUE(stdDev * nrStdDev, 0.25f);
72+
{
73+
distWeight = minDistance / 5000.f;
74+
threshold = std::max(stdDev * std::max(nrStdDev, distWeight), 0.3f);
75+
}
7376
else
7477
threshold = stdDev * nrStdDev;
7578

agrolib/solarRadiation/solarRadiation.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,8 @@ bool computeRadiationRsun(Crit3DRadiationSettings* radSettings, float temperatur
735735
clearSkyTransmissivity = radSettings->getClearSky();
736736

737737
// noon
738-
Crit3DTime noonTime = myTime;
738+
Crit3DTime noonTime;
739+
noonTime.date = myTime.date;
739740
noonTime.time = 12*3600;
740741
if (radSettings->gisSettings->isUTC)
741742
{

0 commit comments

Comments
 (0)