diff --git a/test/ci_tests/ci_result_file.nc b/test/ci_tests/ci_result_file.nc index 75c253a..2cf9ffb 100644 Binary files a/test/ci_tests/ci_result_file.nc and b/test/ci_tests/ci_result_file.nc differ diff --git a/test/ci_tests/ci_test_file.nc b/test/ci_tests/ci_test_file.nc index 13b9f54..ad5a3f6 100644 Binary files a/test/ci_tests/ci_test_file.nc and b/test/ci_tests/ci_test_file.nc differ diff --git a/test/ci_tests/make_test_file.py b/test/ci_tests/make_test_file.py index 0f65c0d..5f76b5d 100644 --- a/test/ci_tests/make_test_file.py +++ b/test/ci_tests/make_test_file.py @@ -22,7 +22,7 @@ WRF_DIAGS = ["avo", "eth", "cape_2d", "cape_3d", "ctt", "dbz", "mdbz", "geopt", "helicity", "lat", "lon", "omg", "p", "pressure", "pvo", "pw", "rh2", "rh", "slp", "ter", "td2", "td", "tc", "theta", "tk", "tv", "twb", "updraft_helicity", "ua", "va", - "wa", "uvmet10", "uvmet", "z", "cfrac"] + "wa", "uvmet10", "uvmet", "z", "cfrac", "zstag"] INTERP_METHS = ["interplevel", "vertcross", "interpline", "vinterp"] @@ -33,6 +33,7 @@ def copy_and_reduce(opts): infilename = opts.filename outfilename = os.path.expanduser( os.path.join(opts.outdir, "ci_test_file.nc")) + with Dataset(infilename) as infile, Dataset(outfilename, "w") as outfile: # Copy the global attributes @@ -164,12 +165,14 @@ def main(opts): if __name__ == "__main__": - + DEFAULT_FILE = ("/Users/ladwig/Documents/wrf_files/" + "wrf_vortex_multi/wrfout_d02_2005-08-28_12:00:00") parser = argparse.ArgumentParser(description="Generate conda test files " "for unit testing.") - parser.add_argument("-f", "--filename", required=True, + parser.add_argument("-f", "--filename", required=False, + default=DEFAULT_FILE, help="the WRF test file") - parser.add_argument("-o", "--outdir", required=True, + parser.add_argument("-o", "--outdir", required=False, default="./", help="the location for the output files") opts = parser.parse_args() diff --git a/test/ci_tests/utests.py b/test/ci_tests/utests.py index bf233de..0a1535f 100644 --- a/test/ci_tests/utests.py +++ b/test/ci_tests/utests.py @@ -8,7 +8,8 @@ import subprocess from wrf import (getvar, interplevel, interpline, vertcross, vinterp, disable_xarray, xarray_enabled, to_np, xy_to_ll, ll_to_xy, xy_to_ll_proj, ll_to_xy_proj, - extract_global_attrs, viewitems, CoordPair) + extract_global_attrs, viewitems, CoordPair, + omp_get_num_procs, omp_set_num_threads) from wrf.util import is_multi_file TEST_FILE = "ci_test_file.nc" @@ -210,7 +211,7 @@ if __name__ == "__main__": "geopt", "helicity", "lat", "lon", "omg", "p", "pressure", "pvo", "pw", "rh2", "rh", "slp", "ter", "td2", "td", "tc", "theta", "tk", "tv", "twb", "updraft_helicity", "ua", "va", - "wa", "uvmet10", "uvmet", "z", "cfrac"] + "wa", "uvmet10", "uvmet", "z", "cfrac", "zstag"] interp_methods = ["interplevel", "vertcross", "interpline", "vinterp"] latlon_tests = ["xy", "ll"]