Merge pull request ESMCI#1734 from NCAR/ejh_doc_fix

fixing docs, cleanup of test workflow

.github/workflows/a3.yml

@@ -117,6 +117,17 @@ jobs:
         make
         sudo make install
         popd
+    - name: autotools build
+      run: |
+        set -x
+        echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc
+        source .bashrc
+        export PATH="/home/runner/openmpi/bin:$PATH"
+        export CC=/home/runner/openmpi/bin/mpicc
+        autoreconf -i
+        ./configure --with-mpiexec='mpiexec --oversubscribe'
+        which mpiexec
+        make check
     - name: cmake build
       run: |
         set -x
@@ -130,19 +141,6 @@ jobs:
         make VERBOSE=1
         make tests VERBOSE=1
         ctest -VV
-    - name: autotools build
-      run: |
-        set -x
-        echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc
-        echo $'alias mpiexec=\'mpiexec --oversubscribe\'' >> .bashrc
-        cat .bashrc
-        source .bashrc
-        export PATH="/home/runner/openmpi/bin:$PATH"
-        export CC=/home/runner/openmpi/bin/mpicc
-        autoreconf -i
-        ./configure --with-mpiexec='mpiexec --oversubscribe'
-        which mpiexec
-        make check
 
         
         

configure.ac

@@ -401,6 +401,8 @@ AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90])
 
 # The user may have changed the MPIEXEC for these test scripts.
 AC_CONFIG_FILES([tests/cunit/run_tests.sh], [chmod ugo+x tests/cunit/run_tests.sh])
+AC_CONFIG_FILES([tests/ncint/run_tests.sh], [chmod ugo+x tests/ncint/run_tests.sh])
+AC_CONFIG_FILES([tests/ncint/run_perf.sh], [chmod ugo+x tests/ncint/run_perf.sh])
 AC_CONFIG_FILES([examples/c/run_tests.sh], [chmod ugo+x examples/c/run_tests.sh])
 
 # Args:

src/flib/pionfget_mod.F90.in

@@ -202,7 +202,7 @@ CONTAINS
 !>
 !! @public
 !! @ingroup PIO_get_var
-!! @brief Writes an netcdf attribute to a file
+!! @brief Writes data to a file
 !! @details
 !! @param File @ref file_desc_t
 !! @param vardesc @ref var_desc_t
@@ -228,7 +228,7 @@ CONTAINS
 !>
 !! @public
 !! @ingroup PIO_get_var
-!! @brief Writes an netcdf attribute to a file
+!! @brief Gets data from a file
 !! @details
 !! @param File @ref file_desc_t
 !! @param varid : The netcdf variable identifier
@@ -276,7 +276,7 @@ CONTAINS
 !>
 !! @public
 !! @ingroup PIO_get_var
-!! @brief Writes an netcdf attribute to a file
+!! @brief Gets data from a file
 !! @details
 !! @param File @ref file_desc_t
 !! @param vardesc @ref var_desc_t
@@ -316,7 +316,7 @@ CONTAINS
 !>
 !! @public
 !! @ingroup PIO_get_var
-!! @brief Writes an netcdf attribute to a file
+!! @brief Gets data from a file
 !! @details
 !! @param File @ref file_desc_t
 !! @param varid : The netcdf variable identifier
@@ -449,7 +449,7 @@ CONTAINS
 !>
 !! @public
 !! @ingroup PIO_get_var
-!! @brief Writes an netcdf attribute to a file
+!! @brief Gets data from a file
 !! @details
 !! @param File @ref file_desc_t
 !! @param vardesc @ref var_desc_t

tests/ncint/Makefile.am

@@ -23,7 +23,9 @@ TESTS = run_tests.sh run_perf.sh
 endif # RUN_TESTS
 
 # Distribute the test script.
-EXTRA_DIST = run_tests.sh run_perf.sh
+EXTRA_DIST = run_tests.sh.in run_perf.sh.in
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log
+
+DISTCLEANFILES = run_tests.sh run_perf.sh

tests/ncint/run_perf.sh → tests/ncint/run_perf.sh.in

@@ -20,7 +20,7 @@ for TEST in $PIO_TESTS
 do
     success1=false
     echo "running ${TEST}"
-    mpiexec -n 4 ./${TEST} && success1=true
+    @WITH_MPIEXEC@ -n 4 ./${TEST} && success1=true
     if test $success1 = false; then
         break
     fi

tests/ncint/run_tests.sh → tests/ncint/run_tests.sh.in

@@ -18,7 +18,7 @@ for TEST in $PIO_TESTS
 do
     success1=false
     echo "running ${TEST}"
-    mpiexec -n 4 ./${TEST} && success1=true
+    @WITH_MPIEXEC@ -n 4 ./${TEST} && success1=true
     if test $success1 = false; then
         break
     fi
@@ -30,7 +30,7 @@ done
 # do
 #     success2=false
 #     echo "running ${TEST}"
-#     mpiexec -n 8 ./${TEST} && success2=true
+#     @WITH_MPIEXEC@ -n 8 ./${TEST} && success2=true
 #     if test $success2 = false; then
 #         break
 #     fi