diff --git a/agrolib/hydrall/hydrall.pro b/agrolib/hydrall/hydrall.pro index 8d0724a7b..86998ceee 100644 --- a/agrolib/hydrall/hydrall.pro +++ b/agrolib/hydrall/hydrall.pro @@ -5,14 +5,16 @@ # #--------------------------------------------------- -QT -= core gui +QT -= core gui TEMPLATE = lib CONFIG += staticlib -DEFINES += _CRT_SECURE_NO_WARNINGS - CONFIG += debug_and_release +CONFIG += c++11 c++14 c++17 + +#DEFINES += _CRT_SECURE_NO_WARNINGS + unix:{ CONFIG(debug, debug|release) { @@ -32,4 +34,3 @@ SOURCES += hydrall.cpp HEADERS += hydrall.h - diff --git a/bin/CRITERIA3D/CRITERIA3D.pro b/bin/CRITERIA3D/CRITERIA3D.pro index 12cd51e2f..5f15fe45f 100644 --- a/bin/CRITERIA3D/CRITERIA3D.pro +++ b/bin/CRITERIA3D/CRITERIA3D.pro @@ -17,7 +17,7 @@ CONFIG += c++11 c++14 c++17 INCLUDEPATH += ./shared \ ../../agrolib/soilFluxes3D/header \ - ../../agrolib/crit3dDate ../../agrolib/mathFunctions \ + ../../agrolib/crit3dDate ../../agrolib/mathFunctions ../../agrolib/hydrall\ ../../agrolib/crop ../../agrolib/soil ../../agrolib/meteo ../../agrolib/gis \ ../../agrolib/interpolation ../../agrolib/solarRadiation ../../agrolib/snow \ ../../agrolib/outputPoints ../../agrolib/soilWidget ../../agrolib/utilities \ diff --git a/bin/CRITERIA3D/criteria3DProject.cpp b/bin/CRITERIA3D/criteria3DProject.cpp index 02a0e2473..2f083458f 100644 --- a/bin/CRITERIA3D/criteria3DProject.cpp +++ b/bin/CRITERIA3D/criteria3DProject.cpp @@ -1342,7 +1342,7 @@ bool Crit3DProject::runModelHour(const QString& hourlyOutputPath, bool isRestart updateDailyTemperatures(); if (1) //if Hydrall is on processes.computeForestModel { - computeHydrall(myDateTime, 25, 200); + //computeHydrall(myDateTime, 25, 200); } } if (processes.computeWater)