Update the EuroSW case in the tests.

tests/EuroSW/BuildHTUs_EuroSW.pbs

@@ -3,22 +3,25 @@
 #PBS -N BuildHTUs_EuroSW
 #
 #PBS -j oe
-#PBS -l nodes=2:ppn=32
-#PBS -l walltime=42:00:00
-#PBS -l vmem=500g,mem=240g
+#PBS -l nodes=1:ppn=64
+#PBS -l walltime=24:00:00
+#PBS -l vmem=250g,mem=250g
 #
 cd ${PBS_O_WORKDIR}
+echo "PPN = ${PBS_NUM_PPN} NODES = ${PBS_NUM_NODES}"
 export NSLOTS=$(($PBS_NUM_NODES*$PBS_NUM_PPN))
 #
 # Set the right Python 3 Anaconda environment
 #
-date
 source ../../Environment
+
+module load python/3.6-anaconda50
+python --version
 #
 # Clean-up. Weights are kept for future runs.
 #
-/bin/rm -f DocumentationInterface *.txt check.out
-WF=$(grep WeightFile run.def.ref | cut -d"=" -f 2 | sed -e's/ //g')
+/bin/rm -f DocumentationInterface Out_*.txt Weight_*.txt check.out
+WF=$(grep WeightFile run.def | cut -d"=" -f 2 | sed -e's/ //g')
 #
 # If weights file does not exist, then compute it quickly
 #
@@ -39,13 +42,13 @@ fi
 mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
 if [ $? -gt 0 ] ; then
     echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    echo "X    Run on EuroSW failed               X"
+    echo "X    Run on EuroSW failed  ${NB}     X"
     echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    exit
 else
     echo "======================================="
-    echo "= Run on EuroSW successful            ="
+    echo "= Run on EuroSW successful ${NB}   ="
     echo "======================================="
 fi
 #
-date
-ls -l
+

tests/EuroSW/run.def

@@ -2,25 +2,27 @@
 #
 #
 #
-EarthRadius = 6378000.
-#
 ModelGridFile = /bdd/MEDI/workspaces/polcher/NewDivBas/EuroSW/geo_EuroSW.nc
-HydroFile = /bdd/ORCHIDEE_Forcing/Routing/Hydro4ORCH/HydroSHEDS_MED.nc
-#
-WeightFile = /bdd/MEDI/workspaces/polcher/NewDivBas/EuroSW/Weights_EuroSW.nc
+HydroFile = /bdd/ORCHIDEE_Forcing/Routing/Hydro4ORCH/HydroSHEDS_qGlobal.nc
 #
 # Configuration for the graph to be generated
 #
-nbasmax = 5
+nbasmax = 7
+#
+# Number of operation of simplification performed together
+#
+numop = 100
 #
 # Output
 #
 GraphFile = /bdd/MEDI/workspaces/polcher/NewDivBas/EuroSW/EuroSW_HydroSHEDS_graph.nc
 #
+WeightFile = /bdd/MEDI/workspaces/polcher/NewDivBas/EuroSW/Weights_EuroSW.nc
+#
+#
 # File containing infrastructures to be placed.
-# Maximum error in the distance of the station in km
-MaxDistErr = 50.0
+# 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 = /bdd/ORCHIDEE_Forcing/Validation/GRDC/GRDC_Monthly_Jan21_v2.nc
-