Skip to content

Commit

Permalink
Merge branch 'develop' into as_docs2
Browse files Browse the repository at this point in the history
  • Loading branch information
AlysonStahl-NOAA authored Jul 18, 2024
2 parents a820806 + dfe6cf7 commit 66b4732
Show file tree
Hide file tree
Showing 8 changed files with 262 additions and 163 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/developer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ jobs:
path: ~/data
key: data-2

- name: Setup Pages
uses: actions/configure-pages@v4

- name: build
run: |
cd wgrib2
Expand Down Expand Up @@ -163,11 +160,7 @@ jobs:
wgrib2/build/*.html
wgrib2/build/*.css
#- name: Upload built documentation
# uses: actions/upload-pages-artifact@v1
# with:
# path: wgrib2/build/docs/html # Path to the built site files

#- name: Deploy
# uses: actions/deploy-pages@v1

- name: Upload built documentation
uses: actions/upload-pages-artifact@v1
with:
path: wgrib2/build/docs/html # Path to the built site files
105 changes: 105 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# This workflow builds the docs and uploads them to gh-pages branch
# for the wgrib2 project.
#
# Ed Hartnett
name: docs
on:
push:
branches:
- develop

# Cancel in-progress workflows when pushing to a branch
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
docs:
runs-on: ubuntu-latest
env:
FC: gfortran
CC: gcc

permissions:
id-token: write
pages: write

steps:

- name: install
run: |
sudo apt-get update
sudo apt-get install libnetcdf-dev libnetcdff-dev netcdf-bin pkg-config
sudo apt-get install libpng-dev autotools-dev libaec-dev autoconf gcovr doxygen
- name: cache-jasper
id: cache-jasper
uses: actions/cache@v4
with:
path: ~/jasper
key: jasper-${{ runner.os }}-1.900.1

- name: checkout-jasper
if: steps.cache-jasper.outputs.cache-hit != 'true'
uses: actions/checkout@v4
with:
repository: jasper-software/jasper
path: jasper
ref: version-1.900.1

- name: build-jasper
if: steps.cache-jasper.outputs.cache-hit != 'true'
run: |
cd jasper
./configure --prefix=$HOME/Jasper
make
make install
- name: checkout-ip
uses: actions/checkout@v4
with:
repository: NOAA-EMC/NCEPLIBS-ip
path: ip
ref: v5.0.0

- name: build-ip
run: |
cd ip
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=~/ip
make -j2
make install
- name: checkout
uses: actions/checkout@v4
with:
path: wgrib2

- name: cache-data
id: cache-data
uses: actions/cache@v4
with:
path: ~/data
key: data-2

- name: Setup Pages
uses: actions/configure-pages@v4

- name: build
run: |
cd wgrib2
mkdir build
cd build
cmake .. -DENABLE_DOCS=ON -DCMAKE_PREFIX_PATH="~/ip"
make VERBOSE=1
- name: Upload built documentation
uses: actions/upload-pages-artifact@v1
with:
path: wgrib2/build/docs/html # Path to the built site files

- name: Deploy
uses: actions/deploy-pages@v1


4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ option(USE_HDF5 "Use HDF5?" off)
option(USE_REGEX "Use Regex?" on)
option(USE_TIGGE "Use tigge?" on)
option(USE_MYSQL "Use MySQL?" off)
option(USE_IPOLATES "Use Ipolates" off)
option(USE_IPOLATES "Use Ipolates" on)
option(USE_UDF "Use UDF?" off)
option(USE_OPENMP "Use OpenMP?" on)
option(USE_PROJ4 "Use Proj4?" off)
Expand Down Expand Up @@ -94,7 +94,7 @@ endif()
message(STATUS "Checking if the user want to use NCEPLIBS-ip...")
if(USE_IPOLATES)
find_package(ip CONFIG REQUIRED)
list(APPEND definitions_list -DIPOLATES_LIB="ipolates_lib_4")
list(APPEND definitions_list -DIPOLATES_LIB="ipolates_lib_d")
list(APPEND definitions_list -DUSE_IPOLATES)
endif()

Expand Down
3 changes: 2 additions & 1 deletion docs/user_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

# Introduction

This document briefly describes wgrib2.
This document briefly describes wgrib2, which provides functionality
for interacting with, reading, writing, and manipulating GRIB2 files.

## Documentation for Previous Versions of wgrib2

Expand Down
140 changes: 70 additions & 70 deletions tests/data/ref_new_grid_earth_gdas.t12z.pgrb2.1p00.anl.75r.grib2.txt
Original file line number Diff line number Diff line change
@@ -1,84 +1,84 @@
1:0:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
1:0:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
2:8324:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:UGRD U-Component of Wind [m/s]:lvl1=(100,1) lvl2=(255,missing):0.01 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-43:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=-17
2:28844:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
3:16648:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:VGRD V-Component of Wind [m/s]:lvl1=(100,1) lvl2=(255,missing):0.01 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-67:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=-18
3:57688:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
4:24972:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:UGRD U-Component of Wind [m/s]:lvl1=(100,2) lvl2=(255,missing):0.02 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-28:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=-14
4:86532:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
5:33296:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:VGRD V-Component of Wind [m/s]:lvl1=(100,2) lvl2=(255,missing):0.02 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-58:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=-23
5:115376:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
6:41620:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:UGRD U-Component of Wind [m/s]:lvl1=(100,4) lvl2=(255,missing):0.04 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-6:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=1
6:144220:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
7:49944:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:VGRD V-Component of Wind [m/s]:lvl1=(100,4) lvl2=(255,missing):0.04 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-27:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=-16
7:173064:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
8:58268:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:UGRD U-Component of Wind [m/s]:lvl1=(100,7) lvl2=(255,missing):0.07 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-1:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=10
8:201908:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
9:66592:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:VGRD V-Component of Wind [m/s]:lvl1=(100,7) lvl2=(255,missing):0.07 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=6:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=-3
9:230752:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
10:74916:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:UGRD U-Component of Wind [m/s]:lvl1=(100,10) lvl2=(255,missing):0.1 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-10:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=8
10:259596:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
11:83240:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:VGRD V-Component of Wind [m/s]:lvl1=(100,10) lvl2=(255,missing):0.1 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=11:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=-1
11:288440:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
12:91564:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:UGRD U-Component of Wind [m/s]:lvl1=(100,20) lvl2=(255,missing):0.2 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-8:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=9
12:313189:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
13:99888:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:VGRD V-Component of Wind [m/s]:lvl1=(100,20) lvl2=(255,missing):0.2 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=14:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=8
13:337938:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
14:108212:grid_template=0:winds(N/S):
lat-lon grid:(360 x 181) units 1e-06 input WE:SN output WE:SN res 48
lat 0.000000 to 180.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=65160
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:UGRD U-Component of Wind [m/s]:lvl1=(100,40) lvl2=(255,missing):0.4 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=-3:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=-8
14:362687:grid_template=0:winds(grid):
lat-lon grid:(360 x 91) units 1e-06 input WE:SN output WE:SN res 56
lat 0.000000 to 90.000000 by 1.000000
lon 0.000000 to 359.000000 by 1.000000 #points=32760
basic_ang=0 sub_angle=1000000 units=0.000001
unscaled lat=0 to 180000000 lon=0 to 359000000
unscaled lat=0 to 90000000 lon=0 to 359000000:12Z26apr2024:VGRD V-Component of Wind [m/s]:lvl1=(100,40) lvl2=(255,missing):0.4 mb:anl::lon=10.000000,lat=12.000000,i=4331,ix=11,iy=13,val=15:lon=20.000000,lat=80.000000,i=28821,ix=21,iy=81,val=13
Loading

0 comments on commit 66b4732

Please sign in to comment.