diff --git a/tests/Pantanal_n48/BuildHTUs_Pantanal.pbs b/tests/AmSud/BuildHTUs_SAM.pbs
similarity index 84%
rename from tests/Pantanal_n48/BuildHTUs_Pantanal.pbs
rename to tests/AmSud/BuildHTUs_SAM.pbs
index 057d3a83beeab8dd6ba767061c0944e95fa96eb7..84185d4f6466acfa59e6ec504c456cb688b2fcf3 100644
--- a/tests/Pantanal_n48/BuildHTUs_Pantanal.pbs
+++ b/tests/AmSud/BuildHTUs_SAM.pbs
@@ -3,10 +3,9 @@
 #PBS -N BuildHTUs_P
 #
 #PBS -j oe
-#PBS -l nodes=1:ppn=48
-#PBS -l walltime=128:00:00
-#PBS -l mem=180gb
-#PBS -l vmem=180gb
+#PBS -l nodes=1:ppn=64
+#PBS -l walltime=6:00:00
+#PBS -l vmem=240g,mem=200g
 #
 cd ${PBS_O_WORKDIR}
 export NSLOTS=$(($PBS_NUM_NODES*$PBS_NUM_PPN))
@@ -17,7 +16,7 @@ source ../../Environment
 #
 # Clean-up. Weights are kept for future runs.
 #
-/bin/rm -f DocumentationInterface *.nc *.txt
+/bin/rm -f DocumentationInterface *graph.nc *.txt check.out
 #
 # Run the Python code to generate the HTUs and write them into a netCDF file.
 #
diff --git a/tests/Iberia_n48_regular/BuildHTUs_IP.pbs b/tests/AmSud/Weight.pbs
similarity index 84%
rename from tests/Iberia_n48_regular/BuildHTUs_IP.pbs
rename to tests/AmSud/Weight.pbs
index 888578004c015425a6fdc5b2038f7f2e5b515b01..0bfe8a76c537de0e12f3451f7396ab1c1fcc681d 100644
--- a/tests/Iberia_n48_regular/BuildHTUs_IP.pbs
+++ b/tests/AmSud/Weight.pbs
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-#PBS -N BuildHTUs_IP
+#PBS -N Weights
 #
 #PBS -j oe
 #PBS -l nodes=1:ppn=64
-#PBS -l walltime=12:00:00
+#PBS -l walltime=128:00:00
 #PBS -l mem=240gb
 #PBS -l vmem=240gb
 #
@@ -20,9 +20,8 @@ source ../../Environment
 /bin/rm -f DocumentationInterface *graph.nc *.txt
 #
 # Run the Python code to generate the HTUs and write them into a netCDF file.
-# It will also generate the weights if needed.
 #
-mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
+mpirun -n ${NSLOTS} python ../../WeightsOnly.py
 if [ $? -gt 0 ] ; then
     echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     echo "X    Run on Iberian Peninsula failed    X"
diff --git a/tests/Pantanal_n48/run.def b/tests/AmSud/run.def
similarity index 72%
rename from tests/Pantanal_n48/run.def
rename to tests/AmSud/run.def
index e14dbab5a1cbcb90ae6e0ac87da8e865d34fe6de..16090c53351375c7a25c1a96bb255e9f3d4b5835 100644
--- a/tests/Pantanal_n48/run.def
+++ b/tests/AmSud/run.def
@@ -5,9 +5,9 @@
 EarthRadius = 6370000.
 #
 ModelGridFile = /bdd/MEDI/workspaces/polcher/WRF_Forcing/AmSud-A/geo_em.d01.nc
-WEST_EAST = -66.75, -52.25
-SOUTH_NORTH = -23.5, -13.5
-HydroFile = /homedata/aschrapffer/RoutingNc_AS/SouthAmerica_FP/routing.nc
+# WEST_EAST = -90.75, -30.25
+# SOUTH_NORTH = -55.25, 25.5
+HydroFile = /homedata/aschrapffer/routingnc/AmSud/routing.nc
 #
 # FORTRAN interface parameters
 #
@@ -23,7 +23,7 @@ numop = 100
 #
 # Output
 #
-GraphFile = AmSud_A_Pantanal_graph.nc
+GraphFile = AmSud_A_graph.nc
 #
 # Diagnostics
 # You need to provide an interval in longitude and Latitude.
diff --git a/tests/EuroSW/BuildHTUs_EuroSW.pbs b/tests/EuroSW/BuildHTUs_EuroSW.pbs
new file mode 100644
index 0000000000000000000000000000000000000000..591f3eedfc0ab45fa80161befccac3dd4eec3b02
--- /dev/null
+++ b/tests/EuroSW/BuildHTUs_EuroSW.pbs
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+#PBS -N BuildHTUs_EuroSW
+#
+#PBS -j oe
+#PBS -l nodes=2:ppn=32
+#PBS -l walltime=12:00:00
+#PBS -l vmem=500g,mem=240g
+#
+cd ${PBS_O_WORKDIR}
+export NSLOTS=$(($PBS_NUM_NODES*$PBS_NUM_PPN))
+#
+# Set the right Python 3 Anaconda environment
+#
+source ../../Environment
+#
+# Clean-up. Weights are kept for future runs.
+#
+/bin/rm -f DocumentationInterface *.txt
+#
+# 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 computed                     ="
+	ls -l Weights.nc
+	echo "======================================="	
+    fi
+fi
+#
+# Run the Python code to generate the HTUs and write them into a netCDF file.
+#
+mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
+if [ $? -gt 0 ] ; then
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    echo "X    Run on EuroSW failed               X"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+else
+    echo "======================================="
+    echo "= Run on EuroSW successful            ="
+    echo "======================================="
+fi
+#
+ls -l
diff --git a/tests/EuroSW/run.def b/tests/EuroSW/run.def
new file mode 100644
index 0000000000000000000000000000000000000000..f83c017e7fd5723169a94f287c1d61bf7011b739
--- /dev/null
+++ b/tests/EuroSW/run.def
@@ -0,0 +1,26 @@
+[OverAll]
+#
+#
+#
+EarthRadius = 6370000.
+#
+ModelGridFile = /bdd/MEDI/workspaces/polcher/NewRouting/geo_EuroSW.nc
+HydroFile = /bdd/MEDI/workspaces/polcher/NewRouting/routing_MED.nc
+#
+# FORTRAN interface parameters
+#
+Documentation = true
+#
+# Configuration for the graph to be generated
+#
+nbasmax = 35
+#
+# Output
+#
+GraphFile = LC_Spain_test_graph.nc
+#
+# Diagnostics
+# You need to provide an interval in longitude and Latitude.
+#
+DiagLon = 3.9, 3.9
+DiagLat = 40.0, 40.0
diff --git a/tests/Iberia_n48/BuildHTUs_IP.pbs b/tests/Iberia/BuildHTUs_IP.pbs
similarity index 95%
rename from tests/Iberia_n48/BuildHTUs_IP.pbs
rename to tests/Iberia/BuildHTUs_IP.pbs
index 474422521317c492215f2db10630abea327e65f9..6fd4258ae9b2c15f75581477b45055569bc9ff6a 100644
--- a/tests/Iberia_n48/BuildHTUs_IP.pbs
+++ b/tests/Iberia/BuildHTUs_IP.pbs
@@ -17,7 +17,7 @@ source ../../Environment
 #
 # Clean-up. Weights are kept for future runs.
 #
-/bin/rm -f DocumentationInterface *graph.nc *.txt
+/bin/rm -f DocumentationInterface *graph.nc *.txt check.out
 #
 # If weights file does not exist, then compute it quickly
 #
diff --git a/tests/Iberia_n48/run.def b/tests/Iberia/run.def
similarity index 100%
rename from tests/Iberia_n48/run.def
rename to tests/Iberia/run.def
diff --git a/tests/Pantanal_n48_regular/BuildHTUs_Pantanal.pbs b/tests/Iberia_regular/BuildHTUs_IP.pbs
similarity index 59%
rename from tests/Pantanal_n48_regular/BuildHTUs_Pantanal.pbs
rename to tests/Iberia_regular/BuildHTUs_IP.pbs
index ae26af83c2e43ee4afa26f35834e987ef27dde59..930284f41cdaec9c16af48955302e53e595c4663 100644
--- a/tests/Pantanal_n48_regular/BuildHTUs_Pantanal.pbs
+++ b/tests/Iberia_regular/BuildHTUs_IP.pbs
@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-#PBS -N BuildHTUs_P
+#PBS -N BuildHTUs_IP
 #
 #PBS -j oe
-#PBS -l nodes=1:ppn=48
-#PBS -l walltime=128:00:00
+#PBS -l nodes=1:ppn=64
+#PBS -l walltime=12:00:00
 #PBS -l mem=240gb
 #PBS -l vmem=240gb
 #
@@ -17,9 +17,22 @@ source ../../Environment
 #
 # Clean-up. Weights are kept for future runs.
 #
-/bin/rm -f DocumentationInterface *.nc *.txt
+/bin/rm -f DocumentationInterface *graph.nc *.txt check.out
+#
+if [ ! -e Weights.nc ] ; then
+    mpirun -n ${NSLOTS} python ../../WeightsOnly.py
+    if [ $? -gt 0 ] ; then
+        exit
+    else
+        echo "======================================="
+        echo "= Weight computed                     ="
+        ls -l Weights.nc
+        echo "======================================="  
+    fi
+fi
 #
 # Run the Python code to generate the HTUs and write them into a netCDF file.
+# It will also generate the weights if needed.
 #
 mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
 if [ $? -gt 0 ] ; then
diff --git a/tests/Iberia_n48_regular/run.def b/tests/Iberia_regular/run.def
similarity index 100%
rename from tests/Iberia_n48_regular/run.def
rename to tests/Iberia_regular/run.def
diff --git a/tests/Pantanal_n48_regular/run.def b/tests/Pantanal_n48_regular/run.def
deleted file mode 100644
index 6b4d1d4348c1b3a3a472057450bff21ca3d81043..0000000000000000000000000000000000000000
--- a/tests/Pantanal_n48_regular/run.def
+++ /dev/null
@@ -1,32 +0,0 @@
-[OverAll]
-#
-#
-#
-EarthRadius = 6370000.
-#
-ModelGridFile = /bdd/ORCHIDEE_Forcing/BC/OOL/OL2/WFDEI_CRU/WFDEI_CRU_1994.nc 
-WEST_EAST = -68.75, -53.25
-SOUTH_NORTH = -24.5, -14.25
-HydroFile = /homedata/aschrapffer/RoutingNc_AS/SouthAmerica_FP/routing.nc
-#
-# FORTRAN interface parameters
-#
-Documentation = true
-#
-# Configuration for the graph to be generated
-#
-nbasmax = 35
-#
-# Number of operation of simplification performed together
-#
-numop = 50
-#
-# Output
-#
-GraphFile = WFDEI_CRU_Pantanal_test_graph.nc
-#
-# Diagnostics
-# You need to provide an interval in longitude and Latitude.
-#
-DiagLon = 3.9, 3.9
-DiagLat = 40.0, 40.0