update wg

ARPA-SIMC · Aug 13, 2024 · 9266710 · 9266710
1 parent b06f9a1
commit 9266710
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/weatherGenerator2D/weatherGenerator2D.pro b/weatherGenerator2D/weatherGenerator2D.pro
@@ -33,8 +33,10 @@ INCLUDEPATH += ../crit3dDate
 INCLUDEPATH += ../meteo
 INCLUDEPATH += ../gis
 INCLUDEPATH += ../crit3dDate
+INCLUDEPATH += ../waterTable
 INCLUDEPATH += ../weatherGenerator
 
+
 SOURCES += wg2D.cpp \
     randomset.cpp \
     wg2D_precipitation.cpp \

diff --git a/weatherGenerator2D/wg2d.cpp b/weatherGenerator2D/wg2d.cpp
@@ -460,9 +460,9 @@ void weatherGenerator2D::computeMonthlyVariables()
         weibullDailyParameterLambda[i] = (double*)calloc(365,sizeof(double));
         interpolatedDailyValuePrecAverage[i] = (float*)calloc(365,sizeof(float));
         interpolatedDailyValuePrecVariance[i] = (float*)calloc(365,sizeof(float));
-        cubicSplineYearInterpolate(monthlyAveragePrec[i],interpolatedDailyValuePrecAverage[i]);
-        cubicSplineYearInterpolate(monthlyStdDevPrec[i],interpolatedDailyValuePrecVariance[i]);
-        for (int j=0;j<365;j++)
+        interpolation::cubicSplineYearInterpolate(monthlyAveragePrec[i], interpolatedDailyValuePrecAverage[i]);
+        interpolation::cubicSplineYearInterpolate(monthlyStdDevPrec[i], interpolatedDailyValuePrecVariance[i]);
+        for (int j=0; j < 365; j++)
         {
             interpolatedDailyValuePrecVariance[i][j] *= interpolatedDailyValuePrecVariance[i][j];
         }