dtcenter · JohnHalleyGotway · Sep 5, 2023 · Aug 23, 2023 · Aug 24, 2023 · Aug 24, 2023
diff --git 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=v2.1
 input_data_version=develop
 truth_data_version=develop
 

diff --git 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: v2.1
 
       - name: Push Docker Image
         run: .github/jobs/push_docker_image.sh

diff --git a/INSTALL b/INSTALL
@@ -84,6 +84,11 @@ sub-directory, or the MET Online Tutorial:
   $MET_<lib>LIB pointing to the directory with the library files.  If
   $MET_<lib>INC and $MET_<lib>LIB are defined, then $MET_<lib> 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
@@ -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
@@ -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<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  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
@@ -4513,6 +4529,43 @@ $as_echo "$ac_cv_prog_c_openmp" >&6; }
 CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}"
 LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}"
 
+#
+# Look for the Proj 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_PROJLIB" && test -z "$MET_PROJINC") || \
+   (test -n "$MET_PROJINC" && test -z "$MET_PROJLIB"); then
+  if test -n "$MET_PROJLIB"; 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
+  else
+    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
+fi
+
+# If the individual locations weren't specified, then the main Proj directory
+# must be specified.  If it isn't, let the user know they need to supply one.
+
+if test -z "$MET_PROJLIB" && test -n "$MET_PROJ"; then
+   MET_PROJINC='${MET_PROJ}/include'
+   MET_PROJLIB='${MET_PROJ}/lib'
+fi
+
+# AC_SUBST command line variables.  If we get here, the Proj
+# libraries were found so no need to check
+
+if test -n "$MET_PROJLIB"; then
+   CPPFLAGS="${CPPFLAGS} -I${MET_PROJINC}"
+   LDFLAGS="${LDFLAGS} -L${MET_PROJLIB}"
+fi
+
 #
 # Look for the NetCDF library
 #
@@ -4542,33 +4595,6 @@ if test -z "$MET_NETCDFLIB" && test -n "$MET_NETCDF"; then
    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
-
 # AC_SUBST command line variables.  If we get here, the NetCDF
 # libraries were found so no need to check
 

diff --git a/configure.ac b/configure.ac
@@ -15,6 +15,43 @@ AC_OPENMP()
 CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}"
 LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}"
 
+#
+# Look for the Proj library
+#
+
+# Configure the variables.  The help text will appear if the user uses "configure --help".
+
+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_PROJLIB" && test -z "$MET_PROJINC") || \
+   (test -n "$MET_PROJINC" && test -z "$MET_PROJLIB"); then
+  if test -n "$MET_PROJLIB"; 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.])
+  else
+    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
+fi
+
+# If the individual locations weren't specified, then the main Proj directory
+# must be specified.  If it isn't, let the user know they need to supply one.
+
+if test -z "$MET_PROJLIB" && test -n "$MET_PROJ"; then
+   MET_PROJINC='${MET_PROJ}/include'
+   MET_PROJLIB='${MET_PROJ}/lib'
+fi
+
+# AC_SUBST command line variables.  If we get here, the Proj 
+# libraries were found so no need to check
+
+if test -n "$MET_PROJLIB"; then
+   CPPFLAGS="${CPPFLAGS} -I${MET_PROJINC}"
+   LDFLAGS="${LDFLAGS} -L${MET_PROJLIB}"
+fi
+
 #
 # Look for the NetCDF library
 #
@@ -44,34 +81,7 @@ if test -z "$MET_NETCDFLIB" && test -n "$MET_NETCDF"; then
    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
-
-# AC_SUBST command line variables.  If we get here, the NetCDF
+# AC_SUBST command line variables.  If we get here, the NetCDF 
 # libraries were found so no need to check
 
 if test -n "$MET_NETCDFLIB"; then

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -193,6 +193,8 @@ The $MET_<lib>INC and $MET_<lib>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/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=v2.1
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <[email protected]>

diff --git 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=v2.1
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <[email protected]>