update solar radiation test

ARPA-SIMC · Jun 26, 2024 · 726bfe8 · 726bfe8
1 parent b7523a9
commit 726bfe8
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/test/TestSolarRadiation/main.cpp b/test/TestSolarRadiation/main.cpp
@@ -76,58 +76,58 @@ int main(int argc, char *argv[])
     std::cout << "Compute a map of global solar irradiance (clear sky)" << std::endl;
 
     // GIS SETTINGS (UTM zone, time zone)
-    gis::Crit3DGisSettings* gisSettings = new gis::Crit3DGisSettings();
-    gisSettings->utmZone = 32;
-    gisSettings->timeZone = 1;
+    gis::Crit3DGisSettings gisSettings;
+    gisSettings.utmZone = 32;
+    gisSettings.timeZone = 1;
 
     // DATETIME (UTC time)
-    Crit3DDate* myDate = new Crit3DDate(1, 7, 2018);
+    Crit3DDate myDate(1, 7, 2018);
     int myHour = 12;
 
-    std::cout << "UTM zone: " << gisSettings->utmZone << std::endl;
-    std::cout << "Date: " << myDate->toStdString() << " hour: " << myHour << " UTC" << std::endl;
+    std::cout << "UTM zone: " << gisSettings.utmZone << std::endl;
+    std::cout << "Date: " << myDate.toStdString() << " hour: " << myHour << " UTC" << std::endl;
 
     // Digital Elevation Model
     QString path;
     QString appPath = a.applicationDirPath() + "/";
     if (! searchDefaultPath(appPath, &path)) return -1;
     std::string inputFileName = path.toStdString() + + "DEM/dem_ravone";
 
-    gis::Crit3DRasterGrid* DEM = new gis::Crit3DRasterGrid();
-    std::string* error = new std::string();
-    if (gis::readEsriGrid(inputFileName, DEM, error))
+    gis::Crit3DRasterGrid DEM;
+    std::string errorStr;
+    if (gis::readEsriGrid(inputFileName, &DEM, errorStr))
         std::cout << "\nDEM = " << inputFileName << std::endl;
     else
     {
-        std::cout << "Error in reading:" << inputFileName << std::endl << *error << std::endl;
+        std::cout << "errorStr in reading:" << inputFileName << std::endl << errorStr << std::endl;
         return 0;
     }
 
-    // SET RADIATION SETTINGS
+    // SET RADIATION SETTINGS (deafult trasmissivity = 0.75)
     Crit3DRadiationSettings* radSettings = new Crit3DRadiationSettings();
-    radSettings->setGisSettings(gisSettings);
+    radSettings->setGisSettings(&gisSettings);
 
-    // INITIALIZE RADIATION MAPS (deafult trasmissivity = 0.75)
-    Crit3DRadiationMaps* radMaps = new Crit3DRadiationMaps(*DEM, *gisSettings);
+    // INITIALIZE RADIATION MAPS
+    Crit3DRadiationMaps* radMaps = new Crit3DRadiationMaps(DEM, gisSettings);
 
     int mySeconds = HOUR_SECONDS * myHour;
-    Crit3DTime* myTime = new Crit3DTime(*myDate, mySeconds);
+    Crit3DTime myTime(myDate, mySeconds);
 
     std::cout << "\nComputing..." << std::endl;
 
     // COMPUTE POTENTIAL GLOBAL RADIATION MAPS
-    if (radiation::computeRadiationGrid(radSettings, *DEM, radMaps, *myTime))
+    if (radiation::computeRadiationDEM(radSettings, DEM, radMaps, myTime))
         std::cout << "\nGlobal solar irradiance (clear sky) computed." << std::endl;
     else
-        std::cout << "Error in compute radiation." << std::endl << std::endl;
+        std::cout << "errorStr in compute radiation." << std::endl << std::endl;
 
     //SAVE OUTPUT
     std::string otputFileName;
     otputFileName = path.toStdString() + PATH_OUTPUT + "globalRadiation";
-    if (gis::writeEsriGrid(otputFileName, radMaps->globalRadiationMap, error))
+    if (gis::writeEsriGrid(otputFileName, radMaps->globalRadiationMap, errorStr))
         std::cout << "Map saved in: " << otputFileName << std::endl;
     else
-        std::cout << "Error in writing:" << otputFileName << std::endl << *error << std::endl;
+        std::cout << "errorStr in writing:" << otputFileName << std::endl << errorStr << std::endl;
 
     return a.exec();
 }