Minor packaging changes to FPv9.3.1 - see flexpart.eu Ticket #155

29feaef9 · Don Morton · 9cd7c043 · 29feaef9 · 29feaef9 · 29feaef9
Commit 29feaef9 authored Aug 31, 2016 by Don Morton
--- a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/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_ifort/grid_conc_20140919020000_001
--- a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/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_ifort/grid_conc_20140919030000_001
--- a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/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_ifort/grid_conc_20140919040000_001
--- a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/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_ifort/grid_conc_20140919050000_001
--- a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/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_ifort/grid_conc_20140919060000_001
--- a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/header
+++ b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/header
--- a/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/receptor_conc
+++ b/flexpart-testing/case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort/receptor_conc
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/dates
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/dates
+20150216013000
+20150216010000
+20150216003000
+20150216000000
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_initial_001
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_initial_001
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_time_20150216000000_001
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_time_20150216000000_001
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_time_20150216003000_001
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_time_20150216003000_001
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_time_20150216010000_001
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_time_20150216010000_001
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_time_20150216013000_001
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/grid_time_20150216013000_001
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/header
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/header
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/receptor_conc
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort/receptor_conc
--- a/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/par_mod.F90
+++ b/flexpart-testing/case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/par_mod.F90
@@ -202,7 +202,7 @@ module par_mod
  ! Maximum number of particles, species, and similar
  !**************************************************
-#if defined WITH_CTBTO_PATCHES
+#if defined CTBTO
  integer,parameter :: maxpart=30000000
  integer,parameter :: maxspec=1
 #else

--- a/flexpart-testing/check/ctbto_cases/ifort/test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_ctbto.xml
+++ b/flexpart-testing/check/ctbto_cases/ifort/test_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_ctbto.xml
+<distribution>
+    <!-- Sample XML testing namelist -->
+    <short_descr>
+        Testing of Leo's GRIB1/2 data for small ECMWF 1.0 deg global
+    </short_descr>
+    <distropath>
+        ../../flexpart_code
+    </distropath>
+    <parmodpath>
+        ../case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/par_mod.F90
+    </parmodpath>
+    <execname>
+        flexpart_ifort
+    </execname>
+    <metcase>
+        <short_descr>
+            ECMWF global fields
+        </short_descr>
+        <metfiledir>
+            ../case_data/met_data/ecmwf/t1_03h_ec1p0d_grib1-2/
+        </metfiledir>
+        <runcase>
+            <short_descr>
+                Backward run, 2 hours length, 1 species, 1 emissions, no nested outgrid
+            </short_descr>
+            <casedir>
+                ../case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/rundir_template
+            </casedir>
+            <controldatadir>
+                ../case_data/ecmwf_02hr_1p0deg_grib1-2/case_ecmwf_02hr_1p0deg_grib1-2_1species_1emission_bwd_CTBTO/control_output_ifort
+            </controldatadir>
+            <basictest>
+                <short_descr>
+                    Max error over entire temporal and spatial mother domain
+                </short_descr>
+                <type>
+                    mother_all_vars_maxabserr
+                </type>
+                <max_threshold>
+                   1.0E-3
+                </max_threshold>
+            </basictest>
+        </runcase>
+    </metcase>
+</distribution>
--- a/flexpart-testing/check/ctbto_cases/ifort/test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto.xml
+++ b/flexpart-testing/check/ctbto_cases/ifort/test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto.xml
+<distribution>
+    <!-- Sample XML testing namelist -->
+    <short_descr>
+        Testing of FLEXPART for very small ECMWF met file - CTBTO patches, GRIB1/2
+    </short_descr>
+    <distropath>
+        ../../flexpart_code
+    </distropath>
+    <parmodpath>
+        ../case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/par_mod.F90
+    </parmodpath>
+    <execname>
+        flexpart_ifort
+    </execname>
+    <metcase>
+        <short_descr>
+            ECMWF patch - 11x11 1.0 degrees over Austria
+        </short_descr>
+        <metfiledir>
+            ../case_data/met_data/ecmwf/t1_33h_ec1p0d
+        </metfiledir>
+        <runcase>
+            <short_descr>
+                Backward run, 1 species, 1 emissions, 6 hours
+            </short_descr>
+            <casedir>
+                ../case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/rundir_template
+            </casedir>
+            <controldatadir>
+                ../case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_bwd_ctbto/control_output_ifort
+            </controldatadir>
+            <basictest>
+                <short_descr>
+                    Max error over entire temporal and spatial mother domain
+                </short_descr>
+                <type>
+                    mother_all_vars_maxabserr
+                </type>
+                <max_threshold>
+                   1.0E-3
+                </max_threshold>
+            </basictest>
+            <basictest>
+                <short_descr>
+                    RMS error over entire temporal and spatial mother domain
+                </short_descr>
+                <type>
+                    mother_all_vars_rmse
+                </type>
+                <max_threshold>
+                   1.0E-3
+                </max_threshold>
+            </basictest>
+        </runcase>
+    </metcase>
+</distribution>
--- a/flexpart-testing/check/ctbto_cases/ifort/test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto.xml
+++ b/flexpart-testing/check/ctbto_cases/ifort/test_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto.xml
+<distribution>
+    <!-- Sample XML testing namelist -->
+    <short_descr>
+        Testing of FLEXPART for very small ECMWF met file - CTBTO patches, GRIB1/2
+    </short_descr>
+    <distropath>
+        ../../flexpart_code
+    </distropath>
+    <parmodpath>
+        ../case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_tinymetgrid_1species_1emission_bwd/par_mod.F90
+    </parmodpath>
+    <execname>
+        flexpart_ifort
+    </execname>
+    <metcase>
+        <short_descr>
+            ECMWF patch - 11x11 1.0 degrees over Austria
+        </short_descr>
+        <metfiledir>
+            ../case_data/met_data/ecmwf/t1_33h_ec1p0d
+        </metfiledir>
+        <runcase>
+            <short_descr>
+                Forward run, 1 species, 1 emissions, 6 hours
+            </short_descr>
+            <casedir>
+                ../case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/rundir_template
+            </casedir>
+            <controldatadir>
+                ../case_data/ecmwf_1p0deg_tinymet_multipletests/case_ecmwf_06hr_1p0deg_grib1-2_tinymetgrid_1species_1emission_fwd_ctbto/control_output_ifort
+            </controldatadir>
+            <basictest>
+                <short_descr>
+                    Max error over entire temporal and spatial mother domain
+                </short_descr>
+                <type>
+                    mother_all_vars_maxabserr
+                </type>
+                <max_threshold>
+                   1.0E-3
+                </max_threshold>
+            </basictest>
+            <basictest>
+                <short_descr>
+                    RMS error over entire temporal and spatial mother domain
+                </short_descr>
+                <type>
+                    mother_all_vars_rmse
+                </type>
+                <max_threshold>
+                   1.0E-3
+                </max_threshold>
+            </basictest>
+        </runcase>
+    </metcase>
+</distribution>
--- a/flexpart-testing/check/ctbto_cases/ifort/test_ncep_02hr_1p0deg_1species_1emission_bwd_ctbto.xml
+++ b/flexpart-testing/check/ctbto_cases/ifort/test_ncep_02hr_1p0deg_1species_1emission_bwd_ctbto.xml
+<distribution>
+    <!-- Sample XML testing namelist -->
+    <short_descr>
+        Testing of Generic FLEXPART for small NCEP 1.0 deg global
+    </short_descr>
+    <distropath>
+        ../../flexpart_code
+    </distropath>
+    <parmodpath>
+        ../case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/par_mod.F90
+    </parmodpath>
+    <execname>
+        flexpart_ifort
+    </execname>
+    <metcase>
+        <short_descr>
+            NCEP global fields
+        </short_descr>
+        <metfiledir>
+            ../case_data/met_data/ncep/t1_03h_nc1p0d/
+        </metfiledir>
+        <runcase>
+            <short_descr>
+                Backward run, 2 hours length, 1 species, 1 emissions, no nested outgrid
+            </short_descr>
+            <casedir>
+                ../case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/rundir_template
+            </casedir>
+            <controldatadir>
+                ../case_data/ncep_02hr_1p0deg/case_ncep_02hr_1p0deg_1species_1emission_bwd_CTBTO/control_output_ifort
+            </controldatadir>
+            <basictest>
+                <short_descr>
+                    Max error over entire temporal and spatial mother domain
+                </short_descr>
+                <type>
+                    mother_all_vars_maxabserr
+                </type>
+                <max_threshold>
+                   1.0E-3
+                </max_threshold>
+            </basictest>
+        </runcase>
+    </metcase>
+</distribution>