Update develop-ref after #1014 and #1020 (#1026)

Co-authored-by: George McCabe <mccabe@ucar.edu> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: johnhg <johnhg@ucar.edu> Co-authored-by: George McCabe <mccabe@dakota.rap.ucar.edu> Co-authored-by: Keith Searight <searight@ucar.edu> Co-authored-by: Hank Fisher <fisherh@kiowa.rap.ucar.edu> Co-authored-by: MET Tools Test Account <met_test@kiowa.rap.ucar.edu> Co-authored-by: Julie.Prestopnik <jpresto@ucar.edu> Co-authored-by: Lisa Goodrich <lisag@ucar.edu> Co-authored-by: jprestop <jpresto@ucar.edu> Co-authored-by: bikegeek <minnawin@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: Minna Win <minnawin@kiowa.rap.ucar.edu> Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu> Co-authored-by: Christina Kalb <kalb@ucar.edu> Co-authored-by: George McCabe <mccabe@cheyenne1.cheyenne.ucar.edu> Co-authored-by: George McCabe <mccabe@cheyenne5.cheyenne.ucar.edu> Co-authored-by: George McCabe <mccabe@cheyenne4.cheyenne.ucar.edu> Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com> Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu> Co-authored-by: mrinalbiswas <biswas@ucar.edu> Co-authored-by: Keith Searight <keith.searight@noaa.gov> Co-authored-by: Molly Smith <molly.b.smith@noaa.gov> Co-authored-by: Hank Fisher <fisherh@ucar.edu> Co-authored-by: Tatiana Burek <tatiana@ucar.edu> Co-authored-by: Venita Hagerty <38571614+venitahagerty@users.noreply.github.com> Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com> Co-authored-by: George McCabe <mccabe@seneca.rap.ucar.edu>
dtcenter · Jul 21, 2021 · 11d4398 · 11d4398
1 parent 62fe3c6
commit 11d4398
Show file tree

Hide file tree

Showing 174 changed files with 5,299 additions and 2,102 deletions.
diff --git a/.github/actions/run_tests/Dockerfile.gempak → ...b/actions/run_tests/Dockerfile.run_gempak b/.github/actions/run_tests/Dockerfile.gempak → ...b/actions/run_tests/Dockerfile.run_gempak
@@ -1,4 +1,4 @@
-ARG METPLUS_ENV_TAG=metplus_base
+ARG METPLUS_ENV_TAG=gempak
 ARG METPLUS_IMG_TAG=develop
 
 FROM dtcenter/metplus-envs:${METPLUS_ENV_TAG} as env

diff --git a/.github/actions/run_tests/Dockerfile.run_gfdl b/.github/actions/run_tests/Dockerfile.run_gfdl
@@ -0,0 +1,11 @@
+ARG METPLUS_ENV_TAG=gfdl-tracker
+ARG METPLUS_IMG_TAG=develop
+
+FROM dtcenter/metplus-envs:${METPLUS_ENV_TAG} as env
+
+ARG METPLUS_IMG_TAG=develop
+FROM dtcenter/metplus-dev:${METPLUS_IMG_TAG}
+
+COPY --from=env /usr/local/lib/libnetcdf.so.19* /usr/local/lib/
+COPY --from=env /usr/local/lib/libnetcdff* /usr/local/lib/
+COPY --from=env /standalone_gfdl-vortextracker_v3.9a_gcc/trk_exec/* /usr/local/bin/
diff --git a/.github/jobs/docker_setup.sh b/.github/jobs/docker_setup.sh
@@ -33,6 +33,12 @@ export DOCKERFILE_PATH=${GITHUB_WORKSPACE}/ci/docker/Dockerfile
 
 MET_TAG=`${GITHUB_WORKSPACE}/ci/docker/hooks/get_met_version`
 
+# if MET_FORCE_TAG variable is set and not empty, use that version instead
+if [ ! -z "$MET_FORCE_TAG" ]; then
+    MET_TAG=$MET_FORCE_TAG
+fi
+
+echo Using MET_TAG=$MET_TAG
 echo Setting DOCKER_BUILDKIT=1
 export DOCKER_BUILDKIT=1
 

diff --git a/.github/jobs/setup_and_run_use_cases.py b/.github/jobs/setup_and_run_use_cases.py
@@ -70,11 +70,12 @@ def main():
         else:
             env_tag = 'metplus_base'
 
-        # get Dockerfile to use (gempak if using gempak)
+        # get Dockerfile to use
+        dockerfile_name = 'Dockerfile.run'
         if 'gempak' in str(requirements).lower():
-            dockerfile_name = 'Dockerfile.gempak'
-        else:
-            dockerfile_name = 'Dockerfile.run'
+            dockerfile_name = f'{dockerfile_name}_gempak'
+        elif 'gfdl' in str(requirements).lower():
+            dockerfile_name = f'{dockerfile_name}_gfdl'
 
         docker_build_cmd = (
             f"docker build -t {run_tag} "
@@ -94,7 +95,7 @@ def main():
 
         end_time = time.time()
         print("TIMING: Command took "
-              f"{time.strftime('%H:%M', time.gmtime(end_time - start_time))}"
+              f"{time.strftime('%M:%S', time.gmtime(end_time - start_time))}"
               f" (MM:SS): '{docker_build_cmd}')")
 
         cmd_args = {'check': True,
@@ -136,7 +137,7 @@ def main():
 
         end_time = time.time()
         print("TIMING: Command took "
-              f"{time.strftime('%H:%M', time.gmtime(end_time - start_time))}"
+              f"{time.strftime('%M:%S', time.gmtime(end_time - start_time))}"
               f" (MM:SS): '{full_cmd}')")
 
     if not isOK:

diff --git a/.github/parm/test_settings.conf b/.github/parm/test_settings.conf
@@ -10,4 +10,7 @@ LOG_METPLUS = {LOG_DIR}/metplus.log
 LOG_TIMESTAMP_TEMPLATE =
 
 # also set path to GempakToCF.jar for GEMPAK use cases
-GEMPAKTOCF_JAR = /data/input/GempakToCF.jar
+GEMPAKTOCF_JAR = /data/input/GempakToCF.jar
+
+# also set location of GFDL Tracker executables
+GFDL_TRACKER_EXEC = /usr/local/bin
diff --git a/.github/parm/use_case_groups.json b/.github/parm/use_case_groups.json
@@ -1,7 +1,7 @@
 [
   {
     "category": "met_tool_wrapper",
-    "index_list": "0-54",
+    "index_list": "0-55",
     "new": false
   },
   {

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -53,6 +53,7 @@ jobs:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          #MET_FORCE_TAG: 10.0.0
   update_data_volumes:
     name: Docker Setup - Update Data Volumes
     runs-on: ubuntu-latest

diff --git a/ci/docker/docker_env/Dockerfile.gfdl-tracker b/ci/docker/docker_env/Dockerfile.gfdl-tracker
@@ -0,0 +1,35 @@
+FROM dtcenter/met:10.0.0
+
+# Needed to install GFDL Tracker
+ENV LIB_Z_PATH /usr/lib64
+ENV LIB_JASPER_PATH /usr/lib64
+ENV LIB_PNG_PATH /usr/lib64
+
+# Needed to install NetCDF-Fortran
+ENV NCDIR /usr/local
+
+# Install NetCDF-C 4.8.0
+RUN cd / \
+ && curl https://codeload.github.com/Unidata/netcdf-c/tar.gz/refs/tags/v4.8.0 --output v4.8.0.tar.gz \
+ && tar zxf v4.8.0.tar.gz \
+ && cd netcdf-c-4.8.0 \
+ && ./configure --disable-dap \
+ && make check install
+
+# Install NetCDF-Fortran 4.5.3
+RUN cd / \
+ && wget https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.5.3.tar.gz \
+ && tar zxf v4.5.3.tar.gz \
+ && cd netcdf-fortran-4.5.3 \
+ && ./configure \
+ && make check install
+
+RUN cd / \
+ && wget https://dtcenter.ucar.edu/dfiles/code/METplus/gfdl_patch/standalone_gfdl-vortextracker_v3.9a_gcc.tar.gz \
+ && tar zxf standalone_gfdl-vortextracker_v3.9a_gcc.tar.gz \
+ && cd standalone_gfdl-vortextracker_v3.9a_gcc \
+ && unset FC && unset CC \
+ && ./configure \
+ && mv configure.trk-docker-gnu configure.trk \
+ && ./compile 2>&1 | tee tracker.log
+
diff --git a/ci/docker/docker_env/Dockerfile.metplus_base b/ci/docker/docker_env/Dockerfile.metplus_base
@@ -3,9 +3,10 @@
 
 FROM conda/miniconda3-centos7
 
-# create conda environments
+WORKDIR /scripts
+COPY scripts/metplus_base_env.sh .
+
 RUN conda update -y -n base -c defaults conda \
- && conda create -y --name metplus_base python=3.6.8 \
- && conda install -y --name metplus_base -c conda-forge python-dateutil==2.8.1
+ && ./metplus_base_env.sh
 
 RUN conda list --name metplus_base > /usr/local/envs/metplus_base/environments.yml
diff --git a/ci/docker/docker_env/Dockerfile.py_embed_base b/ci/docker/docker_env/Dockerfile.py_embed_base
@@ -4,10 +4,10 @@
 
 FROM conda/miniconda3-centos7
 
-# create conda environments
+WORKDIR /scripts
+COPY scripts/py_embed_base_env.sh .
+
 RUN conda update -y -n base -c defaults conda \
- && conda create -y --name py_embed_base python=3.6.8 \
- && conda install -y --name py_embed_base -c conda-forge xarray==0.16.2 \
- && conda install -y --name py_embed_base -c conda-forge netcdf4==1.5.6
+ && ./py_embed_base_env.sh
 
 RUN conda list --name py_embed_base > /usr/local/envs/py_embed_base/environments.yml