From 600095391eab1287aa1bad372b54bad0a6a2931d Mon Sep 17 00:00:00 2001 From: Chris Blanton Date: Thu, 14 Oct 2021 14:09:32 -0400 Subject: [PATCH 1/3] Skip the parallel part of Test04 if parallel tests are configured to be skipped but run them otherwise, even if run through CI --- t/Test04-grid_coupled_nest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/Test04-grid_coupled_nest.sh b/t/Test04-grid_coupled_nest.sh index 42b67c91..b7a04587 100755 --- a/t/Test04-grid_coupled_nest.sh +++ b/t/Test04-grid_coupled_nest.sh @@ -115,7 +115,7 @@ ncgen -o OCCAM_p5degree.nc $BATS_TEST_DIRNAME/Test03-input/OCCAM_p5degree.ncl --tile_file land_grid.tile1.nc,land_grid.tile2.nc,land_grid.tile3.nc,land_grid.tile4.nc,land_grid.tile5.nc,land_grid.tile6.nc # MPI only - if [ -z "$skip_mpi" ] && [ -z "$CI" ]; then + if [ -z "$skip_mpi" ]; then #make the coupler_mosaic mpirun -n 8 make_coupler_mosaic_parallel --atmos_mosaic atmos_mosaic.nc \ --land_mosaic land_mosaic.nc --ocean_mosaic ocean_mosaic.nc \ From 0de16e17484d19e582fdd45682401c6f012b5954 Mon Sep 17 00:00:00 2001 From: Chris Blanton Date: Thu, 14 Oct 2021 14:11:58 -0400 Subject: [PATCH 2/3] Compare the serially and parallel-generated fregrid output with nccmp --- t/Test15-regrid_land.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/Test15-regrid_land.sh b/t/Test15-regrid_land.sh index 9d6fa8c0..97ad80cc 100755 --- a/t/Test15-regrid_land.sh +++ b/t/Test15-regrid_land.sh @@ -61,8 +61,10 @@ load test_utils --nlat 90 \ --input_file 00050101.land_static \ --scalar_field soil_frac,lake_frac,glac_frac,area,soil_area,lake_area,glac_area \ - --output_file out.nc \ + --output_file out_parallel.nc \ --remap_file remap_file.nc + + nccmp -md out.nc out_parallel.nc fi # remap other fields From 2bbfc31d77c007a05384f23ea35e0c8e846183d8 Mon Sep 17 00:00:00 2001 From: Chris Blanton Date: Thu, 14 Oct 2021 15:15:18 -0400 Subject: [PATCH 3/3] Skip Test 5 only if compiled with MPI, so that Test 5 runs without MPI --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 67b26447..7f903aeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,13 @@ jobs: ../configure $MPI $QUAD_P - name: Build tools run: make -C build - - name: Run tests + - name: Run all tests + if: matrix.with_mpi == '' + run: make -C build -j check LOG_DRIVER_FLAGS=--comments + - name: Run most tests (skip the slow ones) + if: matrix.with_mpi == '--with-mpi' + env: + SKIP_TESTS: 4 run: make -C build -j check LOG_DRIVER_FLAGS=--comments - name: Save log file on failure uses: actions/upload-artifact@v2.2.1