Simplify the Iberian test case.

tests/Iberia/BuildHTUs_IP.pbs

@@ -4,7 +4,7 @@
 #
 #PBS -j oe
 #PBS -l nodes=1:ppn=64
-#PBS -l walltime=128:00:00
+#PBS -l walltime=48:00:00
 #PBS -l mem=160gb
 #PBS -l vmem=160gb
 #
@@ -19,30 +19,32 @@ source ../../Environment
 #
 /bin/rm -f DocumentationInterface *graph.nc *.txt check.out
 #
-# If weights file does not exist, then compute it quickly
-#
-if [ ! -e Weights.nc ] ; then
-    mpirun -n ${NSLOTS} python ../../WeightsOnly.py
-    if [ $? -gt 0 ] ; then
-	exit
-    else
-	echo "============================================="
-	echo "= Weight calculations successful            ="
-	echo "============================================="	
-    fi
-fi
-#
 # Run the Python code to generate the HTUs and write them into a netCDF file.
 #
+cp run_MEDCORDEX.def run.def
 mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
 if [ $? -gt 0 ] ; then
-    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    echo "X    Run on Iberian Peninsula failed    X"
-    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    echo "X    MEDCORDEX Run on Iberian Peninsula failed    X"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 else
-    echo "======================================="
-    echo "= Run on Iberian Peninsula successful ="
-    echo "======================================="
+    echo "================================================="
+    echo "= MEDCORDEX Run on Iberian Peninsula successful ="
+    echo "================================================="
 fi
 #
-ls -l
+/bin/rm -f *.txt
+#
+#
+#
+cp run_regular.def run.def
+mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
+if [ $? -gt 0 ] ; then
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    echo "X    Regular grid run on Iberian Peninsula failed    X"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+else
+    echo "===================================================="
+    echo "= Regular grid run on Iberian Peninsula successful ="
+    echo "===================================================="
+fi

tests/Iberia/run_MEDCORDEX.def

+[OverAll]
+#
+#
+#
+EarthRadius = 6370000.
+#
+ModelGridFile = /bdd/MEDI/workspaces/polcher/NewRouting/geo_MEDCORDEX.nc
+WEST_EAST = -9.75, 5.25
+SOUTH_NORTH = 35.5, 43.5
+HydroFile = /bdd/ORCHIDEE_Forcing/Routing/Hydro4ORCH/HydroSHEDS_MED.nc
+#
+# FORTRAN interface parameters
+#
+Documentation = true
+#
+# Configuration for the graph to be generated
+#
+nbasmax = 35
+#
+# Number of operation of simplification performed together
+#
+numop = 100
+#
+# Output
+#
+GraphFile = MEDCORDEX_Spain_graph.nc
+#

tests/Iberia/run_regular.def

+[OverAll]
+#
+#
+#
+EarthRadius = 6370000.
+#
+ModelGridFile = /bdd/MEDI/workspaces/polcher/NewRouting/EM_WFDEI_CRU_2000.nc 
+WEST_EAST = -9.75, 5.25
+SOUTH_NORTH = 35.5, 43.5
+HydroFile = /bdd/ORCHIDEE_Forcing/Routing/Hydro4ORCH/HydroSHEDS_MED.nc
+#
+# FORTRAN interface parameters
+#
+Documentation = true
+#
+# Configuration for the graph to be generated
+#
+nbasmax = 35
+#
+# Number of operation of simplification performed together
+#
+numop = 100
+#
+# Output
+#
+GraphFile = EM_WFDEI_Spain_graph.nc
+#