From 82ea3ecd7c56e1a657fb4d8c1e83afe8ba68bf84 Mon Sep 17 00:00:00 2001 From: ftomei Date: Mon, 19 Aug 2024 18:00:06 +0200 Subject: [PATCH] clean radiation --- solarRadiation/solarRadiation.cpp | 43 ------------------------------- solarRadiation/solarRadiation.h | 7 ----- 2 files changed, 50 deletions(-) diff --git a/solarRadiation/solarRadiation.cpp b/solarRadiation/solarRadiation.cpp index 6f3209526..c9b03e7df 100644 --- a/solarRadiation/solarRadiation.cpp +++ b/solarRadiation/solarRadiation.cpp @@ -46,14 +46,6 @@ Crit3DRadiationMaps::Crit3DRadiationMaps() reflectedRadiationMap = new gis::Crit3DRasterGrid; sunElevationMap = new gis::Crit3DRasterGrid; - /* - linkeMap = new gis::Crit3DRasterGrid; - albedoMap = new gis::Crit3DRasterGrid; - sunAzimuthMap = new gis::Crit3DRasterGrid; - sunIncidenceMap = new gis::Crit3DRasterGrid; - sunShadowMap = new gis::Crit3DRasterGrid; - */ - isComputed = false; } @@ -86,20 +78,6 @@ Crit3DRadiationMaps::Crit3DRadiationMaps(const gis::Crit3DRasterGrid& dem, const sunElevationMap = new gis::Crit3DRasterGrid; sunElevationMap->initializeGrid(dem); - /* - albedoMap = new gis::Crit3DRasterGrid; - linkeMap = new gis::Crit3DRasterGrid; - sunAzimuthMap = new gis::Crit3DRasterGrid; - sunIncidenceMap = new gis::Crit3DRasterGrid; - sunShadowMap = new gis::Crit3DRasterGrid; - - linkeMap->initializeGrid(dem); - albedoMap->initializeGrid(dem); - sunAzimuthMap->initializeGrid(dem); - sunIncidenceMap->initializeGrid(dem); - sunShadowMap->initializeGrid(dem); - */ - isComputed = false; } @@ -122,14 +100,6 @@ void Crit3DRadiationMaps::clear() reflectedRadiationMap->clear(); sunElevationMap->clear(); - /* - albedoMap->clear(); - linkeMap->clear(); - sunAzimuthMap->clear(); - sunIncidenceMap->clear(); - sunShadowMap->clear(); - */ - delete latMap; delete lonMap; delete slopeMap; @@ -141,14 +111,6 @@ void Crit3DRadiationMaps::clear() delete reflectedRadiationMap; delete sunElevationMap; - /* - delete albedoMap; - delete linkeMap; - delete sunAzimuthMap; - delete sunIncidenceMap; - delete sunShadowMap; - */ - isComputed = false; } @@ -843,11 +805,6 @@ bool computeRadiationRsun(Crit3DRadiationSettings* radSettings, float temperatur linke, albedo, radSettings->getClearSky(), transmissivity, &sunPosition, &radPoint, myDem)) return false; - /* - radiationMaps->sunAzimuthMap->value[row][col] = sunPosition.azimuth; - radiationMaps->sunIncidenceMap->value[row][col] = sunPosition.incidence; - radiationMaps->sunShadowMap->value[row][col] = float((sunPosition.shadow) ? 0 : 1); - */ radiationMaps->sunElevationMap->value[row][col] = sunPosition.elevation; radiationMaps->globalRadiationMap->value[row][col] = float(radPoint.global); radiationMaps->beamRadiationMap->value[row][col] = float(radPoint.beam); diff --git a/solarRadiation/solarRadiation.h b/solarRadiation/solarRadiation.h index e7b9c7af7..92f8d9f84 100644 --- a/solarRadiation/solarRadiation.h +++ b/solarRadiation/solarRadiation.h @@ -29,13 +29,6 @@ // for vine3d gis::Crit3DRasterGrid* sunElevationMap; - /* - gis::Crit3DRasterGrid* linkeMap; - gis::Crit3DRasterGrid* albedoMap; - gis::Crit3DRasterGrid* sunAzimuthMap; - gis::Crit3DRasterGrid* sunIncidenceMap; - gis::Crit3DRasterGrid* sunShadowMap; - */ Crit3DRadiationMaps(); Crit3DRadiationMaps(const gis::Crit3DRasterGrid& dem, const gis::Crit3DGisSettings& gisSettings);