small modification for comparison tests

benchmark tests for FP

pep8speaks

small bug

update bug fix

add statement that rasters are close

Option to have an uMax_Limit Layer as input

alpha and umax same for each startcell

default

fix

comment

small comment

rename variables - camelCase; paths can beread in with customPaths

rename variables - camelCase; paths can beread in with customPaths

add flag if variable alpha is computed

add dynamic exponent

shorten part where calculation is executed (independend of forest True/False

rename variables, option to provide variable zdeltaLim or umaxLim

pep8speaks

docu for variable parameter

calculation with generations (MN)

 Add relative comparison (when rasters are close)

write message in report file

add option/ FLAG to calculate with generations

data for benchmark tests with generations

docu for generations

pep8speaks

pep8speaks

pep8spekas

Author: PaulaSp3

avaframe/com4FlowPy/com4FlowPy.py

@@ -66,6 +66,7 @@ def com4FlowPyMain(cfgPath, cfgSetup):
     modelParameters["varUmaxBool"] = cfgSetup.getboolean("variableUmaxLim")
     modelParameters["varAlphaBool"] = cfgSetup.getboolean("variableAlpha")
     modelParameters["varExponentBool"] = cfgSetup.getboolean("variableExponent")
+    modelParameters["calcGeneration"] = cfgSetup.getboolean("calcGeneration")
     # modelParameters["infra"]  = cfgSetup["infra"]
     # modelParameters["forest"] = cfgSetup["forest"]
 
@@ -243,10 +244,13 @@ def startLogging(modelParameters, forestParams, modelPaths, MPOptions):
         log.info("calculation with Infrastructure")
         log.info(f"{'INFRA LAYER:' : <14}{'%s'%modelPaths['infraPath'] : <5}")
         log.info("------------------------")
-    for param, value in MPOptions.items():
-        log.info(f"{'%s:'%param : <20}{value : <5}")
+    try:
+        for param, value in MPOptions.items():
+            log.info(f"{'%s:'%param : <20}{value : <5}")
         # log.info("{}:\t{}".format(param,value))
-    log.info("------------------------")
+        log.info("------------------------")
+    except:
+        log.info("------------------------")
     log.info(f"{'WorkDir:' : <12}{'%s'%modelPaths['workDir'] : <5}")
     log.info(f"{'ResultsDir:' : <12}{'%s'%modelPaths['resDir'] : <5}")
     # log.info("WorkDir: {}".format(modelPaths["workDir"]))

avaframe/com4FlowPy/com4FlowPyCfg.ini

@@ -144,6 +144,13 @@ forestFrictionLayerType = absolute
 # NOTE: this currently only works with 'forestFrictionLayer' module!!
 skipForestCells = 1 
 
+#++++++++++++ Calculate with generations
+# If calcGenerations = True, a different order of cells in a path are calculated.
+# The results can vary when computing with generations.
+# Additionally, the generation (iteration step) can be derived, which is required
+# to get thalweg information.
+calcGeneration = False
+
 #++++++++++++ Parameters for Tiling
 # tileSize: size of tiles in x and y direction in meters (if total size of) x
 #           or y of input DEM is larger than tileSize, then the input raster

avaframe/com4FlowPy/flowClass.py

@@ -347,10 +347,10 @@ def calc_distribution(self):
         row_local, col_local = np.where(self.dist > threshold)
 
         return (
-            self.rowindex - 1 + row_local,
-            self.colindex - 1 + col_local,
-            self.dist[row_local, col_local],
-            self.z_delta_neighbour[row_local, col_local],
+            list(self.rowindex - 1 + row_local),
+            list(self.colindex - 1 + col_local),
+            list(self.dist[row_local, col_local]),
+            list(self.z_delta_neighbour[row_local, col_local]),
         )
 
     def forest_detrainment(self):

avaframe/com4FlowPy/flowCore.py

@@ -0,0 +1 @@
+PROJCS["MGI_Austria_GK_West",GEOGCS["GCS_MGI",DATUM["D_MGI",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",-5000000.0],PARAMETER["Central_Meridian",10.3333333333333],PARAMETER["Scale_Factor",1.0],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]