diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8ca241ca36..30bab2f8ae 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -43,14 +43,15 @@ Describe the steps to reproduce the behavior: - [ ] Select **scientist(s)** or **no scientist** required ### Labels ### +- [ ] Review default **alert** labels - [ ] Select **component(s)** - [ ] Select **priority** - [ ] Select **requestor(s)** -### Projects and Milestone ### -- [ ] Select **Organization** level **Project** for support of the current coordinated release -- [ ] Select **Repository** level **Project** for development toward the next official release or add **alert: NEED CYCLE ASSIGNMENT** label +### Milestone and Projects ### - [ ] Select **Milestone** as the next bugfix version +- [ ] Select **Coordinated METplus-X.Y Support** project for support of the current coordinated release +- [ ] Select **MET-X.Y.Z Development** project for development toward the next official release ## Define Related Issue(s) ## Consider the impact to the other METplus components. @@ -70,14 +71,14 @@ Branch name: `bugfix__main__` Pull request: `bugfix main_ ` - [ ] Define the pull request metadata, as permissions allow. Select: **Reviewer(s)** and **Development** issue -Select: **Organization** level software support **Project** for the current coordinated release Select: **Milestone** as the next bugfix version +Select: **Coordinated METplus-X.Y Support** project for support of the current coordinated release - [ ] Iterate until the reviewer(s) accept and merge your changes. - [ ] Delete your fork or branch. - [ ] Complete the steps above to fix the bug on the **develop** branch. Branch name: `bugfix__develop_` Pull request: `bugfix develop ` Select: **Reviewer(s)** and **Development** issue -Select: **Repository** level development cycle **Project** for the next official release Select: **Milestone** as the next official version +Select: **MET-X.Y.Z Development** project for development toward the next official release - [ ] Close this issue. diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.md b/.github/ISSUE_TEMPLATE/enhancement_request.md index df95cc1587..e1134781cd 100644 --- a/.github/ISSUE_TEMPLATE/enhancement_request.md +++ b/.github/ISSUE_TEMPLATE/enhancement_request.md @@ -33,13 +33,14 @@ Consider breaking the enhancement down into sub-issues. - [ ] Select **scientist(s)** or **no scientist** required ### Labels ### +- [ ] Review default **alert** labels - [ ] Select **component(s)** - [ ] Select **priority** - [ ] Select **requestor(s)** -### Projects and Milestone ### -- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label -- [ ] Select **Milestone** as the next official version or **Future Versions** +### Milestone and Projects ### +- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas** +- [ ] For the next official version, select the **MET-X.Y.Z Development** project ## Define Related Issue(s) ## Consider the impact to the other METplus components. @@ -58,9 +59,9 @@ Branch name: `feature__` - [ ] Submit a pull request to merge into **develop**. Pull request: `feature ` - [ ] Define the pull request metadata, as permissions allow. -Select: **Reviewer(s)** and **Development** issues -Select: **Repository** level development cycle **Project** for the next official release +Select: **Reviewer(s)** and **Development** issue Select: **Milestone** as the next official version +Select: **MET-X.Y.Z Development** project for development toward the next official release - [ ] Iterate until the reviewer(s) accept and merge your changes. - [ ] Delete your fork or branch. - [ ] Close this issue. diff --git a/.github/ISSUE_TEMPLATE/new_feature_request.md b/.github/ISSUE_TEMPLATE/new_feature_request.md index c2e0179c28..e4adb302c7 100644 --- a/.github/ISSUE_TEMPLATE/new_feature_request.md +++ b/.github/ISSUE_TEMPLATE/new_feature_request.md @@ -37,13 +37,14 @@ Consider breaking the new feature down into sub-issues. - [ ] Select **scientist(s)** or **no scientist** required ### Labels ### +- [ ] Review default **alert** labels - [ ] Select **component(s)** - [ ] Select **priority** - [ ] Select **requestor(s)** -### Projects and Milestone ### -- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label -- [ ] Select **Milestone** as the next official version or **Future Versions** +### Milestone and Projects ### +- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas** +- [ ] For the next official version, select the **MET-X.Y.Z Development** project ## Define Related Issue(s) ## Consider the impact to the other METplus components. @@ -62,9 +63,9 @@ Branch name: `feature__` - [ ] Submit a pull request to merge into **develop**. Pull request: `feature ` - [ ] Define the pull request metadata, as permissions allow. -Select: **Reviewer(s)** and **Development** issues -Select: **Repository** level development cycle **Project** for the next official release +Select: **Reviewer(s)** and **Development** issue Select: **Milestone** as the next official version +Select: **MET-X.Y.Z Development** project for development toward the next official release - [ ] Iterate until the reviewer(s) accept and merge your changes. - [ ] Delete your fork or branch. - [ ] Close this issue. diff --git a/.github/ISSUE_TEMPLATE/sub-issue.md b/.github/ISSUE_TEMPLATE/sub-issue.md index 855e27d83d..e02109e963 100644 --- a/.github/ISSUE_TEMPLATE/sub-issue.md +++ b/.github/ISSUE_TEMPLATE/sub-issue.md @@ -23,10 +23,11 @@ This is a sub-issue of #*List the parent issue number here*. - [ ] Select **scientist(s)** or **no scientist** required ### Labels ### +- [ ] Review default **alert** labels - [ ] Select **component(s)** - [ ] Select **priority** - [ ] Select **requestor(s)** -### Projects and Milestone ### -- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label -- [ ] Select **Milestone** as the next official version or **Future Versions** +### Milestone and Projects ### +- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas** +- [ ] For the next official version, select the **MET-X.Y.Z Development** project diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md index f175cdb678..05ad99baf8 100644 --- a/.github/ISSUE_TEMPLATE/task.md +++ b/.github/ISSUE_TEMPLATE/task.md @@ -33,13 +33,14 @@ Consider breaking the task down into sub-issues. - [ ] Select **scientist(s)** or **no scientist** required ### Labels ### +- [ ] Review default **alert** labels - [ ] Select **component(s)** - [ ] Select **priority** - [ ] Select **requestor(s)** -### Projects and Milestone ### -- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label -- [ ] Select **Milestone** as the next official version or **Future Versions** +### Milestone and Projects ### +- [ ] Select **Milestone** as the next official version or **Backlog of Development Ideas** +- [ ] For the next official version, select the **MET-X.Y.Z Development** project ## Define Related Issue(s) ## Consider the impact to the other METplus components. @@ -58,9 +59,9 @@ Branch name: `feature__` - [ ] Submit a pull request to merge into **develop**. Pull request: `feature ` - [ ] Define the pull request metadata, as permissions allow. -Select: **Reviewer(s)** and **Development** issues -Select: **Repository** level development cycle **Project** for the next official release +Select: **Reviewer(s)** and **Development** issue Select: **Milestone** as the next official version +Select: **MET-X.Y.Z Development** project for development toward the next official release - [ ] Iterate until the reviewer(s) accept and merge your changes. - [ ] Delete your fork or branch. - [ ] Close this issue. diff --git a/.github/jobs/set_job_controls.sh b/.github/jobs/set_job_controls.sh index 76a123d18b..6f80c44aea 100755 --- a/.github/jobs/set_job_controls.sh +++ b/.github/jobs/set_job_controls.sh @@ -6,7 +6,7 @@ run_unit_tests=false run_diff=false run_update_truth=false met_base_repo=met-base -met_base_tag=v2.0_debian10 +met_base_tag=v3.0 input_data_version=develop truth_data_version=develop diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 685638ecb3..6f7f5e04c4 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -27,9 +27,9 @@ See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors - [ ] Complete the PR definition above. - [ ] Ensure the PR title matches the feature or bugfix branch name. - [ ] Define the PR metadata, as permissions allow. -Select: **Reviewer(s)** -Select: **Organization** level software support **Project** or **Repository** level development cycle **Project** +Select: **Reviewer(s)** and **Development** issue Select: **Milestone** as the version that will include these changes +Select: **Coordinated METplus-X.Y Support** project for bugfix releases or **MET-X.Y.Z Development** project for official releases - [ ] After submitting the PR, select the :gear: icon in the **Development** section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected. - [ ] After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge. - [ ] Close the linked issue and delete your feature or bugfix branch from GitHub. diff --git a/.github/workflows/build_docker_and_trigger_metplus.yml b/.github/workflows/build_docker_and_trigger_metplus.yml index 89e5e14f67..6d0adf11fa 100644 --- a/.github/workflows/build_docker_and_trigger_metplus.yml +++ b/.github/workflows/build_docker_and_trigger_metplus.yml @@ -29,7 +29,7 @@ jobs: env: SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite MET_BASE_REPO: met-base - MET_BASE_TAG: v2.0_debian10 + MET_BASE_TAG: v3.0 - name: Push Docker Image run: .github/jobs/push_docker_image.sh diff --git a/INSTALL b/INSTALL index 14000719f8..c408f5d504 100644 --- a/INSTALL +++ b/INSTALL @@ -84,6 +84,11 @@ sub-directory, or the MET Online Tutorial: $MET_LIB pointing to the directory with the library files. If $MET_INC and $MET_LIB are defined, then $MET_ is ignored. + - Set $MET_PROJ to point to the main Proj directory, or set + $MET_PROJINC to point to the directory with the Proj include files + and set $MET_PROJLIB to point to the directory with the Proj + library files. + - Set $MET_NETCDF to point to the main NetCDF directory, or set $MET_NETCDFINC to point to the directory with the NetCDF include files and set $MET_NETCDFLIB to point to the directory with the NetCDF diff --git a/Makefile.in b/Makefile.in index aa3a1d74ff..b93bd865e6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -274,6 +274,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/configure b/configure index 7f4e796d1c..1e7e56769e 100755 --- a/configure +++ b/configure @@ -757,6 +757,9 @@ MET_HDF5 MET_NETCDFLIB MET_NETCDFINC MET_NETCDF +MET_PROJLIB +MET_PROJINC +MET_PROJ OPENMP_CFLAGS am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -888,6 +891,9 @@ CFLAGS LDFLAGS LIBS CPPFLAGS +MET_PROJ +MET_PROJINC +MET_PROJLIB MET_NETCDF MET_NETCDFINC MET_NETCDFLIB @@ -1611,6 +1617,16 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + MET_PROJ Where proj lib and include subdirectories are located. If they + are installed in /usr/local, you don't have to specify them. + MET_PROJINC Where proj include files are located. Use if the libraries and + include files are not under the same main proj directory. If + used, MET_PROJLIB must also be defined and MET_PROJ will be + ignored. + MET_PROJLIB Where proj libraries are located. Use if the libraries and + include files are not under the same main proj directory. If + used, MET_PROJINC must also be defined and MET_PROJ will be + ignored. MET_NETCDF Where netcdf lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. MET_NETCDFINC @@ -4514,10 +4530,10 @@ CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}" LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}" # -# Look for the NetCDF library +# Look for the Proj library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4525,63 +4541,63 @@ LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}" # Ensure that both or neither are specified. -if (test -n "$MET_NETCDFLIB" && test -z "$MET_NETCDFINC") || \ - (test -n "$MET_NETCDFINC" && test -z "$MET_NETCDFLIB"); then - if test -n "$MET_NETCDFLIB"; then - as_fn_error $? "MET_NETCDFLIB environment variable set, but MET_NETCDFINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 - else - as_fn_error $? "MET_NETCDFINC environment variable set, but MET_NETCDFLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 - fi +if (test -n "$MET_PROJLIB" && test -z "$MET_PROJINC"); then + as_fn_error $? "MET_PROJLIB environment variable set, but MET_PROJINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_PROJINC" && test -z "$MET_PROJLIB"); then + as_fn_error $? "MET_PROJINC environment variable set, but MET_PROJLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 +fi + +# Use the main Proj directory if individual locations were not specified. + +if (test -n "$MET_PROJ" && test -z "$MET_PROJLIB"); then + MET_PROJINC='${MET_PROJ}/include' + MET_PROJLIB='${MET_PROJ}/lib' +fi + +# AC_SUBST command line variables. + +if (test -n "$MET_PROJLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_PROJINC}" + LDFLAGS="${LDFLAGS} -L${MET_PROJLIB}" fi -# If the individual locations weren't specified, then the main NetCDF directory -# must be specified. If it isn't, let the user know they need to supply one. - -if test -z "$MET_NETCDFLIB" && test -n "$MET_NETCDF"; then - MET_NETCDFINC='${MET_NETCDF}/include' - MET_NETCDFLIB='${MET_NETCDF}/lib' -fi - -# We don't currently look for the NetCDF libraries in "known" -# locations. If we want to, this example code might be -# helpful. -## Not specified? Check for FTK in standard places. -#if test -z "$FTKLIB"; then -# # Check for flaim tool kit as a sub-project. -# if test -d "$srcdir/ftk"; then -# AC_CONFIG_SUBDIRS([ftk]) -# FTKINC='$(top_srcdir)/ftk/src' -# FTKLIB='$(top_builddir)/ftk/src' -# else -# # Check for flaim tool kit as a super-project. -# if test -d "$srcdir/../ftk"; then -# FTKINC='$(top_srcdir)/../ftk/src' -# FTKLIB='$(top_builddir)/../ftk/src' -# fi -# fi -#fi # -## Still empty? Check for installed flaim tool kit. -#if test -z "$FTKLIB"; then -# AC_CHECK_LIB([flaimtk], [ftkFastChecksum], -# [AC_CHECK_HEADERS([flaimtk.h]) -# LIBS="-lflaimtk $LIBS"], -# [AC_MSG_ERROR([No FLAIM Took Kit found.])]) -#fi +# Look for the NetCDF library. +# + +# Configure the variables. The help text will appear if the user uses "configure --help". + + + + + +# Ensure that both or neither are specified. + +if (test -n "$MET_NETCDFLIB" && test -z "$MET_NETCDFINC"); then + as_fn_error $? "MET_NETCDFLIB environment variable set, but MET_NETCDFINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_NETCDFINC" && test -z "$MET_NETCDFLIB"); then + as_fn_error $? "MET_NETCDFINC environment variable set, but MET_NETCDFLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 +fi -# AC_SUBST command line variables. If we get here, the NetCDF -# libraries were found so no need to check +# Use the main NetCDF directory if individual locations were not specified. -if test -n "$MET_NETCDFLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_NETCDFINC}" - LDFLAGS="${LDFLAGS} -L${MET_NETCDFLIB}" +if (test -n "$MET_NETCDF" && test -z "$MET_NETCDFLIB"); then + MET_NETCDFINC='${MET_NETCDF}/include' + MET_NETCDFLIB='${MET_NETCDF}/lib' +fi + +# AC_SUBST command line variables. + +if (test -n "$MET_NETCDFLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_NETCDFINC}" + LDFLAGS="${LDFLAGS} -L${MET_NETCDFLIB}" fi # -# Look for the HDF5 library +# Look for the HDF5 library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4589,36 +4605,31 @@ fi # Ensure that both or neither are specified. -if (test -n "$MET_HDF5LIB" && test -z "$MET_HDF5INC") || \ - (test -n "$MET_HDF5INC" && test -z "$MET_HDF5LIB"); then - if test -n "$MET_HDF5LIB"; then - as_fn_error $? "MET_HDF5LIB environment variable set, but MET_HDF5INC not set. If one of these variables is set, then both must be set." "$LINENO" 5 - else - as_fn_error $? "MET_HDF5INC environment variable set, but MET_HDF5LIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 - fi +if (test -n "$MET_HDF5LIB" && test -z "$MET_HDF5INC"); then + as_fn_error $? "MET_HDF5LIB environment variable set, but MET_HDF5INC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_HDF5INC" && test -z "$MET_HDF5LIB"); then + as_fn_error $? "MET_HDF5INC environment variable set, but MET_HDF5LIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 fi -# If the individual locations weren't specified, then the main HDF5 directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main HDF5 directory if individual locations were not specified. -if test -z "$MET_HDF5LIB" && test -n "$MET_HDF5"; then - MET_HDF5INC='${MET_HDF5}/include' - MET_HDF5LIB='${MET_HDF5}/lib' +if (test -n "$MET_HDF5" && test -z "$MET_HDF5LIB"); then + MET_HDF5INC='${MET_HDF5}/include' + MET_HDF5LIB='${MET_HDF5}/lib' fi -# AC_SUBST command line variables. If we get here, the HDF5 -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_HDF5LIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_HDF5INC}" - LDFLAGS="${LDFLAGS} -L${MET_HDF5LIB}" +if (test -n "$MET_HDF5LIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_HDF5INC}" + LDFLAGS="${LDFLAGS} -L${MET_HDF5LIB}" fi # # Look for the GRIB2C library # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4627,36 +4638,31 @@ fi # Ensure that both or neither are specified. -if (test -n "$MET_GRIB2CLIB" && test -z "$MET_GRIB2CINC") || \ - (test -n "$MET_GRIB2CINC" && test -z "$MET_GRIB2CLIB"); then - if test -n "$MET_GRIB2CLIB"; then - as_fn_error $? "MET_GRIB2CLIB environment variable set, but MET_GRIB2CINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 - else - as_fn_error $? "MET_GRIB2CINC environment variable set, but MET_GRIB2CLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 - fi +if (test -n "$MET_GRIB2CLIB" && test -z "$MET_GRIB2CINC"); then + as_fn_error $? "MET_GRIB2CLIB environment variable set, but MET_GRIB2CINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_GRIB2CINC" && test -z "$MET_GRIB2CLIB"); then + as_fn_error $? "MET_GRIB2CINC environment variable set, but MET_GRIB2CLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 fi -# If the individual locations weren't specified, then the main Grib2c directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main GRIB2C directory if individual locations were not specified. -if test -z "$MET_GRIB2CLIB" && test -n "$MET_GRIB2C"; then - MET_GRIB2CINC='${MET_GRIB2C}/include' - MET_GRIB2CLIB='${MET_GRIB2C}/lib' +if (test -n "$MET_GRIB2C" && test -z "$MET_GRIB2CLIB"); then + MET_GRIB2CINC='${MET_GRIB2C}/include' + MET_GRIB2CLIB='${MET_GRIB2C}/lib' fi -# AC_SUBST command line variables. If we get here, the Grib2c -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_GRIB2CLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_GRIB2CINC}" - LDFLAGS="${LDFLAGS} -L${MET_GRIB2CLIB}" +if (test -n "$MET_GRIB2CLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_GRIB2CINC}" + LDFLAGS="${LDFLAGS} -L${MET_GRIB2CLIB}" fi # -# Look for the PYTHON executable and library +# Look for the PYTHON executable and library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4667,34 +4673,34 @@ fi if (test -n "$MET_PYTHON_BIN_EXE" || \ test -n "$MET_PYTHON_CC" || \ test -n "$MET_PYTHON_LD"); then - if test -z "$MET_PYTHON_BIN_EXE"; then - as_fn_error $? "MET_PYTHON_CC or MET_PYTHON_LD environment variable set, but MET_PYTHON_BIN_EXE not set. If one of these variables is set, then all must be set." "$LINENO" 5 - elif test -z "$MET_PYTHON_CC"; then - as_fn_error $? "MET_PYTHON_BIN_EXE or MET_PYTHON_LD environment variable set, but MET_PYTHON_CC not set. If one of these variables is set, then all must be set." "$LINENO" 5 - elif test -z "$MET_PYTHON_LD"; then - as_fn_error $? "MET_PYTHON_BIN_EXE or MET_PYTHON_CC environment variable set, but MET_PYTHON_LD not set. If one of these variables is set, then all must be set." "$LINENO" 5 + if (test -z "$MET_PYTHON_BIN_EXE"); then + as_fn_error $? "MET_PYTHON_CC or MET_PYTHON_LD environment variable set, but MET_PYTHON_BIN_EXE not set. If one of these variables is set, then all must be set." "$LINENO" 5 + elif (test -z "$MET_PYTHON_CC"); then + as_fn_error $? "MET_PYTHON_BIN_EXE or MET_PYTHON_LD environment variable set, but MET_PYTHON_CC not set. If one of these variables is set, then all must be set." "$LINENO" 5 + elif (test -z "$MET_PYTHON_LD"); then + as_fn_error $? "MET_PYTHON_BIN_EXE or MET_PYTHON_CC environment variable set, but MET_PYTHON_LD not set. If one of these variables is set, then all must be set." "$LINENO" 5 fi fi # Add MET_PYTHON_BIN_EXE to the CPPFLAGS -if test -n "$MET_PYTHON_BIN_EXE"; then +if (test -n "$MET_PYTHON_BIN_EXE"); then CPPFLAGS=$CPPFLAGS' -DMET_PYTHON_BIN_EXE="\"${MET_PYTHON_BIN_EXE}\""' fi -if test -n "$MET_PYTHON_CC"; then +if (test -n "$MET_PYTHON_CC"); then CPPFLAGS="${CPPFLAGS} -I../../basic/vx_log -I../../basic/vx_util ${MET_PYTHON_CC}" fi -if test -n "$MET_PYTHON_LD"; then +if (test -n "$MET_PYTHON_LD"); then LDFLAGS="${LDFLAGS} ${MET_PYTHON_LD}" fi # -# Look for the GSL library +# Look for the GSL library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4702,55 +4708,49 @@ fi # Ensure that both or neither are specified. -if (test -n "$MET_GSLLIB" && test -z "$MET_GSLINC") || \ - (test -n "$MET_GSLINC" && test -z "$MET_GSLLIB"); then - if test -n "$MET_GSLLIB"; then - as_fn_error $? "MET_GSLLIB environment variable set, but MET_GSLINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 - else - as_fn_error $? "MET_GSLINC environment variable set, but MET_GSLLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 - fi +if (test -n "$MET_GSLLIB" && test -z "$MET_GSLINC"); then + as_fn_error $? "MET_GSLLIB environment variable set, but MET_GSLINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_GSLINC" && test -z "$MET_GSLLIB"); then + as_fn_error $? "MET_GSLINC environment variable set, but MET_GSLLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 fi -# If the individual locations weren't specified, then the main Gsl directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main GSL directory if individual locations were not specified. -if test -z "$MET_GSLLIB" && test -n "$MET_GSL"; then - MET_GSLINC='${MET_GSL}/include' - MET_GSLLIB='${MET_GSL}/lib' +if (test -n "$MET_GSL" && test -z "$MET_GSLLIB"); then + MET_GSLINC='${MET_GSL}/include' + MET_GSLLIB='${MET_GSL}/lib' fi -# AC_SUBST command line variables. If we get here, the Gsl -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_GSLLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_GSLINC}" - LDFLAGS="${LDFLAGS} -L${MET_GSLLIB}" +if (test -n "$MET_GSLLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_GSLINC}" + LDFLAGS="${LDFLAGS} -L${MET_GSLLIB}" fi # -# Look for the BUFR library +# Look for the BUFR library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". # If the individual locations weren't specified, then the main Bufr directory -# must be specified. If it isn't, let the user know they need to supply one. +# must be specified. If it isn't, let the user know they need to supply one. -if test -z "$MET_BUFRLIB" && test -n "$MET_BUFR"; then - MET_BUFRLIB='${MET_BUFR}/lib' +if (test -n "$MET_BUFR" && test -z "$MET_BUFRLIB"); then + MET_BUFRLIB='${MET_BUFR}/lib' fi -# AC_SUBST command line variables. If we get here, the Bufr -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_BUFRLIB"; then - LDFLAGS="${LDFLAGS} -L${MET_BUFRLIB}" +if (test -n "$MET_BUFRLIB"); then + LDFLAGS="${LDFLAGS} -L${MET_BUFRLIB}" fi -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4766,12 +4766,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: BUFRLIB_NAME will be set" >&5 $as_echo "$as_me: BUFRLIB_NAME will be set" >&6;} - # -# Look for the HDF library +# Look for the HDF library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4779,36 +4778,31 @@ $as_echo "$as_me: BUFRLIB_NAME will be set" >&6;} # Ensure that both or neither are specified. -if (test -n "$MET_HDFLIB" && test -z "$MET_HDFINC") || \ - (test -n "$MET_HDFINC" && test -z "$MET_HDFLIB"); then - if test -n "$MET_HDFLIB"; then - as_fn_error $? "MET_HDFLIB environment variable set, but MET_HDFINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 - else - as_fn_error $? "MET_HDFINC environment variable set, but MET_HDFLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 - fi +if (test -n "$MET_HDFLIB" && test -z "$MET_HDFINC"); then + as_fn_error $? "MET_HDFLIB environment variable set, but MET_HDFINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_HDFINC" && test -z "$MET_HDFLIB"); then + as_fn_error $? "MET_HDFINC environment variable set, but MET_HDFLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 fi -# If the individual locations weren't specified, then the main HDF directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main HDF directory if individual locations were not specified. -if test -z "$MET_HDFLIB" && test -n "$MET_HDF"; then - MET_HDFINC='${MET_HDF}/include' - MET_HDFLIB='${MET_HDF}/lib' +if (test -n "$MET_HDF" && test -z "$MET_HDFLIB"); then + MET_HDFINC='${MET_HDF}/include' + MET_HDFLIB='${MET_HDF}/lib' fi -# AC_SUBST command line variables. If we get here, the HDF -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_HDFLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_HDFINC}" - LDFLAGS="${LDFLAGS} -L${MET_HDFLIB}" +if (test -n "$MET_HDFLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_HDFINC}" + LDFLAGS="${LDFLAGS} -L${MET_HDFLIB}" fi # -# Look for the HDFEOS library +# Look for the HDFEOS library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4816,36 +4810,31 @@ fi # Ensure that both or neither are specified. -if (test -n "$MET_HDFEOSLIB" && test -z "$MET_HDFEOSINC") || \ - (test -n "$MET_HDFEOSINC" && test -z "$MET_HDFEOSLIB"); then - if test -n "$MET_HDFEOSLIB"; then - as_fn_error $? "MET_HDFEOSLIB environment variable set, but MET_HDFEOSINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 - else - as_fn_error $? "MET_HDFEOSINC environment variable set, but MET_HDFEOSLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 - fi +if (test -n "$MET_HDFEOSLIB" && test -z "$MET_HDFEOSINC"); then + as_fn_error $? "MET_HDFEOSLIB environment variable set, but MET_HDFEOSINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_HDFEOSINC" && test -z "$MET_HDFEOSLIB"); then + as_fn_error $? "MET_HDFEOSINC environment variable set, but MET_HDFEOSLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 fi -# If the individual locations weren't specified, then the main HDFEOS directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main HDFEOS directory if individual locations were not specified. -if test -z "$MET_HDFEOSLIB" && test -n "$MET_HDFEOS"; then - MET_HDFEOSINC='${MET_HDFEOS}/include' - MET_HDFEOSLIB='${MET_HDFEOS}/lib' +if (test -n "$MET_HDFEOS" && test -z "$MET_HDFEOSLIB"); then + MET_HDFEOSINC='${MET_HDFEOS}/include' + MET_HDFEOSLIB='${MET_HDFEOS}/lib' fi -# AC_SUBST command line variables. If we get here, the HDFEOS -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_HDFEOSLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_HDFEOSINC}" - LDFLAGS="${LDFLAGS} -L${MET_HDFEOSLIB}" +if (test -n "$MET_HDFEOSLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_HDFEOSINC}" + LDFLAGS="${LDFLAGS} -L${MET_HDFEOSLIB}" fi # # Look for the Cairo library # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4853,36 +4842,31 @@ fi # Ensure that both or neither are specified. -if (test -n "$MET_CAIROLIB" && test -z "$MET_CAIROINC") || \ - (test -n "$MET_CAIROINC" && test -z "$MET_CAIROLIB"); then - if test -n "$MET_CAIROLIB"; then - as_fn_error $? "MET_CAIROLIB environment variable set, but MET_CAIROINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 - else - as_fn_error $? "MET_CAIROINC environment variable set, but MET_CAIROLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 - fi +if (test -n "$MET_CAIROLIB" && test -z "$MET_CAIROINC"); then + as_fn_error $? "MET_CAIROLIB environment variable set, but MET_CAIROINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_CAIROINC" && test -z "$MET_CAIROLIB"); then + as_fn_error $? "MET_CAIROINC environment variable set, but MET_CAIROLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 fi -# If the individual locations weren't specified, then the main Cairo directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main Cairo directory if individual locations were not specified. -if test -z "$MET_CAIROLIB" && test -n "$MET_CAIRO"; then - MET_CAIROINC='${MET_CAIRO}/include' - MET_CAIROLIB='${MET_CAIRO}/lib' +if (test -n "$MET_CAIRO" && test -z "$MET_CAIROLIB"); then + MET_CAIROINC='${MET_CAIRO}/include' + MET_CAIROLIB='${MET_CAIRO}/lib' fi -# AC_SUBST command line variables. If we get here, the Cairo -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_CAIROLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_CAIROINC}" - LDFLAGS="${LDFLAGS} -L${MET_CAIROLIB}" +if (test -n "$MET_CAIROLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_CAIROINC}" + LDFLAGS="${LDFLAGS} -L${MET_CAIROLIB}" fi # # Look for the Freetype library # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". @@ -4890,29 +4874,24 @@ fi # Ensure that both or neither are specified. -if (test -n "$MET_FREETYPELIB" && test -z "$MET_FREETYPEINC") || \ - (test -n "$MET_FREETYPEINC" && test -z "$MET_FREETYPELIB"); then - if test -n "$MET_FREETYPELIB"; then - as_fn_error $? "MET_FREETYPELIB environment variable set, but MET_FREETYPEINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 - else - as_fn_error $? "MET_FREETYPEINC environment variable set, but MET_FREETYPELIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 - fi +if (test -n "$MET_FREETYPELIB" && test -z "$MET_FREETYPEINC"); then + as_fn_error $? "MET_FREETYPELIB environment variable set, but MET_FREETYPEINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_FREETYPEINC" && test -z "$MET_FREETYPELIB"); then + as_fn_error $? "MET_FREETYPEINC environment variable set, but MET_FREETYPELIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 fi -# If the individual locations weren't specified, then the main Freetype directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main Freetype directory if individual locations were not specified. -if test -z "$MET_FREETYPELIB" && test -n "$MET_FREETYPE"; then - MET_FREETYPEINC='${MET_FREETYPE}/include' - MET_FREETYPELIB='${MET_FREETYPE}/lib' +if (test -z "$MET_FREETYPELIB" && test -n "$MET_FREETYPE"); then + MET_FREETYPEINC='${MET_FREETYPE}/include' + MET_FREETYPELIB='${MET_FREETYPE}/lib' fi -# AC_SUBST command line variables. If we get here, the Freetype -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_FREETYPELIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_FREETYPEINC}" - LDFLAGS="${LDFLAGS} -L${MET_FREETYPELIB}" +if (test -n "$MET_FREETYPELIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_FREETYPEINC}" + LDFLAGS="${LDFLAGS} -L${MET_FREETYPELIB}" fi # @@ -4943,11 +4922,11 @@ fi if test "x$ENABLE_BLOCK4" = "xyes"; then - CPPFLAGS="${CPPFLAGS} -DBLOCK4" - { $as_echo "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will be used in the compiles" >&5 + CPPFLAGS="${CPPFLAGS} -DBLOCK4" + { $as_echo "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will be used in the compiles" >&5 $as_echo "$as_me: -DBLOCK4 will be used in the compiles" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will not be used in the compiles" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will not be used in the compiles" >&5 $as_echo "$as_me: -DBLOCK4 will not be used in the compiles" >&6;} fi @@ -4976,10 +4955,10 @@ fi if test "x$ENABLE_STATIC_LINKING" = "xyes"; then LDFLAGS="${LDFLAGS} -static" - { $as_echo "$as_me:${as_lineno-$LINENO}: Static linking will be used in the compiles" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Static linking will be used in the compiles" >&5 $as_echo "$as_me: Static linking will be used in the compiles" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: Dynamic linking will not be used in the compiles" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Dynamic linking will not be used in the compiles" >&5 $as_echo "$as_me: Dynamic linking will not be used in the compiles" >&6;} fi @@ -5010,10 +4989,10 @@ if test "x$ENABLE_ASCII2NC" = "xyes"; then $as_echo "#define ENABLE_ASCII2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: ascii2nc will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: ascii2nc will be compiled" >&5 $as_echo "$as_me: ascii2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: ascii2nc will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: ascii2nc will not be compiled" >&5 $as_echo "$as_me: ascii2nc will not be compiled" >&6;} fi @@ -5044,10 +5023,10 @@ if test "x$ENABLE_LIDAR2NC" = "xyes"; then $as_echo "#define ENABLE_LIDAR2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: lidar2nc will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: lidar2nc will be compiled" >&5 $as_echo "$as_me: lidar2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: lidar2nc will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: lidar2nc will not be compiled" >&5 $as_echo "$as_me: lidar2nc will not be compiled" >&6;} fi @@ -5078,10 +5057,10 @@ if test "x$ENABLE_ENSEMBLE_STAT" = "xyes"; then $as_echo "#define ENABLE_ENSEMBLE_STAT /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: ensemble_stat will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: ensemble_stat will be compiled" >&5 $as_echo "$as_me: ensemble_stat will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: ensemble_stat will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: ensemble_stat will not be compiled" >&5 $as_echo "$as_me: ensemble_stat will not be compiled" >&6;} fi @@ -5112,10 +5091,10 @@ if test "x$ENABLE_GEN_ENS_PROD" = "xyes"; then $as_echo "#define ENABLE_GEN_ENS_PROD /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: gen_ens_prod will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: gen_ens_prod will be compiled" >&5 $as_echo "$as_me: gen_ens_prod will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: gen_ens_prod will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: gen_ens_prod will not be compiled" >&5 $as_echo "$as_me: gen_ens_prod will not be compiled" >&6;} fi @@ -5147,10 +5126,10 @@ if test "x$ENABLE_GEN_VX_MASK" = "xyes"; then $as_echo "#define ENABLE_GEN_VX_MASK /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: gen_vx_mask will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: gen_vx_mask will be compiled" >&5 $as_echo "$as_me: gen_vx_mask will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: gen_vx_mask will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: gen_vx_mask will not be compiled" >&5 $as_echo "$as_me: gen_vx_mask will not be compiled" >&6;} fi @@ -5182,10 +5161,10 @@ if test "x$ENABLE_GIS_UTILS" = "xyes"; then $as_echo "#define ENABLE_GIS_UTILS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: gis_utils will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: gis_utils will be compiled" >&5 $as_echo "$as_me: gis_utils will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: gis_utils will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: gis_utils will not be compiled" >&5 $as_echo "$as_me: gis_utils will not be compiled" >&6;} fi @@ -5217,10 +5196,10 @@ if test "x$ENABLE_GRID_STAT" = "xyes"; then $as_echo "#define ENABLE_GRID_STAT /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: grid_stat will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: grid_stat will be compiled" >&5 $as_echo "$as_me: grid_stat will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: grid_stat will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: grid_stat will not be compiled" >&5 $as_echo "$as_me: grid_stat will not be compiled" >&6;} fi @@ -5251,10 +5230,10 @@ if test "x$ENABLE_IODA2NC" = "xyes"; then $as_echo "#define ENABLE_IODA2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: ioda2nc will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: ioda2nc will be compiled" >&5 $as_echo "$as_me: ioda2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: ioda2nc will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: ioda2nc will not be compiled" >&5 $as_echo "$as_me: ioda2nc will not be compiled" >&6;} fi @@ -5285,10 +5264,10 @@ if test "x$ENABLE_MADIS2NC" = "xyes"; then $as_echo "#define ENABLE_MADIS2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: madis2nc will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: madis2nc will be compiled" >&5 $as_echo "$as_me: madis2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: madis2nc will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: madis2nc will not be compiled" >&5 $as_echo "$as_me: madis2nc will not be compiled" >&6;} fi @@ -5319,10 +5298,10 @@ if test "x$ENABLE_MODE" = "xyes"; then $as_echo "#define ENABLE_MODE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: mode will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: mode will be compiled" >&5 $as_echo "$as_me: mode will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: mode will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: mode will not be compiled" >&5 $as_echo "$as_me: mode will not be compiled" >&6;} fi @@ -5353,10 +5332,10 @@ if test "x$ENABLE_MODE_ANALYSIS" = "xyes"; then $as_echo "#define ENABLE_MODE_ANALYSIS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_analysis will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_analysis will be compiled" >&5 $as_echo "$as_me: mode_analysis will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_analysis will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_analysis will not be compiled" >&5 $as_echo "$as_me: mode_analysis will not be compiled" >&6;} fi @@ -5387,10 +5366,10 @@ if test "x$ENABLE_PB2NC" = "xyes"; then $as_echo "#define ENABLE_PB2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: pb2nc will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: pb2nc will be compiled" >&5 $as_echo "$as_me: pb2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: pb2nc will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: pb2nc will not be compiled" >&5 $as_echo "$as_me: pb2nc will not be compiled" >&6;} fi @@ -5421,10 +5400,10 @@ if test "x$ENABLE_PCP_COMBINE" = "xyes"; then $as_echo "#define ENABLE_PCP_COMBINE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: pcp_combine will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: pcp_combine will be compiled" >&5 $as_echo "$as_me: pcp_combine will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: pcp_combine will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: pcp_combine will not be compiled" >&5 $as_echo "$as_me: pcp_combine will not be compiled" >&6;} fi @@ -5455,10 +5434,10 @@ if test "x$ENABLE_PLOT_DATA_PLANE" = "xyes"; then $as_echo "#define ENABLE_PLOT_DATA_PLANE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: plot_data_plane will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: plot_data_plane will be compiled" >&5 $as_echo "$as_me: plot_data_plane will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: plot_data_plane will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: plot_data_plane will not be compiled" >&5 $as_echo "$as_me: plot_data_plane will not be compiled" >&6;} fi @@ -5489,10 +5468,10 @@ if test "x$ENABLE_REGRID_DATA_PLANE" = "xyes"; then $as_echo "#define ENABLE_REGRID_DATA_PLANE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: regrid_data_plane will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: regrid_data_plane will be compiled" >&5 $as_echo "$as_me: regrid_data_plane will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: regrid_data_plane will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: regrid_data_plane will not be compiled" >&5 $as_echo "$as_me: regrid_data_plane will not be compiled" >&6;} fi @@ -5523,10 +5502,10 @@ if test "x$ENABLE_POINT2GRID" = "xyes"; then $as_echo "#define ENABLE_POINT2GRID /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: point2grid will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: point2grid will be compiled" >&5 $as_echo "$as_me: point2grid will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: point2grid will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: point2grid will not be compiled" >&5 $as_echo "$as_me: point2grid will not be compiled" >&6;} fi @@ -5557,10 +5536,10 @@ if test "x$ENABLE_SHIFT_DATA_PLANE" = "xyes"; then $as_echo "#define ENABLE_SHIFT_DATA_PLANE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: shift_data_plane will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: shift_data_plane will be compiled" >&5 $as_echo "$as_me: shift_data_plane will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: shift_data_plane will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: shift_data_plane will not be compiled" >&5 $as_echo "$as_me: shift_data_plane will not be compiled" >&6;} fi @@ -5591,10 +5570,10 @@ if test "x$ENABLE_PLOT_POINT_OBS" = "xyes"; then $as_echo "#define ENABLE_PLOT_POINT_OBS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: plot_point_obs will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: plot_point_obs will be compiled" >&5 $as_echo "$as_me: plot_point_obs will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: plot_point_obs will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: plot_point_obs will not be compiled" >&5 $as_echo "$as_me: plot_point_obs will not be compiled" >&6;} fi @@ -5625,10 +5604,10 @@ if test "x$ENABLE_POINT_STAT" = "xyes"; then $as_echo "#define ENABLE_POINT_STAT /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: point_stat will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: point_stat will be compiled" >&5 $as_echo "$as_me: point_stat will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: point_stat will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: point_stat will not be compiled" >&5 $as_echo "$as_me: point_stat will not be compiled" >&6;} fi @@ -5659,10 +5638,10 @@ if test "x$ENABLE_STAT_ANALYSIS" = "xyes"; then $as_echo "#define ENABLE_STAT_ANALYSIS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: stat_analysis will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: stat_analysis will be compiled" >&5 $as_echo "$as_me: stat_analysis will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: stat_analysis will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: stat_analysis will not be compiled" >&5 $as_echo "$as_me: stat_analysis will not be compiled" >&6;} fi @@ -5693,10 +5672,10 @@ if test "x$ENABLE_WAVELET_STAT" = "xyes"; then $as_echo "#define ENABLE_WAVELET_STAT /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: wavelet_stat will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: wavelet_stat will be compiled" >&5 $as_echo "$as_me: wavelet_stat will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: wavelet_stat will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: wavelet_stat will not be compiled" >&5 $as_echo "$as_me: wavelet_stat will not be compiled" >&6;} fi @@ -5727,10 +5706,10 @@ if test "x$ENABLE_SERIES_ANALYSIS" = "xyes"; then $as_echo "#define ENABLE_SERIES_ANALYSIS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: series_analysis will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: series_analysis will be compiled" >&5 $as_echo "$as_me: series_analysis will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: series_analysis will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: series_analysis will not be compiled" >&5 $as_echo "$as_me: series_analysis will not be compiled" >&6;} fi @@ -5761,10 +5740,10 @@ if test "x$ENABLE_WWMCA" = "xyes"; then $as_echo "#define ENABLE_WWMCA /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: wwmca will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: wwmca will be compiled" >&5 $as_echo "$as_me: wwmca will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: wwmca will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: wwmca will not be compiled" >&5 $as_echo "$as_me: wwmca will not be compiled" >&6;} fi @@ -5795,10 +5774,10 @@ if test "x$ENABLE_MODIS" = "xyes"; then $as_echo "#define ENABLE_MODIS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: modis will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: modis will be compiled" >&5 $as_echo "$as_me: modis will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: modis will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: modis will not be compiled" >&5 $as_echo "$as_me: modis will not be compiled" >&6;} fi @@ -5829,10 +5808,10 @@ if test "x$ENABLE_MODE_GRAPHICS" = "xyes"; then $as_echo "#define ENABLE_MODE_GRAPHICS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_graphics will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_graphics will be compiled" >&5 $as_echo "$as_me: mode_graphics will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_graphics will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_graphics will not be compiled" >&5 $as_echo "$as_me: mode_graphics will not be compiled" >&6;} fi @@ -5863,10 +5842,10 @@ if test "x$ENABLE_MODE_TIME_DOMAIN" = "xyes"; then $as_echo "#define ENABLE_MODE_TIME_DOMAIN /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_time_domain will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_time_domain will be compiled" >&5 $as_echo "$as_me: mode_time_domain will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_time_domain will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_time_domain will not be compiled" >&5 $as_echo "$as_me: mode_time_domain will not be compiled" >&6;} fi @@ -5897,10 +5876,10 @@ if test "x$ENABLE_TC_UTILS" = "xyes"; then $as_echo "#define ENABLE_TC_UTILS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: tc_utils will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: tc_utils will be compiled" >&5 $as_echo "$as_me: tc_utils will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: tc_utils will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: tc_utils will not be compiled" >&5 $as_echo "$as_me: tc_utils will not be compiled" >&6;} fi @@ -5931,10 +5910,10 @@ if test "x$ENABLE_GSI_TOOLS" = "xyes"; then $as_echo "#define ENABLE_GSI_TOOLS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: gsi_tools will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: gsi_tools will be compiled" >&5 $as_echo "$as_me: gsi_tools will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: gsi_tools will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: gsi_tools will not be compiled" >&5 $as_echo "$as_me: gsi_tools will not be compiled" >&6;} fi @@ -5973,11 +5952,11 @@ if test "x$ENABLE_GRIB2" = "xyes"; then $as_echo "#define ENABLE_GRIB2 /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2 utilites will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2 utilites will be compiled" >&5 $as_echo "$as_me: GRIB2 utilites will be compiled" >&6;} - CPPFLAGS="${CPPFLAGS} -DWITH_GRIB2" + CPPFLAGS="${CPPFLAGS} -DWITH_GRIB2" - { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2CLIB_NAME will be set" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2CLIB_NAME will be set" >&5 $as_echo "$as_me: GRIB2CLIB_NAME will be set" >&6;} if test -z "$GRIB2CLIB_NAME"; then GRIB2_LIBS="-lvx_data2d_grib2 -lgrib2c -ljasper -lpng -lz" @@ -5985,7 +5964,7 @@ $as_echo "$as_me: GRIB2CLIB_NAME will be set" >&6;} GRIB2_LIBS="-lvx_data2d_grib2 ${GRIB2CLIB_NAME} -ljasper -lpng -lz" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2 utilities will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2 utilities will not be compiled" >&5 $as_echo "$as_me: GRIB2 utilities will not be compiled" >&6;} GRIB2_LIBS= fi @@ -6018,22 +5997,17 @@ if test "x$ENABLE_PYTHON" = "xyes"; then $as_echo "#define ENABLE_PYTHON /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: python embedding will be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: python embedding will be compiled" >&5 $as_echo "$as_me: python embedding will be compiled" >&6;} - CPPFLAGS="${CPPFLAGS} -DWITH_PYTHON" - PYTHON_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils ${MET_PYTHON_LD}" + CPPFLAGS="${CPPFLAGS} -DWITH_PYTHON" + PYTHON_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils ${MET_PYTHON_LD}" else - { $as_echo "$as_me:${as_lineno-$LINENO}: python embedding will not be compiled" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: python embedding will not be compiled" >&5 $as_echo "$as_me: python embedding will not be compiled" >&6;} - PYTHON_LIBS= + PYTHON_LIBS= fi -######################################################################## - - - - ######################################################################## # Check for the MET_DEVELOPMENT environment variable diff --git a/configure.ac b/configure.ac index 28744a1f22..49d3397a6a 100644 --- a/configure.ac +++ b/configure.ac @@ -16,149 +16,139 @@ CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}" LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}" # -# Look for the NetCDF library +# Look for the Proj library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_NETCDF], [Where netcdf lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) -AC_ARG_VAR([MET_NETCDFINC], [Where netcdf include files are located. Use if the libraries and include files are not under the same main netcdf directory. If used, MET_NETCDFLIB must also be defined and MET_NETCDF will be ignored.]) -AC_ARG_VAR([MET_NETCDFLIB], [Where netcdf libraries are located. Use if the libraries and include files are not under the same main netcdf directory. If used, MET_NETCDFINC must also be defined and MET_NETCDF will be ignored.]) +AC_ARG_VAR([MET_PROJ], [Where proj lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) +AC_ARG_VAR([MET_PROJINC], [Where proj include files are located. Use if the libraries and include files are not under the same main proj directory. If used, MET_PROJLIB must also be defined and MET_PROJ will be ignored.]) +AC_ARG_VAR([MET_PROJLIB], [Where proj libraries are located. Use if the libraries and include files are not under the same main proj directory. If used, MET_PROJINC must also be defined and MET_PROJ will be ignored.]) # Ensure that both or neither are specified. -if (test -n "$MET_NETCDFLIB" && test -z "$MET_NETCDFINC") || \ - (test -n "$MET_NETCDFINC" && test -z "$MET_NETCDFLIB"); then - if test -n "$MET_NETCDFLIB"; then - AC_MSG_ERROR([MET_NETCDFLIB environment variable set, but MET_NETCDFINC not set. If one of these variables is set, then both must be set.]) - else - AC_MSG_ERROR([MET_NETCDFINC environment variable set, but MET_NETCDFLIB not set. If one of these variables is set, then both must be set.]) - fi +if (test -n "$MET_PROJLIB" && test -z "$MET_PROJINC"); then + AC_MSG_ERROR([MET_PROJLIB environment variable set, but MET_PROJINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_PROJINC" && test -z "$MET_PROJLIB"); then + AC_MSG_ERROR([MET_PROJINC environment variable set, but MET_PROJLIB not set. If one of these variables is set, then both must be set.]) +fi + +# Use the main Proj directory if individual locations were not specified. + +if (test -n "$MET_PROJ" && test -z "$MET_PROJLIB"); then + MET_PROJINC='${MET_PROJ}/include' + MET_PROJLIB='${MET_PROJ}/lib' +fi + +# AC_SUBST command line variables. + +if (test -n "$MET_PROJLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_PROJINC}" + LDFLAGS="${LDFLAGS} -L${MET_PROJLIB}" fi -# If the individual locations weren't specified, then the main NetCDF directory -# must be specified. If it isn't, let the user know they need to supply one. - -if test -z "$MET_NETCDFLIB" && test -n "$MET_NETCDF"; then - MET_NETCDFINC='${MET_NETCDF}/include' - MET_NETCDFLIB='${MET_NETCDF}/lib' -fi - -# We don't currently look for the NetCDF libraries in "known" -# locations. If we want to, this example code might be -# helpful. -## Not specified? Check for FTK in standard places. -#if test -z "$FTKLIB"; then -# # Check for flaim tool kit as a sub-project. -# if test -d "$srcdir/ftk"; then -# AC_CONFIG_SUBDIRS([ftk]) -# FTKINC='$(top_srcdir)/ftk/src' -# FTKLIB='$(top_builddir)/ftk/src' -# else -# # Check for flaim tool kit as a super-project. -# if test -d "$srcdir/../ftk"; then -# FTKINC='$(top_srcdir)/../ftk/src' -# FTKLIB='$(top_builddir)/../ftk/src' -# fi -# fi -#fi # -## Still empty? Check for installed flaim tool kit. -#if test -z "$FTKLIB"; then -# AC_CHECK_LIB([flaimtk], [ftkFastChecksum], -# [AC_CHECK_HEADERS([flaimtk.h]) -# LIBS="-lflaimtk $LIBS"], -# [AC_MSG_ERROR([No FLAIM Took Kit found.])]) -#fi +# Look for the NetCDF library. +# + +# Configure the variables. The help text will appear if the user uses "configure --help". + +AC_ARG_VAR([MET_NETCDF], [Where netcdf lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) +AC_ARG_VAR([MET_NETCDFINC], [Where netcdf include files are located. Use if the libraries and include files are not under the same main netcdf directory. If used, MET_NETCDFLIB must also be defined and MET_NETCDF will be ignored.]) +AC_ARG_VAR([MET_NETCDFLIB], [Where netcdf libraries are located. Use if the libraries and include files are not under the same main netcdf directory. If used, MET_NETCDFINC must also be defined and MET_NETCDF will be ignored.]) + +# Ensure that both or neither are specified. + +if (test -n "$MET_NETCDFLIB" && test -z "$MET_NETCDFINC"); then + AC_MSG_ERROR([MET_NETCDFLIB environment variable set, but MET_NETCDFINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_NETCDFINC" && test -z "$MET_NETCDFLIB"); then + AC_MSG_ERROR([MET_NETCDFINC environment variable set, but MET_NETCDFLIB not set. If one of these variables is set, then both must be set.]) +fi -# AC_SUBST command line variables. If we get here, the NetCDF -# libraries were found so no need to check +# Use the main NetCDF directory if individual locations were not specified. -if test -n "$MET_NETCDFLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_NETCDFINC}" - LDFLAGS="${LDFLAGS} -L${MET_NETCDFLIB}" +if (test -n "$MET_NETCDF" && test -z "$MET_NETCDFLIB"); then + MET_NETCDFINC='${MET_NETCDF}/include' + MET_NETCDFLIB='${MET_NETCDF}/lib' +fi + +# AC_SUBST command line variables. + +if (test -n "$MET_NETCDFLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_NETCDFINC}" + LDFLAGS="${LDFLAGS} -L${MET_NETCDFLIB}" fi # -# Look for the HDF5 library +# Look for the HDF5 library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_HDF5], [Where hdf5 lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) -AC_ARG_VAR([MET_HDF5INC], [Where hdf5 include files are located. Use if the libraries and include files are not under the same main hdf5 directory. If used, MET_HDF5LIB must also be defined and MET_HDF5 will be ignored.]) -AC_ARG_VAR([MET_HDF5LIB], [Where hdf5 libraries are located. Use if the libraries and include files are not under the same main hdf5 directory. If used, MET_HDF5INC must also be defined and MET_HDF5 will be ignored.]) +AC_ARG_VAR([MET_HDF5], [Where hdf5 lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) +AC_ARG_VAR([MET_HDF5INC], [Where hdf5 include files are located. Use if the libraries and include files are not under the same main hdf5 directory. If used, MET_HDF5LIB must also be defined and MET_HDF5 will be ignored.]) +AC_ARG_VAR([MET_HDF5LIB], [Where hdf5 libraries are located. Use if the libraries and include files are not under the same main hdf5 directory. If used, MET_HDF5INC must also be defined and MET_HDF5 will be ignored.]) # Ensure that both or neither are specified. -if (test -n "$MET_HDF5LIB" && test -z "$MET_HDF5INC") || \ - (test -n "$MET_HDF5INC" && test -z "$MET_HDF5LIB"); then - if test -n "$MET_HDF5LIB"; then - AC_MSG_ERROR([MET_HDF5LIB environment variable set, but MET_HDF5INC not set. If one of these variables is set, then both must be set.]) - else - AC_MSG_ERROR([MET_HDF5INC environment variable set, but MET_HDF5LIB not set. If one of these variables is set, then both must be set.]) - fi +if (test -n "$MET_HDF5LIB" && test -z "$MET_HDF5INC"); then + AC_MSG_ERROR([MET_HDF5LIB environment variable set, but MET_HDF5INC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_HDF5INC" && test -z "$MET_HDF5LIB"); then + AC_MSG_ERROR([MET_HDF5INC environment variable set, but MET_HDF5LIB not set. If one of these variables is set, then both must be set.]) fi -# If the individual locations weren't specified, then the main HDF5 directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main HDF5 directory if individual locations were not specified. -if test -z "$MET_HDF5LIB" && test -n "$MET_HDF5"; then - MET_HDF5INC='${MET_HDF5}/include' - MET_HDF5LIB='${MET_HDF5}/lib' +if (test -n "$MET_HDF5" && test -z "$MET_HDF5LIB"); then + MET_HDF5INC='${MET_HDF5}/include' + MET_HDF5LIB='${MET_HDF5}/lib' fi -# AC_SUBST command line variables. If we get here, the HDF5 -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_HDF5LIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_HDF5INC}" - LDFLAGS="${LDFLAGS} -L${MET_HDF5LIB}" +if (test -n "$MET_HDF5LIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_HDF5INC}" + LDFLAGS="${LDFLAGS} -L${MET_HDF5LIB}" fi # # Look for the GRIB2C library # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_GRIB2C], [Where grib2c lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) -AC_ARG_VAR([MET_GRIB2CINC], [Where grib2c include files are located. Use if the libraries and include files are not under the same main grib2c directory. If used, MET_GRIB2CLIB must also be defined and MET_GRIB2C will be ignored.]) -AC_ARG_VAR([MET_GRIB2CLIB], [Where grib2c libraries are located. Use if the libraries and include files are not under the same main grib2c directory. If used, MET_GRIB2CINC must also be defined and MET_GRIB2C will be ignored.]) -AC_ARG_VAR([GRIB2CLIB_NAME], [Name of grib2c library to link with. For example, -lgrib2c_v1.6.0 or -lgrib2c, etc. If it is -lgrib2c, you don't have to specify it.]) +AC_ARG_VAR([MET_GRIB2C], [Where grib2c lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) +AC_ARG_VAR([MET_GRIB2CINC], [Where grib2c include files are located. Use if the libraries and include files are not under the same main grib2c directory. If used, MET_GRIB2CLIB must also be defined and MET_GRIB2C will be ignored.]) +AC_ARG_VAR([MET_GRIB2CLIB], [Where grib2c libraries are located. Use if the libraries and include files are not under the same main grib2c directory. If used, MET_GRIB2CINC must also be defined and MET_GRIB2C will be ignored.]) +AC_ARG_VAR([GRIB2CLIB_NAME], [Name of grib2c library to link with. For example, -lgrib2c_v1.6.0 or -lgrib2c, etc. If it is -lgrib2c, you don't have to specify it.]) # Ensure that both or neither are specified. -if (test -n "$MET_GRIB2CLIB" && test -z "$MET_GRIB2CINC") || \ - (test -n "$MET_GRIB2CINC" && test -z "$MET_GRIB2CLIB"); then - if test -n "$MET_GRIB2CLIB"; then - AC_MSG_ERROR([MET_GRIB2CLIB environment variable set, but MET_GRIB2CINC not set. If one of these variables is set, then both must be set.]) - else - AC_MSG_ERROR([MET_GRIB2CINC environment variable set, but MET_GRIB2CLIB not set. If one of these variables is set, then both must be set.]) - fi +if (test -n "$MET_GRIB2CLIB" && test -z "$MET_GRIB2CINC"); then + AC_MSG_ERROR([MET_GRIB2CLIB environment variable set, but MET_GRIB2CINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_GRIB2CINC" && test -z "$MET_GRIB2CLIB"); then + AC_MSG_ERROR([MET_GRIB2CINC environment variable set, but MET_GRIB2CLIB not set. If one of these variables is set, then both must be set.]) fi -# If the individual locations weren't specified, then the main Grib2c directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main GRIB2C directory if individual locations were not specified. -if test -z "$MET_GRIB2CLIB" && test -n "$MET_GRIB2C"; then - MET_GRIB2CINC='${MET_GRIB2C}/include' - MET_GRIB2CLIB='${MET_GRIB2C}/lib' +if (test -n "$MET_GRIB2C" && test -z "$MET_GRIB2CLIB"); then + MET_GRIB2CINC='${MET_GRIB2C}/include' + MET_GRIB2CLIB='${MET_GRIB2C}/lib' fi -# AC_SUBST command line variables. If we get here, the Grib2c -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_GRIB2CLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_GRIB2CINC}" - LDFLAGS="${LDFLAGS} -L${MET_GRIB2CLIB}" +if (test -n "$MET_GRIB2CLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_GRIB2CINC}" + LDFLAGS="${LDFLAGS} -L${MET_GRIB2CLIB}" fi # -# Look for the PYTHON executable and library +# Look for the PYTHON executable and library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". AC_ARG_VAR([MET_PYTHON_BIN_EXE], [Full path to the python executable corresponding to MET_PYTHON_CC and MET_PYTHON_LD, e.g. /usr/bin/python3.]) AC_ARG_VAR([MET_PYTHON_CC], [Where the python header files are located, e.g. -I. Set to the output of 'python3-config --cflags'.]) @@ -169,244 +159,217 @@ AC_ARG_VAR([MET_PYTHON_LD], [Where the python library files are located, e.g. -L if (test -n "$MET_PYTHON_BIN_EXE" || \ test -n "$MET_PYTHON_CC" || \ test -n "$MET_PYTHON_LD"); then - if test -z "$MET_PYTHON_BIN_EXE"; then - AC_MSG_ERROR([MET_PYTHON_CC or MET_PYTHON_LD environment variable set, but MET_PYTHON_BIN_EXE not set. If one of these variables is set, then all must be set.]) - elif test -z "$MET_PYTHON_CC"; then - AC_MSG_ERROR([MET_PYTHON_BIN_EXE or MET_PYTHON_LD environment variable set, but MET_PYTHON_CC not set. If one of these variables is set, then all must be set.]) - elif test -z "$MET_PYTHON_LD"; then - AC_MSG_ERROR([MET_PYTHON_BIN_EXE or MET_PYTHON_CC environment variable set, but MET_PYTHON_LD not set. If one of these variables is set, then all must be set.]) + if (test -z "$MET_PYTHON_BIN_EXE"); then + AC_MSG_ERROR([MET_PYTHON_CC or MET_PYTHON_LD environment variable set, but MET_PYTHON_BIN_EXE not set. If one of these variables is set, then all must be set.]) + elif (test -z "$MET_PYTHON_CC"); then + AC_MSG_ERROR([MET_PYTHON_BIN_EXE or MET_PYTHON_LD environment variable set, but MET_PYTHON_CC not set. If one of these variables is set, then all must be set.]) + elif (test -z "$MET_PYTHON_LD"); then + AC_MSG_ERROR([MET_PYTHON_BIN_EXE or MET_PYTHON_CC environment variable set, but MET_PYTHON_LD not set. If one of these variables is set, then all must be set.]) fi fi # Add MET_PYTHON_BIN_EXE to the CPPFLAGS -if test -n "$MET_PYTHON_BIN_EXE"; then +if (test -n "$MET_PYTHON_BIN_EXE"); then CPPFLAGS=$CPPFLAGS' -DMET_PYTHON_BIN_EXE="\"${MET_PYTHON_BIN_EXE}\""' fi -if test -n "$MET_PYTHON_CC"; then +if (test -n "$MET_PYTHON_CC"); then CPPFLAGS="${CPPFLAGS} -I../../basic/vx_log -I../../basic/vx_util ${MET_PYTHON_CC}" fi -if test -n "$MET_PYTHON_LD"; then +if (test -n "$MET_PYTHON_LD"); then LDFLAGS="${LDFLAGS} ${MET_PYTHON_LD}" fi # -# Look for the GSL library +# Look for the GSL library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_GSL], [Where gsl lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) -AC_ARG_VAR([MET_GSLINC], [Where gsl include files are located. Use if the libraries and include files are not under the same main gsl directory. If used, MET_GSLLIB must also be defined and MET_GSL will be ignored.]) -AC_ARG_VAR([MET_GSLLIB], [Where gsl libraries are located. Use if the libraries and include files are not under the same main gsl directory. If used, MET_GSLINC must also be defined and MET_GSL will be ignored.]) +AC_ARG_VAR([MET_GSL], [Where gsl lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) +AC_ARG_VAR([MET_GSLINC], [Where gsl include files are located. Use if the libraries and include files are not under the same main gsl directory. If used, MET_GSLLIB must also be defined and MET_GSL will be ignored.]) +AC_ARG_VAR([MET_GSLLIB], [Where gsl libraries are located. Use if the libraries and include files are not under the same main gsl directory. If used, MET_GSLINC must also be defined and MET_GSL will be ignored.]) # Ensure that both or neither are specified. -if (test -n "$MET_GSLLIB" && test -z "$MET_GSLINC") || \ - (test -n "$MET_GSLINC" && test -z "$MET_GSLLIB"); then - if test -n "$MET_GSLLIB"; then - AC_MSG_ERROR([MET_GSLLIB environment variable set, but MET_GSLINC not set. If one of these variables is set, then both must be set.]) - else - AC_MSG_ERROR([MET_GSLINC environment variable set, but MET_GSLLIB not set. If one of these variables is set, then both must be set.]) - fi +if (test -n "$MET_GSLLIB" && test -z "$MET_GSLINC"); then + AC_MSG_ERROR([MET_GSLLIB environment variable set, but MET_GSLINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_GSLINC" && test -z "$MET_GSLLIB"); then + AC_MSG_ERROR([MET_GSLINC environment variable set, but MET_GSLLIB not set. If one of these variables is set, then both must be set.]) fi -# If the individual locations weren't specified, then the main Gsl directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main GSL directory if individual locations were not specified. -if test -z "$MET_GSLLIB" && test -n "$MET_GSL"; then - MET_GSLINC='${MET_GSL}/include' - MET_GSLLIB='${MET_GSL}/lib' +if (test -n "$MET_GSL" && test -z "$MET_GSLLIB"); then + MET_GSLINC='${MET_GSL}/include' + MET_GSLLIB='${MET_GSL}/lib' fi -# AC_SUBST command line variables. If we get here, the Gsl -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_GSLLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_GSLINC}" - LDFLAGS="${LDFLAGS} -L${MET_GSLLIB}" +if (test -n "$MET_GSLLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_GSLINC}" + LDFLAGS="${LDFLAGS} -L${MET_GSLLIB}" fi # -# Look for the BUFR library +# Look for the BUFR library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_BUFR], [Where bufr lib subdirectory is located. If it is installed in /usr/local, you don't have to specify it.]) -AC_ARG_VAR([MET_BUFRLIB], [Where bufr libraries are located. Use if the library files are not in a bin subdirectory. If used MET_BUFR will be ignored.]) +AC_ARG_VAR([MET_BUFR], [Where bufr lib subdirectory is located. If it is installed in /usr/local, you don't have to specify it.]) +AC_ARG_VAR([MET_BUFRLIB], [Where bufr libraries are located. Use if the library files are not in a bin subdirectory. If used MET_BUFR will be ignored.]) # If the individual locations weren't specified, then the main Bufr directory -# must be specified. If it isn't, let the user know they need to supply one. +# must be specified. If it isn't, let the user know they need to supply one. -if test -z "$MET_BUFRLIB" && test -n "$MET_BUFR"; then - MET_BUFRLIB='${MET_BUFR}/lib' +if (test -n "$MET_BUFR" && test -z "$MET_BUFRLIB"); then + MET_BUFRLIB='${MET_BUFR}/lib' fi -# AC_SUBST command line variables. If we get here, the Bufr -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_BUFRLIB"; then - LDFLAGS="${LDFLAGS} -L${MET_BUFRLIB}" +if (test -n "$MET_BUFRLIB"); then + LDFLAGS="${LDFLAGS} -L${MET_BUFRLIB}" fi -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([BUFRLIB_NAME], [Name of bufr library to link with. For example, -lbufr_v11.3.0_4_64 or -lbufr, etc. If it is -lbufr, you don't have to specify it.]) +AC_ARG_VAR([BUFRLIB_NAME], [Name of bufr library to link with. For example, -lbufr_v11.3.0_4_64 or -lbufr, etc. If it is -lbufr, you don't have to specify it.]) AC_SUBST([BUFRLIB_NAME]) AM_CONDITIONAL([BUFRLIB_NAME_SET], [test ! -z "$BUFRLIB_NAME"]) AC_MSG_NOTICE([BUFRLIB_NAME will be set]) - # -# Look for the HDF library +# Look for the HDF library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_HDF], [Where hdf version 4 lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. HDF version 4 is only needed if you are building the MODIS utility.]) -AC_ARG_VAR([MET_HDFINC], [Where hdf version 4 include files are located. Use if the libraries and include files are not under the same main hdf directory. If used, MET_HDFLIB must also be defined and MET_HDF will be ignored.]) -AC_ARG_VAR([MET_HDFLIB], [Where hdf version 4 libraries are located. Use if the libraries and include files are not under the same main hdf directory. If used, MET_HDFINC must also be defined and MET_HDF will be ignored.]) +AC_ARG_VAR([MET_HDF], [Where hdf version 4 lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. HDF version 4 is only needed if you are building the MODIS utility.]) +AC_ARG_VAR([MET_HDFINC], [Where hdf version 4 include files are located. Use if the libraries and include files are not under the same main hdf directory. If used, MET_HDFLIB must also be defined and MET_HDF will be ignored.]) +AC_ARG_VAR([MET_HDFLIB], [Where hdf version 4 libraries are located. Use if the libraries and include files are not under the same main hdf directory. If used, MET_HDFINC must also be defined and MET_HDF will be ignored.]) # Ensure that both or neither are specified. -if (test -n "$MET_HDFLIB" && test -z "$MET_HDFINC") || \ - (test -n "$MET_HDFINC" && test -z "$MET_HDFLIB"); then - if test -n "$MET_HDFLIB"; then - AC_MSG_ERROR([MET_HDFLIB environment variable set, but MET_HDFINC not set. If one of these variables is set, then both must be set.]) - else - AC_MSG_ERROR([MET_HDFINC environment variable set, but MET_HDFLIB not set. If one of these variables is set, then both must be set.]) - fi +if (test -n "$MET_HDFLIB" && test -z "$MET_HDFINC"); then + AC_MSG_ERROR([MET_HDFLIB environment variable set, but MET_HDFINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_HDFINC" && test -z "$MET_HDFLIB"); then + AC_MSG_ERROR([MET_HDFINC environment variable set, but MET_HDFLIB not set. If one of these variables is set, then both must be set.]) fi -# If the individual locations weren't specified, then the main HDF directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main HDF directory if individual locations were not specified. -if test -z "$MET_HDFLIB" && test -n "$MET_HDF"; then - MET_HDFINC='${MET_HDF}/include' - MET_HDFLIB='${MET_HDF}/lib' +if (test -n "$MET_HDF" && test -z "$MET_HDFLIB"); then + MET_HDFINC='${MET_HDF}/include' + MET_HDFLIB='${MET_HDF}/lib' fi -# AC_SUBST command line variables. If we get here, the HDF -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_HDFLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_HDFINC}" - LDFLAGS="${LDFLAGS} -L${MET_HDFLIB}" +if (test -n "$MET_HDFLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_HDFINC}" + LDFLAGS="${LDFLAGS} -L${MET_HDFLIB}" fi # -# Look for the HDFEOS library +# Look for the HDFEOS library. # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_HDFEOS], [Where hdfeos version 2 lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. HDF-EOS version 2 is only needed if you are building the MODIS utility.]) -AC_ARG_VAR([MET_HDFEOSINC], [Where hdfeos version 2 include files are located. Use if the libraries and include files are not under the same main hdfeos directory. If used, MET_HDFEOSLIB must also be defined and MET_HDFEOS will be ignored.]) -AC_ARG_VAR([MET_HDFEOSLIB], [Where hdfeos version 2 libraries are located. Use if the libraries and include files are not under the same main hdfeos directory. If used, MET_HDFEOSINC must also be defined and MET_HDFEOS will be ignored.]) +AC_ARG_VAR([MET_HDFEOS], [Where hdfeos version 2 lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. HDF-EOS version 2 is only needed if you are building the MODIS utility.]) +AC_ARG_VAR([MET_HDFEOSINC], [Where hdfeos version 2 include files are located. Use if the libraries and include files are not under the same main hdfeos directory. If used, MET_HDFEOSLIB must also be defined and MET_HDFEOS will be ignored.]) +AC_ARG_VAR([MET_HDFEOSLIB], [Where hdfeos version 2 libraries are located. Use if the libraries and include files are not under the same main hdfeos directory. If used, MET_HDFEOSINC must also be defined and MET_HDFEOS will be ignored.]) # Ensure that both or neither are specified. -if (test -n "$MET_HDFEOSLIB" && test -z "$MET_HDFEOSINC") || \ - (test -n "$MET_HDFEOSINC" && test -z "$MET_HDFEOSLIB"); then - if test -n "$MET_HDFEOSLIB"; then - AC_MSG_ERROR([MET_HDFEOSLIB environment variable set, but MET_HDFEOSINC not set. If one of these variables is set, then both must be set.]) - else - AC_MSG_ERROR([MET_HDFEOSINC environment variable set, but MET_HDFEOSLIB not set. If one of these variables is set, then both must be set.]) - fi +if (test -n "$MET_HDFEOSLIB" && test -z "$MET_HDFEOSINC"); then + AC_MSG_ERROR([MET_HDFEOSLIB environment variable set, but MET_HDFEOSINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_HDFEOSINC" && test -z "$MET_HDFEOSLIB"); then + AC_MSG_ERROR([MET_HDFEOSINC environment variable set, but MET_HDFEOSLIB not set. If one of these variables is set, then both must be set.]) fi -# If the individual locations weren't specified, then the main HDFEOS directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main HDFEOS directory if individual locations were not specified. -if test -z "$MET_HDFEOSLIB" && test -n "$MET_HDFEOS"; then - MET_HDFEOSINC='${MET_HDFEOS}/include' - MET_HDFEOSLIB='${MET_HDFEOS}/lib' +if (test -n "$MET_HDFEOS" && test -z "$MET_HDFEOSLIB"); then + MET_HDFEOSINC='${MET_HDFEOS}/include' + MET_HDFEOSLIB='${MET_HDFEOS}/lib' fi -# AC_SUBST command line variables. If we get here, the HDFEOS -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_HDFEOSLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_HDFEOSINC}" - LDFLAGS="${LDFLAGS} -L${MET_HDFEOSLIB}" +if (test -n "$MET_HDFEOSLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_HDFEOSINC}" + LDFLAGS="${LDFLAGS} -L${MET_HDFEOSLIB}" fi # # Look for the Cairo library # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_CAIRO], [Where cairo lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. Cairo is only needed if you are building the mode_graphics utility.]) -AC_ARG_VAR([MET_CAIROINC], [Where cairo include files are located. Use if the libraries and include files are not under the same main cairo directory. If used, MET_CAIROLIB must also be defined and MET_CAIRO will be ignored.]) -AC_ARG_VAR([MET_CAIROLIB], [Where cairo libraries are located. Use if the libraries and include files are not under the same main cairo directory. If used, MET_CAIROINC must also be defined and MET_CAIRO will be ignored.]) +AC_ARG_VAR([MET_CAIRO], [Where cairo lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. Cairo is only needed if you are building the mode_graphics utility.]) +AC_ARG_VAR([MET_CAIROINC], [Where cairo include files are located. Use if the libraries and include files are not under the same main cairo directory. If used, MET_CAIROLIB must also be defined and MET_CAIRO will be ignored.]) +AC_ARG_VAR([MET_CAIROLIB], [Where cairo libraries are located. Use if the libraries and include files are not under the same main cairo directory. If used, MET_CAIROINC must also be defined and MET_CAIRO will be ignored.]) # Ensure that both or neither are specified. -if (test -n "$MET_CAIROLIB" && test -z "$MET_CAIROINC") || \ - (test -n "$MET_CAIROINC" && test -z "$MET_CAIROLIB"); then - if test -n "$MET_CAIROLIB"; then - AC_MSG_ERROR([MET_CAIROLIB environment variable set, but MET_CAIROINC not set. If one of these variables is set, then both must be set.]) - else - AC_MSG_ERROR([MET_CAIROINC environment variable set, but MET_CAIROLIB not set. If one of these variables is set, then both must be set.]) - fi +if (test -n "$MET_CAIROLIB" && test -z "$MET_CAIROINC"); then + AC_MSG_ERROR([MET_CAIROLIB environment variable set, but MET_CAIROINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_CAIROINC" && test -z "$MET_CAIROLIB"); then + AC_MSG_ERROR([MET_CAIROINC environment variable set, but MET_CAIROLIB not set. If one of these variables is set, then both must be set.]) fi -# If the individual locations weren't specified, then the main Cairo directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main Cairo directory if individual locations were not specified. -if test -z "$MET_CAIROLIB" && test -n "$MET_CAIRO"; then - MET_CAIROINC='${MET_CAIRO}/include' - MET_CAIROLIB='${MET_CAIRO}/lib' +if (test -n "$MET_CAIRO" && test -z "$MET_CAIROLIB"); then + MET_CAIROINC='${MET_CAIRO}/include' + MET_CAIROLIB='${MET_CAIRO}/lib' fi -# AC_SUBST command line variables. If we get here, the Cairo -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_CAIROLIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_CAIROINC}" - LDFLAGS="${LDFLAGS} -L${MET_CAIROLIB}" +if (test -n "$MET_CAIROLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_CAIROINC}" + LDFLAGS="${LDFLAGS} -L${MET_CAIROLIB}" fi # # Look for the Freetype library # -# Configure the variables. The help text will appear if the user uses "configure --help". +# Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_FREETYPE], [Where freetype lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. Freetype is only needed if you are building the mode_graphics utility.]) -AC_ARG_VAR([MET_FREETYPEINC], [Where freetype include files are located. Use if the libraries and include files are not under the same main freetype directory. If used, MET_FREETYPELIB must also be defined and MET_FREETYPE will be ignored.]) -AC_ARG_VAR([MET_FREETYPELIB], [Where freetype libraries are located. Use if the libraries and include files are not under the same main freetype directory. If used, MET_FREETYPEINC must also be defined and MET_FREETYPE will be ignored.]) +AC_ARG_VAR([MET_FREETYPE], [Where freetype lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. Freetype is only needed if you are building the mode_graphics utility.]) +AC_ARG_VAR([MET_FREETYPEINC], [Where freetype include files are located. Use if the libraries and include files are not under the same main freetype directory. If used, MET_FREETYPELIB must also be defined and MET_FREETYPE will be ignored.]) +AC_ARG_VAR([MET_FREETYPELIB], [Where freetype libraries are located. Use if the libraries and include files are not under the same main freetype directory. If used, MET_FREETYPEINC must also be defined and MET_FREETYPE will be ignored.]) # Ensure that both or neither are specified. -if (test -n "$MET_FREETYPELIB" && test -z "$MET_FREETYPEINC") || \ - (test -n "$MET_FREETYPEINC" && test -z "$MET_FREETYPELIB"); then - if test -n "$MET_FREETYPELIB"; then - AC_MSG_ERROR([MET_FREETYPELIB environment variable set, but MET_FREETYPEINC not set. If one of these variables is set, then both must be set.]) - else - AC_MSG_ERROR([MET_FREETYPEINC environment variable set, but MET_FREETYPELIB not set. If one of these variables is set, then both must be set.]) - fi +if (test -n "$MET_FREETYPELIB" && test -z "$MET_FREETYPEINC"); then + AC_MSG_ERROR([MET_FREETYPELIB environment variable set, but MET_FREETYPEINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_FREETYPEINC" && test -z "$MET_FREETYPELIB"); then + AC_MSG_ERROR([MET_FREETYPEINC environment variable set, but MET_FREETYPELIB not set. If one of these variables is set, then both must be set.]) fi -# If the individual locations weren't specified, then the main Freetype directory -# must be specified. If it isn't, let the user know they need to supply one. +# Use the main Freetype directory if individual locations were not specified. -if test -z "$MET_FREETYPELIB" && test -n "$MET_FREETYPE"; then - MET_FREETYPEINC='${MET_FREETYPE}/include' - MET_FREETYPELIB='${MET_FREETYPE}/lib' +if (test -z "$MET_FREETYPELIB" && test -n "$MET_FREETYPE"); then + MET_FREETYPEINC='${MET_FREETYPE}/include' + MET_FREETYPELIB='${MET_FREETYPE}/lib' fi -# AC_SUBST command line variables. If we get here, the Freetype -# libraries were found so no need to check +# AC_SUBST command line variables. -if test -n "$MET_FREETYPELIB"; then - CPPFLAGS="${CPPFLAGS} -I${MET_FREETYPEINC}" - LDFLAGS="${LDFLAGS} -L${MET_FREETYPELIB}" +if (test -n "$MET_FREETYPELIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_FREETYPEINC}" + LDFLAGS="${LDFLAGS} -L${MET_FREETYPELIB}" fi # @@ -427,10 +390,10 @@ AC_ARG_ENABLE(block4, AM_CONDITIONAL([ENABLE_BLOCK4], [test "x$ENABLE_BLOCK4" = "xyes"]) if test "x$ENABLE_BLOCK4" = "xyes"; then - CPPFLAGS="${CPPFLAGS} -DBLOCK4" - AC_MSG_NOTICE([-DBLOCK4 will be used in the compiles]) + CPPFLAGS="${CPPFLAGS} -DBLOCK4" + AC_MSG_NOTICE([-DBLOCK4 will be used in the compiles]) else - AC_MSG_NOTICE([-DBLOCK4 will not be used in the compiles]) + AC_MSG_NOTICE([-DBLOCK4 will not be used in the compiles]) fi # static linking @@ -448,9 +411,9 @@ AM_CONDITIONAL([ENABLE_STATIC_LINKING], [test "x$ENABLE_STATIC_LINKING" = "xyes" if test "x$ENABLE_STATIC_LINKING" = "xyes"; then LDFLAGS="${LDFLAGS} -static" - AC_MSG_NOTICE([Static linking will be used in the compiles]) + AC_MSG_NOTICE([Static linking will be used in the compiles]) else - AC_MSG_NOTICE([Dynamic linking will not be used in the compiles]) + AC_MSG_NOTICE([Dynamic linking will not be used in the compiles]) fi # ascii2nc @@ -467,10 +430,10 @@ AC_ARG_ENABLE(ascii2nc, AM_CONDITIONAL([ENABLE_ASCII2NC], [test "x$ENABLE_ASCII2NC" = "xyes"]) if test "x$ENABLE_ASCII2NC" = "xyes"; then - AC_DEFINE([ENABLE_ASCII2NC], [], ["build ascii2nc"]) - AC_MSG_NOTICE([ascii2nc will be compiled]) + AC_DEFINE([ENABLE_ASCII2NC], [], ["build ascii2nc"]) + AC_MSG_NOTICE([ascii2nc will be compiled]) else - AC_MSG_NOTICE([ascii2nc will not be compiled]) + AC_MSG_NOTICE([ascii2nc will not be compiled]) fi # lidar2nc @@ -487,10 +450,10 @@ AC_ARG_ENABLE(lidar2nc, AM_CONDITIONAL([ENABLE_LIDAR2NC], [test "x$ENABLE_LIDAR2NC" = "xyes"]) if test "x$ENABLE_LIDAR2NC" = "xyes"; then - AC_DEFINE([ENABLE_LIDAR2NC], [], ["build lidar2nc"]) - AC_MSG_NOTICE([lidar2nc will be compiled]) + AC_DEFINE([ENABLE_LIDAR2NC], [], ["build lidar2nc"]) + AC_MSG_NOTICE([lidar2nc will be compiled]) else - AC_MSG_NOTICE([lidar2nc will not be compiled]) + AC_MSG_NOTICE([lidar2nc will not be compiled]) fi # ensemble_stat @@ -507,10 +470,10 @@ AC_ARG_ENABLE(ensemble_stat, AM_CONDITIONAL([ENABLE_ENSEMBLE_STAT], [test "x$ENABLE_ENSEMBLE_STAT" = "xyes"]) if test "x$ENABLE_ENSEMBLE_STAT" = "xyes"; then - AC_DEFINE([ENABLE_ENSEMBLE_STAT], [], ["build ensemble_stat"]) - AC_MSG_NOTICE([ensemble_stat will be compiled]) + AC_DEFINE([ENABLE_ENSEMBLE_STAT], [], ["build ensemble_stat"]) + AC_MSG_NOTICE([ensemble_stat will be compiled]) else - AC_MSG_NOTICE([ensemble_stat will not be compiled]) + AC_MSG_NOTICE([ensemble_stat will not be compiled]) fi # gen_ens_prod @@ -527,10 +490,10 @@ AC_ARG_ENABLE(gen_ens_prod, AM_CONDITIONAL([ENABLE_GEN_ENS_PROD], [test "x$ENABLE_GEN_ENS_PROD" = "xyes"]) if test "x$ENABLE_GEN_ENS_PROD" = "xyes"; then - AC_DEFINE([ENABLE_GEN_ENS_PROD], [], ["build gen_ens_prod"]) - AC_MSG_NOTICE([gen_ens_prod will be compiled]) + AC_DEFINE([ENABLE_GEN_ENS_PROD], [], ["build gen_ens_prod"]) + AC_MSG_NOTICE([gen_ens_prod will be compiled]) else - AC_MSG_NOTICE([gen_ens_prod will not be compiled]) + AC_MSG_NOTICE([gen_ens_prod will not be compiled]) fi @@ -548,10 +511,10 @@ AC_ARG_ENABLE(gen_vx_mask, AM_CONDITIONAL([ENABLE_GEN_VX_MASK], [test "x$ENABLE_GEN_VX_MASK" = "xyes"]) if test "x$ENABLE_GEN_VX_MASK" = "xyes"; then - AC_DEFINE([ENABLE_GEN_VX_MASK], [], ["build gen_vx_mask"]) - AC_MSG_NOTICE([gen_vx_mask will be compiled]) + AC_DEFINE([ENABLE_GEN_VX_MASK], [], ["build gen_vx_mask"]) + AC_MSG_NOTICE([gen_vx_mask will be compiled]) else - AC_MSG_NOTICE([gen_vx_mask will not be compiled]) + AC_MSG_NOTICE([gen_vx_mask will not be compiled]) fi @@ -569,10 +532,10 @@ AC_ARG_ENABLE(gis_utils, AM_CONDITIONAL([ENABLE_GIS_UTILS], [test "x$ENABLE_GIS_UTILS" = "xyes"]) if test "x$ENABLE_GIS_UTILS" = "xyes"; then - AC_DEFINE([ENABLE_GIS_UTILS], [], ["build gis_utils"]) - AC_MSG_NOTICE([gis_utils will be compiled]) + AC_DEFINE([ENABLE_GIS_UTILS], [], ["build gis_utils"]) + AC_MSG_NOTICE([gis_utils will be compiled]) else - AC_MSG_NOTICE([gis_utils will not be compiled]) + AC_MSG_NOTICE([gis_utils will not be compiled]) fi @@ -590,10 +553,10 @@ AC_ARG_ENABLE(grid_stat, AM_CONDITIONAL([ENABLE_GRID_STAT], [test "x$ENABLE_GRID_STAT" = "xyes"]) if test "x$ENABLE_GRID_STAT" = "xyes"; then - AC_DEFINE([ENABLE_GRID_STAT], [], ["build grid_stat"]) - AC_MSG_NOTICE([grid_stat will be compiled]) + AC_DEFINE([ENABLE_GRID_STAT], [], ["build grid_stat"]) + AC_MSG_NOTICE([grid_stat will be compiled]) else - AC_MSG_NOTICE([grid_stat will not be compiled]) + AC_MSG_NOTICE([grid_stat will not be compiled]) fi # ioda2nc @@ -610,10 +573,10 @@ AC_ARG_ENABLE(ioda2nc, AM_CONDITIONAL([ENABLE_IODA2NC], [test "x$ENABLE_IODA2NC" = "xyes"]) if test "x$ENABLE_IODA2NC" = "xyes"; then - AC_DEFINE([ENABLE_IODA2NC], [], ["build ioda2nc"]) - AC_MSG_NOTICE([ioda2nc will be compiled]) + AC_DEFINE([ENABLE_IODA2NC], [], ["build ioda2nc"]) + AC_MSG_NOTICE([ioda2nc will be compiled]) else - AC_MSG_NOTICE([ioda2nc will not be compiled]) + AC_MSG_NOTICE([ioda2nc will not be compiled]) fi # madis2nc @@ -630,10 +593,10 @@ AC_ARG_ENABLE(madis2nc, AM_CONDITIONAL([ENABLE_MADIS2NC], [test "x$ENABLE_MADIS2NC" = "xyes"]) if test "x$ENABLE_MADIS2NC" = "xyes"; then - AC_DEFINE([ENABLE_MADIS2NC], [], ["build madis2nc"]) - AC_MSG_NOTICE([madis2nc will be compiled]) + AC_DEFINE([ENABLE_MADIS2NC], [], ["build madis2nc"]) + AC_MSG_NOTICE([madis2nc will be compiled]) else - AC_MSG_NOTICE([madis2nc will not be compiled]) + AC_MSG_NOTICE([madis2nc will not be compiled]) fi # mode @@ -650,10 +613,10 @@ AC_ARG_ENABLE(mode, AM_CONDITIONAL([ENABLE_MODE], [test "x$ENABLE_MODE" = "xyes"]) if test "x$ENABLE_MODE" = "xyes"; then - AC_DEFINE([ENABLE_MODE], [], ["build mode"]) - AC_MSG_NOTICE([mode will be compiled]) + AC_DEFINE([ENABLE_MODE], [], ["build mode"]) + AC_MSG_NOTICE([mode will be compiled]) else - AC_MSG_NOTICE([mode will not be compiled]) + AC_MSG_NOTICE([mode will not be compiled]) fi # mode_analysis @@ -670,10 +633,10 @@ AC_ARG_ENABLE(mode_analysis, AM_CONDITIONAL([ENABLE_MODE_ANALYSIS], [test "x$ENABLE_MODE_ANALYSIS" = "xyes"]) if test "x$ENABLE_MODE_ANALYSIS" = "xyes"; then - AC_DEFINE([ENABLE_MODE_ANALYSIS], [], ["build mode_analysis"]) - AC_MSG_NOTICE([mode_analysis will be compiled]) + AC_DEFINE([ENABLE_MODE_ANALYSIS], [], ["build mode_analysis"]) + AC_MSG_NOTICE([mode_analysis will be compiled]) else - AC_MSG_NOTICE([mode_analysis will not be compiled]) + AC_MSG_NOTICE([mode_analysis will not be compiled]) fi # pb2nc @@ -690,10 +653,10 @@ AC_ARG_ENABLE(pb2nc, AM_CONDITIONAL([ENABLE_PB2NC], [test "x$ENABLE_PB2NC" = "xyes"]) if test "x$ENABLE_PB2NC" = "xyes"; then - AC_DEFINE([ENABLE_PB2NC], [], ["build pb2nc"]) - AC_MSG_NOTICE([pb2nc will be compiled]) + AC_DEFINE([ENABLE_PB2NC], [], ["build pb2nc"]) + AC_MSG_NOTICE([pb2nc will be compiled]) else - AC_MSG_NOTICE([pb2nc will not be compiled]) + AC_MSG_NOTICE([pb2nc will not be compiled]) fi # pcp_combine @@ -710,10 +673,10 @@ AC_ARG_ENABLE(pcp_combine, AM_CONDITIONAL([ENABLE_PCP_COMBINE], [test "x$ENABLE_PCP_COMBINE" = "xyes"]) if test "x$ENABLE_PCP_COMBINE" = "xyes"; then - AC_DEFINE([ENABLE_PCP_COMBINE], [], ["build pcp_combine"]) - AC_MSG_NOTICE([pcp_combine will be compiled]) + AC_DEFINE([ENABLE_PCP_COMBINE], [], ["build pcp_combine"]) + AC_MSG_NOTICE([pcp_combine will be compiled]) else - AC_MSG_NOTICE([pcp_combine will not be compiled]) + AC_MSG_NOTICE([pcp_combine will not be compiled]) fi # plot_data_plane @@ -730,10 +693,10 @@ AC_ARG_ENABLE(plot_data_plane, AM_CONDITIONAL([ENABLE_PLOT_DATA_PLANE], [test "x$ENABLE_PLOT_DATA_PLANE" = "xyes"]) if test "x$ENABLE_PLOT_DATA_PLANE" = "xyes"; then - AC_DEFINE([ENABLE_PLOT_DATA_PLANE], [], ["build plot_data_plane"]) - AC_MSG_NOTICE([plot_data_plane will be compiled]) + AC_DEFINE([ENABLE_PLOT_DATA_PLANE], [], ["build plot_data_plane"]) + AC_MSG_NOTICE([plot_data_plane will be compiled]) else - AC_MSG_NOTICE([plot_data_plane will not be compiled]) + AC_MSG_NOTICE([plot_data_plane will not be compiled]) fi # regrid_data_plane @@ -750,10 +713,10 @@ AC_ARG_ENABLE(regrid_data_plane, AM_CONDITIONAL([ENABLE_REGRID_DATA_PLANE], [test "x$ENABLE_REGRID_DATA_PLANE" = "xyes"]) if test "x$ENABLE_REGRID_DATA_PLANE" = "xyes"; then - AC_DEFINE([ENABLE_REGRID_DATA_PLANE], [], ["build regrid_data_plane"]) - AC_MSG_NOTICE([regrid_data_plane will be compiled]) + AC_DEFINE([ENABLE_REGRID_DATA_PLANE], [], ["build regrid_data_plane"]) + AC_MSG_NOTICE([regrid_data_plane will be compiled]) else - AC_MSG_NOTICE([regrid_data_plane will not be compiled]) + AC_MSG_NOTICE([regrid_data_plane will not be compiled]) fi # point2grid @@ -770,10 +733,10 @@ AC_ARG_ENABLE(point2grid, AM_CONDITIONAL([ENABLE_POINT2GRID], [test "x$ENABLE_POINT2GRID" = "xyes"]) if test "x$ENABLE_POINT2GRID" = "xyes"; then - AC_DEFINE([ENABLE_POINT2GRID], [], ["build point2grid"]) - AC_MSG_NOTICE([point2grid will be compiled]) + AC_DEFINE([ENABLE_POINT2GRID], [], ["build point2grid"]) + AC_MSG_NOTICE([point2grid will be compiled]) else - AC_MSG_NOTICE([point2grid will not be compiled]) + AC_MSG_NOTICE([point2grid will not be compiled]) fi # shift_data_plane @@ -790,10 +753,10 @@ AC_ARG_ENABLE(shift_data_plane, AM_CONDITIONAL([ENABLE_SHIFT_DATA_PLANE], [test "x$ENABLE_SHIFT_DATA_PLANE" = "xyes"]) if test "x$ENABLE_SHIFT_DATA_PLANE" = "xyes"; then - AC_DEFINE([ENABLE_SHIFT_DATA_PLANE], [], ["build shift_data_plane"]) - AC_MSG_NOTICE([shift_data_plane will be compiled]) + AC_DEFINE([ENABLE_SHIFT_DATA_PLANE], [], ["build shift_data_plane"]) + AC_MSG_NOTICE([shift_data_plane will be compiled]) else - AC_MSG_NOTICE([shift_data_plane will not be compiled]) + AC_MSG_NOTICE([shift_data_plane will not be compiled]) fi # plot_point_obs @@ -810,10 +773,10 @@ AC_ARG_ENABLE(plot_point_obs, AM_CONDITIONAL([ENABLE_PLOT_POINT_OBS], [test "x$ENABLE_PLOT_POINT_OBS" = "xyes"]) if test "x$ENABLE_PLOT_POINT_OBS" = "xyes"; then - AC_DEFINE([ENABLE_PLOT_POINT_OBS], [], ["build plot_point_obs"]) - AC_MSG_NOTICE([plot_point_obs will be compiled]) + AC_DEFINE([ENABLE_PLOT_POINT_OBS], [], ["build plot_point_obs"]) + AC_MSG_NOTICE([plot_point_obs will be compiled]) else - AC_MSG_NOTICE([plot_point_obs will not be compiled]) + AC_MSG_NOTICE([plot_point_obs will not be compiled]) fi # point_stat @@ -830,10 +793,10 @@ AC_ARG_ENABLE(point_stat, AM_CONDITIONAL([ENABLE_POINT_STAT], [test "x$ENABLE_POINT_STAT" = "xyes"]) if test "x$ENABLE_POINT_STAT" = "xyes"; then - AC_DEFINE([ENABLE_POINT_STAT], [], ["build point_stat"]) - AC_MSG_NOTICE([point_stat will be compiled]) + AC_DEFINE([ENABLE_POINT_STAT], [], ["build point_stat"]) + AC_MSG_NOTICE([point_stat will be compiled]) else - AC_MSG_NOTICE([point_stat will not be compiled]) + AC_MSG_NOTICE([point_stat will not be compiled]) fi # stat_analysis @@ -850,10 +813,10 @@ AC_ARG_ENABLE(stat_analysis, AM_CONDITIONAL([ENABLE_STAT_ANALYSIS], [test "x$ENABLE_STAT_ANALYSIS" = "xyes"]) if test "x$ENABLE_STAT_ANALYSIS" = "xyes"; then - AC_DEFINE([ENABLE_STAT_ANALYSIS], [], ["build stat_analysis"]) - AC_MSG_NOTICE([stat_analysis will be compiled]) + AC_DEFINE([ENABLE_STAT_ANALYSIS], [], ["build stat_analysis"]) + AC_MSG_NOTICE([stat_analysis will be compiled]) else - AC_MSG_NOTICE([stat_analysis will not be compiled]) + AC_MSG_NOTICE([stat_analysis will not be compiled]) fi # wavelet_stat @@ -870,10 +833,10 @@ AC_ARG_ENABLE(wavelet_stat, AM_CONDITIONAL([ENABLE_WAVELET_STAT], [test "x$ENABLE_WAVELET_STAT" = "xyes"]) if test "x$ENABLE_WAVELET_STAT" = "xyes"; then - AC_DEFINE([ENABLE_WAVELET_STAT], [], ["build wavelet_stat"]) - AC_MSG_NOTICE([wavelet_stat will be compiled]) + AC_DEFINE([ENABLE_WAVELET_STAT], [], ["build wavelet_stat"]) + AC_MSG_NOTICE([wavelet_stat will be compiled]) else - AC_MSG_NOTICE([wavelet_stat will not be compiled]) + AC_MSG_NOTICE([wavelet_stat will not be compiled]) fi # series_analysis @@ -890,10 +853,10 @@ AC_ARG_ENABLE(series_analysis, AM_CONDITIONAL([ENABLE_SERIES_ANALYSIS], [test "x$ENABLE_SERIES_ANALYSIS" = "xyes"]) if test "x$ENABLE_SERIES_ANALYSIS" = "xyes"; then - AC_DEFINE([ENABLE_SERIES_ANALYSIS], [], ["build series_analysis"]) - AC_MSG_NOTICE([series_analysis will be compiled]) + AC_DEFINE([ENABLE_SERIES_ANALYSIS], [], ["build series_analysis"]) + AC_MSG_NOTICE([series_analysis will be compiled]) else - AC_MSG_NOTICE([series_analysis will not be compiled]) + AC_MSG_NOTICE([series_analysis will not be compiled]) fi # wwmca @@ -910,10 +873,10 @@ AC_ARG_ENABLE(wwmca, AM_CONDITIONAL([ENABLE_WWMCA], [test "x$ENABLE_WWMCA" = "xyes"]) if test "x$ENABLE_WWMCA" = "xyes"; then - AC_DEFINE([ENABLE_WWMCA], [], ["build wwmca"]) - AC_MSG_NOTICE([wwmca will be compiled]) + AC_DEFINE([ENABLE_WWMCA], [], ["build wwmca"]) + AC_MSG_NOTICE([wwmca will be compiled]) else - AC_MSG_NOTICE([wwmca will not be compiled]) + AC_MSG_NOTICE([wwmca will not be compiled]) fi # modis @@ -930,10 +893,10 @@ AC_ARG_ENABLE(modis, AM_CONDITIONAL([ENABLE_MODIS], [test "x$ENABLE_MODIS" = "xyes"]) if test "x$ENABLE_MODIS" = "xyes"; then - AC_DEFINE([ENABLE_MODIS], [], ["build modis"]) - AC_MSG_NOTICE([modis will be compiled]) + AC_DEFINE([ENABLE_MODIS], [], ["build modis"]) + AC_MSG_NOTICE([modis will be compiled]) else - AC_MSG_NOTICE([modis will not be compiled]) + AC_MSG_NOTICE([modis will not be compiled]) fi # mode_graphics @@ -950,10 +913,10 @@ AC_ARG_ENABLE(mode_graphics, AM_CONDITIONAL([ENABLE_MODE_GRAPHICS], [test "x$ENABLE_MODE_GRAPHICS" = "xyes"]) if test "x$ENABLE_MODE_GRAPHICS" = "xyes"; then - AC_DEFINE([ENABLE_MODE_GRAPHICS], [], ["build mode_graphics"]) - AC_MSG_NOTICE([mode_graphics will be compiled]) + AC_DEFINE([ENABLE_MODE_GRAPHICS], [], ["build mode_graphics"]) + AC_MSG_NOTICE([mode_graphics will be compiled]) else - AC_MSG_NOTICE([mode_graphics will not be compiled]) + AC_MSG_NOTICE([mode_graphics will not be compiled]) fi # mode_time_domain @@ -970,10 +933,10 @@ AC_ARG_ENABLE(mode_time_domain, AM_CONDITIONAL([ENABLE_MODE_TIME_DOMAIN], [test "x$ENABLE_MODE_TIME_DOMAIN" = "xyes"]) if test "x$ENABLE_MODE_TIME_DOMAIN" = "xyes"; then - AC_DEFINE([ENABLE_MODE_TIME_DOMAIN], [], ["build mode_time_domain"]) - AC_MSG_NOTICE([mode_time_domain will be compiled]) + AC_DEFINE([ENABLE_MODE_TIME_DOMAIN], [], ["build mode_time_domain"]) + AC_MSG_NOTICE([mode_time_domain will be compiled]) else - AC_MSG_NOTICE([mode_time_domain will not be compiled]) + AC_MSG_NOTICE([mode_time_domain will not be compiled]) fi # tc_utils @@ -990,10 +953,10 @@ AC_ARG_ENABLE(tc_utils, AM_CONDITIONAL([ENABLE_TC_UTILS], [test "x$ENABLE_TC_UTILS" = "xyes"]) if test "x$ENABLE_TC_UTILS" = "xyes"; then - AC_DEFINE([ENABLE_TC_UTILS], [], ["build tc_utils"]) - AC_MSG_NOTICE([tc_utils will be compiled]) + AC_DEFINE([ENABLE_TC_UTILS], [], ["build tc_utils"]) + AC_MSG_NOTICE([tc_utils will be compiled]) else - AC_MSG_NOTICE([tc_utils will not be compiled]) + AC_MSG_NOTICE([tc_utils will not be compiled]) fi # gsi_tools @@ -1010,10 +973,10 @@ AC_ARG_ENABLE(gsi_tools, AM_CONDITIONAL([ENABLE_GSI_TOOLS], [test "x$ENABLE_GSI_TOOLS" = "xyes"]) if test "x$ENABLE_GSI_TOOLS" = "xyes"; then - AC_DEFINE([ENABLE_GSI_TOOLS], [], ["build gsi_tools"]) - AC_MSG_NOTICE([gsi_tools will be compiled]) + AC_DEFINE([ENABLE_GSI_TOOLS], [], ["build gsi_tools"]) + AC_MSG_NOTICE([gsi_tools will be compiled]) else - AC_MSG_NOTICE([gsi_tools will not be compiled]) + AC_MSG_NOTICE([gsi_tools will not be compiled]) fi # GRIB2 @@ -1031,18 +994,18 @@ AM_CONDITIONAL([ENABLE_GRIB2], [test "x$ENABLE_GRIB2" = "xyes"]) AM_CONDITIONAL([GRIB2CLIB_NAME_SET], [test ! -z "$GRIB2CLIB_NAME"]) if test "x$ENABLE_GRIB2" = "xyes"; then - AC_DEFINE([ENABLE_GRIB2], [], ["build GRIB2 utilities"]) - AC_MSG_NOTICE([GRIB2 utilites will be compiled]) - CPPFLAGS="${CPPFLAGS} -DWITH_GRIB2" + AC_DEFINE([ENABLE_GRIB2], [], ["build GRIB2 utilities"]) + AC_MSG_NOTICE([GRIB2 utilites will be compiled]) + CPPFLAGS="${CPPFLAGS} -DWITH_GRIB2" AC_SUBST([GRIB2CLIB_NAME]) - AC_MSG_NOTICE([GRIB2CLIB_NAME will be set]) + AC_MSG_NOTICE([GRIB2CLIB_NAME will be set]) if test -z "$GRIB2CLIB_NAME"; then GRIB2_LIBS="-lvx_data2d_grib2 -lgrib2c -ljasper -lpng -lz" else GRIB2_LIBS="-lvx_data2d_grib2 ${GRIB2CLIB_NAME} -ljasper -lpng -lz" fi else - AC_MSG_NOTICE([GRIB2 utilities will not be compiled]) + AC_MSG_NOTICE([GRIB2 utilities will not be compiled]) GRIB2_LIBS= fi AC_SUBST([GRIB2_LIBS]) @@ -1061,21 +1024,16 @@ AC_ARG_ENABLE(python, AM_CONDITIONAL([ENABLE_PYTHON], [test "x$ENABLE_PYTHON" = "xyes"]) if test "x$ENABLE_PYTHON" = "xyes"; then - AC_DEFINE([ENABLE_PYTHON], [], ["build python embedding"]) - AC_MSG_NOTICE([python embedding will be compiled]) - CPPFLAGS="${CPPFLAGS} -DWITH_PYTHON" - PYTHON_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils ${MET_PYTHON_LD}" + AC_DEFINE([ENABLE_PYTHON], [], ["build python embedding"]) + AC_MSG_NOTICE([python embedding will be compiled]) + CPPFLAGS="${CPPFLAGS} -DWITH_PYTHON" + PYTHON_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils ${MET_PYTHON_LD}" else - AC_MSG_NOTICE([python embedding will not be compiled]) - PYTHON_LIBS= + AC_MSG_NOTICE([python embedding will not be compiled]) + PYTHON_LIBS= fi AC_SUBST([PYTHON_LIBS]) -######################################################################## - - - - ######################################################################## # Check for the MET_DEVELOPMENT environment variable diff --git a/data/Makefile.in b/data/Makefile.in index 2bf69df44f..a3fb0c78e1 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -279,6 +279,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/climo/Makefile.in b/data/climo/Makefile.in index 9157b38272..f653ea973c 100644 --- a/data/climo/Makefile.in +++ b/data/climo/Makefile.in @@ -249,6 +249,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/climo/seeps/Makefile.in b/data/climo/seeps/Makefile.in index e8ef783b4d..b3cf3b8346 100644 --- a/data/climo/seeps/Makefile.in +++ b/data/climo/seeps/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/colortables/Makefile.in b/data/colortables/Makefile.in index 7c1f6997b1..bc2c584108 100644 --- a/data/colortables/Makefile.in +++ b/data/colortables/Makefile.in @@ -279,6 +279,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/colortables/NCL_colortables/Makefile.in b/data/colortables/NCL_colortables/Makefile.in index 831de55b27..3f33b60626 100644 --- a/data/colortables/NCL_colortables/Makefile.in +++ b/data/colortables/NCL_colortables/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/config/IODA2NCConfig_default b/data/config/IODA2NCConfig_default index 071a846374..f2c6d215f6 100644 --- a/data/config/IODA2NCConfig_default +++ b/data/config/IODA2NCConfig_default @@ -93,7 +93,8 @@ metadata_map = [ { key = "pressure"; val = "air_pressure,pressure"; }, { key = "height"; val = "height,height_above_mean_sea_level"; }, { key = "datetime"; val = "datetime,dateTime"; }, - { key = "elevation"; val = "elevation,station_elevation"; } + { key = "elevation"; val = "elevation,station_elevation"; }, + { key = "nlocs"; val = "Location"; } ]; // diff --git a/data/config/Makefile.in b/data/config/Makefile.in index 661063c4d0..b5e7cdd628 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/map/Makefile.in b/data/map/Makefile.in index feec2dd2f7..99b4d844bd 100644 --- a/data/map/Makefile.in +++ b/data/map/Makefile.in @@ -279,6 +279,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/map/admin_by_country/Makefile.in b/data/map/admin_by_country/Makefile.in index 6459056796..dfe35f6d1e 100644 --- a/data/map/admin_by_country/Makefile.in +++ b/data/map/admin_by_country/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/poly/HMT_masks/Makefile.in b/data/poly/HMT_masks/Makefile.in index efb0ff9e20..913f377f04 100644 --- a/data/poly/HMT_masks/Makefile.in +++ b/data/poly/HMT_masks/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/poly/Makefile.in b/data/poly/Makefile.in index e21a12d8f9..48c826f0f9 100644 --- a/data/poly/Makefile.in +++ b/data/poly/Makefile.in @@ -279,6 +279,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/poly/NCEP_masks/Makefile.in b/data/poly/NCEP_masks/Makefile.in index 59224ac306..4c05b09c25 100644 --- a/data/poly/NCEP_masks/Makefile.in +++ b/data/poly/NCEP_masks/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/ps/Makefile.in b/data/ps/Makefile.in index e2501d83ba..81d8853a46 100644 --- a/data/ps/Makefile.in +++ b/data/ps/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in index 5528382198..75416d29e5 100644 --- a/data/table_files/Makefile.in +++ b/data/table_files/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/data/table_files/met_header_columns_V12.0.txt b/data/table_files/met_header_columns_V12.0.txt index aee1401eb8..bf218d00bc 100644 --- a/data/table_files/met_header_columns_V12.0.txt +++ b/data/table_files/met_header_columns_V12.0.txt @@ -34,7 +34,7 @@ V12.0 : STAT : GENMPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID V12.0 : STAT : SSIDX : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE FCST_MODEL REF_MODEL N_INIT N_TERM N_VLD SS_INDEX V12.0 : MODE : OBJ : VERSION MODEL N_VALID GRID_RES DESC FCST_LEAD FCST_VALID FCST_ACCUM OBS_LEAD OBS_VALID OBS_ACCUM FCST_RAD FCST_THR OBS_RAD OBS_THR FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE OBJECT_ID OBJECT_CAT CENTROID_X CENTROID_Y CENTROID_LAT CENTROID_LON AXIS_ANG LENGTH WIDTH AREA AREA_THRESH CURVATURE CURVATURE_X CURVATURE_Y COMPLEXITY INTENSITY_10 INTENSITY_25 INTENSITY_50 INTENSITY_75 INTENSITY_90 INTENSITY_USER INTENSITY_SUM CENTROID_DIST BOUNDARY_DIST CONVEX_HULL_DIST ANGLE_DIFF ASPECT_DIFF AREA_RATIO INTERSECTION_AREA UNION_AREA SYMMETRIC_DIFF INTERSECTION_OVER_AREA CURVATURE_RATIO COMPLEXITY_RATIO PERCENTILE_INTENSITY_RATIO INTEREST -V12.0 : MODE : CTS : VERSION MODEL N_VALID GRID_RES DESC FCST_LEAD FCST_VALID FCST_ACCUM OBS_LEAD OBS_VALID OBS_ACCUM FCST_RAD FCST_THR OBS_RAD OBS_THR FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE FIELD TOTAL FY_OY FY_ON FN_OY FN_ON BASER FMEAN ACC FBIAS PODY PODN POFD FAR CSI GSS HK HSS ODDS +V12.0 : MODE : CTS : VERSION MODEL N_VALID GRID_RES DESC FCST_LEAD FCST_VALID FCST_ACCUM OBS_LEAD OBS_VALID OBS_ACCUM FCST_RAD FCST_THR OBS_RAD OBS_THR FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE FIELD TOTAL FY_OY FY_ON FN_OY FN_ON BASER FMEAN ACC FBIAS PODY PODN POFD FAR CSI GSS HK HSS ODDS LODDS ORSS EDS SEDS EDI SEDI BAGSS V12.0 : TCST : TCMPR : VERSION AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT LEAD VALID INIT_MASK VALID_MASK LINE_TYPE TOTAL INDEX LEVEL WATCH_WARN INITIALS ALAT ALON BLAT BLON TK_ERR X_ERR Y_ERR ALTK_ERR CRTK_ERR ADLAND BDLAND AMSLP BMSLP AMAX_WIND BMAX_WIND AAL_WIND_34 BAL_WIND_34 ANE_WIND_34 BNE_WIND_34 ASE_WIND_34 BSE_WIND_34 ASW_WIND_34 BSW_WIND_34 ANW_WIND_34 BNW_WIND_34 AAL_WIND_50 BAL_WIND_50 ANE_WIND_50 BNE_WIND_50 ASE_WIND_50 BSE_WIND_50 ASW_WIND_50 BSW_WIND_50 ANW_WIND_50 BNW_WIND_50 AAL_WIND_64 BAL_WIND_64 ANE_WIND_64 BNE_WIND_64 ASE_WIND_64 BSE_WIND_64 ASW_WIND_64 BSW_WIND_64 ANW_WIND_64 BNW_WIND_64 ARADP BRADP ARRP BRRP AMRD BMRD AGUSTS BGUSTS AEYE BEYE ADIR BDIR ASPEED BSPEED ADEPTH BDEPTH NUM_MEMBERS TRACK_SPREAD TRACK_STDEV MSLP_STDEV MAX_WIND_STDEV V12.0 : TCST : TCDIAG : VERSION AMODEL BMODEL DESC STORM_ID BASIN CYCLONE STORM_NAME INIT LEAD VALID INIT_MASK VALID_MASK LINE_TYPE TOTAL INDEX DIAG_SOURCE TRACK_SOURCE FIELD_SOURCE (N_DIAG) DIAG_[0-9]* VALUE_[0-9]* diff --git a/data/tc_data/Makefile.in b/data/tc_data/Makefile.in index 7fde41b40e..9cbf6fdbb6 100644 --- a/data/tc_data/Makefile.in +++ b/data/tc_data/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/docs/Users_Guide/installation.rst b/docs/Users_Guide/installation.rst index cdfeb91e1c..5e4318b349 100644 --- a/docs/Users_Guide/installation.rst +++ b/docs/Users_Guide/installation.rst @@ -193,6 +193,8 @@ The $MET_INC and $MET_LIB environment variables are used if the librar The following environment variables should also be set: +* Set $MET_PROJ to point to the main Proj directory, or set $MET_PROJINC to point to the directory with the Proj include files and set $MET_PROJLIB to point to the directory with the Proj library files. + * Set $MET_NETCDF to point to the main NetCDF directory, or set $MET_NETCDFINC to point to the directory with the NetCDF include files and set $MET_NETCDFLIB to point to the directory with the NetCDF library files. Note that the files for both NetCDF-C and NetCDF-CXX must be installed in the same include and library directories. * Set $MET_HDF5 to point to the main HDF5 directory. diff --git a/docs/Users_Guide/reformat_point.rst b/docs/Users_Guide/reformat_point.rst index 809639c249..b7738a120e 100644 --- a/docs/Users_Guide/reformat_point.rst +++ b/docs/Users_Guide/reformat_point.rst @@ -975,10 +975,12 @@ _____________________ { key = "station_id"; val = "station_id,report_identifier"; }, { key = "pressure"; val = "air_pressure,pressure"; }, { key = "height"; val = "height,height_above_mean_sea_level"; }, - { key = "elevation"; val = "elevation,station_elevation"; } + { key = "elevation"; val = "elevation,station_elevation"; }, + { key = "nlocs"; val = "Location"; } ]; This entry is an array of dictionaries, each containing a **key** string and **val** string which define a mapping of metadata for IODA data files. +The "nlocs" is for the dimension name of the locations. The following key can be added: "nstring", "latitude" and "longitude". _____________________ diff --git a/internal/scripts/docker/Dockerfile b/internal/scripts/docker/Dockerfile index e7ba6fa10d..b0506a210a 100644 --- a/internal/scripts/docker/Dockerfile +++ b/internal/scripts/docker/Dockerfile @@ -1,5 +1,5 @@ ARG MET_BASE_REPO=met-base -ARG MET_BASE_TAG=v2.0_debian10 +ARG MET_BASE_TAG=v3.0 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG} MAINTAINER John Halley Gotway diff --git a/internal/scripts/docker/Dockerfile.copy b/internal/scripts/docker/Dockerfile.copy index d4456f87ff..1da6cf19fa 100644 --- a/internal/scripts/docker/Dockerfile.copy +++ b/internal/scripts/docker/Dockerfile.copy @@ -1,5 +1,5 @@ ARG MET_BASE_REPO=met-base-unit-test -ARG MET_BASE_TAG=v2.0_debian10 +ARG MET_BASE_TAG=v3.0 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG} MAINTAINER John Halley Gotway diff --git a/internal/scripts/docker/build_met_docker.sh b/internal/scripts/docker/build_met_docker.sh index df02108390..e7cfb2dcde 100755 --- a/internal/scripts/docker/build_met_docker.sh +++ b/internal/scripts/docker/build_met_docker.sh @@ -9,7 +9,7 @@ mkdir -p /met/logs LOG_FILE=/met/logs/MET-${MET_GIT_NAME}_configure.log echo "Configuring MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}" ./bootstrap -./configure --enable-grib2 --enable-mode_graphics --enable-modis --enable-lidar2nc --enable-python CPPFLAGS="-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/cairo" > ${LOG_FILE} 2>&1 +./configure --enable-grib2 --enable-mode_graphics --enable-modis --enable-lidar2nc --enable-python CPPFLAGS="-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/cairo" LIBS="-ltirpc" > ${LOG_FILE} 2>&1 if [ $? != 0 ]; then cat ${LOG_FILE} exit 1 diff --git a/internal/scripts/environment/development.dakota b/internal/scripts/environment/development.dakota index d13b5543ff..8252fcafc7 100644 --- a/internal/scripts/environment/development.dakota +++ b/internal/scripts/environment/development.dakota @@ -6,6 +6,7 @@ MET_PROJ_DIR=/d3/projects/MET # Variables required to build MET export MET_DEVELOPMENT=true export MET_DST=/usr/local +export MET_PROJ=/usr/local/proj-9.2.1 export MET_NETCDF=${MET_DST}/netcdf-4.7.0/gcc-6.3.0 export MET_HDF5=${MET_DST}/hdf5-1.8.20 export MET_HDFINC=${MET_DST}/hdf4-4.2.13/include/hdf @@ -31,7 +32,7 @@ export CXXFLAGS=${CFLAGS} # Set LDFLAGS to include -rpath settings when compiling MET export LDFLAGS="-Wl,--disable-new-dtags" -export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_DST}/lib:${MET_HDFEOS}/lib:${MET_NETCDF}/lib:${MET_DST}/zlib-1.2.11/lib:${MET_DST}/szip-2.1.1/lib" +export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_DST}/lib:${MET_HDFEOS}/lib:${MET_PROJ}/lib:${MET_NETCDF}/lib:${MET_DST}/zlib-1.2.11/lib:${MET_DST}/szip-2.1.1/lib" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_HDFLIB}:${MET_HDF5}/lib:${MET_PYTHON}/lib" # Variables required to run MET diff --git a/internal/scripts/environment/development.docker b/internal/scripts/environment/development.docker index e7968889f6..b92adf7f14 100644 --- a/internal/scripts/environment/development.docker +++ b/internal/scripts/environment/development.docker @@ -29,7 +29,7 @@ export MET_TEST_RSCRIPT=/usr/bin/Rscript export MAKE_ARGS=-j export TEST_BASE=/met -export COMPILER=gnu +export COMPILER=gnu_12.2.0 export MET_SUBDIR=${TEST_BASE} export MET_TARBALL=none export USE_MODULES=FALSE diff --git a/internal/scripts/environment/development.kiowa b/internal/scripts/environment/development.kiowa deleted file mode 100644 index 00659dd3d4..0000000000 --- a/internal/scripts/environment/development.kiowa +++ /dev/null @@ -1,45 +0,0 @@ -# Define the development environment for NCAR project machine kiowa - -# Top-level MET project directory -MET_PROJ_DIR=/d1/projects/MET - -# Variables required to build MET -export MET_DEVELOPMENT=true -export MET_DST=/usr/local -export MET_NETCDF=${MET_DST}/netcdf-4.7.0/gcc-6.3.0 -export MET_HDF5=${MET_DST}/hdf5-1.8.20 -export MET_HDFINC=${MET_DST}/hdf4-4.2.13/include/hdf -export MET_HDFLIB=${MET_DST}/hdf4-4.2.13/lib -export MET_HDFEOS=${MET_DST}/hdf-eos2-19v1 -export MET_BUFR=${MET_DST} -export MET_GRIB2C=${MET_DST} -export MET_GSL=${MET_PROJ_DIR}/MET_releases/external_libs/gnu_6.3.0 -export MET_CAIROINC=/usr/include/cairo -export MET_CAIROLIB=/usr/lib -export MET_FREETYPEINC=/usr/include/freetype2 -export MET_FREETYPELIB=/usr/lib - -# For Python 3 in met-9.0 -export MET_PYTHON="/var/autofs/mnt/linux-amd64/debian/stretch/local/met-python3" -export MET_PYTHON_CC="-I${MET_PYTHON}/include/python3.7m" -export MET_PYTHON_LD="-L${MET_PYTHON}/lib -lpython3.7m -lcrypt -lpthread -ldl -lutil -lm" - -# -D__64BIT__ is required because we've compiled libgrib2c.a with that flag -export CFLAGS="-DUNDERSCORE -fPIC -D__64BIT__" -export CXXFLAGS=${CFLAGS} - -# Set LDFLAGS to include -rpath settings when compiling MET -export LDFLAGS="-Wl,--disable-new-dtags" -export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_DST}/lib:${MET_HDFEOS}/lib:${MET_NETCDF}/lib:${MET_DST}/zlib-1.2.11/lib:${MET_DST}/szip-2.1.1/lib" -export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_HDFLIB}:${MET_HDF5}/lib:${MET_PYTHON}/lib" - -# Variables required to run MET -export MET_TEST_INPUT=${MET_PROJ_DIR}/MET_test_data/unit_test -export MET_FONT_DIR=${MET_TEST_INPUT}/fonts - -# This is a cron script -- create the shell environment for this job -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:\ - /usr/bin/X11:/opt/bin:${MET_NETCDF}/bin" - -# Fortify bin directory -export FORTIFY_BIN=/d1/projects/Fortify/20.2.1/Fortify_SCA_and_Apps_20.2.1/bin diff --git a/internal/scripts/environment/development.seneca b/internal/scripts/environment/development.seneca index 9565d5e04b..51099f2bd1 100644 --- a/internal/scripts/environment/development.seneca +++ b/internal/scripts/environment/development.seneca @@ -7,6 +7,7 @@ MET_PROJ_DIR=/d1/projects/MET # Variables required to build MET export MET_DEVELOPMENT=true export MET_DST=/usr/local +export MET_PROJ=${MET_DST}/proj-9.2.1 export MET_NETCDF=${MET_DST}/netcdf-4.7.0/gcc-8.3.0 export MET_HDF5=${MET_DST}/hdf5-1.8.21 export MET_HDFINC=${MET_DST}/hdf4-4.2.15/include/hdf @@ -33,7 +34,7 @@ export CXXFLAGS=${CFLAGS} # Set LDFLAGS to include -rpath settings when compiling MET export LDFLAGS="-Wl,--disable-new-dtags" -export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_DST}/lib:${MET_HDFEOS}/lib:${MET_NETCDF}/lib:${MET_DST}/zlib-1.2.11/lib:${MET_DST}/szip-2.1.1/lib" +export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_DST}/lib:${MET_HDFEOS}/lib:${MET_PROJ}/lib:${MET_NETCDF}/lib:${MET_DST}/zlib-1.2.11/lib:${MET_DST}/szip-2.1.1/lib" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_HDFLIB}:${MET_HDF5}/lib:${MET_GSL}/lib:${MET_PYTHON}/lib:${MET_JASPER}/lib" export LDFLAGS="${LDFLAGS} -L${MET_JASPER}/lib" diff --git a/internal/scripts/installation/compile_MET_all.sh b/internal/scripts/installation/compile_MET_all.sh index 2adf80a45f..333a9b06eb 100644 --- a/internal/scripts/installation/compile_MET_all.sh +++ b/internal/scripts/installation/compile_MET_all.sh @@ -36,7 +36,7 @@ # # The compile_MET_all.sh script will compile and install MET and its # external library dependencies, if needed, including: -# GSL, BUFRLIB, GRIB2C (with dependencies Z, PNG, JASPER), +# PROJ, GSL, BUFRLIB, GRIB2C (with dependencies Z, PNG, JASPER), # HDF5, NETCDF (C and CXX), HDF4 (optional for MODIS-Regrid # and lidar2nc), HDFEOS (optional for MODIS-Regrid and lidar2nc), # FREETYPE (optional for MODE Graphics), and CAIRO (optional @@ -51,7 +51,7 @@ # in the input environment configuration file (install_met_env.: # MET_GRIB2CLIB, MET_GRIB2CINC, GRIB2CLIB_NAME, # MET_BUFRLIB, BUFRLIB_NAME, MET_HDF5, MET_NETCDF, -# MET_GSL, LIB_JASPER, LIB_PNG, LIB_Z. +# MET_PROJ, MET_GSL, LIB_JASPER, LIB_PNG, LIB_Z. # # The optional libraries HDF4, HDFEOS, FREETYPE, and CAIRO are # used for the following, not widely used tools, MODIS-Regrid, @@ -180,6 +180,12 @@ else COMPILE_NETCDF=0 fi +if [ -z ${MET_PROJ} ]; then + COMPILE_PROJ=1 +else + COMPILE_PROJ=0 +fi + if [ -z ${MET_GSL} ]; then COMPILE_GSL=1 else @@ -239,6 +245,7 @@ if [ ! -z "${SKIP_MET}" ]; then COMPILE_MET=0; fi # skip compilation of external libraries if SKIP_LIBS is set if [ ! -z "${SKIP_LIBS}" ]; then + COMPILE_PROJ=0 COMPILE_GSL=0 COMPILE_BUFRLIB=0 COMPILE_ZLIB=0 @@ -384,6 +391,25 @@ if [[ ${MET_PYTHON}/bin/python3 ]]; then ${MET_PYTHON}/bin/python3 --version fi +# Compile Proj +if [ $COMPILE_PROJ -eq 1 ]; then + + vrs="9.2.1"; + + echo + echo "Compiling PROJ_${vrs} at `date`" + mkdir -p ${LIB_DIR}/proj + rm -rf ${LIB_DIR}/proj/proj* + tar -xf ${TAR_DIR}/proj-${vrs}.tar.gz -C ${LIB_DIR}/proj + cd ${LIB_DIR}/proj/proj* + echo "cd `pwd`" + run_cmd "mkdir build; cd build" + run_cmd "cmake -DCMAKE_INSTALL_PREFIX=${LIB_DIR} .." + run_cmd "cmake --build ." + run_cmd "cmake --build . --target install" + +fi + # Compile GSL if [ $COMPILE_GSL -eq 1 ]; then @@ -530,11 +556,7 @@ if [ $COMPILE_HDF -eq 1 ]; then tar -xf ${TAR_DIR}/HDF4.2*.tar.gz -C ${LIB_DIR}/hdf cd ${LIB_DIR}/hdf/HDF* echo "cd `pwd`" - run_cmd "./configure --prefix=${LIB_DIR} --disable-netcdf --with-jpeg=${LIB_DIR} --with-zlib=${LIB_DIR} > hdf4.configure.log 2>&1" - cat mfhdf/hdiff/Makefile | \ - sed 's/LIBS = -ljpeg -lz/LIBS = -ljpeg -lz -lm/g' \ - > Makefile_new - mv Makefile_new mfhdf/hdiff/Makefile + run_cmd "./configure --prefix=${LIB_DIR} --disable-netcdf --with-jpeg=${LIB_DIR} --with-zlib=${LIB_DIR} CPPFLAGS=-I/usr/include/tirpc LIBS='-lm -ltirpc' > hdf4.configure.log 2>&1" if [[ ${COMPILER_MAJOR_VERSION} -ge 10 ]]; then cat hdf/src/Makefile | \ sed 's/FFLAGS = -O2/FFLAGS = -w -fallow-argument-mismatch -O2/g' \ @@ -705,7 +727,7 @@ fi # https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html # ${parameter:+word} # If parameter is null or unset, nothing is substituted, otherwise the expansion of word is substituted. -export LDFLAGS="${LDFLAGS} -Wl,-rpath,${LIB_DIR}/lib${MET_NETCDF:+:$MET_NETCDF/lib}${MET_HDF5:+:$MET_HDF5/lib}${MET_BUFRLIB:+:$MET_BUFRLIB}${MET_GRIB2CLIB:+:$MET_GRIB2CLIB}${MET_PYTHON_LIB:+:$MET_PYTHON_LIB}${MET_GSL:+:$MET_GSL/lib}${ADDTL_DIR:+:$ADDTL_DIR}" +export LDFLAGS="${LDFLAGS} -Wl,-rpath,${LIB_DIR}/lib${MET_PROJ:+:$MET_PROJ/lib}${LIB_DIR}/lib${MET_NETCDF:+:$MET_NETCDF/lib}${MET_HDF5:+:$MET_HDF5/lib}${MET_BUFRLIB:+:$MET_BUFRLIB}${MET_GRIB2CLIB:+:$MET_GRIB2CLIB}${MET_PYTHON_LIB:+:$MET_PYTHON_LIB}${MET_GSL:+:$MET_GSL/lib}${ADDTL_DIR:+:$ADDTL_DIR}" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${LIB_JASPER:+$LIB_JASPER}${LIB_LIBPNG:+:$LIB_PNG}${LIB_Z:+$LIB_Z}" export LDFLAGS="${LDFLAGS} ${LIB_JASPER:+-L$LIB_JASPER} ${LIB_LIBPNG:+-L$LIB_LIBPNG} ${MET_HDF5:+-L$MET_HDF5/lib} ${ADDTL_DIR:+-L$ADDTL_DIR}" export LIBS="${LIBS} -lhdf5_hl -lhdf5 -lz" diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic index f2ef8ccc3e..5c6c5f42d0 100644 --- a/internal/scripts/installation/config/install_met_env.generic +++ b/internal/scripts/installation/config/install_met_env.generic @@ -1,59 +1,66 @@ -#Find the directory this script is called from +# Find the directory this script is called from DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -#Required -#Directory that is the root of the compile -export TEST_BASE=$DIR/../ +# Required +# Directory that is the root of the compile +export TEST_BASE=${DIR} -#Required -#Compiler options = gnu, intel, ics, ips, PrgEnv-intel, or pgi -#Compiler+version can be used for machines using modules e.g. gnu_6.3.0 -export COMPILER=gnu +# Required +# Format is compiler_version (e.g. gnu_8.3.0) +# Compiler options = gnu, intel, ics, ips, PrgEnv-intel, or pgi +# Version is used for gnu in compilation of BUFRLIB and HDF5 +export COMPILER=gnu_8.3.0 -#Required -#Root directory for creating/untaring met source code - usually same as TEST_BASE +# Required +# Root directory for creating/untaring met source code - usually same as TEST_BASE export MET_SUBDIR=${TEST_BASE} -#Required -#The name of the met tarbal usually downloaded with version from dtcenter.org and includes a version -# example - met-9.0.1.20200423.tar.gz -#met.tar.gz is used for compiling from cloned github repo -export MET_TARBALL=met.tar.gz +# Required +# The name of the met tarbal usually downloaded with version from dtcenter.org and includes a version +# example - v11.1.0.tar.gz +export MET_TARBALL=v12.0.0.tar.gz -#Required -#Specifiy if machine useds modules for loading software +# Required +# Specify if machine useds modules for loading software export USE_MODULES=FALSE -#Root directory of your python install -export PYTHON_LOC="$(python3-config --prefix)" +# Root directory of your python install, containing the bin, include, lib, and share directories +export MET_PYTHON=`python3-config --prefix` -#Directory of your python executable -export MET_PYTHON=${PYTHON_LOC} +# Python ldflags created using python3-config +export MET_PYTHON_LD=`python3-config --ldflags --embed` -#Python ldflags created using python3-config -export MET_PYTHON_LD="$(python3-config --ldflags)" +# Python cflags created using python3-config +export MET_PYTHON_CC=`python3-config --cflags` -#Python cflags created using python3-config -export MET_PYTHON_CC="$(python3-config --cflags)" +# Use MAKE_ARGS to sped up the compilation of the external libaries and/or MET +# MAKE_ARGS can be set "-j #" where # is replaced with the number of +# cores to use (as an integer) or to simply "-j" to use all available cores. +export MAKE_ARGS=-j -#64 bit machine or not -export SET_D64BIT=FALSE - -#General CFLAGS -export CFLAGS="-Wall -g" - -#General CXXLAGS -export CXXFLAGS="-Wall -g" - -#Normally should be omitted or set to TRUE - only used if building from github repo -export USE_MET_TAR_FILE=FALSE - -#If you've already compiled these and don't need to compile them again, set the following +# If users have already installed these libraries and would like to make use of +# them, uncomment out the export statements. If those pre-existing libraries are +# in the external_libs directory, no further edits are needed; however, users +# that have the pre-existing libraries not in the external_libs directory will +# need to update the paths to the appropriate location. #export EXTERNAL_LIBS=${TEST_BASE}/external_libs +#export MET_GSL=${EXTERNAL_LIBS} +#export MET_BUFRLIB=${EXTERNAL_LIBS}/lib +#export BUFRLIB_NAME=-lbufr +#export LIB_JASPER=${EXTERNAL_LIBS}/lib +#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +#export LIB_Z=${EXTERNAL_LIBS}/lib #export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib #export MET_GRIB2CINC=${EXTERNAL_LIBS}/include #export GRIB2CLIB_NAME=-lgrib2c -#export MET_BUFRLIB=${EXTERNAL_LIBS}/lib -#export BUFRLIB_NAME=-lbufr -#export MET_NETCDF=${EXTERNAL_LIBS}/lib -# Also, don't forget to set the following options to zero within the compile script if you've already compiled those libraries as well: COMPILE_GSL, COMPILE_HDF, COMPILE_HDFEOS, COMPILE_CAIRO, COMPILE_FREETYPE +#export MET_HDF5=${EXTERNAL_LIBS} +#export MET_NETCDF=${EXTERNAL_LIBS} + +# The optional libraries HDF4, HDFEOS, FREETYPE, and CAIRO are used for the +# following, not widely used tools: MODIS-Regrid, lidar2nc, and MODE Graphics. +# To enable the compilation of these libraries, set the compilation flags for +# the library (e.g. COMPILE_HDF, COMPILE_HDFEOS, COMPILE_CAIRO, +# COMPILE_FREETYPE) to any value in the environment config file. If these +# libraries have already been installed and don't need to be reinstalled, set +# MET_HDF, MET_HDFEOS, MET_FREETYPEINC, MET_FREETYPELIB, MET_CAIROINC, +# and MET_CAIROLIB to their installed locations. diff --git a/internal/scripts/sonarqube/python.sonar-project.properties b/internal/scripts/sonarqube/python.sonar-project.properties index 7f25756321..082f1ebb0c 100644 --- a/internal/scripts/sonarqube/python.sonar-project.properties +++ b/internal/scripts/sonarqube/python.sonar-project.properties @@ -11,7 +11,7 @@ sonar.sourceEncoding=UTF-8 #----- Default SonarQube server #sonar.host.url=http://localhost:9000 -sonar.host.url=http://mandan:9000 +sonar.host.url=http://needham.rap.ucar.edu:9000 -sonar.login=squ_e965ad7d3c3abed1326573f25262212dc969798b +sonar.login=squ_2577d67c624e6b2881bdf978cb71f25d19550b47 sonar.branch.name=develop diff --git a/internal/scripts/sonarqube/sonar-project.properties b/internal/scripts/sonarqube/sonar-project.properties index 1760c20f68..5ee2731ba8 100644 --- a/internal/scripts/sonarqube/sonar-project.properties +++ b/internal/scripts/sonarqube/sonar-project.properties @@ -12,7 +12,7 @@ sonar.sourceEncoding=UTF-8 #----- Default SonarQube server #sonar.host.url=http://localhost:9000 -sonar.host.url=http://mandan:9000 +sonar.host.url=http://needham.rap.ucar.edu:9000 -sonar.login=squ_e965ad7d3c3abed1326573f25262212dc969798b +sonar.login=squ_2577d67c624e6b2881bdf978cb71f25d19550b47 sonar.branch.name=develop diff --git a/internal/test_unit/R_test/test_const_dakota.R b/internal/test_unit/R_test/test_const_dakota.R deleted file mode 100644 index 7984e83480..0000000000 --- a/internal/test_unit/R_test/test_const_dakota.R +++ /dev/null @@ -1,50 +0,0 @@ - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# Testing Scripts Information -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -strDirTest = "/d3/projects/MET/MET_test/test"; -strDirHdr = paste(strDirTest, "/hdr", sep=""); -strDirTmp = paste(strDirTest, "/tmp", sep=""); - -intSigFig = 6; -intSigFigBc = 1; -intAbsDifBc = 5; -boolRmTmp = TRUE; - -listNcDiffAttrExcl = c("FileOrigins"); - - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# Testing System Utilities -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -strNcDiffExec = "/usr/local/bin/ncdiff"; -strModeConv = paste(strDirTest, "/bin/mode_conv.pl", sep=""); -strTcstConv = paste(strDirTest, "/bin/tcst_conv.pl", sep=""); - - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# MET constants -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -#strDirMetBase = "/d1/pgoldenb/opt/MET_builds/METv3.0.1_gnu4"; -strDirMetBase = "/d3/projects/MET/MET_releases/METv3.0.1"; -strSaExec = paste(strDirMetBase, "/bin/stat_analysis", sep=""); - - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# METViewer constants -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -strDirMv = "/d3/projects/METViewer/src/apps/verif/metviewer"; -strMvExec = paste(strDirMv, "/bin/mv_batch.sh", sep=""); -strDirMvScripts = paste(strDirTest, "/R_work/scripts", sep=""); -strDirMvData = paste(strDirTest, "/R_work/data", sep=""); - - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# Test Data Information -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -strDirData = "/d1/pgoldenb/var/hmt/2011/dwr_domains"; -listMetOutDir = list( - met_2_0 = "/d1/pgoldenb/opt/MET_builds/METv2.0_gnu4/out", - met_3_0 = "/d1/pgoldenb/opt/MET_builds/METv3.0_gnu4/out", - met_3_0_1 = "/d1/pgoldenb/opt/MET_builds/METv3.0.1_gnu4/out" -); diff --git a/internal/test_unit/hdr/met_11_0.hdr b/internal/test_unit/hdr/met_11_0.hdr index 4c496af7f9..70519912da 100644 --- a/internal/test_unit/hdr/met_11_0.hdr +++ b/internal/test_unit/hdr/met_11_0.hdr @@ -6,6 +6,8 @@ ISC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_L MCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT _VAR_ MCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU HK HK_BCL HK_BCU HSS HSS_BCL HSS_BCU GER GER_BCL GER_BCU HSS_EC HSS_EC_BCL HSS_EC_BCU EC_VALUE MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV FCST OBS OBS_QC CLIMO_MEAN CLIMO_STDEV CLIMO_CDF_VAR_ +SEEPS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL S12 S13 S21 S23 S31 S32 PF1 PF2 PF3 PV1 PV2 PV3 MEAN_FCST MEAN_OBS SEEPS +SEEPS_MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE OBS_SID OBS_LAT OBS_LON FCST OBS OBS_QC FCST_CAT OBS_CAT P1 P2 T1 T2 SEEPS NBRCNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBS FBS_BCL FBS_BCU FSS FSS_BCL FSS_BCU AFSS AFSS_BCL AFSS_BCU UFSS UFSS_BCL UFSS_BCU F_RATE F_RATE_BCL F_RATE_BCU O_RATE O_RATE_BCL O_RATE_BCU NBRCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY_OY FY_ON FN_OY FN_ON NBRCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER BASER_NCL BASER_NCU BASER_BCL BASER_BCU FMEAN FMEAN_NCL FMEAN_NCU FMEAN_BCL FMEAN_BCU ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU FBIAS FBIAS_BCL FBIAS_BCU PODY PODY_NCL PODY_NCU PODY_BCL PODY_BCU PODN PODN_NCL PODN_NCU PODN_BCL PODN_BCU POFD POFD_NCL POFD_NCU POFD_BCL POFD_BCU FAR FAR_NCL FAR_NCU FAR_BCL FAR_BCU CSI CSI_NCL CSI_NCU CSI_BCL CSI_BCU GSS GSS_BCL GSS_BCU HK HK_NCL HK_NCU HK_BCL HK_BCU HSS HSS_BCL HSS_BCU ODDS ODDS_NCL ODDS_NCU ODDS_BCL ODDS_BCU LODDS LODDS_NCL LODDS_NCU LODDS_BCL LODDS_BCU ORSS ORSS_NCL ORSS_NCU ORSS_BCL ORSS_BCU EDS EDS_NCL EDS_NCU EDS_BCL EDS_BCU SEDS SEDS_NCL SEDS_NCU SEDS_BCL SEDS_BCU EDI EDI_NCL EDI_NCU EDI_BCL EDI_BCU SEDI SEDI_NCL SEDI_NCU SEDI_BCL SEDI_BCU BAGSS BAGSS_BCL BAGSS_BCU diff --git a/internal/test_unit/hdr/met_11_1.hdr b/internal/test_unit/hdr/met_11_1.hdr index 4c496af7f9..70519912da 100644 --- a/internal/test_unit/hdr/met_11_1.hdr +++ b/internal/test_unit/hdr/met_11_1.hdr @@ -6,6 +6,8 @@ ISC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_L MCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT _VAR_ MCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU HK HK_BCL HK_BCU HSS HSS_BCL HSS_BCU GER GER_BCL GER_BCU HSS_EC HSS_EC_BCL HSS_EC_BCU EC_VALUE MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV FCST OBS OBS_QC CLIMO_MEAN CLIMO_STDEV CLIMO_CDF_VAR_ +SEEPS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL S12 S13 S21 S23 S31 S32 PF1 PF2 PF3 PV1 PV2 PV3 MEAN_FCST MEAN_OBS SEEPS +SEEPS_MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE OBS_SID OBS_LAT OBS_LON FCST OBS OBS_QC FCST_CAT OBS_CAT P1 P2 T1 T2 SEEPS NBRCNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBS FBS_BCL FBS_BCU FSS FSS_BCL FSS_BCU AFSS AFSS_BCL AFSS_BCU UFSS UFSS_BCL UFSS_BCU F_RATE F_RATE_BCL F_RATE_BCU O_RATE O_RATE_BCL O_RATE_BCU NBRCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY_OY FY_ON FN_OY FN_ON NBRCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER BASER_NCL BASER_NCU BASER_BCL BASER_BCU FMEAN FMEAN_NCL FMEAN_NCU FMEAN_BCL FMEAN_BCU ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU FBIAS FBIAS_BCL FBIAS_BCU PODY PODY_NCL PODY_NCU PODY_BCL PODY_BCU PODN PODN_NCL PODN_NCU PODN_BCL PODN_BCU POFD POFD_NCL POFD_NCU POFD_BCL POFD_BCU FAR FAR_NCL FAR_NCU FAR_BCL FAR_BCU CSI CSI_NCL CSI_NCU CSI_BCL CSI_BCU GSS GSS_BCL GSS_BCU HK HK_NCL HK_NCU HK_BCL HK_BCU HSS HSS_BCL HSS_BCU ODDS ODDS_NCL ODDS_NCU ODDS_BCL ODDS_BCU LODDS LODDS_NCL LODDS_NCU LODDS_BCL LODDS_BCU ORSS ORSS_NCL ORSS_NCU ORSS_BCL ORSS_BCU EDS EDS_NCL EDS_NCU EDS_BCL EDS_BCU SEDS SEDS_NCL SEDS_NCU SEDS_BCL SEDS_BCU EDI EDI_NCL EDI_NCU EDI_BCL EDI_BCU SEDI SEDI_NCL SEDI_NCU SEDI_BCL SEDI_BCU BAGSS BAGSS_BCL BAGSS_BCU diff --git a/internal/test_unit/hdr/met_12_0.hdr b/internal/test_unit/hdr/met_12_0.hdr index 4c496af7f9..888df0f61d 100644 --- a/internal/test_unit/hdr/met_12_0.hdr +++ b/internal/test_unit/hdr/met_12_0.hdr @@ -6,6 +6,8 @@ ISC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_L MCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT _VAR_ MCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL N_CAT ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU HK HK_BCL HK_BCU HSS HSS_BCL HSS_BCU GER GER_BCL GER_BCU HSS_EC HSS_EC_BCL HSS_EC_BCU EC_VALUE MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL INDEX OBS_SID OBS_LAT OBS_LON OBS_LVL OBS_ELV FCST OBS OBS_QC CLIMO_MEAN CLIMO_STDEV CLIMO_CDF_VAR_ +SEEPS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL S12 S13 S21 S23 S31 S32 PF1 PF2 PF3 PV1 PV2 PV3 MEAN_FCST MEAN_OBS SEEPS +SEEPS_MPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE OBS_SID OBS_LAT OBS_LON FCST OBS OBS_QC FCST_CAT OBS_CAT P1 P2 T1 T2 SEEPS NBRCNT : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FBS FBS_BCL FBS_BCU FSS FSS_BCL FSS_BCU AFSS AFSS_BCL AFSS_BCU UFSS UFSS_BCL UFSS_BCU F_RATE F_RATE_BCL F_RATE_BCU O_RATE O_RATE_BCL O_RATE_BCU NBRCTC : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL FY_OY FY_ON FN_OY FN_ON NBRCTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE TOTAL BASER BASER_NCL BASER_NCU BASER_BCL BASER_BCU FMEAN FMEAN_NCL FMEAN_NCU FMEAN_BCL FMEAN_BCU ACC ACC_NCL ACC_NCU ACC_BCL ACC_BCU FBIAS FBIAS_BCL FBIAS_BCU PODY PODY_NCL PODY_NCU PODY_BCL PODY_BCU PODN PODN_NCL PODN_NCU PODN_BCL PODN_BCU POFD POFD_NCL POFD_NCU POFD_BCL POFD_BCU FAR FAR_NCL FAR_NCU FAR_BCL FAR_BCU CSI CSI_NCL CSI_NCU CSI_BCL CSI_BCU GSS GSS_BCL GSS_BCU HK HK_NCL HK_NCU HK_BCL HK_BCU HSS HSS_BCL HSS_BCU ODDS ODDS_NCL ODDS_NCU ODDS_BCL ODDS_BCU LODDS LODDS_NCL LODDS_NCU LODDS_BCL LODDS_BCU ORSS ORSS_NCL ORSS_NCU ORSS_BCL ORSS_BCU EDS EDS_NCL EDS_NCU EDS_BCL EDS_BCU SEDS SEDS_NCL SEDS_NCU SEDS_BCL SEDS_BCU EDI EDI_NCL EDI_NCU EDI_BCL EDI_BCU SEDI SEDI_NCL SEDI_NCU SEDI_BCL SEDI_BCU BAGSS BAGSS_BCL BAGSS_BCU @@ -32,7 +34,7 @@ GENMPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_L SSIDX : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE FCST_MODEL REF_MODEL N_INIT N_TERM N_VLD SS_INDEX MODE_SOA : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE N_VALID GRID_RES OBJECT_ID OBJECT_CAT CENTROID_X CENTROID_Y CENTROID_LAT CENTROID_LON AXIS_ANG LENGTH WIDTH AREA AREA_THRESH CURVATURE CURVATURE_X CURVATURE_Y COMPLEXITY INTENSITY_10 INTENSITY_25 INTENSITY_50 INTENSITY_75 INTENSITY_90 INTENSITY_50 INTENSITY_SUM MODE_POA : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE N_VALID GRID_RES OBJECT_ID OBJECT_CAT CENTROID_DIST BOUNDARY_DIST CONVEX_HULL_DIST ANGLE_DIFF ASPECT_DIFF AREA_RATIO INTERSECTION_AREA UNION_AREA SYMMETRIC_DIFF INTERSECTION_OVER_AREA CURVATURE_RATIO COMPLEXITY_RATIO PERCENTILE_INTENSITY_RATIO INTEREST -MODE_CTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE N_VALID GRID_RES FIELD TOTAL FY_OY FY_ON FN_OY FN_ON BASER FMEAN ACC FBIAS PODY PODN POFD FAR CSI GSS HK HSS ODDS +MODE_CTS : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE N_VALID GRID_RES FIELD TOTAL FY_OY FY_ON FN_OY FN_ON BASER FMEAN ACC FBIAS PODY PODN POFD FAR CSI GSS HK HSS ODDS LODDS ORSS EDS SEDS EDI SEDI BAGSS TCST_TCMPR : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE AMODEL BMODEL STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK TOTAL INDEX LEVEL WATCH_WARN INITIALS ALAT ALON BLAT BLON TK_ERR X_ERR Y_ERR ALTK_ERR CRTK_ERR ADLAND BDLAND AMSLP BMSLP AMAX_WIND BMAX_WIND AAL_WIND_34 BAL_WIND_34 ANE_WIND_34 BNE_WIND_34 ASE_WIND_34 BSE_WIND_34 ASW_WIND_34 BSW_WIND_34 ANW_WIND_34 BNW_WIND_34 AAL_WIND_50 BAL_WIND_50 ANE_WIND_50 BNE_WIND_50 ASE_WIND_50 BSE_WIND_50 ASW_WIND_50 BSW_WIND_50 ANW_WIND_50 BNW_WIND_50 AAL_WIND_64 BAL_WIND_64 ANE_WIND_64 BNE_WIND_64 ASE_WIND_64 BSE_WIND_64 ASW_WIND_64 BSW_WIND_64 ANW_WIND_64 BNW_WIND_64 ARADP BRADP ARRP BRRP AMRD BMRD AGUSTS BGUSTS AEYE BEYE ADIR BDIR ASPEED BSPEED ADEPTH BDEPTH NUM_MEMBERS TRACK_SPREAD TRACK_STDEV MSLP_STDEV MAX_WIND_STDEV TCST_TCDIAG : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE AMODEL BMODEL STORM_ID BASIN CYCLONE STORM_NAME INIT_MASK VALID_MASK TOTAL INDEX DIAG_SOURCE TRACK_SOURCE FIELD_SOURCE N_DIAG _VAR_ TCST_PROBRIRW : VERSION MODEL DESC FCST_LEAD FCST_VALID_BEG FCST_VALID_END OBS_LEAD OBS_VALID_BEG OBS_VALID_END FCST_VAR FCST_UNITS FCST_LEV OBS_VAR OBS_UNITS OBS_LEV OBTYPE VX_MASK INTERP_MTHD INTERP_PNTS FCST_THRESH OBS_THRESH COV_THRESH ALPHA LINE_TYPE ALAT ALON BLAT BLON INITIALS TK_ERR X_ERR Y_ERR ADLAND BDLAND RI_BEG RI_END RI_WINDOW AWIND_END BWIND_BEG BWIND_END BDELTA BDELTA_MAX BLEVEL_BEG BLEVEL_END N_THRESH _VAR_ diff --git a/internal/test_unit/perl/mode_conv.pl b/internal/test_unit/perl/mode_conv.pl index 2ae9f205e4..d35a616633 100755 --- a/internal/test_unit/perl/mode_conv.pl +++ b/internal/test_unit/perl/mode_conv.pl @@ -7,6 +7,7 @@ # tools # # last revised: 2016-09-17 for MET version 6.0 +# last revised: 2023-08-22 for MET version 12.0 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -38,7 +39,7 @@ () CURVATURE_RATIO COMPLEXITY_RATIO PERCENTILE_INTENSITY_RATIO INTEREST); my @fld_ctss = qw(N_VALID GRID_RES FIELD TOTAL FY_OY FY_ON FN_OY FN_ON BASER FMEAN ACC FBIAS PODY PODN POFD FAR - CSI GSS HK HSS ODDS); + CSI GSS HK HSS ODDS LODDS ORSS EDS SEDS EDI SEDI BAGSS); my $fmt_hdr = "%-8s" . # VERSION @@ -133,7 +134,14 @@ () "%12s" . # GSS "%12s" . # HK "%12s" . # HSS - "%12s"; # ODDS + "%12s" . # ODDS + "%12s" . # LODDS + "%12s" . # ORSS + "%12s" . # EDS + "%12s" . # SEDS + "%12s" . # EDI + "%12s" . # SEDI + "%12s"; # BAGSS if( 1 > @ARGV && 2 < @ARGV ){ die "ERROR: unexpected number of arguments\n\n" . usage() } @@ -202,7 +210,11 @@ () # write a cts line my $fmt_val; if( $type eq "c" ){ - push @outs, (" MODE_CTS ", @vals[2,3,22 .. 40]); + # pad with bad data, if needed + if( @vals < 48 ){ + push @vals, (-9999) x (48 - @vals); + } + push @outs, (" MODE_CTS ", @vals[2,3,22 .. 47]); $fmt_val = $fmt_cts; } @@ -307,3 +319,11 @@ () # 38 - HK # 39 - HSS # 40 - ODDS +# 41 - LODDS +# 42 - ORSS +# 43 - EDS +# 44 - SEDS +# 45 - EDI +# 46 - SEDI +# 47 - BAGSS + diff --git a/internal/test_util/Makefile.in b/internal/test_util/Makefile.in index 333d20944e..273b760ac6 100644 --- a/internal/test_util/Makefile.in +++ b/internal/test_util/Makefile.in @@ -249,6 +249,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/basic/Makefile.in b/internal/test_util/basic/Makefile.in index f11b231015..297b68955b 100644 --- a/internal/test_util/basic/Makefile.in +++ b/internal/test_util/basic/Makefile.in @@ -249,6 +249,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/basic/vx_config/Makefile.in b/internal/test_util/basic/vx_config/Makefile.in index 15fbe1495e..b4f2a63d55 100644 --- a/internal/test_util/basic/vx_config/Makefile.in +++ b/internal/test_util/basic/vx_config/Makefile.in @@ -274,6 +274,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/basic/vx_log/Makefile.in b/internal/test_util/basic/vx_log/Makefile.in index b2645f0632..a280f93a32 100644 --- a/internal/test_util/basic/vx_log/Makefile.in +++ b/internal/test_util/basic/vx_log/Makefile.in @@ -243,6 +243,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/basic/vx_util/Makefile.am b/internal/test_util/basic/vx_util/Makefile.am index 287e2af635..7fcf6cf3d4 100644 --- a/internal/test_util/basic/vx_util/Makefile.am +++ b/internal/test_util/basic/vx_util/Makefile.am @@ -110,4 +110,4 @@ test_ascii_header_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util diff --git a/internal/test_util/basic/vx_util/Makefile.in b/internal/test_util/basic/vx_util/Makefile.in index 3849c4f8b7..468ceb6843 100644 --- a/internal/test_util/basic/vx_util/Makefile.in +++ b/internal/test_util/basic/vx_util/Makefile.in @@ -279,6 +279,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -405,7 +408,7 @@ test_ascii_header_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util all: all-am diff --git a/internal/test_util/libcode/Makefile.in b/internal/test_util/libcode/Makefile.in index 6eaddab183..3cbc250888 100644 --- a/internal/test_util/libcode/Makefile.in +++ b/internal/test_util/libcode/Makefile.in @@ -249,6 +249,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/libcode/vx_data2d/Makefile.am b/internal/test_util/libcode/vx_data2d/Makefile.am index 5f959f49f9..7e3c1ffd77 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.am +++ b/internal/test_util/libcode/vx_data2d/Makefile.am @@ -26,7 +26,7 @@ test_table_read_LDADD = -lvx_config \ -lvx_cal \ -lvx_math \ -lvx_log \ - -lgsl -lgslcblas + -lproj -lgsl -lgslcblas dump_default_table_SOURCES = dump_default_table.cc dump_default_table_CPPFLAGS = ${MET_CPPFLAGS} @@ -41,4 +41,4 @@ dump_default_table_LDADD = -lvx_config \ -lvx_cal \ -lvx_math \ -lvx_log \ - -lgsl -lgslcblas + -lproj -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index f0361c5122..5ddc56a697 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -247,6 +247,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -336,7 +339,7 @@ test_table_read_LDADD = -lvx_config \ -lvx_cal \ -lvx_math \ -lvx_log \ - -lgsl -lgslcblas + -lproj -lgsl -lgslcblas dump_default_table_SOURCES = dump_default_table.cc dump_default_table_CPPFLAGS = ${MET_CPPFLAGS} @@ -351,7 +354,7 @@ dump_default_table_LDADD = -lvx_config \ -lvx_cal \ -lvx_math \ -lvx_log \ - -lgsl -lgslcblas + -lproj -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.am b/internal/test_util/libcode/vx_data2d_factory/Makefile.am index a3676e6a28..78d54d8936 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.am @@ -50,4 +50,4 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index a5513331c2..fc47b90c40 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -245,6 +245,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -358,7 +361,7 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.am b/internal/test_util/libcode/vx_data2d_grib/Makefile.am index 794586af1f..e03b42df6e 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.am @@ -27,4 +27,4 @@ test_read_grib1_LDADD = -lvx_data2d_grib \ -lvx_color \ -lvx_cal \ -lvx_log \ - -lgsl -lgslcblas + -lproj -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index 3e6d315d66..7d3461c0c5 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -238,6 +238,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -329,7 +332,7 @@ test_read_grib1_LDADD = -lvx_data2d_grib \ -lvx_color \ -lvx_cal \ -lvx_log \ - -lgsl -lgslcblas + -lproj -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am index 208342a1c2..e32ef23772 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am @@ -28,4 +28,4 @@ test_read_nc_met_LDADD = -lvx_data2d_nc_met \ -lvx_color \ -lvx_cal \ -lvx_log \ - -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in index f2f33374f7..372ccf3a8c 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -239,6 +239,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -331,7 +334,7 @@ test_read_nc_met_LDADD = -lvx_data2d_nc_met \ -lvx_color \ -lvx_cal \ -lvx_log \ - -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am index 1c91ca8ef2..151f5f84d6 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am @@ -28,4 +28,4 @@ test_read_nccf_LDADD = -lvx_data2d_nccf \ -lvx_color \ -lvx_cal \ -lvx_log \ - -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index fa4c47eda9..f86958db2c 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -237,6 +237,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -329,7 +332,7 @@ test_read_nccf_LDADD = -lvx_data2d_nccf \ -lvx_color \ -lvx_cal \ -lvx_log \ - -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_geodesy/Makefile.in b/internal/test_util/libcode/vx_geodesy/Makefile.in index 45a8923ec8..f006dc86c7 100644 --- a/internal/test_util/libcode/vx_geodesy/Makefile.in +++ b/internal/test_util/libcode/vx_geodesy/Makefile.in @@ -237,6 +237,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/libcode/vx_grid/Makefile.am b/internal/test_util/libcode/vx_grid/Makefile.am index 7fe77b4d0a..271b4e3460 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.am +++ b/internal/test_util/libcode/vx_grid/Makefile.am @@ -24,5 +24,4 @@ test_grid_area_LDADD = -lvx_grid \ -lvx_math \ -lvx_cal \ -lvx_log \ - -lz \ - -lm + -lz -lm -lproj diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index b636d9ac42..ae2a4383d0 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -237,6 +237,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -325,8 +328,7 @@ test_grid_area_LDADD = -lvx_grid \ -lvx_math \ -lvx_cal \ -lvx_log \ - -lz \ - -lm + -lz -lm -lproj all: all-am diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.am b/internal/test_util/libcode/vx_nc_util/Makefile.am index 50a6db27b2..6fef8cf74c 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.am +++ b/internal/test_util/libcode/vx_nc_util/Makefile.am @@ -49,5 +49,5 @@ test_pressure_levels_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in index 57d28ac4c3..f437196d7f 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.in +++ b/internal/test_util/libcode/vx_nc_util/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -351,7 +354,7 @@ test_pressure_levels_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util all: all-am diff --git a/internal/test_util/libcode/vx_physics/Makefile.in b/internal/test_util/libcode/vx_physics/Makefile.in index 3bbc795eb2..ddd63db625 100644 --- a/internal/test_util/libcode/vx_physics/Makefile.in +++ b/internal/test_util/libcode/vx_physics/Makefile.in @@ -237,6 +237,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/libcode/vx_plot_util/Makefile.in b/internal/test_util/libcode/vx_plot_util/Makefile.in index fd5faa8f00..8aa88eed23 100644 --- a/internal/test_util/libcode/vx_plot_util/Makefile.in +++ b/internal/test_util/libcode/vx_plot_util/Makefile.in @@ -238,6 +238,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/libcode/vx_ps/Makefile.in b/internal/test_util/libcode/vx_ps/Makefile.in index 06d19a7bf0..17081679e8 100644 --- a/internal/test_util/libcode/vx_ps/Makefile.in +++ b/internal/test_util/libcode/vx_ps/Makefile.in @@ -237,6 +237,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/libcode/vx_series_data/Makefile.am b/internal/test_util/libcode/vx_series_data/Makefile.am index 60e78a153f..6d91db397b 100644 --- a/internal/test_util/libcode/vx_series_data/Makefile.am +++ b/internal/test_util/libcode/vx_series_data/Makefile.am @@ -32,4 +32,4 @@ test_series_data_LDADD = -lvx_config \ -lvx_log \ -lvx_cal \ -lvx_util \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_series_data/Makefile.in b/internal/test_util/libcode/vx_series_data/Makefile.in index 3578366e91..6cf8e84616 100644 --- a/internal/test_util/libcode/vx_series_data/Makefile.in +++ b/internal/test_util/libcode/vx_series_data/Makefile.in @@ -239,6 +239,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -335,7 +338,7 @@ test_series_data_LDADD = -lvx_config \ -lvx_log \ -lvx_cal \ -lvx_util \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_solar/Makefile.in b/internal/test_util/libcode/vx_solar/Makefile.in index dcd7455458..1233b23042 100644 --- a/internal/test_util/libcode/vx_solar/Makefile.in +++ b/internal/test_util/libcode/vx_solar/Makefile.in @@ -237,6 +237,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.am b/internal/test_util/libcode/vx_tc_util/Makefile.am index f4a385b7d4..f9f85a3050 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.am +++ b/internal/test_util/libcode/vx_tc_util/Makefile.am @@ -50,7 +50,7 @@ test_read_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util test_read_prob_SOURCES = test_read_prob.cc test_read_prob_CPPFLAGS = ${MET_CPPFLAGS} @@ -86,5 +86,5 @@ test_read_prob_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in index 0c6b71622a..9c1cef30d3 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.in +++ b/internal/test_util/libcode/vx_tc_util/Makefile.in @@ -247,6 +247,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -356,7 +359,7 @@ test_read_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util test_read_prob_SOURCES = test_read_prob.cc test_read_prob_CPPFLAGS = ${MET_CPPFLAGS} @@ -392,7 +395,7 @@ test_read_prob_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util all: all-am diff --git a/internal/test_util/tools/Makefile.in b/internal/test_util/tools/Makefile.in index f1d2a1f3fe..186c0537e1 100644 --- a/internal/test_util/tools/Makefile.in +++ b/internal/test_util/tools/Makefile.in @@ -249,6 +249,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/tools/other/Makefile.in b/internal/test_util/tools/other/Makefile.in index 9599a8dfd5..035eb82c4c 100644 --- a/internal/test_util/tools/other/Makefile.in +++ b/internal/test_util/tools/other/Makefile.in @@ -249,6 +249,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.am b/internal/test_util/tools/other/mode_time_domain/Makefile.am index 3dc14e906c..496e79f330 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.am +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.am @@ -71,5 +71,5 @@ test_velocity_LDADD = \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in index c114ecd60f..c18289e08a 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -262,6 +262,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -397,7 +400,7 @@ test_velocity_LDADD = \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz all: all-am diff --git a/scripts/Rscripts/Makefile.in b/scripts/Rscripts/Makefile.in index ecfeb05665..2acf818e34 100644 --- a/scripts/Rscripts/Makefile.in +++ b/scripts/Rscripts/Makefile.in @@ -279,6 +279,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/scripts/Rscripts/include/Makefile.in b/scripts/Rscripts/include/Makefile.in index ba65effd91..7f8f6b245c 100644 --- a/scripts/Rscripts/include/Makefile.in +++ b/scripts/Rscripts/include/Makefile.in @@ -219,6 +219,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/scripts/python/Makefile.in b/scripts/python/Makefile.in index 99855cad22..02691c4f09 100644 --- a/scripts/python/Makefile.in +++ b/scripts/python/Makefile.in @@ -251,6 +251,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/scripts/python/examples/Makefile.in b/scripts/python/examples/Makefile.in index ad4832e5a0..3abe6fdead 100644 --- a/scripts/python/examples/Makefile.in +++ b/scripts/python/examples/Makefile.in @@ -221,6 +221,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/scripts/python/met/Makefile.in b/scripts/python/met/Makefile.in index f149bf98e8..b8663fcdac 100644 --- a/scripts/python/met/Makefile.in +++ b/scripts/python/met/Makefile.in @@ -221,6 +221,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/scripts/python/pyembed/Makefile.in b/scripts/python/pyembed/Makefile.in index 077334a8f3..d5641b6a8e 100644 --- a/scripts/python/pyembed/Makefile.in +++ b/scripts/python/pyembed/Makefile.in @@ -279,6 +279,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/scripts/python/tc_diag/Makefile.in b/scripts/python/tc_diag/Makefile.in index aa22e5d013..a092039006 100644 --- a/scripts/python/tc_diag/Makefile.in +++ b/scripts/python/tc_diag/Makefile.in @@ -221,6 +221,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/scripts/python/utility/Makefile.in b/scripts/python/utility/Makefile.in index 7a994964d1..a51225a41e 100644 --- a/scripts/python/utility/Makefile.in +++ b/scripts/python/utility/Makefile.in @@ -221,6 +221,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/Makefile.in b/src/Makefile.in index 934182add5..25afc196c7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -249,6 +249,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/basic/Makefile.in b/src/basic/Makefile.in index bf83fcf031..77eeeedf8f 100644 --- a/src/basic/Makefile.in +++ b/src/basic/Makefile.in @@ -251,6 +251,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/basic/enum_to_string/Makefile.in b/src/basic/enum_to_string/Makefile.in index 814fdfda3d..d0e76d5e05 100644 --- a/src/basic/enum_to_string/Makefile.in +++ b/src/basic/enum_to_string/Makefile.in @@ -268,6 +268,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/basic/vx_cal/Makefile.in b/src/basic/vx_cal/Makefile.in index e3e4399f86..f23327226c 100644 --- a/src/basic/vx_cal/Makefile.in +++ b/src/basic/vx_cal/Makefile.in @@ -275,6 +275,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index f59251ae49..3d6af85624 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -323,6 +323,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/basic/vx_log/Makefile.in b/src/basic/vx_log/Makefile.in index 7057cfead1..13b0b73efa 100644 --- a/src/basic/vx_log/Makefile.in +++ b/src/basic/vx_log/Makefile.in @@ -254,6 +254,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/basic/vx_math/Makefile.in b/src/basic/vx_math/Makefile.in index 267f4e3bb2..b185c4c3db 100644 --- a/src/basic/vx_math/Makefile.in +++ b/src/basic/vx_math/Makefile.in @@ -268,6 +268,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/basic/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index 9888ef5d13..43939400f7 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -373,6 +373,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/basic/vx_util_math/Makefile.in b/src/basic/vx_util_math/Makefile.in index db47183f09..bc7f62bd82 100644 --- a/src/basic/vx_util_math/Makefile.in +++ b/src/basic/vx_util_math/Makefile.in @@ -253,6 +253,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/Makefile.in b/src/libcode/Makefile.in index f4aa5ac826..7e35d744ef 100644 --- a/src/libcode/Makefile.in +++ b/src/libcode/Makefile.in @@ -260,6 +260,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_afm/Makefile.in b/src/libcode/vx_afm/Makefile.in index 5f4661b089..a42770282c 100644 --- a/src/libcode/vx_afm/Makefile.in +++ b/src/libcode/vx_afm/Makefile.in @@ -262,6 +262,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_analysis_util/Makefile.in b/src/libcode/vx_analysis_util/Makefile.in index ff0b55ec5e..22227b0c6a 100644 --- a/src/libcode/vx_analysis_util/Makefile.in +++ b/src/libcode/vx_analysis_util/Makefile.in @@ -269,6 +269,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_bool_calc/Makefile.in b/src/libcode/vx_bool_calc/Makefile.in index cb58b490a9..b541ca6b87 100644 --- a/src/libcode/vx_bool_calc/Makefile.in +++ b/src/libcode/vx_bool_calc/Makefile.in @@ -264,6 +264,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_color/Makefile.in b/src/libcode/vx_color/Makefile.in index 74de00208e..7558c1599e 100644 --- a/src/libcode/vx_color/Makefile.in +++ b/src/libcode/vx_color/Makefile.in @@ -281,6 +281,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_data2d/Makefile.in b/src/libcode/vx_data2d/Makefile.in index 708d731dc6..f1f052dea3 100644 --- a/src/libcode/vx_data2d/Makefile.in +++ b/src/libcode/vx_data2d/Makefile.in @@ -264,6 +264,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_data2d_factory/Makefile.in b/src/libcode/vx_data2d_factory/Makefile.in index ed3da07481..f0974875f2 100644 --- a/src/libcode/vx_data2d_factory/Makefile.in +++ b/src/libcode/vx_data2d_factory/Makefile.in @@ -267,6 +267,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_data2d_grib/Makefile.in b/src/libcode/vx_data2d_grib/Makefile.in index df5f23bfe9..4e2468fb76 100644 --- a/src/libcode/vx_data2d_grib/Makefile.in +++ b/src/libcode/vx_data2d_grib/Makefile.in @@ -264,6 +264,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_data2d_grib2/Makefile.in b/src/libcode/vx_data2d_grib2/Makefile.in index fec9efaa4e..f3fbbcc006 100644 --- a/src/libcode/vx_data2d_grib2/Makefile.in +++ b/src/libcode/vx_data2d_grib2/Makefile.in @@ -257,6 +257,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_data2d_nc_met/Makefile.in b/src/libcode/vx_data2d_nc_met/Makefile.in index 1548295a50..18878c25f7 100644 --- a/src/libcode/vx_data2d_nc_met/Makefile.in +++ b/src/libcode/vx_data2d_nc_met/Makefile.in @@ -261,6 +261,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_data2d_nc_pinterp/Makefile.in b/src/libcode/vx_data2d_nc_pinterp/Makefile.in index ac2869fb14..989068ea4d 100644 --- a/src/libcode/vx_data2d_nc_pinterp/Makefile.in +++ b/src/libcode/vx_data2d_nc_pinterp/Makefile.in @@ -262,6 +262,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_data2d_nccf/Makefile.in b/src/libcode/vx_data2d_nccf/Makefile.in index 44d23bbc8d..9f8ca6f73e 100644 --- a/src/libcode/vx_data2d_nccf/Makefile.in +++ b/src/libcode/vx_data2d_nccf/Makefile.in @@ -258,6 +258,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_data2d_python/Makefile.in b/src/libcode/vx_data2d_python/Makefile.in index fdd274cc72..bfc7060cd1 100644 --- a/src/libcode/vx_data2d_python/Makefile.in +++ b/src/libcode/vx_data2d_python/Makefile.in @@ -265,6 +265,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_geodesy/Makefile.in b/src/libcode/vx_geodesy/Makefile.in index 3cd3bc8c93..eda413d780 100644 --- a/src/libcode/vx_geodesy/Makefile.in +++ b/src/libcode/vx_geodesy/Makefile.in @@ -253,6 +253,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_gis/Makefile.in b/src/libcode/vx_gis/Makefile.in index 254974527b..412cd006f3 100644 --- a/src/libcode/vx_gis/Makefile.in +++ b/src/libcode/vx_gis/Makefile.in @@ -262,6 +262,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_gnomon/Makefile.in b/src/libcode/vx_gnomon/Makefile.in index 4c5548a7af..3086a47bbf 100644 --- a/src/libcode/vx_gnomon/Makefile.in +++ b/src/libcode/vx_gnomon/Makefile.in @@ -253,6 +253,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in index d87cc11e58..a67bd0ec16 100644 --- a/src/libcode/vx_grid/Makefile.in +++ b/src/libcode/vx_grid/Makefile.in @@ -279,6 +279,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_gsl_prob/Makefile.in b/src/libcode/vx_gsl_prob/Makefile.in index a16c772b92..b60c9f0e09 100644 --- a/src/libcode/vx_gsl_prob/Makefile.in +++ b/src/libcode/vx_gsl_prob/Makefile.in @@ -261,6 +261,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_nav/Makefile.in b/src/libcode/vx_nav/Makefile.in index b3b9073674..468226f6b9 100644 --- a/src/libcode/vx_nav/Makefile.in +++ b/src/libcode/vx_nav/Makefile.in @@ -253,6 +253,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_nc_obs/Makefile.in b/src/libcode/vx_nc_obs/Makefile.in index fa930a532b..2ef201b449 100644 --- a/src/libcode/vx_nc_obs/Makefile.in +++ b/src/libcode/vx_nc_obs/Makefile.in @@ -263,6 +263,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_nc_util/Makefile.in b/src/libcode/vx_nc_util/Makefile.in index 28ab8cb87c..81fbd40a9f 100644 --- a/src/libcode/vx_nc_util/Makefile.in +++ b/src/libcode/vx_nc_util/Makefile.in @@ -261,6 +261,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_pb_util/Makefile.in b/src/libcode/vx_pb_util/Makefile.in index 1c858815c0..b88c641dc2 100644 --- a/src/libcode/vx_pb_util/Makefile.in +++ b/src/libcode/vx_pb_util/Makefile.in @@ -259,6 +259,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_physics/Makefile.in b/src/libcode/vx_physics/Makefile.in index 186bf1d838..20b84ee14d 100644 --- a/src/libcode/vx_physics/Makefile.in +++ b/src/libcode/vx_physics/Makefile.in @@ -253,6 +253,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_plot_util/Makefile.in b/src/libcode/vx_plot_util/Makefile.in index 0560b6742a..b071eb2b54 100644 --- a/src/libcode/vx_plot_util/Makefile.in +++ b/src/libcode/vx_plot_util/Makefile.in @@ -258,6 +258,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_pointdata_python/Makefile.in b/src/libcode/vx_pointdata_python/Makefile.in index 8d36c6b212..93da42dfd2 100644 --- a/src/libcode/vx_pointdata_python/Makefile.in +++ b/src/libcode/vx_pointdata_python/Makefile.in @@ -262,6 +262,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_ps/Makefile.in b/src/libcode/vx_ps/Makefile.in index 4870c08043..517daf49df 100644 --- a/src/libcode/vx_ps/Makefile.in +++ b/src/libcode/vx_ps/Makefile.in @@ -263,6 +263,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_pxm/Makefile.in b/src/libcode/vx_pxm/Makefile.in index 9e4525b171..626c404f1e 100644 --- a/src/libcode/vx_pxm/Makefile.in +++ b/src/libcode/vx_pxm/Makefile.in @@ -260,6 +260,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_python3_utils/Makefile.in b/src/libcode/vx_python3_utils/Makefile.in index 2e2be4096c..bf1839f2b6 100644 --- a/src/libcode/vx_python3_utils/Makefile.in +++ b/src/libcode/vx_python3_utils/Makefile.in @@ -266,6 +266,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_regrid/Makefile.in b/src/libcode/vx_regrid/Makefile.in index 1e1abd9e7e..78c1e849c8 100644 --- a/src/libcode/vx_regrid/Makefile.in +++ b/src/libcode/vx_regrid/Makefile.in @@ -255,6 +255,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_render/Makefile.in b/src/libcode/vx_render/Makefile.in index 46a34c50d2..b3f2ee31bf 100644 --- a/src/libcode/vx_render/Makefile.in +++ b/src/libcode/vx_render/Makefile.in @@ -277,6 +277,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_seeps/Makefile.in b/src/libcode/vx_seeps/Makefile.in index e4710b5830..7334c459d4 100644 --- a/src/libcode/vx_seeps/Makefile.in +++ b/src/libcode/vx_seeps/Makefile.in @@ -253,6 +253,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_series_data/Makefile.in b/src/libcode/vx_series_data/Makefile.in index 91a471ea3c..d4a9153226 100644 --- a/src/libcode/vx_series_data/Makefile.in +++ b/src/libcode/vx_series_data/Makefile.in @@ -256,6 +256,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_shapedata/Makefile.in b/src/libcode/vx_shapedata/Makefile.in index 16e8a8fda7..41bf90d9d3 100644 --- a/src/libcode/vx_shapedata/Makefile.in +++ b/src/libcode/vx_shapedata/Makefile.in @@ -269,6 +269,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_solar/Makefile.in b/src/libcode/vx_solar/Makefile.in index e72e1e9f68..1c28bf8c32 100644 --- a/src/libcode/vx_solar/Makefile.in +++ b/src/libcode/vx_solar/Makefile.in @@ -255,6 +255,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_stat_out/Makefile.in b/src/libcode/vx_stat_out/Makefile.in index 0742054db0..a3f53c5973 100644 --- a/src/libcode/vx_stat_out/Makefile.in +++ b/src/libcode/vx_stat_out/Makefile.in @@ -255,6 +255,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_statistics/Makefile.in b/src/libcode/vx_statistics/Makefile.in index ea08eed52f..64ba6edd5e 100644 --- a/src/libcode/vx_statistics/Makefile.in +++ b/src/libcode/vx_statistics/Makefile.in @@ -280,6 +280,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_summary/Makefile.in b/src/libcode/vx_summary/Makefile.in index 35ae2159fa..fa86db187b 100644 --- a/src/libcode/vx_summary/Makefile.in +++ b/src/libcode/vx_summary/Makefile.in @@ -275,6 +275,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_tc_util/Makefile.in b/src/libcode/vx_tc_util/Makefile.in index 86ec3f0107..c1c10aa2ad 100644 --- a/src/libcode/vx_tc_util/Makefile.in +++ b/src/libcode/vx_tc_util/Makefile.in @@ -289,6 +289,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/libcode/vx_time_series/Makefile.in b/src/libcode/vx_time_series/Makefile.in index 82b0d7d6f3..92e35e0d53 100644 --- a/src/libcode/vx_time_series/Makefile.in +++ b/src/libcode/vx_time_series/Makefile.in @@ -257,6 +257,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 5b75053efb..1d5afeee2b 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -251,6 +251,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/tools/core/Makefile.in b/src/tools/core/Makefile.in index ea28f37143..fe26ee596f 100644 --- a/src/tools/core/Makefile.in +++ b/src/tools/core/Makefile.in @@ -259,6 +259,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/tools/core/ensemble_stat/Makefile.am b/src/tools/core/ensemble_stat/Makefile.am index cd2a3a5913..f4870d0d69 100644 --- a/src/tools/core/ensemble_stat/Makefile.am +++ b/src/tools/core/ensemble_stat/Makefile.am @@ -42,7 +42,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = ensemble_stat.h \ ensemble_stat_conf_info.h diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index 8ea979cad4..10ec728d48 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -350,7 +353,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = ensemble_stat.h \ ensemble_stat_conf_info.h diff --git a/src/tools/core/grid_stat/Makefile.am b/src/tools/core/grid_stat/Makefile.am index 252c0b2a68..75382103e4 100644 --- a/src/tools/core/grid_stat/Makefile.am +++ b/src/tools/core/grid_stat/Makefile.am @@ -41,7 +41,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = grid_stat.h \ grid_stat_conf_info.h diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index a7b4413930..07eed34176 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -241,6 +241,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -348,7 +351,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = grid_stat.h \ grid_stat_conf_info.h diff --git a/src/tools/core/mode/Makefile.am b/src/tools/core/mode/Makefile.am index c3a9ccbfa5..be5aa15e6e 100644 --- a/src/tools/core/mode/Makefile.am +++ b/src/tools/core/mode/Makefile.am @@ -60,7 +60,7 @@ mode_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz EXTRA_DIST = mode_exec.h \ mode_ps_file.h \ diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 4bab26a2ce..324734bfa1 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -259,6 +259,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -385,7 +388,7 @@ mode_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz EXTRA_DIST = mode_exec.h \ mode_ps_file.h \ diff --git a/src/tools/core/mode_analysis/Makefile.am b/src/tools/core/mode_analysis/Makefile.am index fb6cbcce41..95ce39e441 100644 --- a/src/tools/core/mode_analysis/Makefile.am +++ b/src/tools/core/mode_analysis/Makefile.am @@ -43,6 +43,6 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util EXTRA_DIST = config_to_att.h diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index 25219b1c9b..65fe67c86f 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -351,7 +354,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util EXTRA_DIST = config_to_att.h all: all-am diff --git a/src/tools/core/pcp_combine/Makefile.am b/src/tools/core/pcp_combine/Makefile.am index d9c05adaef..047e7f3fe6 100644 --- a/src/tools/core/pcp_combine/Makefile.am +++ b/src/tools/core/pcp_combine/Makefile.am @@ -34,4 +34,4 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index 1a06f529bb..2508fde598 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -239,6 +239,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -338,7 +341,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/core/point_stat/Makefile.am b/src/tools/core/point_stat/Makefile.am index 4d82f666e6..72fd3afa13 100644 --- a/src/tools/core/point_stat/Makefile.am +++ b/src/tools/core/point_stat/Makefile.am @@ -42,7 +42,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = point_stat.h \ point_stat_conf_info.h diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index b4614a61d9..6970bd2117 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -350,7 +353,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = point_stat.h \ point_stat_conf_info.h diff --git a/src/tools/core/series_analysis/Makefile.am b/src/tools/core/series_analysis/Makefile.am index d569d0584a..dc9bf9b4b6 100644 --- a/src/tools/core/series_analysis/Makefile.am +++ b/src/tools/core/series_analysis/Makefile.am @@ -41,7 +41,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = series_analysis.h \ series_analysis_conf_info.h diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index 1414057e40..44a0b546cd 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -243,6 +243,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -350,7 +353,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = series_analysis.h \ series_analysis_conf_info.h diff --git a/src/tools/core/stat_analysis/Makefile.am b/src/tools/core/stat_analysis/Makefile.am index d134d12dd1..7243d38298 100644 --- a/src/tools/core/stat_analysis/Makefile.am +++ b/src/tools/core/stat_analysis/Makefile.am @@ -47,7 +47,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_color \ -lvx_log \ -lvx_summary \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = stat_analysis.h \ parse_stat_line.h \ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index 5451dc9026..2336e6fbc8 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -248,6 +248,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -361,7 +364,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_color \ -lvx_log \ -lvx_summary \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = stat_analysis.h \ parse_stat_line.h \ diff --git a/src/tools/core/wavelet_stat/Makefile.am b/src/tools/core/wavelet_stat/Makefile.am index a1fbba3b9c..b7f82f764d 100644 --- a/src/tools/core/wavelet_stat/Makefile.am +++ b/src/tools/core/wavelet_stat/Makefile.am @@ -47,7 +47,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = wavelet_stat.h \ wavelet_stat_conf_info.h diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index 6c98ae8d39..3f2d2b0469 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -355,7 +358,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = wavelet_stat.h \ wavelet_stat_conf_info.h diff --git a/src/tools/dev_utils/Makefile.am b/src/tools/dev_utils/Makefile.am index 07f245903b..c9daba3cf8 100644 --- a/src/tools/dev_utils/Makefile.am +++ b/src/tools/dev_utils/Makefile.am @@ -142,7 +142,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas # Build chk4copyright when making a distribution so that we can # add missing copyrights to the source files diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index a059e83426..31181b9f20 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -385,6 +385,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -583,7 +586,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-recursive diff --git a/src/tools/dev_utils/shapefiles/Makefile.in b/src/tools/dev_utils/shapefiles/Makefile.in index ca79d9c227..de5d8fec1f 100644 --- a/src/tools/dev_utils/shapefiles/Makefile.in +++ b/src/tools/dev_utils/shapefiles/Makefile.in @@ -238,6 +238,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/tools/other/Makefile.in b/src/tools/other/Makefile.in index 2fe8bcc902..52bafebb9c 100644 --- a/src/tools/other/Makefile.in +++ b/src/tools/other/Makefile.in @@ -271,6 +271,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/tools/other/ascii2nc/Makefile.am b/src/tools/other/ascii2nc/Makefile.am index da25278b79..6c123107be 100644 --- a/src/tools/other/ascii2nc/Makefile.am +++ b/src/tools/other/ascii2nc/Makefile.am @@ -59,7 +59,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index 519b26e2b0..a4ed87b60b 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -287,6 +287,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -406,7 +409,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/gen_ens_prod/Makefile.am b/src/tools/other/gen_ens_prod/Makefile.am index ffeee88e2f..4fdce9ab82 100644 --- a/src/tools/other/gen_ens_prod/Makefile.am +++ b/src/tools/other/gen_ens_prod/Makefile.am @@ -42,7 +42,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_ens_prod.h \ gen_ens_prod_conf_info.h diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index 25ab818a94..a061b0909d 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -350,7 +353,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_ens_prod.h \ gen_ens_prod_conf_info.h diff --git a/src/tools/other/gen_vx_mask/Makefile.am b/src/tools/other/gen_vx_mask/Makefile.am index 9063ca47d6..e05a781e0e 100644 --- a/src/tools/other/gen_vx_mask/Makefile.am +++ b/src/tools/other/gen_vx_mask/Makefile.am @@ -50,6 +50,6 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_solar \ -lvx_cal \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_vx_mask.h diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index fc4acc0fce..e431f5ff9d 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -239,6 +239,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -353,7 +356,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_solar \ -lvx_cal \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_vx_mask.h all: all-am diff --git a/src/tools/other/gis_utils/Makefile.in b/src/tools/other/gis_utils/Makefile.in index d40b28e556..c4ffd9e720 100644 --- a/src/tools/other/gis_utils/Makefile.in +++ b/src/tools/other/gis_utils/Makefile.in @@ -253,6 +253,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/tools/other/grid_diag/Makefile.am b/src/tools/other/grid_diag/Makefile.am index cdc26ba1c7..d8307b8992 100644 --- a/src/tools/other/grid_diag/Makefile.am +++ b/src/tools/other/grid_diag/Makefile.am @@ -40,7 +40,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_color \ -lvx_log \ -lvx_gsl_prob \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = grid_diag.h \ grid_diag_conf_info.h diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index b38399d0b3..9ce5481f2c 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -241,6 +241,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -347,7 +350,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_color \ -lvx_log \ -lvx_gsl_prob \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = grid_diag.h \ grid_diag_conf_info.h diff --git a/src/tools/other/gsi_tools/Makefile.am b/src/tools/other/gsi_tools/Makefile.am index 2c7849aec7..214e70657d 100644 --- a/src/tools/other/gsi_tools/Makefile.am +++ b/src/tools/other/gsi_tools/Makefile.am @@ -60,7 +60,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util gsidens2orank_SOURCES = gsidens2orank.h \ gsi_record.h \ @@ -109,5 +109,5 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index 70792921df..218e3de140 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -277,6 +277,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -401,7 +404,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util gsidens2orank_SOURCES = gsidens2orank.h \ gsi_record.h \ @@ -451,7 +454,7 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util all: all-am diff --git a/src/tools/other/ioda2nc/Makefile.am b/src/tools/other/ioda2nc/Makefile.am index c93d12f0f3..650b13fffb 100644 --- a/src/tools/other/ioda2nc/Makefile.am +++ b/src/tools/other/ioda2nc/Makefile.am @@ -42,6 +42,6 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 460328f95e..2c23b4f74e 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -254,6 +254,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -362,7 +365,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) all: all-am diff --git a/src/tools/other/ioda2nc/ioda2nc.cc b/src/tools/other/ioda2nc/ioda2nc.cc index 4e77447176..622d949f58 100644 --- a/src/tools/other/ioda2nc/ioda2nc.cc +++ b/src/tools/other/ioda2nc/ioda2nc.cc @@ -25,7 +25,6 @@ // //////////////////////////////////////////////////////////////////////// -using namespace std; #include #include @@ -35,7 +34,6 @@ using namespace std; #include #include -using namespace netCDF; #include "main.h" #include "apply_mask.h" @@ -52,13 +50,17 @@ using namespace netCDF; #include "nc_point_obs_out.h" #include "nc_summary.h" +using namespace std; +using namespace netCDF; + + //////////////////////////////////////////////////////////////////////// // // Constants // -static const char * DEF_CONFIG_NAME = "MET_BASE/config/IODA2NCConfig_default"; +static const char *DEF_CONFIG_NAME = "MET_BASE/config/IODA2NCConfig_default"; static const char *program_name = "ioda2nc"; @@ -130,7 +132,7 @@ static vector observations; // // Output NetCDF file, dimensions, and variables // -static NcFile *f_out = (NcFile *) 0; +static NcFile *f_out = (NcFile *) nullptr; //////////////////////////////////////////////////////////////////////// @@ -164,22 +166,23 @@ static void set_valid_beg_time(const StringArray &); static void set_valid_end_time(const StringArray &); static void set_verbosity(const StringArray &); -static bool check_core_data(const bool, const bool, StringArray &, StringArray &, e_ioda_format); +static bool check_core_data(const bool, const bool, + StringArray &, StringArray &, e_ioda_format); static bool check_missing_thresh(float value); -static ConcatString find_meta_name(StringArray, StringArray); +static ConcatString find_meta_name(string meta_key, StringArray available_names); static bool get_meta_data_float(NcFile *, StringArray &, const char *, float *, const int); static bool get_meta_data_strings(NcVar &, char *); static bool get_meta_data_strings(NcVar &, char **); static bool get_obs_data_float(NcFile *, const ConcatString, NcVar *, float *, int *, const int, const e_ioda_format); -static bool has_postfix(std::string const &, std::string const &); - +static bool has_postfix(const std::string &, std::string const &); +static bool is_in_metadata_map(string metadata_key, StringArray &available_list); + //////////////////////////////////////////////////////////////////////// int met_main(int argc, char *argv[]) { - int i; // Initialize static variables initialize(); @@ -191,7 +194,7 @@ int met_main(int argc, char *argv[]) { open_netcdf(); // Process each IODA file - for(i=0; i= debug_level_for_performance) { @@ -1139,7 +1148,7 @@ void clean_up() { if(f_out) { delete f_out; - f_out = (NcFile *) 0; + f_out = (NcFile *) nullptr; } return; @@ -1210,7 +1219,7 @@ bool check_core_data(const bool has_msg_type, const bool has_station_id, StringArray &t_core_dims = (ioda_format == ioda_v2) ? core_dims : core_dims_v1; for(int idx=0; idx " << "core dimension \"" << t_core_dims[idx] << "\" is missing.\n\n"; is_netcdf_ready = false; @@ -1219,7 +1228,7 @@ bool check_core_data(const bool has_msg_type, const bool has_station_id, if (ioda_format == ioda_v1) { if(has_msg_type || has_station_id) { - if(!dim_names.has("nstring")) { + if (!is_in_metadata_map("nstring", dim_names)) { mlog << Error << "\n" << method_name << "-> " << "core dimension \"nstring\" is missing.\n\n"; is_netcdf_ready = false; @@ -1228,19 +1237,7 @@ bool check_core_data(const bool has_msg_type, const bool has_station_id, } for(int idx=0; idx 0) { - for (int idx2=0; idx2 < alt_names.n(); idx2++) { - if (core_meta_vars[idx] != alt_names[idx2]) { - found = metadata_vars.has(alt_names[idx2]); - if (found) break; - } - } - } - } - if(!found) { + if(!is_in_metadata_map(core_meta_vars[idx], metadata_vars)) { mlog << Error << "\n" << method_name << "-> " << "core variable \"" << core_meta_vars[idx] << "\" is missing.\n\n"; is_netcdf_ready = false; @@ -1264,13 +1261,16 @@ bool check_missing_thresh(float value) { //////////////////////////////////////////////////////////////////////// -ConcatString find_meta_name(StringArray metadata_names, StringArray config_names) { +ConcatString find_meta_name(string meta_key, StringArray available_names) { ConcatString metadata_name; - - for(int idx =0; idx 0) { NcVar meta_var = get_var(f_in, metadata_name.c_str(), metadata_group_name); @@ -1388,9 +1387,11 @@ bool get_obs_data_float(NcFile *f_in, const ConcatString var_name, //////////////////////////////////////////////////////////////////////// -bool has_postfix(std::string const &str_buf, std::string const &postfix) { - if(str_buf.length() >= postfix.length()) { - return (0 == str_buf.compare(str_buf.length() - postfix.length(), postfix.length(), postfix)); +bool has_postfix(const std::string &str_buf, std::string const &postfix) { + auto buf_len = str_buf.length(); + auto postfix_len = postfix.length(); + if(buf_len >= postfix_len) { + return (0 == str_buf.compare(buf_len - postfix_len, postfix_len, postfix)); } else { return false; } @@ -1398,6 +1399,23 @@ bool has_postfix(std::string const &str_buf, std::string const &postfix) { //////////////////////////////////////////////////////////////////////// +bool is_in_metadata_map(std::string metadata_key, StringArray &available_list) { + bool found = available_list.has(metadata_key); + + if (!found) { + StringArray alt_names = conf_info.metadata_map[metadata_key]; + if (alt_names.n() > 0) { + for (int idx=0; idx #include #include @@ -25,6 +23,9 @@ using namespace std; #include "grib_strings.h" #include "vx_log.h" +using namespace std; + + //////////////////////////////////////////////////////////////////////// // // Code for class IODA2NCConfInfo @@ -94,8 +95,8 @@ void IODA2NCConfInfo::process_config() { int i; ConcatString s, mask_name; StringArray sa; - StringArray * sid_list = 0; - Dictionary *dict = (Dictionary *) 0; + StringArray * sid_list = nullptr; + Dictionary *dict = (Dictionary *) nullptr; static const char *method_name = "IODA2NCConfInfo::process_config() -> "; // Dump the contents of the config file diff --git a/src/tools/other/ioda2nc/ioda2nc_conf_info.h b/src/tools/other/ioda2nc/ioda2nc_conf_info.h index a806a66276..cab5ec6f6e 100644 --- a/src/tools/other/ioda2nc/ioda2nc_conf_info.h +++ b/src/tools/other/ioda2nc/ioda2nc_conf_info.h @@ -54,10 +54,10 @@ class IODA2NCConfInfo { ThreshArray missing_thresh; // Fill value thresh array ConcatString version; // Config file version - map obs_name_map; - map message_type_map; - map metadata_map; - map obs_to_qc_map; + std::map obs_name_map; + std::map message_type_map; + std::map metadata_map; + std::map obs_to_qc_map; StringArray surface_message_types; TimeSummaryInfo timeSummaryInfo; @@ -66,8 +66,8 @@ class IODA2NCConfInfo { void clear(); - map getObsVarMap() const { return obs_name_map; } - map getMessageTypeMap() const { return message_type_map; } + std::map getObsVarMap() const { return obs_name_map; } + std::map getMessageTypeMap() const { return message_type_map; } TimeSummaryInfo getSummaryInfo() const { return timeSummaryInfo; }; void read_config(const char *, const char *); diff --git a/src/tools/other/lidar2nc/Makefile.am b/src/tools/other/lidar2nc/Makefile.am index 85d138f2af..5cad14876f 100644 --- a/src/tools/other/lidar2nc/Makefile.am +++ b/src/tools/other/lidar2nc/Makefile.am @@ -54,4 +54,4 @@ lidar2nc_LDADD = -lvx_shapedata \ $(PYTHON_LIBS) \ -lvx_summary \ -lmfhdf -ldf -ljpeg \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index 4df06eb34e..fc7814febf 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -254,6 +254,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -375,7 +378,7 @@ lidar2nc_LDADD = -lvx_shapedata \ $(PYTHON_LIBS) \ -lvx_summary \ -lmfhdf -ldf -ljpeg \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz all: all-am diff --git a/src/tools/other/madis2nc/Makefile.am b/src/tools/other/madis2nc/Makefile.am index 637923fb2b..6b1dba74fd 100644 --- a/src/tools/other/madis2nc/Makefile.am +++ b/src/tools/other/madis2nc/Makefile.am @@ -41,7 +41,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = madis2nc.h \ madis2nc_conf_info.h diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 249aa1a951..4b821f3bcf 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -348,7 +351,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = madis2nc.h \ madis2nc_conf_info.h diff --git a/src/tools/other/mode_graphics/Makefile.am b/src/tools/other/mode_graphics/Makefile.am index 907fbe5bc3..adda76d68a 100644 --- a/src/tools/other/mode_graphics/Makefile.am +++ b/src/tools/other/mode_graphics/Makefile.am @@ -42,7 +42,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_config \ -lvx_cal \ -lvx_math \ - -lcairo -lfreetype -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lcairo -lfreetype -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz # If we are in development mode, generate the "to_string" files and # clean them up in a "make clean". We don't want to do either of these diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index 4b40febd48..d08405212e 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -262,6 +262,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -369,7 +372,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_config \ -lvx_cal \ -lvx_math \ - -lcairo -lfreetype -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lcairo -lfreetype -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz all: all-am diff --git a/src/tools/other/mode_time_domain/Makefile.am b/src/tools/other/mode_time_domain/Makefile.am index 44cdb1d48c..2015d82293 100644 --- a/src/tools/other/mode_time_domain/Makefile.am +++ b/src/tools/other/mode_time_domain/Makefile.am @@ -69,7 +69,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz # If we are in development mode, generate the "to_string" files and # clean them up in a "make clean". We don't want to do either of these diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index c4ee18d0ff..0650adc52e 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -280,6 +280,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -416,7 +419,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz all: all-am diff --git a/src/tools/other/modis_regrid/Makefile.am b/src/tools/other/modis_regrid/Makefile.am index b68b30c9d6..326cdf5870 100644 --- a/src/tools/other/modis_regrid/Makefile.am +++ b/src/tools/other/modis_regrid/Makefile.am @@ -57,7 +57,8 @@ modis_regrid_LDADD = -lvx_pxm \ -lGctp \ -ljpeg \ -lz \ - -lm + -lm \ + -lproj EXTRA_DIST = cloudsat_swath_file.h \ data_averager.h \ diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index 6a03772b64..b72e0d8284 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -250,6 +250,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -373,7 +376,8 @@ modis_regrid_LDADD = -lvx_pxm \ -lGctp \ -ljpeg \ -lz \ - -lm + -lm \ + -lproj EXTRA_DIST = cloudsat_swath_file.h \ data_averager.h \ diff --git a/src/tools/other/pb2nc/Makefile.am b/src/tools/other/pb2nc/Makefile.am index 0066d07efd..144d4f5ba1 100644 --- a/src/tools/other/pb2nc/Makefile.am +++ b/src/tools/other/pb2nc/Makefile.am @@ -59,7 +59,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) EXTRA_DIST = readpb.prm \ diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index b712d9c386..8e07def80d 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -270,6 +270,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -390,7 +393,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) EXTRA_DIST = readpb.prm \ diff --git a/src/tools/other/plot_data_plane/Makefile.am b/src/tools/other/plot_data_plane/Makefile.am index 04fc834a49..24b7dbc16c 100644 --- a/src/tools/other/plot_data_plane/Makefile.am +++ b/src/tools/other/plot_data_plane/Makefile.am @@ -41,4 +41,4 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_math \ -lvx_cal \ -lvx_log \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lz -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index 029c2f0138..3e5e862ffa 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -241,6 +241,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -347,7 +350,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_math \ -lvx_cal \ -lvx_log \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lz -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/plot_point_obs/Makefile.am b/src/tools/other/plot_point_obs/Makefile.am index f86ab9ddfa..f34ef23a5a 100644 --- a/src/tools/other/plot_point_obs/Makefile.am +++ b/src/tools/other/plot_point_obs/Makefile.am @@ -46,7 +46,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = plot_point_obs.h \ plot_point_obs_conf_info.h diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index 979406f594..c1f721ef3f 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -354,7 +357,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = plot_point_obs.h \ plot_point_obs_conf_info.h diff --git a/src/tools/other/point2grid/Makefile.am b/src/tools/other/point2grid/Makefile.am index c97cb9d818..3f332a9d34 100644 --- a/src/tools/other/point2grid/Makefile.am +++ b/src/tools/other/point2grid/Makefile.am @@ -38,4 +38,4 @@ point2grid_LDADD = -lvx_statistics \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index 8390321194..4d31513f8a 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -254,6 +254,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -358,7 +361,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_cal \ -lvx_log \ $(PYTHON_LIBS) \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/regrid_data_plane/Makefile.am b/src/tools/other/regrid_data_plane/Makefile.am index 03de86948d..94cd352f65 100644 --- a/src/tools/other/regrid_data_plane/Makefile.am +++ b/src/tools/other/regrid_data_plane/Makefile.am @@ -36,4 +36,4 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index e241480a5a..83f8c1bdd1 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -343,7 +346,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/shift_data_plane/Makefile.am b/src/tools/other/shift_data_plane/Makefile.am index 03a7409d39..d97ea98b7f 100644 --- a/src/tools/other/shift_data_plane/Makefile.am +++ b/src/tools/other/shift_data_plane/Makefile.am @@ -36,4 +36,4 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index ffaacb9873..11b93c7f97 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -343,7 +346,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/wwmca_tool/Makefile.am b/src/tools/other/wwmca_tool/Makefile.am index fb710a0569..d8f2701165 100644 --- a/src/tools/other/wwmca_tool/Makefile.am +++ b/src/tools/other/wwmca_tool/Makefile.am @@ -58,7 +58,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas wwmca_plot_SOURCES = gridhemisphere_to_string.cc gridhemisphere_to_string.h \ wwmca_plot.cc \ @@ -103,7 +103,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas # If we are in development mode, generate the "to_string" files and # clean them up in a "make clean". We don't want to do either of these diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index a07ea1f228..13bbb9abdf 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -300,6 +300,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -422,7 +425,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas wwmca_plot_SOURCES = gridhemisphere_to_string.cc gridhemisphere_to_string.h \ wwmca_plot.cc \ @@ -468,7 +471,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/tc_utils/Makefile.in b/src/tools/tc_utils/Makefile.in index 63280f6d5e..2cd4549d0f 100644 --- a/src/tools/tc_utils/Makefile.in +++ b/src/tools/tc_utils/Makefile.in @@ -251,6 +251,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.am b/src/tools/tc_utils/rmw_analysis/Makefile.am index 0b7ffb72d0..cf27759681 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.am +++ b/src/tools/tc_utils/rmw_analysis/Makefile.am @@ -41,7 +41,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = rmw_analysis_conf_info.h \ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index 2578bfbdaf..409baa5a41 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -349,7 +352,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = rmw_analysis_conf_info.h \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.am b/src/tools/tc_utils/tc_diag/Makefile.am index 2bef023a98..a877795dca 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.am +++ b/src/tools/tc_utils/tc_diag/Makefile.am @@ -42,7 +42,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = tc_diag_conf_info.h \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.in b/src/tools/tc_utils/tc_diag/Makefile.in index 211748e267..67b37ca03f 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.in +++ b/src/tools/tc_utils/tc_diag/Makefile.in @@ -244,6 +244,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -352,7 +355,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = tc_diag_conf_info.h \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.am b/src/tools/tc_utils/tc_dland/Makefile.am index a4f59ac757..2321150cf8 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.am +++ b/src/tools/tc_utils/tc_dland/Makefile.am @@ -28,5 +28,5 @@ tc_dland_LDADD = -lvx_tc_util \ -lvx_gsl_prob \ -lvx_cal \ -lvx_math \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 95aa50cac1..c413bf9e16 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -253,6 +253,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -347,7 +350,7 @@ tc_dland_LDADD = -lvx_tc_util \ -lvx_gsl_prob \ -lvx_cal \ -lvx_math \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) all: all-am diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am index 82ebba80b3..61797a8c5d 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.am +++ b/src/tools/tc_utils/tc_gen/Makefile.am @@ -45,7 +45,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = tc_gen_conf_info.h \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index b36097a634..8490e3f8a5 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -242,6 +242,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -353,7 +356,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = tc_gen_conf_info.h \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.am b/src/tools/tc_utils/tc_pairs/Makefile.am index d037e64fa3..6ee78dcd75 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.am +++ b/src/tools/tc_utils/tc_pairs/Makefile.am @@ -45,7 +45,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = tc_pairs_conf_info.h \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index 857edee523..4c12ea4532 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -266,6 +266,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -377,7 +380,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = tc_pairs_conf_info.h \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.am b/src/tools/tc_utils/tc_rmw/Makefile.am index 8babe35490..ae3485a3eb 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.am +++ b/src/tools/tc_utils/tc_rmw/Makefile.am @@ -42,7 +42,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = tc_rmw_conf_info.h \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 2e1eef2ed7..0bb8949b79 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -244,6 +244,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -352,7 +355,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) EXTRA_DIST = tc_rmw_conf_info.h \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am index d2b4bec963..ffe30bc36c 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.am +++ b/src/tools/tc_utils/tc_stat/Makefile.am @@ -47,7 +47,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = tc_stat_conf_info.h \ tc_stat_files.h \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index f598129371..f6ab37bcc8 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -244,6 +244,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -357,7 +360,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ - -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = tc_stat_conf_info.h \ tc_stat_files.h \