Merge pull request #124 from ceblanton/testing_input_more

Two test updates that didn't make it in #104

.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

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 \

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