diff --git a/RoutingPreProc.py b/RoutingPreProc.py index 849f7f11dde61e1aaf0d7857ad7db7d68d6037eb..385ea9cf66dd71386e79f6405d066fa6126f5a7a 100644 --- a/RoutingPreProc.py +++ b/RoutingPreProc.py @@ -20,6 +20,7 @@ config=configparser.ConfigParser({'SaveWeights':'true', "DiagLon":"0.0, 0.0", "D config.read("run.def") saveweights=config.get("OverAll", "SaveWeights") nbasmax=int(config.getfloat("OverAll", "nbasmax")) +numop=int(config.getfloat("OverAll", "numop")) OutGraphFile=config.get("OverAll","GraphFile") lonint=np.array(config.get("OverAll", "DiagLon").split(","),dtype=float) latint=np.array(config.get("OverAll", "DiagLat").split(","),dtype=float) @@ -207,7 +208,7 @@ comm.Barrier() hsuper.dumpnetcdf(OutGraphFile.replace(".nc","_HydroSuper.nc"), gg, modelgrid, part) print("Rank : {0} - Basin_count Before Truncate : ".format(part.rank), hsuper.basin_count) -hs = TR(hsuper, part, comm, modelgrid, numop = 200) +hs = TR(hsuper, part, comm, modelgrid, numop = numop) print("Rank : {0} - Basin_count After Truncate : ".format(part.rank), hsuper.basin_count) hgraph = IF.HydroGraph(nbasmax, hsuper, part, modelgrid) diff --git a/tests/Iberia_n48/run.def b/tests/Iberia_n48/run.def index e252d30a3064c468aa45316579c5e5125ee09113..6cafae4b1e0d80aadcbe108c9bf3fbd953e31be9 100644 --- a/tests/Iberia_n48/run.def +++ b/tests/Iberia_n48/run.def @@ -15,7 +15,11 @@ Documentation = true # # Configuration for the graph to be generated # -nbasmax = 100 +nbasmax = 80 +# +# Number of operation of simplification performed together +# +numop = 200 # # Output # diff --git a/tests/Iberia_n48_regular/run.def b/tests/Iberia_n48_regular/run.def index 7011ae3e9322099c4f0664bcdfcb40c22afb0933..b0afac7840d2d0c3dab4bd0c8e24ad757175fb80 100644 --- a/tests/Iberia_n48_regular/run.def +++ b/tests/Iberia_n48_regular/run.def @@ -15,7 +15,11 @@ Documentation = true # # Configuration for the graph to be generated # -nbasmax = 50 +nbasmax = 35 +# +# Number of operation of simplification performed together +# +numop = 100 # # Output # diff --git a/tests/Mallorca/run.def b/tests/Mallorca/run.def index 7ddf7f6698cc16802ed6681db12298a6599b5f8d..981458b2511f0ee507e5cd69801ae568cb179186 100644 --- a/tests/Mallorca/run.def +++ b/tests/Mallorca/run.def @@ -17,6 +17,10 @@ Documentation = true # nbasmax = 35 # +# Number of operation of simplification performed together +# +numop = 200 +# # Output # GraphFile = MEDCORDEX_test_graph.nc