1525 wrong description of the incidence angle

AixLib/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Liu.mo

@@ -58,16 +58,17 @@ equation
 
   // calculation of total radiation on tilted surface according to model of Liu and Jordan
   // according to [Dissertation Nytsch-Geusen, p.98]
-  OutTotalRadTilted.I = max(0, R*InBeamRadHor + 0.5*(1 + cos(from_deg(
+  OutTotalRadTilted.H = max(0, R*InBeamRadHor + 0.5*(1 + cos(from_deg(
     Tilt)))*InDiffRadHor + GroundReflection*(InBeamRadHor + InDiffRadHor)
     *((1 - cos(from_deg(Tilt)))/2));
 
   // Setting the outputs of direct. diffuse and ground reflection radiation on tilted surface and the angle of incidence
-  OutTotalRadTilted.I_dir = R*InBeamRadHor;
-  OutTotalRadTilted.I_diff = 0.5*(1 + cos(from_deg(Tilt)))*InDiffRadHor;
-  OutTotalRadTilted.I_gr = GroundReflection*(InBeamRadHor + InDiffRadHor)*((1 - cos(from_deg(Tilt)))/2);
+  OutTotalRadTilted.HDir = R*InBeamRadHor;
+  OutTotalRadTilted.HDif = 0.5*(1 + cos(from_deg(Tilt)))*InDiffRadHor;
+  OutTotalRadTilted.HGrd = GroundReflection*(InBeamRadHor + InDiffRadHor)*((1 - cos(from_deg(Tilt)))/2);
 
-  OutTotalRadTilted.AOI = Modelica.Math.acos(cos_theta); // in rad
+  OutTotalRadTilted.incAng = Modelica.Math.acos(cos_theta);
+                                                         // in rad
 
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},

AixLib/BoundaryConditions/WeatherData/Old/WeatherTRY/RadiationOnTiltedSurface/RadOnTiltedSurf_Perez.mo

@@ -255,14 +255,15 @@ equation
     DiffRadTilt = DiffRadTiltHZ + DiffRadTiltDOM + DiffRadTiltCS
     "total diffuse irradiation on a tilted Surface";
 
-    OutTotalRadTilted.I = max(0, BeamRadTilt + DiffRadTilt + RadGroundRefl)
+  OutTotalRadTilted.H   = max(0, BeamRadTilt + DiffRadTilt + RadGroundRefl)
     "output connector for the total Irradiation on a tilted Surface";
 
   // calculation of direct. diffuse and ground reflection radiation on tilted surface
-  OutTotalRadTilted.I_dir = BeamRadTilt;
-  OutTotalRadTilted.I_diff = DiffRadTilt;
-  OutTotalRadTilted.I_gr = RadGroundRefl;
-  OutTotalRadTilted.AOI = Modelica.Math.acos(cos_theta); // in rad
+  OutTotalRadTilted.HDir = BeamRadTilt;
+  OutTotalRadTilted.HDif = DiffRadTilt;
+  OutTotalRadTilted.HGrd = RadGroundRefl;
+  OutTotalRadTilted.incAng = Modelica.Math.acos(cos_theta);
+                                                         // in rad
 
 //Output
   BeamRadTilt=BeamRadTiltOut;

AixLib/Obsolete/Year2020/ThermalZones/HighOrder/Components/Walls/Wall_ASHRAE140.mo

@@ -195,7 +195,7 @@ public
         transformation(
         extent={{-10,-10},{10,10}},
         origin={-20,88})));
-  Modelica.Blocks.Sources.RealExpression SolarRadTotal(y=SolarRadiationPort.I) if outside
+  Modelica.Blocks.Sources.RealExpression SolarRadTotal(y=SolarRadiationPort.H) if outside
     annotation (Placement(transformation(extent={{-80,86},{-60,106}})));
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor tempOutAirSensor
     "Outdoor air (dry bulb) temperature sensor"

AixLib/Obsolete/Year2021/Electrical/PVSystem.mo

@@ -1,4 +1,4 @@
-within AixLib.Obsolete.Year2021.Electrical;
+within AixLib.Obsolete.Year2021.Electrical;
 package PVSystem
 
   model PVSystem "PVSystem"
@@ -15,7 +15,7 @@ package PVSystem
       annotation (Placement(transformation(extent={{-124,-12},{-100,14}}),
           iconTransformation(extent={{-136,-24},{-100,14}})));
 
-    Modelica.Blocks.Sources.RealExpression realExpression(y=IcTotalRad.I)
+    Modelica.Blocks.Sources.RealExpression realExpression(y=IcTotalRad.H)
       annotation (Placement(transformation(extent={{-96,-10},{-76,10}})));
   equation
 

AixLib/Resources/Scripts/ConvertAixLib_from_2.1.1_to_2.1.2.mos

@@ -0,0 +1,20 @@
+clear
+
+convertClear();
+
+convertElement("AixLib.Utilities.Interfaces.SolarRad_in", "I", "H");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_in", "I_dir", "HDir");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_in", "I_diff", "HDif");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_in", "I_gr", "HGrd");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_in", "AOI", "incAng");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_out", "I", "H");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_out", "I_dir", "HDir");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_out", "I_diff", "HDif");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_out", "I_gr", "HGrd");
+convertElement("AixLib.Utilities.Interfaces.SolarRad_out", "AOI", "incAng");
+convertElement("AixLib.Utilities.Sources.PrescribedSolarRad", "solarRad_out[n]", "solRadOut[n]");
+convertElement("AixLib.Utilities.Sources.PrescribedSolarRad", "I[n]", "H[n]");
+convertElement("AixLib.Utilities.Sources.PrescribedSolarRad", "I_dir[n]", "HDir[n]");
+convertElement("AixLib.Utilities.Sources.PrescribedSolarRad", "I_diff[n]", "HDif[n]");
+convertElement("AixLib.Utilities.Sources.PrescribedSolarRad", "I_gr[n]", "HGrd[n]");
+convertElement("AixLib.Utilities.Sources.PrescribedSolarRad", "AOI[n]", "incAng[n]");

AixLib/ThermalZones/HighOrder/Components/Examples/Walls/OutsideWall.mo

@@ -42,12 +42,18 @@ equation
   connect(heatStarToComb.portConvRadComb, outerWall.thermStarComb_inside) annotation (Line(points={{-48,26},{-42,26},{-42,25},{-30,25}}, color={191,0,0}));
   connect(Toutside.port, outerWall.port_outside) annotation (Line(points={{20,22},{2,22},{2,25},{-17.7,25}}, color={191,0,0}));
   connect(WindSpeed.y, outerWall.WindSpeedPort) annotation (Line(points={{11.1,56},{-4,56},{-4,66.8},{-17.7,66.8}}, color={0,0,127}));
-  connect(varRad.solarRad_out[1], outerWall.SolarRadiationPort) annotation (Line(points={{41,80},{12,80},{12,77.25},{-16.2,77.25}}, color={255,128,0}));
-  connect(Solarradiation.y, varRad.AOI[1]) annotation (Line(points={{77.1,79},{68.55,79},{68.55,87},{59,87}}, color={0,0,127}));
-  connect(Solarradiation.y, varRad.I_gr[1]) annotation (Line(points={{77.1,79},{67.55,79},{67.55,83.1},{58.9,83.1}}, color={0,0,127}));
-  connect(Solarradiation.y, varRad.I_diff[1]) annotation (Line(points={{77.1,79},{68.55,79},{68.55,79},{59,79}}, color={0,0,127}));
-  connect(Solarradiation.y, varRad.I_dir[1]) annotation (Line(points={{77.1,79},{67.55,79},{67.55,75},{59,75}}, color={0,0,127}));
-  connect(Solarradiation.y, varRad.I[1]) annotation (Line(points={{77.1,79},{68.55,79},{68.55,71.1},{58.9,71.1}}, color={0,0,127}));
+  connect(varRad.solRadOut[1], outerWall.SolarRadiationPort) annotation (Line(
+        points={{41,80},{12,80},{12,77.25},{-16.2,77.25}}, color={255,128,0}));
+  connect(Solarradiation.y, varRad.incAng[1]) annotation (Line(points={{77.1,79},
+          {68.55,79},{68.55,87},{59,87}}, color={0,0,127}));
+  connect(Solarradiation.y, varRad.HGrd[1]) annotation (Line(points={{77.1,79},
+          {67.55,79},{67.55,83.1},{58.9,83.1}}, color={0,0,127}));
+  connect(Solarradiation.y, varRad.HDif[1]) annotation (Line(points={{77.1,79},
+          {68.55,79},{68.55,79},{59,79}}, color={0,0,127}));
+  connect(Solarradiation.y, varRad.HDir[1]) annotation (Line(points={{77.1,79},
+          {67.55,79},{67.55,75},{59,75}}, color={0,0,127}));
+  connect(Solarradiation.y, varRad.H[1]) annotation (Line(points={{77.1,79},{
+          68.55,79},{68.55,71.1},{58.9,71.1}}, color={0,0,127}));
   annotation (experiment(StopTime = 36000, Interval = 60, Algorithm = "Lsodar"),Documentation(info = "<html><h4>
   <span style=\"color:#008000\">Overview</span>
 </h4>

AixLib/ThermalZones/HighOrder/Components/Examples/WindowsDoors/WindowSimple.mo

@@ -17,22 +17,18 @@ model WindowSimple
 equation
   connect(Toutside.port, windowSimple.port_outside) annotation(Line(points = {{-42, 10}, {-34, 10}, {-34, 10.4}, {-22.2, 10.4}}, color = {191, 0, 0}));
   connect(windowSimple.port_inside, Tinside.port) annotation(Line(points = {{10.2, 10.4}, {24, 10.4}, {24, 10}, {38, 10}}, color = {191, 0, 0}));
-  connect(varRad.solarRad_out[1], windowSimple.solarRad_in) annotation(Line(points = {{-47, 50}, {-32, 50}, {-32, 21.6}, {-22.2, 21.6}}, color = {255, 128, 0}));
-  connect(SolarRadiation.y, varRad.I[1]) annotation (Line(
-      points={{-79,50},{-74,50},{-74,58.9},{-64.9,58.9}},
-      color={0,0,127}));
-  connect(SolarRadiation.y, varRad.I_dir[1]) annotation (Line(
-      points={{-79,50},{-74,50},{-74,55},{-65,55}},
-      color={0,0,127}));
-  connect(SolarRadiation.y, varRad.I_diff[1]) annotation (Line(
-      points={{-79,50},{-76,50},{-76,48},{-74,48},{-74,51},{-65,51}},
-      color={0,0,127}));
-  connect(SolarRadiation.y, varRad.I_gr[1]) annotation (Line(
-      points={{-79,50},{-74,50},{-74,46.9},{-64.9,46.9}},
-      color={0,0,127}));
-  connect(SolarRadiation.y, varRad.AOI[1]) annotation (Line(
-      points={{-79,50},{-74,50},{-74,43},{-65,43}},
-      color={0,0,127}));
+  connect(varRad.solRadOut[1], windowSimple.solarRad_in) annotation (Line(
+        points={{-47,50},{-32,50},{-32,21.6},{-22.2,21.6}}, color={255,128,0}));
+  connect(SolarRadiation.y, varRad.H[1]) annotation (Line(points={{-79,50},{-74,
+          50},{-74,58.9},{-64.9,58.9}}, color={0,0,127}));
+  connect(SolarRadiation.y, varRad.HDir[1]) annotation (Line(points={{-79,50},{
+          -74,50},{-74,55},{-65,55}}, color={0,0,127}));
+  connect(SolarRadiation.y, varRad.HDif[1]) annotation (Line(points={{-79,50},{
+          -76,50},{-76,48},{-74,48},{-74,51},{-65,51}}, color={0,0,127}));
+  connect(SolarRadiation.y, varRad.HGrd[1]) annotation (Line(points={{-79,50},{
+          -74,50},{-74,46.9},{-64.9,46.9}}, color={0,0,127}));
+  connect(SolarRadiation.y, varRad.incAng[1]) annotation (Line(points={{-79,50},
+          {-74,50},{-74,43},{-65,43}}, color={0,0,127}));
   connect(Tinside1.port, windowSimple.radPort) annotation (Line(points={{38,42},{26,42},{26,21.6},{10.2,21.6}}, color={191,0,0}));
   annotation (experiment(StopTime = 3600, Interval = 60, Algorithm = "Lsodar"),Documentation(info = "<html><h4>
   <span style=\"color:#008000\">Overview</span>

AixLib/ThermalZones/HighOrder/Components/Shadow/RadiationTransfer.mo

@@ -43,17 +43,17 @@ equation
           {-2,56}}, color={0,0,127}));
   connect(hDifTil.H, add.u2) annotation (Line(points={{-39,30},{-8,30},{-8,44},{
           -2,44}}, color={0,0,127}));
-  connect(add.y, preSolRad.I[1]) annotation (Line(points={{21,50},{30,50},{30,17.8},
-          {42.2,17.8}}, color={0,0,127}));
-  connect(hDirTil.H, preSolRad.I_dir[1]) annotation (Line(points={{-39,70},{-12,
+  connect(add.y, preSolRad.H[1]) annotation (Line(points={{21,50},{30,50},{30,
+          17.8},{42.2,17.8}}, color={0,0,127}));
+  connect(hDirTil.H, preSolRad.HDir[1]) annotation (Line(points={{-39,70},{-12,
           70},{-12,10},{42,10}}, color={0,0,127}));
-  connect(hDifTil.H, preSolRad.I_diff[1]) annotation (Line(points={{-39,30},{-20,
+  connect(hDifTil.H, preSolRad.HDif[1]) annotation (Line(points={{-39,30},{-20,
           30},{-20,2},{42,2}}, color={0,0,127}));
-  connect(const.y, preSolRad.I_gr[1]) annotation (Line(points={{-39,-10},{-30,-10},
+  connect(const.y, preSolRad.HGrd[1]) annotation (Line(points={{-39,-10},{-30,-10},
           {-30,-6.2},{42.2,-6.2}}, color={0,0,127}));
-  connect(hDirTil.inc, preSolRad.AOI[1]) annotation (Line(points={{-39,66},{-26,
-          66},{-26,-14},{42,-14}}, color={0,0,127}));
-  connect(preSolRad.solarRad_out[1], solRadOut)
+  connect(hDirTil.inc, preSolRad.incAng[1]) annotation (Line(points={{-39,66},{
+          -26,66},{-26,-14},{42,-14}}, color={0,0,127}));
+  connect(preSolRad.solRadOut[1], solRadOut)
     annotation (Line(points={{78,0},{110,0}}, color={255,128,0}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
         Text(

AixLib/ThermalZones/HighOrder/Components/Shadow/ShadowEffect.mo

@@ -51,21 +51,21 @@ equation
   else
     gShaDir = 0;
   end if;
-  solRadOut.I = solRadOut.I_dir + solRadOut.I_diff;
-  solRadOut.I_dir = solRadIn.I_dir*gShaDir;
+  solRadOut.H =solRadOut.HDir + solRadOut.HDif;
+  solRadOut.HDir = solRadIn.HDir*gShaDir;
   // Calculate the shadow factor for diffuse radiation
   if calMod == AixLib.ThermalZones.HighOrder.Components.Shadow.Types.selectorShadowEffectMode.constRedDiffAllDir then
     gShaDif = gShaDif_mean;
-    solRadOut.I_diff = solRadIn.I_diff*gShaDif*redFacDifRad;
+    solRadOut.HDif = solRadIn.HDif*gShaDif*redFacDifRad;
   elseif calMod == AixLib.ThermalZones.HighOrder.Components.Shadow.Types.selectorShadowEffectMode.constRedDiffPerpDir then
     gShaDif = atan((heiWinMax+heiWinMin)/2 / lenShie)/(Modelica.Constants.pi/2);
-    solRadOut.I_diff = solRadIn.I_diff*gShaDif*redFacDifRad;
+    solRadOut.HDif = solRadIn.HDif*gShaDif*redFacDifRad;
   else
     gShaDif = 99;  //Not used in the following equation, to avoid sigular structure
-    solRadOut.I_diff = solRadIn.I_diff*gShaDir*redFacDifRad;
+    solRadOut.HDif = solRadIn.HDif*gShaDir*redFacDifRad;
   end if;
-  solRadOut.I_gr = solRadIn.I_gr;
-  solRadOut.AOI = solRadIn.AOI;
+  solRadOut.HGrd =solRadIn.HGrd;
+  solRadOut.incAng = solRadIn.incAng;
 
   connect(shaLen.weaBus, weaBus) annotation (Line(
       points={{-40,0},{-74,0},{-74,80},{-100,80}},

AixLib/ThermalZones/HighOrder/Components/Sunblinds/Sunblind.mo

@@ -10,19 +10,19 @@ model Sunblind "Reduces beam at Imax and TOutAirLimit"
     annotation (Placement(transformation(extent={{-112,-56},{-80,-24}}), iconTransformation(extent={{-100,-40},{-80,-20}})));
 equation
    for i in 1:n loop
-     if (Rad_In[i].I>Imax and TOutAir > TOutAirLimit) then
-       Rad_Out[i].I=Rad_In[i].I*gsunblind[i];
-       Rad_Out[i].I_dir=Rad_In[i].I_dir*gsunblind[i];
-       Rad_Out[i].I_diff=Rad_In[i].I_diff*gsunblind[i];
-       Rad_Out[i].I_gr=Rad_In[i].I_gr*gsunblind[i];
-       Rad_Out[i].AOI=Rad_In[i].AOI;
+     if (Rad_In[i].H>Imax and TOutAir > TOutAirLimit) then
+      Rad_Out[i].H =Rad_In[i].H*gsunblind[i];
+      Rad_Out[i].HDir = Rad_In[i].HDir*gsunblind[i];
+      Rad_Out[i].HDif = Rad_In[i].HDif*gsunblind[i];
+      Rad_Out[i].HGrd =Rad_In[i].HGrd*gsunblind[i];
+      Rad_Out[i].incAng = Rad_In[i].incAng;
        sunblindonoff[i]=1-gsunblind[i];
      else // quantity of solar radiation remains unchanged
-       Rad_Out[i].I=Rad_In[i].I;
-       Rad_Out[i].I_dir=Rad_In[i].I_dir;
-       Rad_Out[i].I_diff=Rad_In[i].I_diff;
-       Rad_Out[i].I_gr=Rad_In[i].I_gr;
-       Rad_Out[i].AOI=Rad_In[i].AOI;
+      Rad_Out[i].H =Rad_In[i].H;
+      Rad_Out[i].HDir = Rad_In[i].HDir;
+      Rad_Out[i].HDif = Rad_In[i].HDif;
+      Rad_Out[i].HGrd =Rad_In[i].HGrd;
+      Rad_Out[i].incAng = Rad_In[i].incAng;
        sunblindonoff[i]=0;
      end if;
      end for;

AixLib/ThermalZones/HighOrder/Components/Sunblinds/SunblindTimeVariable.mo

@@ -833,11 +833,11 @@ model SunblindTimeVariable
     annotation (Placement(transformation(extent={{-22,36},{-2,56}})));
 equation
    for i in 1:n loop
-       Rad_Out[i].I=Rad_In[i].I*gsunblind[i]*combiTimeTable.y[1];
-       Rad_Out[i].I_dir=Rad_In[i].I_dir*gsunblind[i]*combiTimeTable.y[1];
-       Rad_Out[i].I_diff=Rad_In[i].I_diff*gsunblind[i]*combiTimeTable.y[1];
-       Rad_Out[i].I_gr=Rad_In[i].I_gr*gsunblind[i]*combiTimeTable.y[1];
-       Rad_Out[i].AOI=Rad_In[i].AOI;
+    Rad_Out[i].H   =Rad_In[i].H*gsunblind[i]*combiTimeTable.y[1];
+    Rad_Out[i].HDir = Rad_In[i].HDir*gsunblind[i]*combiTimeTable.y[1];
+    Rad_Out[i].HDif = Rad_In[i].HDif*gsunblind[i]*combiTimeTable.y[1];
+    Rad_Out[i].HGrd   =Rad_In[i].HGrd*gsunblind[i]*combiTimeTable.y[1];
+    Rad_Out[i].incAng = Rad_In[i].incAng;
        sunblindonoff[i]=1-gsunblind[i]*combiTimeTable.y[1];
      end for;
     annotation (Placement(transformation(extent={{-112,-56},{-80,-24}}), iconTransformation(extent={{-100,-40},{-80,-20}})),

AixLib/ThermalZones/HighOrder/Components/Sunblinds/Sunblind_Task44.mo

@@ -833,11 +833,11 @@ extends AixLib.ThermalZones.HighOrder.Components.Sunblinds.BaseClasses.PartialSu
     annotation (Placement(transformation(extent={{-22,36},{-2,56}})));
 equation
    for i in 1:n loop
-       Rad_Out[i].I=Rad_In[i].I*gsunblind[i]*combiTimeTable.y[1];
-       Rad_Out[i].I_dir=Rad_In[i].I_dir*gsunblind[i]*combiTimeTable.y[1];
-       Rad_Out[i].I_diff=Rad_In[i].I_diff*gsunblind[i]*combiTimeTable.y[1];
-       Rad_Out[i].I_gr=Rad_In[i].I_gr*gsunblind[i]*combiTimeTable.y[1];
-       Rad_Out[i].AOI=Rad_In[i].AOI;
+    Rad_Out[i].H   =Rad_In[i].H*gsunblind[i]*combiTimeTable.y[1];
+    Rad_Out[i].HDir = Rad_In[i].HDir*gsunblind[i]*combiTimeTable.y[1];
+    Rad_Out[i].HDif = Rad_In[i].HDif*gsunblind[i]*combiTimeTable.y[1];
+    Rad_Out[i].HGrd   =Rad_In[i].HGrd*gsunblind[i]*combiTimeTable.y[1];
+    Rad_Out[i].incAng = Rad_In[i].incAng;
        sunblindonoff[i]=1-gsunblind[i]*combiTimeTable.y[1];
      end for;
     annotation (Placement(transformation(extent={{-112,-56},{-80,-24}}), iconTransformation(extent={{-100,-40},{-80,-20}})),

AixLib/ThermalZones/HighOrder/Components/WindowsDoors/BaseClasses/CorrectionSolarGain/CorGSimple.mo

@@ -4,7 +4,7 @@ model CorGSimple "Simple correction with factor g for shortwave solar transmitta
 
 equation
     for i in 1:n loop
-      solarRadWinTrans[i] = SR_input[i].I*g;
+      solarRadWinTrans[i] =SR_input[i].H *g;
     end for;
 
   annotation (Documentation(info="<html><h4>

AixLib/ThermalZones/HighOrder/Components/WindowsDoors/BaseClasses/CorrectionSolarGain/CorG_ASHRAE140.mo

@@ -45,8 +45,10 @@ model CorG_ASHRAE140
 equation
   for i in 1:n loop
     // Snell's Law
-    AOI[i] = SR_input[i].AOI; // in rad
-    AOI_help[i] = to_deg(SR_input[i].AOI); // angle of solar incidence in deg
+    AOI[i] =SR_input[i].incAng;
+                              // in rad
+    AOI_help[i] =to_deg(SR_input[i].incAng);
+                                           // angle of solar incidence in deg
     y=AOI_help[i];
 
     AOR[i] = asin(sin(AOI[i])/INDRG); //  Angle of refraction in deg
@@ -73,7 +75,8 @@ equation
     SHGC[i]= T[i]+S[i];
 
     //Solar radiation transmitted through window
-    solarRadWinTrans[i]= (SR_input[i].I_diff + SR_input[i].I_dir + SR_input[i].I_gr) * SHGC[i];
+    solarRadWinTrans[i]=(SR_input[i].HDif + SR_input[i].HDir + SR_input[i].HGrd)
+      *SHGC[i];
 
   end for;
 

AixLib/ThermalZones/HighOrder/Components/WindowsDoors/BaseClasses/CorrectionSolarGain/CorG_VDI6007.mo

@@ -51,7 +51,7 @@ Real[n] Qsek2_dir;
 Real[n] CorG_dir;  // transmission coefficient correction factor for direct irradiations
 equation
   for i in 1:n loop
-    theta[i] = SR_input[i].AOI;
+    theta[i] =SR_input[i].incAng;
     Ta_dir[i]= (((((A6*to_deg(theta[i])+A5)*to_deg(theta[i])+A4)*to_deg(theta[i])+A3)*to_deg(theta[i])+A2)*to_deg(theta[i])+A1)*to_deg(theta[i])+A0;
     Tai_dir[i]= 0.907^(1/sqrt(1-(sin(theta[i])/1.515)^2));
     Ta1_dir[i]= Ta_dir[i]*Tai_dir[i];
@@ -67,7 +67,8 @@ equation
     CorG_dir[i]= (Ta2_dir[i]+Qsek2_dir[i])/g_dir0;
 
     //calculating the input thermal energy due to solar radiation
-    solarRadWinTrans[i] = ((SR_input[i].I_dir*CorG_dir[i])+(SR_input[i].I_diff*CorG_diff)+(SR_input[i].I_gr*CorG_gr));
+    solarRadWinTrans[i] =((SR_input[i].HDir*CorG_dir[i]) + (SR_input[i].HDif*
+      CorG_diff) + (SR_input[i].HGrd*CorG_gr));
   end for;
 
 annotation (