Finish plevel mods and tests

Author: underwoo

src/Makefile.am

@@ -9,15 +9,17 @@ combine_programs = \
 bin_PROGRAMS = \
   decompress-ncc \
   list_ncvars \
-  PLEV.exe \
   $(combine_programs)
 
 bin_SCRIPTS = \
   combine_restarts \
   iceberg_comb.sh \
-  list_ncvars.csh
+  list_ncvars.csh \
+  plevel.sh
 
-pkglibexec_PROGRAMS = print_version
+pkglibexec_PROGRAMS = \
+  print_version \
+  PLEV.exe
 
 noinst_LIBRARIES = libver.a
 
@@ -134,7 +136,10 @@ iceberg_comb.sh: iceberg-comb/iceberg_comb.sh.in Makefile
 # ********************************************************* #
 # plevel                                                    #
 # ********************************************************* #
-dist_bin_SCRIPTS = plevel/plevel.sh
+plevel.sh: plevel/plevel.sh.in Makefile
+	$(do_subst) < $(srcdir)/plevel/plevel.sh.in > plevel.sh
+	chmod +x plevel.sh
+
 PLEV_exe_SOURCES = plevel/plev_constants.F90 \
                    plevel/moisture_convert.F90 \
                    plevel/pressure_interp.F90 \

src/plevel/plevel.sh renamed to src/plevel/plevel.sh.in

@@ -32,6 +32,11 @@
 # afy    Ver   1.01  Use 'which' to locate executables              June 10
 # ------------------------------------------------------------------------------
 
+script_name=`basename $0`
+pkg_libexec_dir=${PKGLIBEXECDIR:-@pkglibexecdir@}
+
+plevel_interp=$pkg_libexec_dir/PLEV.exe
+
 fields=
 more_output=1
 ofile=plevel.nc
@@ -47,6 +52,57 @@ tlist=
 plevs="100000 92500 85000 70000 60000 50000 40000 30000 25000 \
         20000 15000 10000  7000  5000  3000  2000  1000"
 
+echoerr()
+{
+    echo "$@" 1>&2
+}
+
+usage()
+{
+    cat << EOF
+Usage:  $script_name [-a] [-3] [-0] [-f] [-d #] -i file [-o ofile] [-m] [-z #] [-s] [fields.....]
+Interpolates data from model levels to pressure levels.  The input
+model grid is a hybrid sigma-pressure coordinate and the output
+pressure levels may be specified.  The minimum required input fields
+are "bk", "pk", and "ps".
+
+    -a          Output all fields converting 3d fields to pressure
+                levels.
+    -3          Output and convert all 3d fields to pressure levels.
+    -0          When fields sphum or zsurf do not exist use zero,
+                otherwise fail.
+    -m          Default missing value is used for all fields (the
+                _FillValue).
+    -x          Do not set data extrapolated beneath the surface to
+                missing values.
+    -i file     Input netcdf file, the file must contain the required
+                variables (pk, bk, ps, ...).
+    -o ofile    The output file name. (Default: plevel.nc)
+    -p plevs    A list of output pressure levels in pascals (with no
+                decimal point).  The default is the 17 NCEP
+                reananalysis levels (bottom to top).  The list must be
+                in quotes and values must be separated by a space.
+    -d value    The verbosity level, use an integer number where
+                value >= 0.  (Default: value=1)
+    -t #,#,#    The starting, ending, and increment index for time axis
+                processing where # is a positive number.  (The default
+                is to process all time indices.)
+    -z #        If using NetCDF4, use deflation of level #.  Defaults
+                to input file settings.
+    -s 1|0      If using NetCDF4, use shuffle if 1 and don't use if 0.
+                Defaults to input file settings.
+
+    fields      A list of (additional) output fields. If this list is
+                not supplied,  then the "-a" or "-3" option must be
+                specified.  Possible list entries included any fields
+                in the input files, and additional fields: slp, hght.
+                Additional input fields may be required for these
+                output fields.
+
+Example: $script_name -a -i atmos.nc slp hght
+
+EOF
+}
 #-----------------------------------------------------------------------
 
 while getopts 03amxi:o:d:p:t:z:s: arg
@@ -73,93 +129,48 @@ fields=$@
 #-----------------------------------------------------------------------
 
 if [ "${ifiles:-NULL}" = "NULL" ]; then
-name=`basename $0`
-cat << EOF
-
-Interpolates data from model levels to pressure levels.
-The input model grid is a hybrid sigma-pressure coordinate
-and the output pressure levels may be specified.
-The minimum required input fields are "bk", "pk", and "ps".
-
-Usage:  $name [-a] [-3] [-0] [-f] [-d #] -i file [-o ofile] [-m] [-z #] [-s] [fields.....]
-
-        -a        = Output all fields converting 3d fields to pressure levels.
-        -3        = Output and convert all 3d fields to pressure levels.
-        -0        = When fields sphum or zsurf do not exist use zero, otherwise fail.
-        -m        = Default missing value is used for all fields (the _FillValue).
-        -x        = DO NOT set data extrapolated beneath the surface to missing values.
-        -i file   = Input netcdf file, the file must contain the required variables 
-                    (pk,bk,ps,...).
-                    If the -i files option is omitted a usage message is printed.
-        -o ofile  = The output file name. (Default: plevel.nc)
-        -p plevs  = A list of output pressure levels in pascals (with no decimal point).
-                    The default is the 17 NCEP reananalysis levels (bottom to top).
-                    The list must be in quotes and values must be separated by a space.
-        -d value    The verbosity level, use an integer number where value >= 0.
-                    (Default: value=1)
-        -t #,#,#    The starting, ending, and increment index for time axis processing
-                    where # is a positive number.
-                    (The default is to process all time indices.)
-        -z #        If using NetCDF4, use deflation of level #.
-                    Defaults to input file settings.
-        -s 1|0      If using NetCDF4, use shuffle if 1 and don't use if 0.
-                    Defaults to input file settings.
-
-        fields    = A list of (additional) output fields. If this list is not supplied,
-                    then the "-a" or "-3" option must be specified.  Possible list entries
-                    included any fields in the input files, and additional fields: slp, hght.
-                    Additional input fields may be required for these output fields.
-
-Example:  $name -a -i atmos.nc slp hght
-
-EOF
-exit 1
+    echoerr "$script_name: no input files specified.  Must specify \"-i <infiles>\""
+    exit 1
 fi
 
-# location of executable
-executable=`which PLEV.exe`
-
-if [ ! -x "$executable" ]; then
-   echo "ERROR: executable does not exist"
-   echo "       executable=$executable"
+# Verify PLEV.exe is available
+if [ ! -x "$plevel_interp" ]; then
+   echoerr "$script_name: unable to find required libexec program \"$plevel_interp\""
    exit 1
 fi
 
 #  make sure input files are present
-
-list=
+missing_ifiles=
 for file in $ifiles;
 do
    if [ ! -e $file ]; then
-       list="$list $file"
+       missing_ifiles="$missing_ifiles $file"
    fi
 done
-if [ ${#list} -gt 0 ]; then
-    echo ERROR: the following input files do not exist
-    for file in $list;
+if [ ${#missing_ifiles} -gt 0 ]; then
+    echoerr "$script_name: missing input files:"
+    for file in $missing_ifiles;
     do
-      echo $file
+      echoerr "    $file"
     done
     exit 1
 fi
 
 # process time loop limits (create array of length 3)
-
 tlist=`echo ${tlist} | sed -e "s/,,,/,,0,/"`
 tlist=`echo ${tlist} | sed -e "s/^,/0,/"`
 tlist=`echo ${tlist} | sed -e "s/,,/,0,/"`
 tloop=`echo ${tlist} | sed -e "s/,/ /g"`
 
-#-----------------------------------------------------------------------
-#   ---- namelist for pressure interp program ----
-    
-    namelist="plev.input.nml"
+#
+# Generate namelist for pressure interp program
+namelist="plev.input.nml"
 
-    echo " &input" > $namelist
+echo " &input" >> $namelist
 
 # input file names
-    echo "     in_file_name =  '$file' ," >> $namelist
-    echo "     out_file_name =   '$ofile' ,"  >> $namelist
+echo "     in_file_name =  '$file' ," >> $namelist
+echo "     out_file_name =   '$ofile' ,"  >> $namelist
 
 # input field names
 i=0
@@ -201,18 +212,21 @@ i=0
 for index in $tloop;
 do
     let "i=$i+1"
-    if [ $index -gt 0 ]; then 
+    if [ $index -gt 0 ]; then
        case $i in
           1) echo "    time_beg = $index" >> $namelist;;
           2) echo "    time_end = $index" >> $namelist;;
           3) echo "    time_inc = $index" >> $namelist;;
-       esac    
+       esac
     fi
 done
 
-   echo " /" >> $namelist
-
-$executable
-
-#rm -f $namelist
+echo " /" >> $namelist
 
+eval $plevel_interp
+if [ $? -eq 0 ]
+then
+    rm -f $namelist
+else
+    echoerr "$script_name: error running \"$plevel_interp\""
+fi

tests/Makefile.am

@@ -72,6 +72,12 @@ TESTS = combine-ncc/combine \
         mppnccombine/xyt-decomp \
         mppnccombine/yt-decomp \
         plevel/plevel \
+        plevel/plevel-0 \
+        plevel/plevel-3 \
+        plevel/plevel-a \
+        plevel/plevel-o \
+        plevel/plevel-nctypes \
+        plevel/plevel-t \
         scatter-ncc/scatter_1x1 \
         scatter-ncc/scatter_1x2 \
         scatter-ncc/scatter_2x1

tests/plevel/create_plevel_test_ncfile.c

@@ -1,13 +1,14 @@
 #include <netcdf.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #define FILE_NAME "test_input.nc"
 #define NX 10
 #define NY 10
 #define PFULL 33
 #define PHALF 34
-#define TIME 1
+#define TIME 10
 #define PS_MIN 75223
 #define PS_MAX 101325
 #define TEMP_MIN 250
@@ -20,12 +21,28 @@ void check_err(int stat, int line) {
     }
 }
 
-int main() {
+int main(int argc, char **argv) {
     int ncid, time_dim, xt_dim, yt_dim, pfull_dim, phalf_dim;
     int times_id, xt_id, yt_id, phalf_id, pfull_id, pk_id, bk_id;
     int ps_id, temp_id, dummy_id;
 
+    int nc_format = NC_CLOBBER;
+
     int stat;
+    int c;
+
+    while (( c = getopt (argc, argv, "abc:")) != -1)
+    {
+        switch (c)
+        {
+            case '4':
+                nc_format = NC_CLOBBER | NC_NETCDF4;
+                break;
+            case '6':
+                nc_format = NC_CLOBBER | NC_64BIT_OFFSET;
+                break;
+        }
+    }
 
     size_t start_ps[3] = {0, 0, 0};
     size_t start_temp[4] = {0, 0, 0, 0};
@@ -85,7 +102,7 @@ int main() {
     check_err(stat, __LINE__);
 
     // Allocate memory for sample data and write to file
-    double times_data[TIME] = {0};
+    double times_data = 0;
     float xt_data[NX], yt_data[NY], temp_data[PFULL][NX][NY];
     float ps_data[NX][NY];
     float dummy_data[NX][NY];
@@ -128,23 +145,7 @@ int main() {
         1497.781, 1156.253, 867.792, 625.5933, 426.2132, 264.7661,
         145.0665, 60.0, 15.0, 0.0};
 
-    // Generate random data as in the Python example
-    for (int i = 0; i < PFULL; i++)
-        for (int j = 0; j < NX; j++)
-            for (int k = 0; k < NY; k++)
-                temp_data[i][j][k] = (rand() % (TEMP_MAX - TEMP_MIN)) + TEMP_MIN;
-
-    for (int i = 0; i < NX; i++)
-        for (int j = 0; j < NY; j++)
-            ps_data[i][j] = (rand() % (PS_MAX-PS_MIN)) + PS_MIN;
-
-    for (int i = 0; i < NX; i++)
-        for (int j = 0; j < NY; j++)
-            dummy_data[i][j] = i * NX + j;
-
-    // Writing data
-    stat = nc_put_var_double(ncid, times_id, &times_data[0]);
-    check_err(stat, __LINE__);
+    // Writing static data
     stat = nc_put_var_float(ncid, xt_id, &xt_data[0]);
     check_err(stat, __LINE__);
     stat = nc_put_var_float(ncid, yt_id, &yt_data[0]);
@@ -157,21 +158,47 @@ int main() {
     check_err(stat, __LINE__);
     stat = nc_put_var_float(ncid, bk_id, &bk_data[0]);
     check_err(stat, __LINE__);
-    stat = nc_put_vara_float(ncid, temp_id,
-                             (size_t[4]){0, 0, 0, 0},
-                             (size_t[4]){1, PFULL, NX, NY},
-                             &temp_data[0][0][0]);
-    check_err(stat, __LINE__);
-    stat = nc_put_vara_float(ncid, ps_id,
-                             (size_t[3]){0, 0, 0},
+
+    // Write time-variable data
+    for (int rec=0; rec < TIME; rec++)
+    {
+        // Generate random data as in the Python example
+        for (int i = 0; i < PFULL; i++)
+            for (int j = 0; j < NX; j++)
+                for (int k = 0; k < NY; k++)
+                    temp_data[i][j][k] = (rand() % (TEMP_MAX - TEMP_MIN)) + TEMP_MIN;
+
+        for (int i = 0; i < NX; i++)
+            for (int j = 0; j < NY; j++)
+                ps_data[i][j] = (rand() % (PS_MAX-PS_MIN)) + PS_MIN;
+
+        for (int i = 0; i < NX; i++)
+            for (int j = 0; j < NY; j++)
+                dummy_data[i][j] = i * NX + j;
+
+        times_data = (double)rec;
+
+        stat = nc_put_vara_double(ncid, times_id,
+                                  (size_t[1]){rec},
+                                  (size_t[1]){1},
+                                  &times_data);
+        check_err(stat, __LINE__);
+        stat = nc_put_vara_float(ncid, temp_id,
+                                 (size_t[4]){rec, 0, 0, 0},
+                                 (size_t[4]){1, PFULL, NX, NY},
+                                 &temp_data[0][0][0]);
+        check_err(stat, __LINE__);
+        stat = nc_put_vara_float(ncid, ps_id,
+                             (size_t[3]){rec, 0, 0},
                              (size_t[3]){1, NX, NY},
                              &ps_data[0][0]);
-    check_err(stat, __LINE__);
-    stat = nc_put_vara_float(ncid, dummy_id,
-                             (size_t[3]){0, 0, 0},
-                             (size_t[3]){1, NX, NY},
-                             &dummy_data[0][0]);
-    check_err(stat, __LINE__);
+        check_err(stat, __LINE__);
+        stat = nc_put_vara_float(ncid, dummy_id,
+                                 (size_t[3]){rec, 0, 0},
+                                 (size_t[3]){1, NX, NY},
+                                 &dummy_data[0][0]);
+        check_err(stat, __LINE__);
+    }
 
     // Close the file
     stat = nc_close(ncid);