Merge branch 'master' of https://gitlab.pik-potsdam.de/foresee/4C

test_data_sets/test_flagm7/site05.sod

-!  site 05 (SOil Profile)																
+!  site 05 (Soil Profile)																
 New Version		14/01/15														
 10		Longitude														
 50		Latitude														

test_data_sets/test_flagm7/test_multi7.con

 ! Test
 ! con-Datei fuer flag_multi=7
-!   sitenum site_name   climfile	soil  	treefile  	manfile		depofile		redfile		litfile     co2 flag	
+!   sitenum site_name   climfile	soil  	    treefile  	  manfile	depofile		redfile		litfile     	
          1     1      site05.cli   site05.sod  	site05.ini   dummy.man 	site05.dep   dummy.red	dummy.lit 103  
          2     2      site05.cli   site05.sod  	site05.ini   dummy.man 	site05.dep   dummy.red	dummy.lit 103

test_data_sets/test_flagm8/clim_motive_dim.dat

-! Koordinaten Motive Deutschland
+! Coordinates MOTIVE Germany
 100111    10.243  54.100      25
 100005    12.429  53.101      75
 100009    13.564  51.798      75

test_data_sets/test_flagm8/motive_dl2im.con

@@ -4,7 +4,7 @@ site09   100009  site09     500    site09
 site96   100096  site96     500    site96
 site98   100098  site98     500    site98
 site99   100099  site99     500    site99
-site100   100100  site100     500    site100
-site102   100102  site102     500    site102
-site104   100104  site104     500    site104
+site100   100100  site100   500    site100
+site102   100102  site102   500    site102
+site104   100104  site104   500    site104
 site80   100080  site80     500    site80

test_data_sets/test_src/clim_src.dat

-! 2342 Klimastationen Deutschland
+! 2342 Climate stations Germany
 11001	8.59	54.7	4
 11002basz	9.55	54.53	43
 11003	9.98	54.09	26
-11004	9.1	54.21	12
+11004	9.1 	54.21	12
 11005	8.65	54.3	4
 11101	8.33	54.68	9
-11102	8.7	54.73	1
+11102	8.7	   54.73	1
 11103	8.98	54.62	21
 11104	9.15	54.65	19
 11105	9.33	54.52	7
 11106	9.73	54.63	23
 11107	9.98	54.53	32
-11108	8.6	54.33	5
+11108	8.6	   54.33	5
 11109	8.87	54.5	1
-11110	9.1	54.38	1
+11110	9.1	    54.38	1
 11111	9.32	54.3	18
 11112	9.63	54.43	35
 11113	9.77	54.4	15
@@ -21,18 +21,18 @@
 11115	9.28	54.15	40
 11116	9.35	54.05	16
 11117	8.87	54.12	7
-11118	8.9	54.65	5
+11118	8.9	    54.65	5
 11119	9.67	54.78	22
 11120	8.88	54	2
-11121	9.6	54.87	5
+11121	9.6	    54.87	5
 11122	9.55	54.17	26
-11123	9.4	54.13	46
+11123	9.4	    54.13	46
 11124	9.17	54.3	11
 11125	8.68	54.87	1
 11126	9.18	54.07	8
 11127	8.63	54.63	6
 11128	9.93	54.4	15
-11129	8.8	54.55	5
+11129	8.8	    54.55	5
 11130	9.77	54.62	33
 11131	8.62	54.52	1
 11132	9.62	54.7	35
@@ -41,7 +41,7 @@
 11135	8.32	54.9	3
 11136	8.57	54.7	1
 11137	8.68	54.38	1
-11138	9.3	54.38	15
+11138	9.3	    54.38	15
 11139	8.92	54.2	3
 12001	10.4	54.16	24
 12002	11.06	54.53	3
@@ -87,15 +87,15 @@
 13118	12.68	54.43	1
 14001	7.15	53.72	11
 14002	6.75	53.56	5
-14003	7.9	53.54	7
-14004	7.9	53.79	2
+14003	7.9	    53.54	7
+14004	7.9 	53.79	2
 14005	7.46	53.45	4
 14006	7.95	53.08	8
-14007	7.3	52.52	24
-14008	7.1	52.44	24
-14101	7.9	53.78	3
+14007	7.3	    52.52	24
+14008	7.1	    52.44	24
+14101	7.9	    53.78	3
 14102	7.87	52.12	55
-14103	7.1	53.5	1
+14103	7.1	    53.5	1
 14104	7.43	53.65	1
 14105	7.62	53.65	3
 14106	7.57	52.17	43

test_data_sets/test_src/test_src.con

-!ID     Klima   soil    GWA     stand   Nodep   Nhdep
+!ID clim.-station soil      GWA   stand    NOdep   NHdep
 1       11002   331031      500     1       3.01    2.47
 2       11002   331131      500     2       3.01    2.47
 3       11002   330731      500     3       3.01    2.47