[processing] split r.sun into two algorithms as it has mutually

exclusive options (fix #21637) (cherry picked from commit ab646c4)
qgis · May 25, 2019 · f17accf · f17accf
1 parent ca0b739
commit f17accf
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/...cessing/algs/grass7/description/r.sun.txt → ...lgs/grass7/description/r.sun.incidout.txt b/...cessing/algs/grass7/description/r.sun.txt → ...lgs/grass7/description/r.sun.incidout.txt
@@ -1,5 +1,5 @@
 r.sun
-Solar irradiance and irradiation model.
+r.sun.incidout - Solar irradiance and irradiation model ( for the set local time).
 Raster (r.*)
 QgsProcessingParameterRasterLayer|elevation|Elevation layer [meters]|None|False
 QgsProcessingParameterRasterLayer|aspect|Aspect layer [decimal degrees]|None|False
@@ -21,11 +21,11 @@ QgsProcessingParameterNumber|day|No. of day of the year (1-365)|QgsProcessingPar
 *QgsProcessingParameterNumber|distance_step|Sampling distance step coefficient (0.5-1.5)|QgsProcessingParameterNumber.Double|1.0|True|0.5|1.5
 *QgsProcessingParameterNumber|npartitions|Read the input files in this number of chunks|QgsProcessingParameterNumber.Integer|1|True|1|None
 *QgsProcessingParameterNumber|civil_time|Civil time zone value, if none, the time will be local solar time|QgsProcessingParameterNumber.Double|None|True|0.0|None
+QgsProcessingParameterNumber|time|Local (solar) time (decimal hours)|QgsProcessingParameterNumber.Double|None|False|0.0|24.0
 QgsProcessingParameterBoolean|-p|Do not incorporate the shadowing effect of terrain|False
 *QgsProcessingParameterBoolean|-m|Use the low-memory version of the program|False
-QgsProcessingParameterRasterDestination|incidout|incidence angle raster map|None|True 
-QgsProcessingParameterRasterDestination|beam_rad|Irradiation [Wh.m-2.day-1]|None|True
-QgsProcessingParameterRasterDestination|insol_time|Insolation time [h] |None|True
-QgsProcessingParameterRasterDestination|diff_rad|Diffuse irradiation [Wh.m-2.day-1]|None|True
-QgsProcessingParameterRasterDestination|refl_rad|Ground reflected irradiation [Wh.m-2.day-1]|None|True 
-QgsProcessingParameterRasterDestination|glob_rad|Global (total) irradiance/irradiation [Wh.m-2.day-1]|None|True
+QgsProcessingParameterRasterDestination|incidout|incidence angle raster map|None|True
+QgsProcessingParameterRasterDestination|beam_rad|Beam irradiance [W.m-2]|None|True
+QgsProcessingParameterRasterDestination|diff_rad|Diffuse irradiance [W.m-2]|None|True
+QgsProcessingParameterRasterDestination|refl_rad|Ground reflected irradiance [W.m-2]|None|True
+QgsProcessingParameterRasterDestination|glob_rad|Global (total) irradiance/irradiation [W.m-2]|None|True
diff --git a/python/plugins/processing/algs/grass7/description/r.sun.insoltime.txt b/python/plugins/processing/algs/grass7/description/r.sun.insoltime.txt
@@ -0,0 +1,30 @@
+r.sun
+r.sun.insoltime - Solar irradiance and irradiation model (daily sums).
+Raster (r.*)
+QgsProcessingParameterRasterLayer|elevation|Elevation layer [meters]|None|False
+QgsProcessingParameterRasterLayer|aspect|Aspect layer [decimal degrees]|None|False
+QgsProcessingParameterNumber|aspect_value|A single value of the orientation (aspect), 270 is south|QgsProcessingParameterNumber.Double|270.0|True|0.0|360.0
+QgsProcessingParameterRasterLayer|slope|Name of the input slope raster map (terrain slope or solar panel inclination) [decimal degrees]|None|False
+QgsProcessingParameterNumber|slope_value|A single value of inclination (slope)|QgsProcessingParameterNumber.Double|0.0|True|0.0|360.0
+QgsProcessingParameterRasterLayer|linke|Name of the Linke atmospheric turbidity coefficient input raster map|None|True
+QgsProcessingParameterRasterLayer|albedo|Name of the ground albedo coefficient input raster map|None|True
+QgsProcessingParameterNumber|albedo_value|A single value of the ground albedo coefficient|QgsProcessingParameterNumber.Double|0.2|True|0.0|360.0
+QgsProcessingParameterRasterLayer|lat|Name of input raster map containing latitudes [decimal degrees]|None|True
+QgsProcessingParameterRasterLayer|long|Name of input raster map containing longitudes [decimal degrees]|None|True
+QgsProcessingParameterRasterLayer|coeff_bh|Name of real-sky beam radiation coefficient input raster map|None|True
+QgsProcessingParameterRasterLayer|coeff_dh|Name of real-sky diffuse radiation coefficient input raster map|None|True
+QgsProcessingParameterRasterLayer|horizon_basemap|The horizon information input map basename|None|True
+QgsProcessingParameterNumber|horizon_step|Angle step size for multidirectional horizon [degrees]|QgsProcessingParameterNumber.Double|None|True|0.0|360.0
+QgsProcessingParameterNumber|day|No. of day of the year (1-365)|QgsProcessingParameterNumber.Integer|1|False|1|365
+*QgsProcessingParameterNumber|step|Time step when computing all-day radiation sums [decimal hours]|QgsProcessingParameterNumber.Double|0.5|True|0
+*QgsProcessingParameterNumber|declination|Declination value (overriding the internally computed value) [radians]|QgsProcessingParameterNumber.Double|None|True|None|None
+*QgsProcessingParameterNumber|distance_step|Sampling distance step coefficient (0.5-1.5)|QgsProcessingParameterNumber.Double|1.0|True|0.5|1.5
+*QgsProcessingParameterNumber|npartitions|Read the input files in this number of chunks|QgsProcessingParameterNumber.Integer|1|True|1|None
+*QgsProcessingParameterNumber|civil_time|Civil time zone value, if none, the time will be local solar time|QgsProcessingParameterNumber.Double|None|True|0.0|None
+QgsProcessingParameterBoolean|-p|Do not incorporate the shadowing effect of terrain|False
+*QgsProcessingParameterBoolean|-m|Use the low-memory version of the program|False
+QgsProcessingParameterRasterDestination|insol_time|Insolation time [h] |None|True
+QgsProcessingParameterRasterDestination|beam_rad|Irradiation raster map [Wh.m-2.day-1]|None|True
+QgsProcessingParameterRasterDestination|diff_rad|Irradiation raster map [Wh.m-2.day-1]|None|True
+QgsProcessingParameterRasterDestination|refl_rad|Irradiation raster map [Wh.m-2.day-1]|None|True
+QgsProcessingParameterRasterDestination|glob_rad|Irradiance/irradiation raster map [Wh.m-2.day-1]|None|True