Merge remote-tracking branch 'origin/main' into 124-enable-export-of-…

…the-resulting-total-runoff-raster-series # Conflicts: # rubem/configuration/output_variables.py
LabSid-USP · Feb 26, 2024 · 7425202 · 7425202
2 parents 8d314ed + fd2430b
commit 7425202
Show file tree

Hide file tree

Showing 19 changed files with 477 additions and 392 deletions.
diff --git a/doc/source/fileformats.rst b/doc/source/fileformats.rst
@@ -46,25 +46,6 @@ This file is the result of pre-processing the corresponding TIFF/GeoTIFF raster
   - Columns = :ref:`clone columns<fileformats:Mask of Catchment (Clone) raster>`;
   - Cell Size = :ref:`clone cell size<fileformats:Mask of Catchment (Clone) raster>`.
 
-Digital Elevation Map (DEM) raster (TIFF)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- Filetype: TIFF :file:`*.tif` raster file.
-- Unit: `Meters Above Sea Level (MASL) <https://wiki.gis.com/wiki/index.php/Meters_above_sea_level>`_
-- Valid Range: :math:`[-100.0, 10000.0]`
-- Restrictions: 
-
-  - ``PCRASTER_VALUESCALE`` = ``VS_SCALAR``;
-  - None of the pixels in the raster must contain ``NO_DATA`` value;
-  - Raster pixels cannot consist entirely of ``1.0`` values;
-  - Raster pixels cannot consist entirely of ``0.0`` values.
-
-- Dimensions:
-
-  - Rows = :ref:`clone rows <fileformats:Mask of Catchment (Clone) raster>`;
-  - Columns = :ref:`clone columns<fileformats:Mask of Catchment (Clone) raster>`;
-  - Cell Size = :ref:`clone cell size<fileformats:Mask of Catchment (Clone) raster>`.
-
 
 Local Drain Direction (LDD) raster
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/doc/source/tutorials.rst b/doc/source/tutorials.rst
@@ -67,7 +67,6 @@ In the part ``Grid`` set 500.000 m as size value and in the part Simulation Peri
 
     [RASTERS]
     dem = /Iguazu/input/maps/dem/dem.map
-    demtif = /Iguazu/input/maps/dem/dem.tif
     clone = /Iguazu/input/maps/clone/clone.map
     samples = /Iguazu/maps/stations/samples.map  
 
@@ -109,7 +108,6 @@ Set the following values for ``Initial Soil Conditions`` fields:
 
     [RASTERS]
     dem = /Iguazu/input/maps/dem/dem.map
-    demtif = /Iguazu/input/maps/dem/dem.tif
     clone = /Iguazu/input/maps/clone/clone.map
     samples = /Iguazu/maps/stations/samples.map 
     soil =  /Iguazu/input/maps/soil/soil.map
@@ -174,7 +172,6 @@ Use the default values for ``FPAR``, ``LAI`` and ``Impervious Area Interception`
 
     [RASTERS]
     dem = /Iguazu/input/maps/dem/dem.map
-    demtif = /Iguazu/input/maps/dem/dem.tif
     clone = /Iguazu/input/maps/clone/clone.map
     samples = /Iguazu/maps/stations/samples.map 
     soil =  /Iguazu/input/maps/soil/soil.map
@@ -243,7 +240,6 @@ In the ``Climate`` section define the appropriate map-series from :file:`/input/
 
     [RASTERS]
     dem = /Iguazu/input/maps/dem/dem.map
-    demtif = /Iguazu/input/maps/dem/dem.tif
     clone = /Iguazu/input/maps/clone/clone.map
     samples = /Iguazu/maps/stations/samples.map 
     soil =  /Iguazu/input/maps/soil/soil.map
@@ -335,7 +331,6 @@ Values in this tab correspond to calibrated parameters in the basin. For the dat
 
     [RASTERS]
     dem = /Iguazu/input/maps/dem/dem.map
-    demtif = /Iguazu/input/maps/dem/dem.tif
     clone = /Iguazu/input/maps/clone/clone.map
     samples = /Iguazu/maps/stations/samples.map 
     soil =  /Iguazu/input/maps/soil/soil.map
@@ -420,7 +415,6 @@ The complete project configuration file should look like this:
 
     [RASTERS]
     dem = /Iguazu/input/maps/dem/dem.map
-    demtif = /Iguazu/input/maps/dem/dem.tif
     clone = /Iguazu/input/maps/clone/clone.map
     samples = /Iguazu/maps/stations/samples.map 
     soil =  /Iguazu/input/maps/soil/soil.map

diff --git a/doc/source/userguide.rst b/doc/source/userguide.rst
@@ -30,24 +30,13 @@ Mandatory path to the output folder. Must be a valid path to an existing **empty
 Digital Elevation Map (DEM)
 ```````````````````````````
 
-Mandatory path to Digital Elevation Map (DEM) file `[masl] <https://wiki.gis.com/wiki/index.php/Meters_above_sea_level>`_ in:
-
- * **PCRaster map format** :file:`*.map`: this map contains topographic ground elevation in meters. Must be a valid file path to a PCRaster map format :file:`*.map` file. :ref:`See more. <fileformats:Digital Elevation Map (DEM) raster>`
+Mandatory path to Digital Elevation Map (DEM) file `[masl] <https://wiki.gis.com/wiki/index.php/Meters_above_sea_level>`_ in PCRaster map format :file:`*.map`: this map contains topographic ground elevation in meters. Must be a valid file path to a PCRaster map format :file:`*.map` file. :ref:`See more. <fileformats:Digital Elevation Map (DEM) raster>`
 
  .. code-block:: dosini
     
     [RASTERS]
     dem = /Dataset/UIGCRB/input/maps/dem/dem.map
 
--------
-
- * **TIF format** :file:`*.tif`: this map contains topographic ground elevation in meters. Must be a valid file path to a TIF :file:`*.tif` raster file. :ref:`See more. <fileformats:Digital Elevation Map (DEM) raster (TIFF)>`
-
- .. code-block:: dosini
-   
-    [RASTERS]
-    demtif = /Dataset/UIGCRB/input/maps/dem/dem.tif
-
 Mask of Catchment (Clone)
 ``````````````````````````
 
@@ -819,7 +808,6 @@ Configuration File Template
 
    [RASTERS]
    dem = /Dataset/UIRB/input/maps/dem/dem.map
-   demtif = /Dataset/UIRB/input/maps/dem/dem.tif
    clone = /Dataset/UIRB/input/maps/clone/clone.map
    ndvi_max = /Dataset/UIRB/input/maps/ndvi/ndvi_max.map
    ndvi_min = /Dataset/UIRB/input/maps/ndvi/ndvi_min.map