using anonym basins for testing #31

ec-jrc · Sep 2, 2019 · aa8206e · aa8206e
1 parent ed618d3
commit aa8206e
Show file tree

Hide file tree

Showing 192 changed files with 0 additions and 10,469 deletions.
diff --git a/tests/data/Madeira/settings/settings_Madeira_prerun.xml b/tests/data/Madeira/settings/settings_Madeira_prerun.xml
diff --git a/tests/data/Madeira/settings/settings_Madeira_run.xml b/tests/data/Madeira/settings/settings_Madeira_run.xml
diff --git a/tests/data/Madeira/lai/lai.nc → tests/data/TestCatchment2/lai/lai.nc b/tests/data/Madeira/lai/lai.nc → tests/data/TestCatchment2/lai/lai.nc
diff --git a/tests/data/Madeira/lai/laif.nc → tests/data/TestCatchment2/lai/laif.nc b/tests/data/Madeira/lai/laif.nc → tests/data/TestCatchment2/lai/laif.nc
diff --git a/tests/data/Madeira/lai/laii.nc → tests/data/TestCatchment2/lai/laii.nc b/tests/data/Madeira/lai/laii.nc → tests/data/TestCatchment2/lai/laii.nc
diff --git a/tests/data/Madeira/lai/laio.nc → tests/data/TestCatchment2/lai/laio.nc b/tests/data/Madeira/lai/laio.nc → tests/data/TestCatchment2/lai/laio.nc
diff --git a/tests/data/Madeira/lai/lair.nc → tests/data/TestCatchment2/lai/lair.nc b/tests/data/Madeira/lai/lair.nc → tests/data/TestCatchment2/lai/lair.nc
diff --git a/...ata/Madeira/maps/MaskMap/Bacia_madeira.nc → ...tCatchment2/maps/MaskMap/Bacia_madeira.nc b/...ata/Madeira/maps/MaskMap/Bacia_madeira.nc → ...tCatchment2/maps/MaskMap/Bacia_madeira.nc
diff --git a/tests/data/Madeira/maps/MaskMap/area.map → ...data/TestCatchment2/maps/MaskMap/area.map b/tests/data/Madeira/maps/MaskMap/area.map → ...data/TestCatchment2/maps/MaskMap/area.map
diff --git a/tests/data/Madeira/maps/area.map → tests/data/TestCatchment2/maps/area.map b/tests/data/Madeira/maps/area.map → tests/data/TestCatchment2/maps/area.map
diff --git a/tests/data/Madeira/maps/area.nc → tests/data/TestCatchment2/maps/area.nc b/tests/data/Madeira/maps/area.nc → tests/data/TestCatchment2/maps/area.nc
diff --git a/tests/data/Madeira/maps/area_reproequal.nc → ...ta/TestCatchment2/maps/area_reproequal.nc b/tests/data/Madeira/maps/area_reproequal.nc → ...ta/TestCatchment2/maps/area_reproequal.nc
diff --git a/tests/data/Madeira/maps/areamodel.nc → tests/data/TestCatchment2/maps/areamodel.nc b/tests/data/Madeira/maps/areamodel.nc → tests/data/TestCatchment2/maps/areamodel.nc
diff --git a/...data/Madeira/maps/areamodel_reproequal.nc → ...stCatchment2/maps/areamodel_reproequal.nc b/...data/Madeira/maps/areamodel_reproequal.nc → ...stCatchment2/maps/areamodel_reproequal.nc
diff --git a/tests/data/Madeira/maps/cellsize.nc → tests/data/TestCatchment2/maps/cellsize.nc b/tests/data/Madeira/maps/cellsize.nc → tests/data/TestCatchment2/maps/cellsize.nc
diff --git a/tests/data/Madeira/maps/chan.nc → tests/data/TestCatchment2/maps/chan.nc b/tests/data/Madeira/maps/chan.nc → tests/data/TestCatchment2/maps/chan.nc
diff --git a/tests/data/Madeira/maps/chanbnkf.nc → tests/data/TestCatchment2/maps/chanbnkf.nc b/tests/data/Madeira/maps/chanbnkf.nc → tests/data/TestCatchment2/maps/chanbnkf.nc
diff --git a/tests/data/Madeira/maps/chanbw.nc → tests/data/TestCatchment2/maps/chanbw.nc b/tests/data/Madeira/maps/chanbw.nc → tests/data/TestCatchment2/maps/chanbw.nc
diff --git a/tests/data/Madeira/maps/changrad.nc → tests/data/TestCatchment2/maps/changrad.nc b/tests/data/Madeira/maps/changrad.nc → tests/data/TestCatchment2/maps/changrad.nc
diff --git a/tests/data/Madeira/maps/chanlength.nc → tests/data/TestCatchment2/maps/chanlength.nc b/tests/data/Madeira/maps/chanlength.nc → tests/data/TestCatchment2/maps/chanlength.nc
diff --git a/tests/data/Madeira/maps/chanman.nc → tests/data/TestCatchment2/maps/chanman.nc b/tests/data/Madeira/maps/chanman.nc → tests/data/TestCatchment2/maps/chanman.nc
diff --git a/tests/data/Madeira/maps/chans.nc → tests/data/TestCatchment2/maps/chans.nc b/tests/data/Madeira/maps/chans.nc → tests/data/TestCatchment2/maps/chans.nc
diff --git a/tests/data/Madeira/maps/countries.nc → tests/data/TestCatchment2/maps/countries.nc b/tests/data/Madeira/maps/countries.nc → tests/data/TestCatchment2/maps/countries.nc
diff --git a/tests/data/Madeira/maps/elvstd.nc → tests/data/TestCatchment2/maps/elvstd.nc b/tests/data/Madeira/maps/elvstd.nc → tests/data/TestCatchment2/maps/elvstd.nc
diff --git a/...data/Madeira/maps/energyconsumptiveuse.nc → ...stCatchment2/maps/energyconsumptiveuse.nc b/...data/Madeira/maps/energyconsumptiveuse.nc → ...stCatchment2/maps/energyconsumptiveuse.nc
diff --git a/tests/data/Madeira/maps/fracmaxwater.nc → .../data/TestCatchment2/maps/fracmaxwater.nc b/tests/data/Madeira/maps/fracmaxwater.nc → .../data/TestCatchment2/maps/fracmaxwater.nc
diff --git a/tests/data/Madeira/maps/fracwater.nc → tests/data/TestCatchment2/maps/fracwater.nc b/tests/data/Madeira/maps/fracwater.nc → tests/data/TestCatchment2/maps/fracwater.nc
diff --git a/tests/data/Madeira/maps/gradient.nc → tests/data/TestCatchment2/maps/gradient.nc b/tests/data/Madeira/maps/gradient.nc → tests/data/TestCatchment2/maps/gradient.nc
diff --git a/tests/data/Madeira/maps/gwbodies.nc → tests/data/TestCatchment2/maps/gwbodies.nc b/tests/data/Madeira/maps/gwbodies.nc → tests/data/TestCatchment2/maps/gwbodies.nc
diff --git a/tests/data/Madeira/maps/lakemask.nc → tests/data/TestCatchment2/maps/lakemask.nc b/tests/data/Madeira/maps/lakemask.nc → tests/data/TestCatchment2/maps/lakemask.nc
diff --git a/tests/data/Madeira/maps/lakes.nc → tests/data/TestCatchment2/maps/lakes.nc b/tests/data/Madeira/maps/lakes.nc → tests/data/TestCatchment2/maps/lakes.nc
diff --git a/tests/data/Madeira/maps/lakes_463.nc → tests/data/TestCatchment2/maps/lakes_463.nc b/tests/data/Madeira/maps/lakes_463.nc → tests/data/TestCatchment2/maps/lakes_463.nc
diff --git a/...ta/Madeira/maps/landuse2000/fracforest.nc → ...Catchment2/maps/landuse2000/fracforest.nc b/...ta/Madeira/maps/landuse2000/fracforest.nc → ...Catchment2/maps/landuse2000/fracforest.nc
diff --git a/...ta/Madeira/maps/landuse2000/fracgwused.nc → ...Catchment2/maps/landuse2000/fracgwused.nc b/...ta/Madeira/maps/landuse2000/fracgwused.nc → ...Catchment2/maps/landuse2000/fracgwused.nc
diff --git a/...Madeira/maps/landuse2000/fracirrigated.nc → ...chment2/maps/landuse2000/fracirrigated.nc b/...Madeira/maps/landuse2000/fracirrigated.nc → ...chment2/maps/landuse2000/fracirrigated.nc
diff --git a/...ta/Madeira/maps/landuse2000/fraclrused.nc → ...Catchment2/maps/landuse2000/fraclrused.nc b/...ta/Madeira/maps/landuse2000/fraclrused.nc → ...Catchment2/maps/landuse2000/fraclrused.nc
diff --git a/.../Madeira/maps/landuse2000/fracmaxwater.nc → ...tchment2/maps/landuse2000/fracmaxwater.nc b/.../Madeira/maps/landuse2000/fracmaxwater.nc → ...tchment2/maps/landuse2000/fracmaxwater.nc
diff --git a/...ta/Madeira/maps/landuse2000/fracncused.nc → ...Catchment2/maps/landuse2000/fracncused.nc b/...ta/Madeira/maps/landuse2000/fracncused.nc → ...Catchment2/maps/landuse2000/fracncused.nc
diff --git a/...ata/Madeira/maps/landuse2000/fracother.nc → ...tCatchment2/maps/landuse2000/fracother.nc b/...ata/Madeira/maps/landuse2000/fracother.nc → ...tCatchment2/maps/landuse2000/fracother.nc
diff --git a/...data/Madeira/maps/landuse2000/fracrice.nc → ...stCatchment2/maps/landuse2000/fracrice.nc b/...data/Madeira/maps/landuse2000/fracrice.nc → ...stCatchment2/maps/landuse2000/fracrice.nc
diff --git a/...ta/Madeira/maps/landuse2000/fracsealed.nc → ...Catchment2/maps/landuse2000/fracsealed.nc b/...ta/Madeira/maps/landuse2000/fracsealed.nc → ...Catchment2/maps/landuse2000/fracsealed.nc
diff --git a/...ata/Madeira/maps/landuse2000/fracwater.nc → ...tCatchment2/maps/landuse2000/fracwater.nc b/...ata/Madeira/maps/landuse2000/fracwater.nc → ...tCatchment2/maps/landuse2000/fracwater.nc
diff --git a/...data/Madeira/maps/landuse2000/lakemask.nc → ...stCatchment2/maps/landuse2000/lakemask.nc b/...data/Madeira/maps/landuse2000/lakemask.nc → ...stCatchment2/maps/landuse2000/lakemask.nc
diff --git a/tests/data/Madeira/maps/landuse2000/pop.nc → ...ta/TestCatchment2/maps/landuse2000/pop.nc b/tests/data/Madeira/maps/landuse2000/pop.nc → ...ta/TestCatchment2/maps/landuse2000/pop.nc
diff --git a/...aps/landusechange/areamodel_reproequal.nc → ...aps/landusechange/areamodel_reproequal.nc b/...aps/landusechange/areamodel_reproequal.nc → ...aps/landusechange/areamodel_reproequal.nc
diff --git a/tests/data/Madeira/maps/landusechange/ff.nc → ...a/TestCatchment2/maps/landusechange/ff.nc b/tests/data/Madeira/maps/landusechange/ff.nc → ...a/TestCatchment2/maps/landusechange/ff.nc
diff --git a/tests/data/Madeira/maps/landusechange/fi.nc → ...a/TestCatchment2/maps/landusechange/fi.nc b/tests/data/Madeira/maps/landusechange/fi.nc → ...a/TestCatchment2/maps/landusechange/fi.nc
diff --git a/tests/data/Madeira/maps/landusechange/fo.nc → ...a/TestCatchment2/maps/landusechange/fo.nc b/tests/data/Madeira/maps/landusechange/fo.nc → ...a/TestCatchment2/maps/landusechange/fo.nc
diff --git a/tests/data/Madeira/maps/landusechange/fr.nc → ...a/TestCatchment2/maps/landusechange/fr.nc b/tests/data/Madeira/maps/landusechange/fr.nc → ...a/TestCatchment2/maps/landusechange/fr.nc
diff --git a/tests/data/Madeira/maps/landusechange/fs.nc → ...a/TestCatchment2/maps/landusechange/fs.nc b/tests/data/Madeira/maps/landusechange/fs.nc → ...a/TestCatchment2/maps/landusechange/fs.nc
diff --git a/tests/data/Madeira/maps/landusechange/fw.nc → ...a/TestCatchment2/maps/landusechange/fw.nc b/tests/data/Madeira/maps/landusechange/fw.nc → ...a/TestCatchment2/maps/landusechange/fw.nc
diff --git a/tests/data/Madeira/maps/ldd.nc → tests/data/TestCatchment2/maps/ldd.nc b/tests/data/Madeira/maps/ldd.nc → tests/data/TestCatchment2/maps/ldd.nc
diff --git a/tests/data/Madeira/maps/ldd_with_islands.nc → ...a/TestCatchment2/maps/ldd_with_islands.nc b/tests/data/Madeira/maps/ldd_with_islands.nc → ...a/TestCatchment2/maps/ldd_with_islands.nc
diff --git a/tests/data/Madeira/maps/lusemask.nc → tests/data/TestCatchment2/maps/lusemask.nc b/tests/data/Madeira/maps/lusemask.nc → tests/data/TestCatchment2/maps/lusemask.nc
diff --git a/tests/data/Madeira/maps/lusemask1.nc → tests/data/TestCatchment2/maps/lusemask1.nc b/tests/data/Madeira/maps/lusemask1.nc → tests/data/TestCatchment2/maps/lusemask1.nc
diff --git a/tests/data/Madeira/maps/lzavin.nc → tests/data/TestCatchment2/maps/lzavin.nc b/tests/data/Madeira/maps/lzavin.nc → tests/data/TestCatchment2/maps/lzavin.nc
diff --git a/tests/data/Madeira/maps/lzthreshold.nc → ...s/data/TestCatchment2/maps/lzthreshold.nc b/tests/data/Madeira/maps/lzthreshold.nc → ...s/data/TestCatchment2/maps/lzthreshold.nc
diff --git a/tests/data/Madeira/maps/outlets_World.nc → ...data/TestCatchment2/maps/outlets_World.nc b/tests/data/Madeira/maps/outlets_World.nc → ...data/TestCatchment2/maps/outlets_World.nc
diff --git a/...data/Madeira/maps/outlets_World_ISIMIP.nc → ...stCatchment2/maps/outlets_World_ISIMIP.nc b/...data/Madeira/maps/outlets_World_ISIMIP.nc → ...stCatchment2/maps/outlets_World_ISIMIP.nc
diff --git a/...parameters/params_AvWaterRateThreshold.nc → ...parameters/params_AvWaterRateThreshold.nc b/...parameters/params_AvWaterRateThreshold.nc → ...parameters/params_AvWaterRateThreshold.nc
diff --git a/...ira/maps/parameters/params_CalChanMan1.nc → ...nt2/maps/parameters/params_CalChanMan1.nc b/...ira/maps/parameters/params_CalChanMan1.nc → ...nt2/maps/parameters/params_CalChanMan1.nc
diff --git a/.../Madeira/maps/parameters/params_GwLoss.nc → ...tchment2/maps/parameters/params_GwLoss.nc b/.../Madeira/maps/parameters/params_GwLoss.nc → ...tchment2/maps/parameters/params_GwLoss.nc
diff --git a/...ira/maps/parameters/params_GwPercValue.nc → ...nt2/maps/parameters/params_GwPercValue.nc b/...ira/maps/parameters/params_GwPercValue.nc → ...nt2/maps/parameters/params_GwPercValue.nc
diff --git a/.../maps/parameters/params_LakeMultiplier.nc → .../maps/parameters/params_LakeMultiplier.nc b/.../maps/parameters/params_LakeMultiplier.nc → .../maps/parameters/params_LakeMultiplier.nc
diff --git a/...arameters/params_LowerZoneTimeConstant.nc → ...arameters/params_LowerZoneTimeConstant.nc b/...arameters/params_LowerZoneTimeConstant.nc → ...arameters/params_LowerZoneTimeConstant.nc
diff --git a/...a/maps/parameters/params_PowerPrefFlow.nc → ...2/maps/parameters/params_PowerPrefFlow.nc b/...a/maps/parameters/params_PowerPrefFlow.nc → ...2/maps/parameters/params_PowerPrefFlow.nc
diff --git a/...ra/maps/parameters/params_SnowMeltCoef.nc → ...t2/maps/parameters/params_SnowMeltCoef.nc b/...ra/maps/parameters/params_SnowMeltCoef.nc → ...t2/maps/parameters/params_SnowMeltCoef.nc
diff --git a/...arameters/params_UpperZoneTimeConstant.nc → ...arameters/params_UpperZoneTimeConstant.nc b/...arameters/params_UpperZoneTimeConstant.nc → ...arameters/params_UpperZoneTimeConstant.nc
diff --git a/...ra/maps/parameters/params_b_Xinanjiang.nc → ...t2/maps/parameters/params_b_Xinanjiang.nc b/...ra/maps/parameters/params_b_Xinanjiang.nc → ...t2/maps/parameters/params_b_Xinanjiang.nc
diff --git a/tests/data/Madeira/maps/pixarea.nc → tests/data/TestCatchment2/maps/pixarea.nc b/tests/data/Madeira/maps/pixarea.nc → tests/data/TestCatchment2/maps/pixarea.nc
diff --git a/...s/data/Madeira/maps/pixarea_reproequal.nc → ...TestCatchment2/maps/pixarea_reproequal.nc b/...s/data/Madeira/maps/pixarea_reproequal.nc → ...TestCatchment2/maps/pixarea_reproequal.nc
diff --git a/tests/data/Madeira/maps/pixleng.nc → tests/data/TestCatchment2/maps/pixleng.nc b/tests/data/Madeira/maps/pixleng.nc → tests/data/TestCatchment2/maps/pixleng.nc
diff --git a/...s/data/Madeira/maps/pixleng_reproequal.nc → ...TestCatchment2/maps/pixleng_reproequal.nc b/...s/data/Madeira/maps/pixleng_reproequal.nc → ...TestCatchment2/maps/pixleng_reproequal.nc
diff --git a/tests/data/Madeira/maps/res.nc → tests/data/TestCatchment2/maps/res.nc b/tests/data/Madeira/maps/res.nc → tests/data/TestCatchment2/maps/res.nc
diff --git a/tests/data/Madeira/maps/resZero.nc → tests/data/TestCatchment2/maps/resZero.nc b/tests/data/Madeira/maps/resZero.nc → tests/data/TestCatchment2/maps/resZero.nc
diff --git a/tests/data/Madeira/maps/res_687.nc → tests/data/TestCatchment2/maps/res_687.nc b/tests/data/Madeira/maps/res_687.nc → tests/data/TestCatchment2/maps/res_687.nc
diff --git a/tests/data/Madeira/maps/soilhyd/genua1_f.nc → ...a/TestCatchment2/maps/soilhyd/genua1_f.nc b/tests/data/Madeira/maps/soilhyd/genua1_f.nc → ...a/TestCatchment2/maps/soilhyd/genua1_f.nc
diff --git a/tests/data/Madeira/maps/soilhyd/genua1_o.nc → ...a/TestCatchment2/maps/soilhyd/genua1_o.nc b/tests/data/Madeira/maps/soilhyd/genua1_o.nc → ...a/TestCatchment2/maps/soilhyd/genua1_o.nc
diff --git a/tests/data/Madeira/maps/soilhyd/genua2_f.nc → ...a/TestCatchment2/maps/soilhyd/genua2_f.nc b/tests/data/Madeira/maps/soilhyd/genua2_f.nc → ...a/TestCatchment2/maps/soilhyd/genua2_f.nc
diff --git a/tests/data/Madeira/maps/soilhyd/genua2_o.nc → ...a/TestCatchment2/maps/soilhyd/genua2_o.nc b/tests/data/Madeira/maps/soilhyd/genua2_o.nc → ...a/TestCatchment2/maps/soilhyd/genua2_o.nc
diff --git a/tests/data/Madeira/maps/soilhyd/genua3.nc → ...ata/TestCatchment2/maps/soilhyd/genua3.nc b/tests/data/Madeira/maps/soilhyd/genua3.nc → ...ata/TestCatchment2/maps/soilhyd/genua3.nc
diff --git a/tests/data/Madeira/maps/soilhyd/ksat1_f.nc → ...ta/TestCatchment2/maps/soilhyd/ksat1_f.nc b/tests/data/Madeira/maps/soilhyd/ksat1_f.nc → ...ta/TestCatchment2/maps/soilhyd/ksat1_f.nc
diff --git a/tests/data/Madeira/maps/soilhyd/ksat1_o.nc → ...ta/TestCatchment2/maps/soilhyd/ksat1_o.nc b/tests/data/Madeira/maps/soilhyd/ksat1_o.nc → ...ta/TestCatchment2/maps/soilhyd/ksat1_o.nc
diff --git a/tests/data/Madeira/maps/soilhyd/ksat2_f.nc → ...ta/TestCatchment2/maps/soilhyd/ksat2_f.nc b/tests/data/Madeira/maps/soilhyd/ksat2_f.nc → ...ta/TestCatchment2/maps/soilhyd/ksat2_f.nc
diff --git a/tests/data/Madeira/maps/soilhyd/ksat2_o.nc → ...ta/TestCatchment2/maps/soilhyd/ksat2_o.nc b/tests/data/Madeira/maps/soilhyd/ksat2_o.nc → ...ta/TestCatchment2/maps/soilhyd/ksat2_o.nc
diff --git a/tests/data/Madeira/maps/soilhyd/ksat3.nc → ...data/TestCatchment2/maps/soilhyd/ksat3.nc b/tests/data/Madeira/maps/soilhyd/ksat3.nc → ...data/TestCatchment2/maps/soilhyd/ksat3.nc
diff --git a/tests/data/Madeira/maps/soilhyd/lambda1_f.nc → .../TestCatchment2/maps/soilhyd/lambda1_f.nc b/tests/data/Madeira/maps/soilhyd/lambda1_f.nc → .../TestCatchment2/maps/soilhyd/lambda1_f.nc
diff --git a/tests/data/Madeira/maps/soilhyd/lambda1_o.nc → .../TestCatchment2/maps/soilhyd/lambda1_o.nc b/tests/data/Madeira/maps/soilhyd/lambda1_o.nc → .../TestCatchment2/maps/soilhyd/lambda1_o.nc
diff --git a/tests/data/Madeira/maps/soilhyd/lambda2_f.nc → .../TestCatchment2/maps/soilhyd/lambda2_f.nc b/tests/data/Madeira/maps/soilhyd/lambda2_f.nc → .../TestCatchment2/maps/soilhyd/lambda2_f.nc
diff --git a/tests/data/Madeira/maps/soilhyd/lambda2_o.nc → .../TestCatchment2/maps/soilhyd/lambda2_o.nc b/tests/data/Madeira/maps/soilhyd/lambda2_o.nc → .../TestCatchment2/maps/soilhyd/lambda2_o.nc
diff --git a/tests/data/Madeira/maps/soilhyd/lambda3.nc → ...ta/TestCatchment2/maps/soilhyd/lambda3.nc b/tests/data/Madeira/maps/soilhyd/lambda3.nc → ...ta/TestCatchment2/maps/soilhyd/lambda3.nc
diff --git a/tests/data/Madeira/maps/soilhyd/thetar1.nc → ...ta/TestCatchment2/maps/soilhyd/thetar1.nc b/tests/data/Madeira/maps/soilhyd/thetar1.nc → ...ta/TestCatchment2/maps/soilhyd/thetar1.nc
diff --git a/tests/data/Madeira/maps/soilhyd/thetar2.nc → ...ta/TestCatchment2/maps/soilhyd/thetar2.nc b/tests/data/Madeira/maps/soilhyd/thetar2.nc → ...ta/TestCatchment2/maps/soilhyd/thetar2.nc
diff --git a/tests/data/Madeira/maps/soilhyd/thetar3.nc → ...ta/TestCatchment2/maps/soilhyd/thetar3.nc b/tests/data/Madeira/maps/soilhyd/thetar3.nc → ...ta/TestCatchment2/maps/soilhyd/thetar3.nc
diff --git a/tests/data/Madeira/maps/soilhyd/thetas1_f.nc → .../TestCatchment2/maps/soilhyd/thetas1_f.nc b/tests/data/Madeira/maps/soilhyd/thetas1_f.nc → .../TestCatchment2/maps/soilhyd/thetas1_f.nc
diff --git a/tests/data/Madeira/maps/soilhyd/thetas1_o.nc → .../TestCatchment2/maps/soilhyd/thetas1_o.nc b/tests/data/Madeira/maps/soilhyd/thetas1_o.nc → .../TestCatchment2/maps/soilhyd/thetas1_o.nc
diff --git a/tests/data/Madeira/maps/soilhyd/thetas2_f.nc → .../TestCatchment2/maps/soilhyd/thetas2_f.nc b/tests/data/Madeira/maps/soilhyd/thetas2_f.nc → .../TestCatchment2/maps/soilhyd/thetas2_f.nc
diff --git a/tests/data/Madeira/maps/soilhyd/thetas2_o.nc → .../TestCatchment2/maps/soilhyd/thetas2_o.nc b/tests/data/Madeira/maps/soilhyd/thetas2_o.nc → .../TestCatchment2/maps/soilhyd/thetas2_o.nc
diff --git a/tests/data/Madeira/maps/soilhyd/thetas3.nc → ...ta/TestCatchment2/maps/soilhyd/thetas3.nc b/tests/data/Madeira/maps/soilhyd/thetas3.nc → ...ta/TestCatchment2/maps/soilhyd/thetas3.nc
diff --git a/...data/Madeira/maps/table2map/cropcoef_f.nc → ...stCatchment2/maps/table2map/cropcoef_f.nc b/...data/Madeira/maps/table2map/cropcoef_f.nc → ...stCatchment2/maps/table2map/cropcoef_f.nc
diff --git a/...data/Madeira/maps/table2map/cropcoef_i.nc → ...stCatchment2/maps/table2map/cropcoef_i.nc b/...data/Madeira/maps/table2map/cropcoef_i.nc → ...stCatchment2/maps/table2map/cropcoef_i.nc
diff --git a/...data/Madeira/maps/table2map/cropcoef_o.nc → ...stCatchment2/maps/table2map/cropcoef_o.nc b/...data/Madeira/maps/table2map/cropcoef_o.nc → ...stCatchment2/maps/table2map/cropcoef_o.nc
diff --git a/...data/Madeira/maps/table2map/cropgrpn_f.nc → ...stCatchment2/maps/table2map/cropgrpn_f.nc b/...data/Madeira/maps/table2map/cropgrpn_f.nc → ...stCatchment2/maps/table2map/cropgrpn_f.nc
diff --git a/...data/Madeira/maps/table2map/cropgrpn_i.nc → ...stCatchment2/maps/table2map/cropgrpn_i.nc b/...data/Madeira/maps/table2map/cropgrpn_i.nc → ...stCatchment2/maps/table2map/cropgrpn_i.nc
diff --git a/...data/Madeira/maps/table2map/cropgrpn_o.nc → ...stCatchment2/maps/table2map/cropgrpn_o.nc b/...data/Madeira/maps/table2map/cropgrpn_o.nc → ...stCatchment2/maps/table2map/cropgrpn_o.nc
diff --git a/...data/Madeira/maps/table2map/mannings_f.nc → ...stCatchment2/maps/table2map/mannings_f.nc b/...data/Madeira/maps/table2map/mannings_f.nc → ...stCatchment2/maps/table2map/mannings_f.nc
diff --git a/...data/Madeira/maps/table2map/mannings_o.nc → ...stCatchment2/maps/table2map/mannings_o.nc b/...data/Madeira/maps/table2map/mannings_o.nc → ...stCatchment2/maps/table2map/mannings_o.nc
diff --git a/...Madeira/maps/table2map/riceharvestday1.nc → ...chment2/maps/table2map/riceharvestday1.nc b/...Madeira/maps/table2map/riceharvestday1.nc → ...chment2/maps/table2map/riceharvestday1.nc
diff --git a/...Madeira/maps/table2map/riceharvestday2.nc → ...chment2/maps/table2map/riceharvestday2.nc b/...Madeira/maps/table2map/riceharvestday2.nc → ...chment2/maps/table2map/riceharvestday2.nc
diff --git a/...adeira/maps/table2map/riceplantingday1.nc → ...hment2/maps/table2map/riceplantingday1.nc b/...adeira/maps/table2map/riceplantingday1.nc → ...hment2/maps/table2map/riceplantingday1.nc
diff --git a/...adeira/maps/table2map/riceplantingday2.nc → ...hment2/maps/table2map/riceplantingday2.nc b/...adeira/maps/table2map/riceplantingday2.nc → ...hment2/maps/table2map/riceplantingday2.nc
diff --git a/...ta/Madeira/maps/table2map/soildepth1_f.nc → ...Catchment2/maps/table2map/soildepth1_f.nc b/...ta/Madeira/maps/table2map/soildepth1_f.nc → ...Catchment2/maps/table2map/soildepth1_f.nc
diff --git a/...ta/Madeira/maps/table2map/soildepth1_o.nc → ...Catchment2/maps/table2map/soildepth1_o.nc b/...ta/Madeira/maps/table2map/soildepth1_o.nc → ...Catchment2/maps/table2map/soildepth1_o.nc
diff --git a/...ta/Madeira/maps/table2map/soildepth2_f.nc → ...Catchment2/maps/table2map/soildepth2_f.nc b/...ta/Madeira/maps/table2map/soildepth2_f.nc → ...Catchment2/maps/table2map/soildepth2_f.nc
diff --git a/...ta/Madeira/maps/table2map/soildepth2_o.nc → ...Catchment2/maps/table2map/soildepth2_o.nc b/...ta/Madeira/maps/table2map/soildepth2_o.nc → ...Catchment2/maps/table2map/soildepth2_o.nc
diff --git a/...ta/Madeira/maps/table2map/soildepth3_f.nc → ...Catchment2/maps/table2map/soildepth3_f.nc b/...ta/Madeira/maps/table2map/soildepth3_f.nc → ...Catchment2/maps/table2map/soildepth3_f.nc
diff --git a/...ta/Madeira/maps/table2map/soildepth3_o.nc → ...Catchment2/maps/table2map/soildepth3_o.nc b/...ta/Madeira/maps/table2map/soildepth3_o.nc → ...Catchment2/maps/table2map/soildepth3_o.nc
diff --git a/tests/data/Madeira/maps/transevap.nc → tests/data/TestCatchment2/maps/transevap.nc b/tests/data/Madeira/maps/transevap.nc → tests/data/TestCatchment2/maps/transevap.nc
diff --git a/tests/data/Madeira/maps/upArea.nc → tests/data/TestCatchment2/maps/upArea.nc b/tests/data/Madeira/maps/upArea.nc → tests/data/TestCatchment2/maps/upArea.nc
diff --git a/...s/data/Madeira/maps/variablewater/varW.nc → ...TestCatchment2/maps/variablewater/varW.nc b/...s/data/Madeira/maps/variablewater/varW.nc → ...TestCatchment2/maps/variablewater/varW.nc
diff --git a/tests/data/Madeira/maps/wateruse2000/dom.nc → ...a/TestCatchment2/maps/wateruse2000/dom.nc b/tests/data/Madeira/maps/wateruse2000/dom.nc → ...a/TestCatchment2/maps/wateruse2000/dom.nc
diff --git a/tests/data/Madeira/maps/wateruse2000/ene.nc → ...a/TestCatchment2/maps/wateruse2000/ene.nc b/tests/data/Madeira/maps/wateruse2000/ene.nc → ...a/TestCatchment2/maps/wateruse2000/ene.nc
diff --git a/tests/data/Madeira/maps/wateruse2000/ind.nc → ...a/TestCatchment2/maps/wateruse2000/ind.nc b/tests/data/Madeira/maps/wateruse2000/ind.nc → ...a/TestCatchment2/maps/wateruse2000/ind.nc
diff --git a/tests/data/Madeira/maps/wateruse2000/liv.nc → ...a/TestCatchment2/maps/wateruse2000/liv.nc b/tests/data/Madeira/maps/wateruse2000/liv.nc → ...a/TestCatchment2/maps/wateruse2000/liv.nc
diff --git a/tests/data/Madeira/meteo/dis.nc → tests/data/TestCatchment2/meteo/dis.nc b/tests/data/Madeira/meteo/dis.nc → tests/data/TestCatchment2/meteo/dis.nc
diff --git a/tests/data/Madeira/meteo/e0.nc → tests/data/TestCatchment2/meteo/e0.nc b/tests/data/Madeira/meteo/e0.nc → tests/data/TestCatchment2/meteo/e0.nc
diff --git a/tests/data/Madeira/meteo/pr.nc → tests/data/TestCatchment2/meteo/pr.nc b/tests/data/Madeira/meteo/pr.nc → tests/data/TestCatchment2/meteo/pr.nc
diff --git a/tests/data/Madeira/meteo/ta.nc → tests/data/TestCatchment2/meteo/ta.nc b/tests/data/Madeira/meteo/ta.nc → tests/data/TestCatchment2/meteo/ta.nc
diff --git a/tests/data/Madeira/out/.gitignore → tests/data/TestCatchment2/out/.gitignore b/tests/data/Madeira/out/.gitignore → tests/data/TestCatchment2/out/.gitignore
diff --git a/tests/data/Madeira/reference/dis.nc → tests/data/TestCatchment2/reference/dis.nc b/tests/data/Madeira/reference/dis.nc → tests/data/TestCatchment2/reference/dis.nc
diff --git a/tests/data/Madeira/reference/dis_out.nc → .../data/TestCatchment2/reference/dis_out.nc b/tests/data/Madeira/reference/dis_out.nc → .../data/TestCatchment2/reference/dis_out.nc
diff --git a/tests/data/Madeira/table2map/cropcoef_f.nc → ...ta/TestCatchment2/table2map/cropcoef_f.nc b/tests/data/Madeira/table2map/cropcoef_f.nc → ...ta/TestCatchment2/table2map/cropcoef_f.nc
diff --git a/tests/data/Madeira/table2map/cropcoef_i.nc → ...ta/TestCatchment2/table2map/cropcoef_i.nc b/tests/data/Madeira/table2map/cropcoef_i.nc → ...ta/TestCatchment2/table2map/cropcoef_i.nc
diff --git a/tests/data/Madeira/table2map/cropcoef_o.nc → ...ta/TestCatchment2/table2map/cropcoef_o.nc b/tests/data/Madeira/table2map/cropcoef_o.nc → ...ta/TestCatchment2/table2map/cropcoef_o.nc
diff --git a/tests/data/Madeira/table2map/cropgrpn_f.nc → ...ta/TestCatchment2/table2map/cropgrpn_f.nc b/tests/data/Madeira/table2map/cropgrpn_f.nc → ...ta/TestCatchment2/table2map/cropgrpn_f.nc
diff --git a/tests/data/Madeira/table2map/cropgrpn_i.nc → ...ta/TestCatchment2/table2map/cropgrpn_i.nc b/tests/data/Madeira/table2map/cropgrpn_i.nc → ...ta/TestCatchment2/table2map/cropgrpn_i.nc
diff --git a/tests/data/Madeira/table2map/cropgrpn_o.nc → ...ta/TestCatchment2/table2map/cropgrpn_o.nc b/tests/data/Madeira/table2map/cropgrpn_o.nc → ...ta/TestCatchment2/table2map/cropgrpn_o.nc
diff --git a/tests/data/Madeira/table2map/mannings_f.nc → ...ta/TestCatchment2/table2map/mannings_f.nc b/tests/data/Madeira/table2map/mannings_f.nc → ...ta/TestCatchment2/table2map/mannings_f.nc
diff --git a/tests/data/Madeira/table2map/mannings_o.nc → ...ta/TestCatchment2/table2map/mannings_o.nc b/tests/data/Madeira/table2map/mannings_o.nc → ...ta/TestCatchment2/table2map/mannings_o.nc
diff --git a/...data/Madeira/table2map/riceharvestday1.nc → ...stCatchment2/table2map/riceharvestday1.nc b/...data/Madeira/table2map/riceharvestday1.nc → ...stCatchment2/table2map/riceharvestday1.nc
diff --git a/...data/Madeira/table2map/riceharvestday2.nc → ...stCatchment2/table2map/riceharvestday2.nc b/...data/Madeira/table2map/riceharvestday2.nc → ...stCatchment2/table2map/riceharvestday2.nc
diff --git a/...ata/Madeira/table2map/riceplantingday1.nc → ...tCatchment2/table2map/riceplantingday1.nc b/...ata/Madeira/table2map/riceplantingday1.nc → ...tCatchment2/table2map/riceplantingday1.nc
diff --git a/...ata/Madeira/table2map/riceplantingday2.nc → ...tCatchment2/table2map/riceplantingday2.nc b/...ata/Madeira/table2map/riceplantingday2.nc → ...tCatchment2/table2map/riceplantingday2.nc
diff --git a/tests/data/Madeira/table2map/soildepth1_f.nc → .../TestCatchment2/table2map/soildepth1_f.nc b/tests/data/Madeira/table2map/soildepth1_f.nc → .../TestCatchment2/table2map/soildepth1_f.nc
diff --git a/tests/data/Madeira/table2map/soildepth1_o.nc → .../TestCatchment2/table2map/soildepth1_o.nc b/tests/data/Madeira/table2map/soildepth1_o.nc → .../TestCatchment2/table2map/soildepth1_o.nc
diff --git a/tests/data/Madeira/table2map/soildepth2_f.nc → .../TestCatchment2/table2map/soildepth2_f.nc b/tests/data/Madeira/table2map/soildepth2_f.nc → .../TestCatchment2/table2map/soildepth2_f.nc
diff --git a/tests/data/Madeira/table2map/soildepth2_o.nc → .../TestCatchment2/table2map/soildepth2_o.nc b/tests/data/Madeira/table2map/soildepth2_o.nc → .../TestCatchment2/table2map/soildepth2_o.nc
diff --git a/tests/data/Madeira/table2map/soildepth3_f.nc → .../TestCatchment2/table2map/soildepth3_f.nc b/tests/data/Madeira/table2map/soildepth3_f.nc → .../TestCatchment2/table2map/soildepth3_f.nc
diff --git a/tests/data/Madeira/table2map/soildepth3_o.nc → .../TestCatchment2/table2map/soildepth3_o.nc b/tests/data/Madeira/table2map/soildepth3_o.nc → .../TestCatchment2/table2map/soildepth3_o.nc
diff --git a/tests/data/Madeira/tables/EndOfMonth.txt → ...data/TestCatchment2/tables/EndOfMonth.txt b/tests/data/Madeira/tables/EndOfMonth.txt → ...data/TestCatchment2/tables/EndOfMonth.txt
diff --git a/tests/data/Madeira/tables/LaiOfDay.txt → ...s/data/TestCatchment2/tables/LaiOfDay.txt b/tests/data/Madeira/tables/LaiOfDay.txt → ...s/data/TestCatchment2/tables/LaiOfDay.txt
diff --git a/tests/data/Madeira/tables/Month.txt → tests/data/TestCatchment2/tables/Month.txt b/tests/data/Madeira/tables/Month.txt → tests/data/TestCatchment2/tables/Month.txt
diff --git a/...eira/tables/ReservoirInitialFillValue.txt → ...ent2/tables/ReservoirInitialFillValue.txt b/...eira/tables/ReservoirInitialFillValue.txt → ...ent2/tables/ReservoirInitialFillValue.txt
diff --git a/tests/data/Madeira/tables/RiceDrainage.txt → ...ta/TestCatchment2/tables/RiceDrainage.txt b/tests/data/Madeira/tables/RiceDrainage.txt → ...ta/TestCatchment2/tables/RiceDrainage.txt
diff --git a/tests/data/Madeira/tables/RiceFlooding.txt → ...ta/TestCatchment2/tables/RiceFlooding.txt b/tests/data/Madeira/tables/RiceFlooding.txt → ...ta/TestCatchment2/tables/RiceFlooding.txt
diff --git a/tests/data/Madeira/tables/RiceOperation.txt → ...a/TestCatchment2/tables/RiceOperation.txt b/tests/data/Madeira/tables/RiceOperation.txt → ...a/TestCatchment2/tables/RiceOperation.txt
diff --git a/tests/data/Madeira/tables/RiceSaturation.txt → .../TestCatchment2/tables/RiceSaturation.txt b/tests/data/Madeira/tables/RiceSaturation.txt → .../TestCatchment2/tables/RiceSaturation.txt
diff --git a/tests/data/Madeira/tables/WUseOfDay.txt → .../data/TestCatchment2/tables/WUseOfDay.txt b/tests/data/Madeira/tables/WUseOfDay.txt → .../data/TestCatchment2/tables/WUseOfDay.txt
diff --git a/...s/data/Madeira/tables/firstdayofmonth.txt → ...TestCatchment2/tables/firstdayofmonth.txt b/...s/data/Madeira/tables/firstdayofmonth.txt → ...TestCatchment2/tables/firstdayofmonth.txt
diff --git a/tests/data/Madeira/tables/lakea.txt → tests/data/TestCatchment2/tables/lakea.txt b/tests/data/Madeira/tables/lakea.txt → tests/data/TestCatchment2/tables/lakea.txt
diff --git a/tests/data/Madeira/tables/lakea_463_RW_F.txt → .../TestCatchment2/tables/lakea_463_RW_F.txt b/tests/data/Madeira/tables/lakea_463_RW_F.txt → .../TestCatchment2/tables/lakea_463_RW_F.txt
diff --git a/tests/data/Madeira/tables/lakearea.txt → ...s/data/TestCatchment2/tables/lakearea.txt b/tests/data/Madeira/tables/lakearea.txt → ...s/data/TestCatchment2/tables/lakearea.txt
diff --git a/tests/data/Madeira/tables/lakearea_463.txt → ...ta/TestCatchment2/tables/lakearea_463.txt b/tests/data/Madeira/tables/lakearea_463.txt → ...ta/TestCatchment2/tables/lakearea_463.txt
diff --git a/tests/data/Madeira/tables/lakeavinflow.txt → ...ta/TestCatchment2/tables/lakeavinflow.txt b/tests/data/Madeira/tables/lakeavinflow.txt → ...ta/TestCatchment2/tables/lakeavinflow.txt
diff --git a/.../data/Madeira/tables/lakeavinflow_463.txt → ...estCatchment2/tables/lakeavinflow_463.txt b/.../data/Madeira/tables/lakeavinflow_463.txt → ...estCatchment2/tables/lakeavinflow_463.txt
diff --git a/...ra/tables/lakes_res_zuzanna/lakea_463.txt → ...t2/tables/lakes_res_zuzanna/lakea_463.txt b/...ra/tables/lakes_res_zuzanna/lakea_463.txt → ...t2/tables/lakes_res_zuzanna/lakea_463.txt
diff --git a/...tables/lakes_res_zuzanna/lakearea_463.txt → ...tables/lakes_res_zuzanna/lakearea_463.txt b/...tables/lakes_res_zuzanna/lakearea_463.txt → ...tables/lakes_res_zuzanna/lakearea_463.txt
diff --git a/...es/lakes_res_zuzanna/lakeavinflow_463.txt → ...es/lakes_res_zuzanna/lakeavinflow_463.txt b/...es/lakes_res_zuzanna/lakeavinflow_463.txt → ...es/lakes_res_zuzanna/lakeavinflow_463.txt
diff --git a/...ra/tables/lakes_res_zuzanna/rclim_687.txt → ...t2/tables/lakes_res_zuzanna/rclim_687.txt b/...ra/tables/lakes_res_zuzanna/rclim_687.txt → ...t2/tables/lakes_res_zuzanna/rclim_687.txt
diff --git a/...bles/lakes_res_zuzanna/rflim_687_97th.txt → ...bles/lakes_res_zuzanna/rflim_687_97th.txt b/...bles/lakes_res_zuzanna/rflim_687_97th.txt → ...bles/lakes_res_zuzanna/rflim_687_97th.txt
diff --git a/...ables/lakes_res_zuzanna/rminq_687_5th.txt → ...ables/lakes_res_zuzanna/rminq_687_5th.txt b/...ables/lakes_res_zuzanna/rminq_687_5th.txt → ...ables/lakes_res_zuzanna/rminq_687_5th.txt
diff --git a/...ables/lakes_res_zuzanna/rndq_687_97th.txt → ...ables/lakes_res_zuzanna/rndq_687_97th.txt b/...ables/lakes_res_zuzanna/rndq_687_97th.txt → ...ables/lakes_res_zuzanna/rndq_687_97th.txt
diff --git a/...bles/lakes_res_zuzanna/rnlim_687_30th.txt → ...bles/lakes_res_zuzanna/rnlim_687_30th.txt b/...bles/lakes_res_zuzanna/rnlim_687_30th.txt → ...bles/lakes_res_zuzanna/rnlim_687_30th.txt
diff --git a/...les/lakes_res_zuzanna/rnormq_687_30th.txt → ...les/lakes_res_zuzanna/rnormq_687_30th.txt b/...les/lakes_res_zuzanna/rnormq_687_30th.txt → ...les/lakes_res_zuzanna/rnormq_687_30th.txt
diff --git a/...ra/tables/lakes_res_zuzanna/rstor_687.txt → ...t2/tables/lakes_res_zuzanna/rstor_687.txt b/...ra/tables/lakes_res_zuzanna/rstor_687.txt → ...t2/tables/lakes_res_zuzanna/rstor_687.txt
diff --git a/tests/data/Madeira/tables/n.txt → tests/data/TestCatchment2/tables/n.txt b/tests/data/Madeira/tables/n.txt → tests/data/TestCatchment2/tables/n.txt
diff --git a/tests/data/Madeira/tables/rclim.txt → tests/data/TestCatchment2/tables/rclim.txt b/tests/data/Madeira/tables/rclim.txt → tests/data/TestCatchment2/tables/rclim.txt
diff --git a/tests/data/Madeira/tables/rclim_687.txt → .../data/TestCatchment2/tables/rclim_687.txt b/tests/data/Madeira/tables/rclim_687.txt → .../data/TestCatchment2/tables/rclim_687.txt
diff --git a/tests/data/Madeira/tables/rflim.txt → tests/data/TestCatchment2/tables/rflim.txt b/tests/data/Madeira/tables/rflim.txt → tests/data/TestCatchment2/tables/rflim.txt
diff --git a/tests/data/Madeira/tables/rflim_687_97th.txt → .../TestCatchment2/tables/rflim_687_97th.txt b/tests/data/Madeira/tables/rflim_687_97th.txt → .../TestCatchment2/tables/rflim_687_97th.txt
diff --git a/tests/data/Madeira/tables/rminq.txt → tests/data/TestCatchment2/tables/rminq.txt b/tests/data/Madeira/tables/rminq.txt → tests/data/TestCatchment2/tables/rminq.txt
diff --git a/tests/data/Madeira/tables/rminq_687_5th.txt → ...a/TestCatchment2/tables/rminq_687_5th.txt b/tests/data/Madeira/tables/rminq_687_5th.txt → ...a/TestCatchment2/tables/rminq_687_5th.txt
diff --git a/tests/data/Madeira/tables/rndq.txt → tests/data/TestCatchment2/tables/rndq.txt b/tests/data/Madeira/tables/rndq.txt → tests/data/TestCatchment2/tables/rndq.txt
diff --git a/tests/data/Madeira/tables/rndq_687_97th.txt → ...a/TestCatchment2/tables/rndq_687_97th.txt b/tests/data/Madeira/tables/rndq_687_97th.txt → ...a/TestCatchment2/tables/rndq_687_97th.txt
diff --git a/tests/data/Madeira/tables/rnlim.txt → tests/data/TestCatchment2/tables/rnlim.txt b/tests/data/Madeira/tables/rnlim.txt → tests/data/TestCatchment2/tables/rnlim.txt
diff --git a/tests/data/Madeira/tables/rnlim_687_30th.txt → .../TestCatchment2/tables/rnlim_687_30th.txt b/tests/data/Madeira/tables/rnlim_687_30th.txt → .../TestCatchment2/tables/rnlim_687_30th.txt
diff --git a/tests/data/Madeira/tables/rnlim_687_67th.txt → .../TestCatchment2/tables/rnlim_687_67th.txt b/tests/data/Madeira/tables/rnlim_687_67th.txt → .../TestCatchment2/tables/rnlim_687_67th.txt
diff --git a/tests/data/Madeira/tables/rnormq.txt → tests/data/TestCatchment2/tables/rnormq.txt b/tests/data/Madeira/tables/rnormq.txt → tests/data/TestCatchment2/tables/rnormq.txt
diff --git a/...s/data/Madeira/tables/rnormq_687_30th.txt → ...TestCatchment2/tables/rnormq_687_30th.txt b/...s/data/Madeira/tables/rnormq_687_30th.txt → ...TestCatchment2/tables/rnormq_687_30th.txt
diff --git a/...s/data/Madeira/tables/rnormq_687_50th.txt → ...TestCatchment2/tables/rnormq_687_50th.txt b/...s/data/Madeira/tables/rnormq_687_50th.txt → ...TestCatchment2/tables/rnormq_687_50th.txt
diff --git a/tests/data/Madeira/tables/rstor_687.txt → .../data/TestCatchment2/tables/rstor_687.txt b/tests/data/Madeira/tables/rstor_687.txt → .../data/TestCatchment2/tables/rstor_687.txt
diff --git a/tests/data/Madeira/tables/rtstor.txt → tests/data/TestCatchment2/tables/rtstor.txt b/tests/data/Madeira/tables/rtstor.txt → tests/data/TestCatchment2/tables/rtstor.txt