Update SAM files

tests/AmSud/run.def

@@ -23,7 +23,7 @@ numop = 100
 #
 # Output
 #
-GraphFile = AmSud_A_graph.nc
+GraphFile = AmSud_A_graph_HydroSHEDS_nbasmax35.nc
 #
 WeightFile = Weights_AmSud_HydroSHEDS.nc
 #
@@ -34,3 +34,5 @@ MaxDistErr = 25.0
 # Maximum error in the upstream area in %
 MaxUpstrErr = 25.0
 GRDCFile = /homedata/aschrapffer/Observations/GRDC_Monthly_Jan20.nc 
+
+FloodplainsFile = /homedata/aschrapffer/FLOOPLAINS_INPUT/HYDROSHEDS_floodplains.nc

tests/HydroSHEDS_CentAmSud/run.def

@@ -4,7 +4,8 @@
 #
 EarthRadius = 6370000.
 #
-ModelGridFile = /home/lfita/estudios/RegIPSL/AmSud/geo_em_CentAmSud.nc 
+# ModelGridFile = /home/lfita/estudios/RegIPSL/AmSud/geo_em_CentAmSud.nc 
+ModelGridFile = /home/lfita/sandbox/copy/geo_em.d01.nc
 # WEST_EAST = -90.75, -30.25
 # SOUTH_NORTH = -55.25, 25.5
 HydroFile = /bdd/ORCHIDEE_Forcing/Routing/Hydro4ORCH/HydroSHEDS_qGlobal.nc 
@@ -19,7 +20,7 @@ nbasmax = 3
 #
 # Number of operation of simplification performed together
 #
-numop = 20
+numop = 50
 #
 # Output
 #
@@ -39,4 +40,5 @@ MaxDistErr = 25.0
 # Maximum error in the upstream area in %
 MaxUpstrErr = 25.0
 GRDCFile = /homedata/aschrapffer/Observations/GRDC_Monthly_Jan20.nc 
-
+#
+FloodplainsFile = /homedata/aschrapffer/FLOOPLAINS_INPUT/HYDROSHEDS_floodplains.nc

tests/MERIT_AmSud/run.def

@@ -23,7 +23,7 @@ numop =100
 #
 # Output
 #
-GraphFile = AmSud_A_graph_nbasmax15_t.nc
+GraphFile = AmSud_A_graph_nbasmax15.nc
 #
 WeightFile = Weights_MERIT.nc
 #

tests/MERIT_CentAmSud/BuildHTUs_SAM.pbs

@@ -4,7 +4,7 @@
 #
 #PBS -j oe
 #PBS -l nodes=2:ppn=32
-#PBS -l walltime=6:00:00
+#PBS -l walltime=12:00:00
 #PBS -l vmem=250g,mem=250g
 #
 cd ${PBS_O_WORKDIR}

tests/MERIT_CentAmSud/run.def

@@ -4,7 +4,8 @@
 #
 EarthRadius = 6370000.
 #
-ModelGridFile = /home/lfita/estudios/RegIPSL/AmSud/geo_em_CentAmSud.nc 
+# ModelGridFile = /home/lfita/estudios/RegIPSL/AmSud/geo_em_CentAmSud.nc 
+ModelGridFile = /home/lfita/sandbox/copy/geo_em.d01.nc
 # WEST_EAST = -90.75, -30.25
 # SOUTH_NORTH = -55.25, 25.5
 HydroFile = /bdd/ORCHIDEE_Forcing/Routing/Hydro4ORCH/MERIT_Global.nc
@@ -19,7 +20,10 @@ nbasmax = 3
 #
 # Number of operation of simplification performed together
 #
-numop = 10
+numop = 20
+maxpercent = 40
+frac_lim = 0.5
+limit_step5 = 40
 #
 # Output
 #
@@ -27,11 +31,13 @@ GraphFile = AmSud_A_CentAmSud_graph.nc
 #
 WeightFile = Weights_MERIT_CentAmSud.nc
 #
+FloodplainsFile = /homedata/aschrapffer/FLOOPLAINS_INPUT/MERIT_floodplains.nc
+#
 #
 # File containing infrastructures to be placed.
 # Maximum error in the distance of the station in km^2
 MaxDistErr = 25.0
 # Maximum error in the upstream area in %
 MaxUpstrErr = 25.0
-GRDCFile = /homedata/aschrapffer/Observations/GRDC_Monthly_Jan20.nc 
+GRDCFile = /homedata/aschrapffer/Observations/GRDC_Monthly_Jan20.nc