Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature_2769_tc_di…
Browse files Browse the repository at this point in the history
…ag_driver_v0.11.0
  • Loading branch information
JohnHalleyGotway committed Jan 24, 2024
2 parents 2588056 + 2367d9a commit 0027dee
Show file tree
Hide file tree
Showing 72 changed files with 1,094 additions and 774 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_docker_and_trigger_metplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Handle Docker Image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Get branch name
id: get_branch_name
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- uses: actions/github-script@v6
- uses: actions/github-script@v7
with:
github-token: ${{ secrets.METPLUS_BOT_TOKEN }}
script: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/compilation_options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set job controls
id: job_status
run: .github/jobs/set_job_controls.sh
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- '--enable-modis'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create directories to store output
run: mkdir -p ${RUNNER_WORKSPACE}/logs
Expand All @@ -76,7 +76,7 @@ jobs:

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
name: Build Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.8'
- name: Install dependencies
Expand All @@ -29,12 +29,12 @@ jobs:
python -m pip install -r docs/requirements.txt
- name: Build docs
run: ./.github/jobs/build_documentation.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: documentation
path: artifact/documentation
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: documentation_warnings.log
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set job controls
id: job_status
run: .github/jobs/set_job_controls.sh
Expand All @@ -76,7 +76,7 @@ jobs:
needs: job_control
if: ${{ needs.job_control.outputs.run_compile == 'true' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create directories to store output
run: mkdir -p ${RUNNER_WORKSPACE}/logs
Expand All @@ -103,7 +103,7 @@ jobs:

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
- 'pb2nc madis2nc pcp_combine'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Free disk space
run: .github/jobs/free_disk_space.sh
Expand All @@ -150,14 +150,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: unit_1a
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -175,7 +175,7 @@ jobs:
- 'met_test_scripts mode_multivar mode_graphics mtd regrid airnow gsi_tools netcdf modis series_analysis gen_ens_prod wwmca_regrid gen_vx_mask grid_weight interp_shape grid_diag grib_tables lidar2nc shift_data_plane trmm2nc aeronet wwmca_plot ioda2nc gaussian'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Free disk space
run: .github/jobs/free_disk_space.sh
Expand All @@ -188,14 +188,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: unit_1b
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -214,7 +214,7 @@ jobs:
- 'ref_config_lead_36'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Free disk space
run: .github/jobs/free_disk_space.sh
Expand All @@ -227,14 +227,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: unit_rc_leads
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -251,13 +251,13 @@ jobs:
- 'ref_config'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Free disk space
run: .github/jobs/free_disk_space.sh

- name: Download ref_config_leads output from artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: unit_rc_leads
path: ${{ runner.workspace }}/output
Expand All @@ -270,14 +270,14 @@ jobs:
INPUT_DATA_VERSION: 'none'

- name: Upload output as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: unit_rc
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -298,13 +298,13 @@ jobs:
- 'ugrid'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Free disk space
run: .github/jobs/free_disk_space.sh

- name: Download 1a output from artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: unit_1a
path: ${{ runner.workspace }}/output
Expand All @@ -317,14 +317,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: unit_2a
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -344,13 +344,13 @@ jobs:
- 'python point2grid plot_data_plane mode mode_analysis perc_thresh hira plot_point_obs quality_filter obs_summary duplicate_flag'
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Free disk space
run: .github/jobs/free_disk_space.sh

- name: Download 1a output from artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: unit_1a
path: ${{ runner.workspace }}/output
Expand All @@ -363,14 +363,14 @@ jobs:
INPUT_DATA_VERSION: ${{ needs.job_control.outputs.input_data_version }}-all

- name: Upload output as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: unit_2b
path: ${{ runner.workspace }}/output

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -383,14 +383,14 @@ jobs:
if: ${{ needs.job_control.outputs.run_diff == 'true' }}
steps:
- name: Download data from previous jobs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Copy test output into single directory
run: |
mkdir ${RUNNER_WORKSPACE}/output
cp -r unit_*/* ${RUNNER_WORKSPACE}/output/
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run Diff Tests in Docker
run: .github/jobs/run_diff_docker.sh
Expand All @@ -401,15 +401,15 @@ jobs:

- name: Upload diff files as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: diff
path: ${{ runner.workspace }}/diff
if-no-files-found: ignore

- name: Upload logs as artifact
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: ${{ runner.workspace }}/logs
Expand All @@ -421,13 +421,13 @@ jobs:
needs: [job_control, unit_1b, unit_2a, unit_2b, unit_rc]
if: ${{ needs.job_control.outputs.run_update_truth == 'true' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Free disk space
run: .github/jobs/free_disk_space.sh

- name: Download data from previous jobs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Copy test output into single directory
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_truth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fi
echo ERROR: Branch is $branch_name - must be develop or match main_vX.Y
exit 1
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: Checkout repository
with:
fetch-depth: 0
Expand Down
10 changes: 2 additions & 8 deletions docs/Contributors_Guide/dev_details/tmp_file_use.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,17 @@ those observations, and writes the result to a NetCDF output file.

PB2NC creates the following temporary files when running:

* :code:`tmp_pb2nc_blk_{PID}`, :code:`tmp_pb2nc_meta_blk_{PID}`,
:code:`tmp_pb2nc_tbl_blk_{PID}`
* :code:`tmp_pb2nc_blk_{PID}`

PB2NC assumes that each input binary file requires Fortran
blocking prior to being read by the BUFRLIB library. It applies
Fortran blocking, writes the result to this temporary file, and
uses BUFRLIB to read its contents.

* :code:`tmp_pb2nc_bufr_{PID}_tbl`: PB2NC extracts Bufr table data
* :code:`tmp_pb2nc_blk_{PID}_tbl`: PB2NC extracts Bufr table data
that is embedded in input files and writes it to this temporary
file for later use.

.. note::
The first 3 files listed above are identical. They are all
Fortran-blocked versions of the same input file. Recommend
modifying the logic to only apply Fortran blocking once.

.. _tmp_files_point2grid:

Point2Grid Tool
Expand Down
Binary file added docs/Users_Guide/figure/installation_dir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0027dee

Please sign in to comment.