Skip to content

Commit

Permalink
Update main_v11.0-ref after 11.0.3 release (#2678) (#2679)
Browse files Browse the repository at this point in the history
Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: hsoh-u <hsoh@ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
Co-authored-by: Stephen Herbener <32968781+srherbener@users.noreply.github.com>
fix #2389 main_v11.0 flowchart (#2391)
fix definitions of G172 and G220 based on comments in NOAA-EMC/NCEPLIBS-w3emc#157. (#2405)
fix #2380 main_v11.0 override (#2381)
fix #2408 main_v11.0 empty config (#2409)
fix #2390 main_v11.0 fix compiling hdf5 with zlib and handle NetCDF-C zip (#2403)
fix #2415 main_v11.0 modulefiles (#2416)
fix #2412 main_v11.0 climo (#2420)
fix #2426 main_v11.0 buoy (#2432)
fix #2437 main_v11.0 convert (#2438)
fix for main_v11.0, for #2437, forgot one reference to the search_parent for a dictionary lookup.
fix 2428 python from env main v11.0 (#2443)
fix 2428 python csv input (#2450)
fix #2452 main_v11.0 airnow (#2453)
fix #2402 main_v11.0 sonarqube (First PR) (#2447)
fix #2449 main_v11.0 pdf (#2465)
fix 2428 python csv input (#2467)
fix #2514 main_v11.0 clang (#2556)
fix #2575 main_v11.0 python_convert (#2577)
fix 2596 main v11.0 rpath compilation (#2600)
fix 2596 main v11.0 rpath compilation (#2613)
fix #2644 main_v11.0 percentile (#2645)
  • Loading branch information
github-actions[bot] committed Sep 11, 2023
1 parent e7ff10f commit 42f672e
Show file tree
Hide file tree
Showing 30 changed files with 374 additions and 53 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Bug report
about: Fix something that's not working
title: 'Bugfix: '
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: bug'
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: bug'
assignees: ''

---
Expand Down Expand Up @@ -49,7 +49,7 @@ Describe the steps to reproduce the behavior:

### 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 PROJECT ASSIGNMENT** label
- [ ] Select **Repository** level **Project** for development toward the next official release or add **alert: NEED CYCLE ASSIGNMENT** label
- [ ] Select **Milestone** as the next bugfix version

## Define Related Issue(s) ##
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/enhancement_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Enhancement request
about: Improve something that it's currently doing
title: ''
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: enhancement'
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: enhancement'
assignees: ''

---
Expand Down Expand Up @@ -38,7 +38,7 @@ Consider breaking the enhancement down into sub-issues.
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
- [ ] 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**

## Define Related Issue(s) ##
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/new_feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: New feature request
about: Make it do something new
title: ''
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: new feature'
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: new feature'
assignees: ''

---
Expand Down Expand Up @@ -42,7 +42,7 @@ Consider breaking the new feature down into sub-issues.
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
- [ ] 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**

## Define Related Issue(s) ##
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/sub-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Sub-Issue
about: Break an issue down into smaller parts
title: ''
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: sub-issue'
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: sub-issue'
assignees: ''

---
Expand All @@ -28,5 +28,5 @@ This is a sub-issue of #*List the parent issue number here*.
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
- [ ] 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**
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/task.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Task
about: Describe something that needs to be done
title: ''
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: task'
labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: task'
assignees: ''

---
Expand Down Expand Up @@ -38,7 +38,7 @@ Consider breaking the task down into sub-issues.
- [ ] Select **requestor(s)**

### Projects and Milestone ###
- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
- [ ] 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**

## Define Related Issue(s) ##
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,25 @@ on:
- 'bugfix_**'
paths-ignore:
- 'docs/**'

- '.github/pull_request_template.md'
- '.github/ISSUE_TEMPLATE/**'
- '.github/labels/**'
- '**/README.md'
- '**/LICENSE.md'

pull_request:
types: [opened, reopened, synchronize]
branches:
- develop
- 'main_v**'
paths-ignore:
- 'docs/**'

- '.github/pull_request_template.md'
- '.github/ISSUE_TEMPLATE/**'
- '.github/labels/**'
- '**/README.md'
- '**/LICENSE.md'

workflow_dispatch:
inputs:
force_tests:
Expand Down
59 changes: 59 additions & 0 deletions .github/workflows/update_truth.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Update Truth Data

on:
workflow_dispatch:
inputs:
pull_requests:
description: 'Pull request(s) that warranted update, e.g. "#123" or "#123 and dtcenter/MET#123"'
required: true
change_summary:
description: 'Summary of changes to truth data'
required: true

jobs:
update_truth:
name: "Update or create truth reference branch"
runs-on: ubuntu-latest
steps:
- name: Check if branch is develop or main_vX.Y
run: |
branch_name=${GITHUB_REF#refs/heads/}
echo "branch_name=$branch_name" >> $GITHUB_ENV
if [[ $branch_name == "develop" ]] || \
[[ $branch_name =~ ^main_v[0-9]+\.[0-9]+$ ]]; then
echo Branch is valid - $branch_name
exit 0
fi
echo ERROR: Branch is $branch_name - must be develop or match main_vX.Y
exit 1
- uses: actions/checkout@v3
name: Checkout repository
with:
fetch-depth: 0
token: ${{ secrets.METPLUS_BOT_TOKEN }}
- name: Resolve conflicts between branch and branch-ref
run: |
branch_name=${{ env.branch_name }}
cd ${GITHUB_WORKSPACE}
if [[ -z "$(git ls-remote --heads origin ${branch_name}-ref)" ]]; then
echo ERROR: ${branch_name}-ref does not exist
exit 1
fi
echo ${branch_name}-ref does exist -- update it
git config --global user.name "metplus-bot"
git config --global user.email "97135045+metplus-bot@users.noreply.github.com"
echo git checkout ${branch_name}
git checkout ${branch_name}
echo git merge -s ours origin/${branch_name}-ref
git merge -s ours origin/${branch_name}-ref
echo git push origin ${branch_name}
git push origin ${branch_name}
- name: Create Pull Request
run: gh pr create --base $BASE --body "$BODY" --title "$TITLE"
env:
GH_TOKEN: ${{ github.token }}
BASE: ${{ env.branch_name }}-ref
BODY: ${{ github.event.inputs.change_summary }}<br/>Created by @${{ github.actor}}
TITLE: Update ${{ env.branch_name }}-ref after ${{ github.event.inputs.pull_requests }}
6 changes: 5 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ version: 2
#formats: all
formats: [pdf]

build:
os: ubuntu-22.04
tools:
python: "3.10"

# Optionally set the version of Python and requirements required to build your
# docs
python:
version: 3.7
install:
- requirements: docs/requirements.txt

Expand Down
16 changes: 16 additions & 0 deletions docs/Users_Guide/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,22 @@ enhancement, or new feature (`MET GitHub issues <https://github.com/dtcenter/MET
Important issues are listed **in bold** for emphasis.


MET Version 11.0.3 release notes (20230908)
-------------------------------------------

.. note::
Version 11.0.3 is the final planned bugfix release for MET version 11.0. Please upgrade to a
newer version for additional bugfixes and enhancements and see the METplus
`release support policy <https://metplus.readthedocs.io/en/latest/Release_Guide/index.html#release-support-policy>`_
for additional details.

* Bugfixes:

* Bugfix: Fix the Clang compilation of MET version 11.0 (`#2514 <https://github.com/dtcenter/MET/issues/2514>`_).
* Bugfix: Fix logic for Python embedding with data censoring and/or conversion (`#2575 <https://github.com/dtcenter/MET/issues/2575>`_).
* Bugfix: Fix reading of upside-down CF-compliant NetCDF Rotated Lat/Lon data (`#2578 <https://github.com/dtcenter/MET/issues/2578>`_).
* Bugfix: Fix logic for computing the 100-th percentile (`#2644 <https://github.com/dtcenter/MET/issues/2644>`_).

MET Version 11.0.2 release notes (20230331)
-------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/Users_Guide/stat-analysis.rst
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ The usage statement for the Stat-Analysis tool is shown below:
stat_analysis has two required arguments and accepts several optional ones.

In the usage statement for the Stat-Analysis tool, some additional terminology is introduced. In the Stat-Analysis tool, the term "job" refers to a set of tasks to be performed after applying user-specified options (i.e., "filters"). The filters are used to pare down a collection of output from the MET statistics tools to only those lines that are desired for the analysis. The job and its filters together comprise the "job command line". The "job command line" may be specified either on the command line to run a single analysis job or within the configuration file to run multiple analysis jobs at the same time. If jobs are specified in both the configuration file and the command line, only the jobs indicated in the configuration file will be run. The various jobs types are described in :numref:`table_WS_format_info_ISC` and the filtering options are described in :numref:`wavelet_stat-configuration-file`.
In the usage statement for the Stat-Analysis tool, some additional terminology is introduced. In the Stat-Analysis tool, the term "job" refers to a set of tasks to be performed after applying user-specified options (i.e., "filters"). The filters are used to pare down a collection of output from the MET statistics tools to only those lines that are desired for the analysis. The job and its filters together comprise the "job command line". The "job command line" may be specified either on the command line to run a single analysis job or within the configuration file to run multiple analysis jobs at the same time. If jobs are specified in both the configuration file and the command line, only the jobs indicated in the configuration file will be run. The various jobs types are described in :numref:`Des_components_STAT_analysis_tool` and the filtering options are described in :numref:`stat_analysis-configuration-file`.

Required arguments for stat_analysis
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
project = 'MET'
author = 'UCAR/NCAR, NOAA, CSU/CIRA, and CU/CIRES'
author_list = 'Opatz, J., T. Jensen, J. Prestopnik, H. Soh, L. Goodrich, B. Brown, R. Bullock, J. Halley Gotway, K. Newman'
version = '11.0.2'
version = '11.0.3'
verinfo = version
release = f'{version}'
release_year = '2023'

release_date = f'{release_year}-03-31'
release_date = f'{release_year}-09-08'
copyright = f'{release_year}, {author}'

# -- General configuration ---------------------------------------------------
Expand Down
28 changes: 25 additions & 3 deletions internal/scripts/installation/compile_MET_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ fi
COMPILER_FAMILY=` echo $COMPILER | cut -d'_' -f1`
COMPILER_VERSION=`echo $COMPILER | cut -d'_' -f2`
COMPILER_MAJOR_VERSION=`echo $COMPILER_VERSION | cut -d'.' -f1`
COMPILER_MINOR_VERSION=`echo $COMPILER_VERSION | cut -d'.' -f2`

echo
echo "USE_MODULES = ${USE_MODULES}"
Expand Down Expand Up @@ -314,6 +315,16 @@ echo "export F77=${F77}"
echo "export F90=${F90}"
echo

# Figure out what kind of OS is being used
unameOut="$(uname -s)"
case "${unameOut}" in
Linux*) machine=Linux;;
Darwin*) machine=Mac;;
CYGWIN*) machine=Cygwin;;
MINGW*) machine=MinGw;;
*) machine="UNKNOWN:${unameOut}"
esac

# Load Python module

if [ ${USE_MODULES} = "TRUE" ]; then
Expand Down Expand Up @@ -631,7 +642,7 @@ if [ $COMPILE_NETCDF -eq 1 ]; then
tar -xzf ${TAR_DIR}/hdf5*.tar.gz
cd hdf5*
echo "cd `pwd`"
echo "./configure --prefix=${LIB_DIR} --with-zlib=${LIB_Z} CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC LDFLAGS=-L${LIB_DIR}/lib CPPFLAGS=-I${LIB_DIR}/include > configure.log 2>&1"
echo "./configure --prefix=${LIB_DIR} --with-zlib=${LIB_Z} CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC LDFLAGS=-L${LIB_DIR}/lib:${LIB_Z} CPPFLAGS=-I${LIB_DIR}/include > configure.log 2>&1"
./configure --prefix=${LIB_DIR} --with-zlib=${LIB_Z} CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC LDFLAGS=-L${LIB_DIR}/lib:${LIB_Z} CPPFLAGS=-I${LIB_DIR}/include > configure.log 2>&1
ret=$?
if [ $ret != 0 ]; then
Expand Down Expand Up @@ -676,8 +687,13 @@ if [ $COMPILE_NETCDF -eq 1 ]; then
tar -xzf ${TAR_DIR}/netcdf-cxx*.tar.gz
cd netcdf-cxx*
echo "cd `pwd`"
echo "./configure --prefix=${LIB_DIR} LDFLAGS=-L${LIB_DIR}/lib CPPFLAGS=-I${LIB_DIR}/include > configure.log 2>&1"
./configure --prefix=${LIB_DIR} LDFLAGS=-L${LIB_DIR}/lib CPPFLAGS=-I${LIB_DIR}/include > configure.log 2>&1
if [[ $machine == "Mac" ]]; then
echo "./configure --prefix=${LIB_DIR} LDFLAGS=-L${LIB_DIR}/lib CPPFLAGS=-I${LIB_DIR}/include LIBS=\"${LIBS} -lhdf5_hl -lhdf5 -lz\"> configure.log 2>&1"
./configure --prefix=${LIB_DIR} LDFLAGS=-L${LIB_DIR}/lib CPPFLAGS=-I${LIB_DIR}/include LIBS="${LIBS} -lhdf5_hl -lhdf5 -lz"> configure.log 2>&1
else
echo "./configure --prefix=${LIB_DIR} LDFLAGS=-L${LIB_DIR}/lib CPPFLAGS=-I${LIB_DIR}/include > configure.log 2>&1"
./configure --prefix=${LIB_DIR} LDFLAGS=-L${LIB_DIR}/lib CPPFLAGS=-I${LIB_DIR}/include > configure.log 2>&1
fi
ret=$?
if [ $ret != 0 ]; then
echo "configure returned with non-zero ($ret) status"
Expand Down Expand Up @@ -837,6 +853,12 @@ if [ $COMPILE_MET -eq 1 ]; then
export MET_PYTHON_LD=${MET_PYTHON_LD}
export MET_PYTHON_CC=${MET_PYTHON_CC}
export LDFLAGS="-Wl,--disable-new-dtags"


if [[ $machine == "Mac" ]]; then
export LDFLAGS=""
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.
Expand Down
6 changes: 3 additions & 3 deletions internal/scripts/installation/config/install_met_env.hera
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module use -a /contrib/anaconda/modulefiles
module load intel/2022.1.2
module load anaconda/latest
export TEST_BASE=/contrib/met/11.0.0
export TEST_BASE=/contrib/met/11.0.1
export COMPILER=intel_2022.1.2
export MET_SUBDIR=${TEST_BASE}
export MET_TARBALL=v11.0.0.tar.gz
export MET_TARBALL=v11.0.1.tar.gz
export USE_MODULES=TRUE
export PYTHON_MODULE=anaconda_latest
export MET_PYTHON=/contrib/anaconda/anaconda3/latest/
export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.7m
export MET_PYTHON_LD=-L${MET_PYTHON}/lib/python3.7/config-3.7m-x86_64-linux-gnu\ -L${MET_PYTHON}/lib\ -lpython3.7m\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -Xlinker\ -export-dynamic
export SET_D64BIT=FALSE
export EXTERNAL_LIBS=/contrib/met/11.0.0/external_libs/
export EXTERNAL_LIBS=/contrib/met/11.0.1/external_libs/
#export MET_NETCDF=${EXTERNAL_LIBS}
export MET_GSL=${EXTERNAL_LIBS}
export MET_BUFRLIB=${EXTERNAL_LIBS}
Expand Down
6 changes: 3 additions & 3 deletions internal/scripts/installation/config/install_met_env.jet
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ module load intel/2022.1.2
module load netcdf/4.7.0
module load hdf5/1.10.5

export TEST_BASE=/contrib/met/11.0.0
export TEST_BASE=/contrib/met/11.0.1
export COMPILER=intel_18.0.5.274
export MET_SUBDIR=${TEST_BASE}
export MET_TARBALL=v11.0.0.tar.gz
export MET_TARBALL=v11.0.1.tar.gz
export USE_MODULES=TRUE
export MET_PYTHON=/mnt/lfs1/HFIP/dtc-hurr/METplus/miniconda/miniconda3/envs/metplus_v5.0_py3.8
export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.8
export MET_PYTHON_LD=-L${MET_PYTHON}/lib\ -L${MET_PYTHON}/lib/python3.8/config-3.8-x86_64-linux-gnu\ -lpython3.8\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -Xlinker\ -export-dynamic
export MET_NETCDF=/apps/netcdf/4.7.0/intel/18.0.5.274
export MET_HDF5=/apps/hdf5/1.10.5/intel/18.0.5.274
export EXTERNAL_LIBS=/contrib/met/11.0.0/external_libs/
export EXTERNAL_LIBS=/contrib/met/11.0.1/external_libs/
#export MET_GSL=${EXTERNAL_LIBS}
#export MET_BUFRLIB=${EXTERNAL_LIBS}
#export BUFRLIB_NAME=-lbufr
Expand Down
26 changes: 26 additions & 0 deletions internal/scripts/installation/config/install_met_env.narya
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
export TEST_BASE=/Volumes/d1/jpresto/projects/MET/MET_installation/11.0.2
export COMPILER=gnu_12.3.0
export MET_SUBDIR=${TEST_BASE}
export MET_TARBALL=v11.0.2.tar.gz
export USE_MODULES=FALSE
export MET_PYTHON=/opt/local
export MET_PYTHON_CC=-I${MET_PYTHON}/Library/Frameworks/Python.framework/Versions/3.10/include/python3.10
export MET_PYTHON_LD=`python3-config --ldflags --embed`
export SET_D64BIT=FALSE
export CFLAGS="-Wall -g"
export CXXFLAGS="-Wall -g"

# If you've already compiled these and don't need to compile them again, set the following;
# Otherwise, if you do need to install these libraries, comment out the variables below
export EXTERNAL_LIBS=${TEST_BASE}/external_libs
#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}
#export MET_HDF5=${EXTERNAL_LIBS}
#export MET_GSL=${EXTERNAL_LIBS}
#export LIB_JASPER=${EXTERNAL_LIBS}/lib
#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib
#export LIB_Z=${EXTERNAL_LIBS}/lib
6 changes: 3 additions & 3 deletions internal/scripts/installation/config/install_met_env.orion
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module load intel/2020.2

export TEST_BASE=/apps/contrib/MET/11.0.0
export TEST_BASE=/apps/contrib/MET/11.0.1
export COMPILER=intel_2020
export MET_SUBDIR=${TEST_BASE}/
export MET_TARBALL=v11.0.0.tar.gz
export MET_TARBALL=v11.0.1.tar.gz
export USE_MODULES=TRUE
export MET_PYTHON=/work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.0_py3.8
export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.8
export MET_PYTHON_LD=-L${MET_PYTHON}/lib/python3.8/config-3.8-x86_64-linux-gnu\ -L${MET_PYTHON}/lib\ -lpython3.8\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm
export EXTERNAL_LIBS=/apps/contrib/MET/11.0.0/external_libs
export EXTERNAL_LIBS=/apps/contrib/MET/11.0.1/external_libs
export LIB_Z=${EXTERNAL_LIBS}/lib
#export MET_GSL=${EXTERNAL_LIBS}
#export MET_BUFRLIB=${EXTERNAL_LIBS}
Expand Down
Loading

0 comments on commit 42f672e

Please sign in to comment.