diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_initial_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_initial_001
index 5f359faab0fab1f433148ff01aecad84c0c01585..80998445cd71371d3ff0aa6d3af06621c7e142be 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_initial_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_initial_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107000000_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107000000_001
index 362b159f29066f82d0270f5595a739060c74ee23..95a9bab1fef7b2289c75413fa90687717968c966 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107000000_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107000000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107003000_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107003000_001
index c4f28849f78ec76ce8915c413069a148c5d0582b..dd452a427f243d3231f2b81e1e1ed36c4f06ba11 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107003000_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107003000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107010000_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107010000_001
index 6e364eb0bd138b7a4ee253c48d6d82e2a4e3db35..66c55a73e7e94139486881ad47a4a0800463eb68 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107010000_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107010000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107013000_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107013000_001
index 8b912c3f765ba2d5e036b7f78e95f4bcc4777677..ef9a04a6737aed6d0eb823b8f010e8b5531b4679 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107013000_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output/grid_time_20131107013000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107003000_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107003000_001
index 901b6fa435c91eb9f0bcb1411fc4b11930bbde5a..ec4c1596c5ffc05c3c69a458090a2dbce47d7477 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107003000_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107003000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107010000_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107010000_001
index 97aa1b25086596028fc416b922b975f9aefc8405..350e5e360520b3e49096f7902689d0a092c735b6 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107010000_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107010000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107013000_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107013000_001
index a36eb5e3a28db97f55099c4fec6c8fc2a0e3e464..c730a4b87057364954675a9acfa08cdbba838b3f 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107013000_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107013000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107020000_001 b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107020000_001
index ab9d5a5a26f787dd01db41d278025430055c3e6f..3fd436ea4a5377f8ec6146c6cfa1542dbaccbccd 100644
Binary files a/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107020000_001 and b/flexpart-testing/case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_CTBTO/control_output/grid_conc_20131107020000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_initial_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_initial_001
index cf7735c002abd4e246c20095a115d97b46eef734..6bdd379917cd89e5cd649c1c38421531e9b11f53 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_initial_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_initial_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919000000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919000000_001
index 2f9d18fb178c74d677cdb2d2a66d16a251235860..318074a1c1f0f1b82e80138fb969cfbf9842a7b4 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919000000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919000000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919010000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919010000_001
index 9d5e30429710ceba9befded96714c68b75f2cc05..ca13d973815ce20c4ab84684d7bc71c55929cca2 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919010000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919010000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919020000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919020000_001
index 9c7fe181e53b2876b08c24b49dda6e3ed73eed6a..5717b564170bb00268fcb20d0bec5c9d6d112db4 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919020000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919020000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919030000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919030000_001
index 6a176961d013f9d470354fb223a83ee5ab1b1e49..34039d4e816dcb2693477540b3891abd70557462 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919030000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919030000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919040000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919040000_001
index b0f6f55b74a72ef699d0c5918313b25e9aeca053..d59d4c9bd30807fc768acda8d3a47197c6a84183 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919040000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919040000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919050000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919050000_001
index 09f4d69cf80379d53beac53683fd33ed4ecbad36..4cd4db29ef99ed04557f2641ba68270fd2926368 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919050000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output/grid_time_20140919050000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919010000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919010000_001
index 169e557115fa0b2cb398d18d22e4aaab43807798..ef726177a9312ed1995f48920250256e86e69c74 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919010000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919010000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919020000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919020000_001
index aebccb9e4178996fbbe81753da02b5697f2175a7..7b9ff259e2868d4c646184f85d8b49428bdec71e 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919020000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919020000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919030000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919030000_001
index 9462b0d291ce23251bfc77f780a512c7d89ddb2d..6518b5853391fd052307ef907a8e7d1c5b2230f3 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919030000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919030000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919040000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919040000_001
index 88bf73beffcf681b5ebeaa471954daa524edd8cb..56b77105ebe1c9195377c670b024b679efcdf0de 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919040000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919040000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919050000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919050000_001
index ff9e3c427e599aae20ba62e8d870a88ebee303de..6d7a46e0868bf69569b2d6b9d0d9e31309ee684e 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919050000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919050000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919060000_001 b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919060000_001
index 1a2e47d89774e38236b7bd3006b990712d58aca9..f57b126cd90aa428af250a1086dbdcbbe8e514a0 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919060000_001 and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/grid_conc_20140919060000_001 differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/header b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/header
index d5253793e31280aa6bfc887d22fe440c316a945c..f918b1da97aef9dcbb15948d2575847a26d0acdb 100644
Binary files a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/header and b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/header differ
diff --git a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/trajectories.txt b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/trajectories.txt
deleted file mode 100644
index 162355912d6ef0770eb3867d09a5f79525d70beb..0000000000000000000000000000000000000000
--- a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output/trajectories.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-20140919 0 FLEXPART V8.2
- 0 1 1
- 1
- 0 14399 14.3500004 48.3833008 14.3500004 48.3833008 0.00000000 100.000000 1 4000
-rel_bj
- 1 -3600 14.3196 48.4158 625.4 545.3 129.7 10384.3 2.86 3.6 1.3 51.7 45.6 77.6 0.0 100.0 14.257 48.457 656. 10.4 2.4 14.296 48.423 639. 17.9 1.2 14.344 48.390 597. 39.7 0.4 14.311 48.454 657. 13.1 1.9 14.330 48.415 633. 18.9 1.0
- 1 0 14.2896 48.4529 640.6 552.9 119.7 10391.5 2.98 7.0 2.6 54.4 47.7 67.2 0.0 100.0 14.202 48.532 675. 15.2 4.1 14.269 48.495 662. 22.0 3.2 14.271 48.445 645. 16.1 2.4 14.340 48.395 604. 29.6 1.1 14.324 48.438 642. 17.0 2.2
- 1 3600 14.2653 48.4883 650.4 560.5 110.2 10398.1 3.16 9.8 3.6 56.0 49.2 60.9 0.0 100.0 14.231 48.534 665. 22.3 4.2 14.165 48.597 687. 18.9 5.3 14.277 48.479 651. 21.0 3.4 14.315 48.433 642. 18.2 2.3 14.343 48.394 605. 19.5 1.1
- 1 7200 14.2396 48.5278 655.6 569.4 110.7 10410.9 2.98 12.1 4.3 55.9 48.7 64.2 0.5 100.0 14.120 48.665 701. 18.4 6.0 14.196 48.585 667. 23.2 4.9 14.255 48.514 654. 22.4 4.1 14.301 48.454 637. 18.3 3.2 14.337 48.403 615. 17.7 1.9
- 1 10800 14.1876 48.5992 670.9 586.3 110.4 10432.9 2.84 12.8 5.0 57.3 50.6 64.2 15.9 100.0 14.062 48.745 716. 16.6 6.3 14.139 48.664 686. 23.4 5.4 14.203 48.589 668. 24.6 4.9 14.244 48.519 648. 19.9 4.2 14.299 48.465 633. 15.6 3.6
- 1 14400 14.1351 48.6740 690.1 605.3 109.6 10456.5 2.51 13.3 5.6 58.0 49.8 64.0 32.6 100.0 14.021 48.823 737. 17.9 7.0 14.087 48.732 708. 25.1 5.7 14.164 48.654 681. 26.7 5.3 14.171 48.571 663. 15.7 4.5 14.264 48.539 647. 14.6 4.9
diff --git a/flexpart-testing/check/check.py b/flexpart-testing/check/check.py
new file mode 100755
index 0000000000000000000000000000000000000000..0ba92f53a272babc1baf08e410fde20a60e7c164
--- /dev/null
+++ b/flexpart-testing/check/check.py
@@ -0,0 +1,315 @@
+#!/usr/bin/env python
+
+"""
+@author: morton
+
+Don Morton
+Boreal Scientific Computing LLC, Fairbanks, Alaska, USA
+Don.Morton@borealscicomp.com
+http://www.borealscicomp.com/
+
+
+@contributors
+
+Christian Maurer
+ZAMG, Vienna, Austria
+christian.maurer@zamg.ac.at
+Delia Arnold
+ZAMG, Vienna, Austria
+delia.arnold-arias@zamg.ac.at
+
+"""
+
+
+
+#import tempfile
+import argparse
+import os
+import uuid
+import sys
+import shutil
+
+import distrotest.TestSuite as TS
+
+import flextest.FlexpartCase as FlexpartCase
+import flextest.FlexpartExecutable as Fexec
+import flextest.FlexpartErrors as FlexpartErrors
+import flextest.flexread.FlexpartOutput as FlexpartOutput
+import flextest.OutputCompare as OutputCompare
+
+# Set up for argument parsing
+
+# This used for checking presence of any files listed in arguments
+def is_valid_file(parser, arg):
+ if not os.path.exists(arg):
+ parser.error("File %s not found" % arg)
+ else:
+ return arg
+
+
+cmdline_makefile_path = None # Initial value for the makefile from command line
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument("xml_file", help="Full path to XML spec file",
+ action="store")
+
+parser.add_argument("-m", "--makefile",
+ help="Full path to makefile",
+ action="store", dest="cmdline_makefile_path")
+
+parser.add_argument("-k", "--keeptemp",
+ help="Keep temporary directories",
+ action="store_true")
+
+args = parser.parse_args()
+
+#print 'args.xml_file: ', args.xml_file
+#print 'args.cmdline_makefile_path: ', args.cmdline_makefile_path
+
+# Get the command line arguments after parsing. Some might be "None"
+xml_file = args.xml_file
+cmdline_makefile_path = args.cmdline_makefile_path
+
+# By default, temp directories will be cleaned up unless test fails. We can choose
+# to keep these with the appropriate command-line flag -k or --keeptemp
+if args.keeptemp:
+ clean_up = False
+ print 'Will retain temporary directories'
+else:
+ clean_up = True
+ print 'Will delete temporary directories if test is successful'
+#sys.exit()
+
+# Bring in the XML filename from the command line
+
+XML_FILE = [xml_file]
+
+
+
+# This is where lots of temporary directories are going to be created.
+# User needs to make sure it is OK to put them in here. Note that there
+# is currently no clean up of these directories if a test fails.
+# The logic is that users
+# might want to go back and look at the test directories, so auto-cleanup
+# prevents that.
+SCRATCH_DIR = '/tmp'
+
+
+t = TS.TestSuite(xml_files=XML_FILE)
+
+distro_list = t.get_distribution_list()
+
+the_distro = distro_list[0]
+
+'''
+print the_distro.get_descr()
+print the_distro.get_distro_path()
+print the_distro.get_makefile_path()
+print the_distro.get_parmod_path()
+'''
+
+# Create a temporary directory for compiling the distribution
+distro_destdir_name = SCRATCH_DIR + '/distrotest_' + str(uuid.uuid4())
+print 'distro_destdir_name: ' + distro_destdir_name
+
+
+good_init = False
+compile_success = False
+all_success = False
+try:
+ srcdir = os.path.realpath(the_distro.get_distro_path())
+
+ # The makefile path will come from command line, if available,
+ if cmdline_makefile_path:
+ makefile = cmdline_makefile_path
+ else:
+ print 'WARNING... makefile path not specified'
+
+ print 'using makefile: ' + str(makefile)
+
+ parmodfile = os.path.realpath(the_distro.get_parmod_path())
+ exec_name = the_distro.get_exec_name()
+ exec_obj = Fexec.FlexpartExecutable(srcdir=srcdir,
+ destdir=distro_destdir_name,
+ makefile=makefile,
+ parmodfile=parmodfile,
+ executable_name=exec_name)
+ good_init = True
+except Exception as e:
+ print 'Bad instantiation: ' + str(e)
+ pass
+
+if good_init:
+ print 'Executable exists: ' + str(exec_obj.executable_exists())
+
+
+
+ # Try to compile it
+ print; print '============================'; print
+ print 'compile test...'
+ print 'Compile directory: ' + distro_destdir_name
+ compile_success = exec_obj.compile_it()
+
+ print 'compile_success: ' + str(compile_success)
+ print 'Executable exists: ' + str(exec_obj.executable_exists())
+
+ if compile_success:
+ flexpart_executable = distro_destdir_name + '/' + exec_name
+ else:
+ print
+ print '*** COMPILE TEST FAILED ***'
+ print
+ print 'If Executable exists is True, it is probably finding an old executable'
+ print 'The test distribution is located in: ' + distro_destdir_name
+ print 'The makefile being used is: ' + makefile
+ print 'You should try to go there and see if you can find error by compiling by hand'
+
+ print; print '============================'; print
+
+# Next, get the met cases for this distro list and iterate through them
+
+if compile_success:
+
+# We add a logical variable that will indicate us whether any
+# of the tests failed and, if so, prevent the erasing of
+# the temporal directories
+ all_success = True
+ list_all_cases = []
+
+ met_case_list = the_distro.get_met_case_list()
+ print met_case_list
+ for the_met_case in met_case_list:
+
+
+ print; print '****************************'
+ the_descr = the_met_case.get_descr()
+ print 'Running MetCase: ' + the_descr
+ the_metfile_dir = os.path.realpath(the_met_case.get_metfile_dir())
+ print 'Met file dir: ' + the_metfile_dir
+ try:
+ the_metnestfile_dir = os.path.realpath(the_met_case.get_metnestfile_dir())
+ print 'Met Nest file dir: ' + the_metnestfile_dir
+ except:
+ #print ' ... no nested met input used'
+ the_metnestfile_dir = None
+
+ print '****************************'; print
+
+ # Iterate through each of the run cases in the met_case
+ run_case_list = the_met_case.get_run_case_list()
+
+ for the_run_case in run_case_list:
+ the_descr = the_run_case.get_descr()
+ print 'Running RunCase: ' + the_descr
+
+ case_dir = os.path.realpath(the_run_case.get_case_dir())
+ print 'Case dir: ' + case_dir
+ case_rundir = SCRATCH_DIR + '/caserun_' + str(uuid.uuid4())
+ list_all_cases.append(case_rundir) # add the case_dir into a list for cleaning
+ control_data_dir = os.path.realpath(the_run_case.get_control_data_dir())
+
+ basic_test_list = the_run_case.get_test_list()
+ run_success = False
+
+ print; print '============================'
+ print 'Case Test ' + str(the_descr) + '...'
+ print 'Case template directory: ' + case_dir
+ print 'Case run directory: ' + case_rundir
+ print 'Control data directory: ' + control_data_dir
+ print 'Met file dir: ' + the_metfile_dir
+ if the_metnestfile_dir:
+ print 'Met Nest file dir: ' + the_metnestfile_dir
+ print 'Executable: ' + flexpart_executable
+ print 'Number of basic tests: ' + str(len(basic_test_list))
+ print '============================'; print
+
+
+ # Create the case object
+ case_obj = FlexpartCase.FlexpartCase(
+ src_dir=case_dir,
+ dest_dir=case_rundir,
+ met_dir=the_metfile_dir,
+ met_nest_dir=the_metnestfile_dir,
+ flexpart_exe=flexpart_executable
+ )
+
+ # Run the case
+ run_val = case_obj.run()
+
+ # Test for success
+ run_success = case_obj.success()
+ print 'run_success: ' + str(run_success)
+ print 'Execution time: %7.2E seconds' % \
+ (case_obj.execution_time_seconds())
+ if not run_success:
+ all_success = False # to know wheter any of the tests failed
+ print 'run test failed'
+ print 'The test distribution is located in: ' + case_rundir
+ print 'The FLEXPART executable being used is: ' + flexpart_executable
+ print 'You should try to go there and see if you can find error by running by hand'
+ print 'There is a file named stdout.txt in there which might give a clue'
+
+ print; print '============================'; print
+
+
+
+ if run_success:
+
+
+ output_compare = OutputCompare.OutputCompare(output_dir=case_rundir + '/output',
+ control_output_dir=control_data_dir)
+
+ #print output_compare.query_test_types()
+
+
+ for the_basic_test in basic_test_list:
+
+ the_descr = the_basic_test.get_descr()
+ test_type = the_basic_test.get_test_type()
+ threshold = the_basic_test.get_threshold()
+
+
+ print; print '-----------------------'
+ print 'Basic Test'
+ print 'Description: ' + the_descr
+ print 'Test type: ' + test_type
+ print 'Threshold: %7.1E' % (threshold)
+
+
+ the_error = output_compare.calculate_test_minus_control(test_type=test_type)
+
+ print 'Test performed. Error = %7.1E' % (the_error)
+ if the_error > threshold:
+ all_success = False
+ print 'Test failed...'
+ print ' Test data is in: ' + case_rundir + '/output'
+ print ' Control data is in: ' + control_data_dir
+ else:
+ print 'Test passed'
+
+ print '-----------------------'; print
+
+if clean_up:
+ if all_success:
+ print 'All tests passed, erasing temporary directories'
+ print distro_destdir_name
+ shutil.rmtree(distro_destdir_name)
+ for item in list_all_cases:
+ print item
+ shutil.rmtree(item)
+ else:
+ print 'Some of the tests failed, temp dirs not erased'
+ print ' WARNING: remember to remove directories manually'
+ print ' when you have finished checking them'
+
+
+
+
+
+
+
+
+
+
+
diff --git a/flexpart-testing/check/ctbto_cases_gfortran.lst b/flexpart-testing/check/ctbto_cases_gfortran.lst
new file mode 100644
index 0000000000000000000000000000000000000000..9e20dbfedd23e0843f81da9eab9537a70c173f03
--- /dev/null
+++ b/flexpart-testing/check/ctbto_cases_gfortran.lst
@@ -0,0 +1,10 @@
+ctbto_cases/gfortran/test_ecmwf_02hr_1p0deg_1species_1emission_bwd_ctbto.xml
+ctbto_cases/gfortran/test_ecmwf_02hr_1p0deg_1species_1emission_fwd_ctbto.xml
+ctbto_cases/gfortran/test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_ctbto.xml
+ctbto_cases/gfortran/test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_ctbto.xml
+ctbto_cases/gfortran/test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto.xml
+ctbto_cases/gfortran/test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto.xml
+ctbto_cases/gfortran/test_ncep_02hr_1p0deg_1species_1emission_bwd_ctbto.xml
+ctbto_cases/gfortran/test_ncep_02hr_1p0deg_1species_1emission_fwd_ctbto.xml
+ctbto_cases/gfortran/test_ncep_02hr_1p0deg_grib1_1species_1emission_bwd_ctbto.xml
+ctbto_cases/gfortran/test_ncep_02hr_1p0deg_grib1_1species_1emission_fwd_ctbto.xml
diff --git a/flexpart-testing/check/db_ctbto.lst b/flexpart-testing/check/db_ctbto.lst
deleted file mode 100644
index 5147dfff66f7d266a8ca654c2aab8bee37c2d453..0000000000000000000000000000000000000000
--- a/flexpart-testing/check/db_ctbto.lst
+++ /dev/null
@@ -1 +0,0 @@
-test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto.xml
diff --git a/flexpart-testing/check/general_cases_gfortran.lst b/flexpart-testing/check/general_cases_gfortran.lst
new file mode 100644
index 0000000000000000000000000000000000000000..2b46623dfea9bd8d403bb6c027619482c2e1374c
--- /dev/null
+++ b/flexpart-testing/check/general_cases_gfortran.lst
@@ -0,0 +1,13 @@
+general_cases/gfortran/test_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_fwd.xml
+general_cases/gfortran/test_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_bwd.xml
+general_cases/gfortran/test_ncep_02hr_1p0deg_1species_1emission_fwd_bwd.xml
+general_cases/gfortran/test_ecmwf_02hr_1p0deg_tinymetgrid_2species_6emission_nestedoutgrid_fwd.xml
+general_cases/gfortran/test_ecmwf_06hr_1p0deg_tinymetgrid_fpformat_1species_1emission_bwd.xml
+general_cases/gfortran/test_ecmwf_06hr_1p0deg_tinymetgrid_fpformat_1species_1emission_fwd.xml
+general_cases/gfortran/test_ecmwf_33hr_1p0deg_tinymetgrid_1species_1emission_bwd.xml
+general_cases/gfortran/test_ecmwf_33hr_1p0deg_tinymetgrid_1species_1emission_fwd.xml
+general_cases/gfortran/test_ecmwf_02hr_1p0deg_nestedinput_1species_1emission_nestedoutgrid_fwd_bwd.xml
+general_cases/gfortran/test_ecmwf_02hr_1p0deg_tinymetgrid_nestedinput_1species_1emission_fwd.xml
+general_cases/gfortran/test_ncep_02hr_1p0deg_grib1_1species_1emission_fwd.xml
+general_cases/gfortran/test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd.xml
+general_cases/gfortran/test_ecmwf_02hr_1p0deg_grib2_1species_1emission_bwd.xml
diff --git a/flexpart-testing/check/list_complex_cases.lst b/flexpart-testing/check/list_complex_cases.lst
deleted file mode 100644
index eee4102be53b9f8820452075859c683d9e9ec430..0000000000000000000000000000000000000000
--- a/flexpart-testing/check/list_complex_cases.lst
+++ /dev/null
@@ -1,13 +0,0 @@
-test_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_fwd.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_bwd.xml
-test_ncep_02hr_1p0deg_1species_1emission_fwd_bwd.xml
-test_ecmwf_02hr_1p0deg_tinymetgrid_2species_6emission_nestedoutgrid_fwd.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_fpformat_1species_1emission_bwd.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_fpformat_1species_1emission_fwd.xml
-test_ecmwf_33hr_1p0deg_tinymetgrid_1species_1emission_bwd.xml
-test_ecmwf_33hr_1p0deg_tinymetgrid_1species_1emission_fwd.xml
-test_ecmwf_02hr_1p0deg_nestedinput_1species_1emission_nestedoutgrid_fwd_bwd.xml
-test_ecmwf_02hr_1p0deg_tinymetgrid_nestedinput_1species_1emission_fwd.xml
-test_ncep_02hr_1p0deg_grib1_1species_1emission_fwd.xml
-test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd.xml
-test_ecmwf_02hr_1p0deg_grib2_1species_1emission_bwd.xml
diff --git a/flexpart-testing/check/list_ctbto_cases.lst b/flexpart-testing/check/list_ctbto_cases.lst
deleted file mode 100644
index 6f624ed2822161d08032eca40768e50987897838..0000000000000000000000000000000000000000
--- a/flexpart-testing/check/list_ctbto_cases.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-test_ecmwf_02hr_1p0deg_1species_1emission_bwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_1species_1emission_fwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_grib2_1species_1emission_bwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_grib2_1species_1emission_fwd_ctbto.xml
-test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto.xml
-test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto.xml
-test_ncep_02hr_1p0deg_1species_1emission_bwd_ctbto.xml
-test_ncep_02hr_1p0deg_1species_1emission_fwd_ctbto.xml
-test_ncep_02hr_1p0deg_grib1_1species_1emission_bwd_ctbto.xml
-test_ncep_02hr_1p0deg_grib1_1species_1emission_fwd_ctbto.xml
diff --git a/flexpart-testing/check/list_simple_cases.lst b/flexpart-testing/check/list_simple_cases.lst
deleted file mode 100644
index 7b52b00cb60ea7734a62551a8bbc82eb5524517e..0000000000000000000000000000000000000000
--- a/flexpart-testing/check/list_simple_cases.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-test_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_fwd.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_bwd.xml
-test_ncep_02hr_1p0deg_1species_1emission_fwd_bwd.xml
\ No newline at end of file
diff --git a/flexpart-testing/check/noctbto.lst b/flexpart-testing/check/noctbto.lst
deleted file mode 100644
index a75a4081b4e547e4b5f5b3699fda7634ecbf8407..0000000000000000000000000000000000000000
--- a/flexpart-testing/check/noctbto.lst
+++ /dev/null
@@ -1,20 +0,0 @@
-test_ecmwf_02hr_1p0deg_1species_1emission_bwd.xml
-test_ecmwf_02hr_1p0deg_1species_1emission_fwd_bwd.xml
-test_ecmwf_02hr_1p0deg_1species_1emission_fwd.xml
-test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd.xml
-test_ecmwf_02hr_1p0deg_grib2_1species_1emission_bwd.xml
-test_ecmwf_02hr_1p0deg_nestedinput_1species_1emission_nestedoutgrid_fwd_bwd.xml
-test_ecmwf_02hr_1p0deg_tinymetgrid_2species_6emission_nestedoutgrid_fwd.xml
-test_ecmwf_02hr_1p0deg_tinymetgrid_nestedinput_1species_1emission_fwd.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_bwd.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_fwd.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_2species_6emission_fwd_ONLYRUN.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_fpformat_1species_1emission_bwd.xml
-test_ecmwf_06hr_1p0deg_tinymetgrid_fpformat_1species_1emission_fwd.xml
-test_ecmwf_33hr_1p0deg_tinymetgrid_1species_1emission_bwd.xml
-test_ecmwf_33hr_1p0deg_tinymetgrid_1species_1emission_fwd.xml
-test_ecmwf_ncep_02hr_1p0deg_1species_1emission_fwd_bwd.xml
-test_ncep_02hr_1p0deg_1species_1emission_bwd.xml
-test_ncep_02hr_1p0deg_1species_1emission_fwd_bwd.xml
-test_ncep_02hr_1p0deg_1species_1emission_fwd.xml
-test_ncep_02hr_1p0deg_grib1_1species_1emission_fwd.xml
diff --git a/flexpart-testing/check/single_ctbto.lst b/flexpart-testing/check/single_ctbto.lst
deleted file mode 100644
index e0a3fa8f127141cd288d8d6fb8b0c546b9ec33f1..0000000000000000000000000000000000000000
--- a/flexpart-testing/check/single_ctbto.lst
+++ /dev/null
@@ -1 +0,0 @@
-test_ecmwf_02hr_1p0deg_grib2_1species_1emission_bwd_ctbto.xml
diff --git a/flexpart-testing/check/yesctbto.lst b/flexpart-testing/check/yesctbto.lst
deleted file mode 100644
index 6f624ed2822161d08032eca40768e50987897838..0000000000000000000000000000000000000000
--- a/flexpart-testing/check/yesctbto.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-test_ecmwf_02hr_1p0deg_1species_1emission_bwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_1species_1emission_fwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_fwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_grib2_1species_1emission_bwd_ctbto.xml
-test_ecmwf_02hr_1p0deg_grib2_1species_1emission_fwd_ctbto.xml
-test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto.xml
-test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto.xml
-test_ncep_02hr_1p0deg_1species_1emission_bwd_ctbto.xml
-test_ncep_02hr_1p0deg_1species_1emission_fwd_ctbto.xml
-test_ncep_02hr_1p0deg_grib1_1species_1emission_bwd_ctbto.xml
-test_ncep_02hr_1p0deg_grib1_1species_1emission_fwd_ctbto.xml
diff --git a/flexpart_code/grib2nc4/.gitignore b/flexpart_code/grib2nc4/.gitignore
index bbc0133e80b213506fde0342d276665ff4ace852..dde82624c3bed3cdf0b19cb1813fd5c9ba1fd70a 100644
--- a/flexpart_code/grib2nc4/.gitignore
+++ b/flexpart_code/grib2nc4/.gitignore
@@ -1,3 +1,3 @@
*.o
*.mod
-grib2netcdf4
+grib2nc4
diff --git a/flexpart_code/grib2nc4/test/.gitignore b/flexpart_code/grib2nc4/test/.gitignore
index 3a5a1b34155700fa2614cbb525dab33eb6f571fb..fb89cb4df119838d415ddd656a8b3184aac8ff55 100644
--- a/flexpart_code/grib2nc4/test/.gitignore
+++ b/flexpart_code/grib2nc4/test/.gitignore
@@ -1,2 +1,2 @@
-grib2netcdf4_test
+grib2nc4_test
testout.nc4