Add a Strcture.txt file to the Iberia test case so that this gets tested here...

Add a Strcture.txt file to the Iberia test case so that this gets tested here as well. It also provides an exemple for how such a file needs to be written.

tests/Iberia/BuildHTUs_IP.pbs

@@ -24,13 +24,13 @@ source ../../Environment
 cp run_MEDCORDEX.def run.def
 mpirun -n ${NSLOTS} python ../../RoutingPreProc.py
 if [ $? -gt 0 ] ; then
-    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-    echo "X    MEDCORDEX Run on Iberian Peninsula failed    X"
-    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXZZ"
+    echo "X    MEDCORDEX Run on Iberian Peninsula failed    XZZ"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXZZ"
 else
-    echo "================================================="
-    echo "= MEDCORDEX Run on Iberian Peninsula successful ="
-    echo "================================================="
+    echo "=================================================ZZ"
+    echo "= MEDCORDEX Run on Iberian Peninsula successful =ZZ"
+    echo "=================================================ZZ"
 fi
 #
 /bin/rm -f Out_RoutingReg_*.txt Weight_proc_*.txt
@@ -40,11 +40,11 @@ fi
 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"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXZZ"
+    echo "X    Regular grid run on Iberian Peninsula failed    XZZ"
+    echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXZZ"
 else
-    echo "===================================================="
-    echo "= Regular grid run on Iberian Peninsula successful ="
-    echo "===================================================="
+    echo "====================================================ZZ"
+    echo "= Regular grid run on Iberian Peninsula successful =ZZ"
+    echo "====================================================ZZ"
 fi

tests/Iberia/Structures.txt

+#ID   Lon(decimal)   lat   upstream area (km^2)   Type-keyword  Name
+1   4.81711944444   43.9761722222   77055   Run-of-river Test Station A
+2   4.81089722222   44.8239166667   66757   Run-of-river Test station B

tests/Iberia/run_MEDCORDEX.def

@@ -30,4 +30,5 @@ GraphFile = MEDCORDEX_Spain_graph.nc
 MaxDistErr = 25.0
 # Maximum error in the upstream area in %
 MaxUpstrErr = 10.0
+StructuresFile = Structures.txt
 GRDCFile = ../../Stations/Station_Metadata.nc

tests/Iberia/run_regular.def

@@ -6,7 +6,7 @@ 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
+SOUTH_NORTH = 35.5, 44.5
 HydroFile = /bdd/ORCHIDEE_Forcing/Routing/Hydro4ORCH/HydroSHEDS_MED.nc
 #
 # FORTRAN interface parameters
@@ -25,3 +25,11 @@ numop = 100
 #
 GraphFile = EM_WFDEI_Spain_graph.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 = 10.0
+StructuresFile = Structures.txt
+GRDCFile = ../../Stations/Station_Metadata.nc
+#