@@ -1507,7 +1507,7 @@ double AtmProfile::poli2(double ha,
1507
1507
b = b / (x2 - x1);
1508
1508
a = y1 - c * x1 * x1 - b * x1;
1509
1509
1510
- return a + b * ha + c * pow (ha, 2 );
1510
+ return a + b * ha + c * pow (ha, ( int ) 2 );
1511
1511
}
1512
1512
1513
1513
size_t AtmProfile::mkAtmProfile ()
@@ -1670,7 +1670,7 @@ size_t AtmProfile::mkAtmProfile()
1670
1670
1671
1671
// std::cout << "layer: " << i << " " << v_layerPressure[i - 1] - dp * pow(dp1, i - 1) << " " << prLimit << std::endl;
1672
1672
1673
- if ( (v_layerPressure[i - 1 ] - dp * pow (dp1, i - 1 ) <= prLimit ) ) { // && (v_layerTemperature[i - 1] <= tx[typeAtm_ - 1][0]) ) { // &&(fabs(prLimit-v_layerPressure[i - 1]-dp*pow(dp1,i-1))>=20.0) ) {
1673
+ if ( (v_layerPressure[i - 1 ] - dp * pow (dp1, ( int )( i - 1 ) ) <= prLimit ) ) { // && (v_layerTemperature[i - 1] <= tx[typeAtm_ - 1][0]) ) { // &&(fabs(prLimit-v_layerPressure[i - 1]-dp*pow(dp1,i-1))>=20.0) ) {
1674
1674
1675
1675
if (control) {
1676
1676
@@ -1695,15 +1695,15 @@ size_t AtmProfile::mkAtmProfile()
1695
1695
1696
1696
for (k = 0 ; k < 20 ; k++) {
1697
1697
1698
- if ( (fabs (v_layerPressure[i - 1 ] - dp * pow (dp1, i - 1 ) > 1.05 *px[typeAtm_ - 1 ][k])) &&
1699
- (fabs (v_layerPressure[i - 1 ] - dp * pow (dp1, i - 1 ) - px[typeAtm_ - 1 ][k])) <= minmin ) {
1698
+ if ( (fabs (v_layerPressure[i - 1 ] - dp * pow (dp1, ( int )( i - 1 ) ) > 1.05 *px[typeAtm_ - 1 ][k])) &&
1699
+ (fabs (v_layerPressure[i - 1 ] - dp * pow (dp1, ( int )( i - 1 ) ) - px[typeAtm_ - 1 ][k])) <= minmin ) {
1700
1700
1701
1701
j = k;
1702
1702
1703
1703
/* std::cout << "P=" << v_layerPressure[i - 1] - dp * pow(dp1, i - 1)
1704
1704
<< " prLimit=" << prLimit << " px[" << typeAtm_ - 1 << "][" << k << "]="
1705
1705
<< px[typeAtm_ - 1][k] << std::endl; */
1706
- minmin = fabs (v_layerPressure[i - 1 ] - dp * pow (dp1, i - 1 ) - px[typeAtm_ - 1 ][k]);
1706
+ minmin = fabs (v_layerPressure[i - 1 ] - dp * pow (dp1, int ( i - 1 ) ) - px[typeAtm_ - 1 ][k]);
1707
1707
/* std::cout << " minmin=" << minmin << std::endl; */
1708
1708
1709
1709
}
@@ -1775,20 +1775,20 @@ size_t AtmProfile::mkAtmProfile()
1775
1775
// std::cout << "i,j,v_layerPressure.size()-1=" << i << "," << j << "," << v_layerPressure.size() - 1 << std::endl;
1776
1776
1777
1777
if (i > v_layerPressure.size () - 1 ) {
1778
- v_layerPressure.push_back (v_layerPressure[i - 1 ] - dp * pow (dp1, i - 1 ));
1778
+ v_layerPressure.push_back (v_layerPressure[i - 1 ] - dp * pow (dp1, ( int )( i - 1 ) ));
1779
1779
1780
1780
www = v_layerWaterVapor[i - 1 ] / 1000.0 ; // in kg/m**3
1781
- g = g0 * pow (1 . + ((v_layerThickness[i - 1 ] / 1000.0 )) / rt, - 2 ); // gravity corrected for the height
1781
+ g = g0 * pow (1 . + ((v_layerThickness[i - 1 ] / 1000.0 )) / rt, ( int )(- 2 ) ); // gravity corrected for the height
1782
1782
dh = 288.6948 * v_layerTemperature[i - 1 ] * (1.0 + 0.61 * www / 1000.0 )
1783
1783
* log (v_layerPressure[i - 1 ] / v_layerPressure[i]) / g;
1784
1784
v_layerThickness.push_back (v_layerThickness[i - 1 ] + dh);
1785
1785
// std::cout << "layer " << i << " v_layerThickness[" << i << "]=" << v_layerThickness[i] << " v_layerPressure[" << i << "]=" << v_layerPressure[i] << std::endl;
1786
1786
v_layerTemperature.push_back (v_layerTemperature[i - 1 ] + dt * dh / 1000.0 );
1787
1787
v_layerWaterVapor.push_back (wgr0 * exp (-v_layerThickness[i] / (1000.0 * h0))); // r[i] in kgr/(m**2*1000m) [gr/m**3]
1788
1788
} else {
1789
- v_layerPressure[i] = v_layerPressure[i - 1 ] - dp * pow (dp1, i - 1 );
1789
+ v_layerPressure[i] = v_layerPressure[i - 1 ] - dp * pow (dp1, ( int )( i - 1 ) );
1790
1790
www = v_layerWaterVapor[i - 1 ] / 1000.0 ; // in kg/m**3
1791
- g = g0 * pow (1 . + ((v_layerThickness[i - 1 ] / 1000.0 )) / rt, - 2 ); // gravity corrected for the height
1791
+ g = g0 * pow (1 . + ((v_layerThickness[i - 1 ] / 1000.0 )) / rt, ( int )(- 2 ) ); // gravity corrected for the height
1792
1792
dh = 288.6948 * v_layerTemperature[i - 1 ] * (1.0 + 0.61 * www / 1000.0 )
1793
1793
* log (v_layerPressure[i - 1 ] / v_layerPressure[i]) / g;
1794
1794
v_layerThickness[i] = v_layerThickness[i - 1 ] + dh;
0 commit comments