Skip to content

Update build action for yaml parser #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rem1776 merged 2 commits into from
Jan 7, 2022
Merged

Update build action for yaml parser #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22616ad
Update build actions
Dec 15, 2021
5b466e0
Change images to organization's repo and fix mixed mode parser test f…
Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_cmake_gnu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
omp-flags: [ -DOPENMP=on, -DOPENMP=off ]
libyaml-flag: [ "", -DWITH_YAML=on ]
container:
image: noaagfdl/ubuntu_libfms_gnu:cmake-3.22.0
image: noaagfdl/ubuntu_libfms_gnu
env:
CMAKE_FLAGS: "${{ matrix.omp-flags }} ${{ matrix.libyaml-flag }} -D64BIT=on"
steps:
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/build_ubuntu_gnu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,26 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
distcheck-conf-flags: [--enable-openmp, --disable-openmp, --enable-mixed-mode, --disable-setting-flags]
fcflags: ["-I/usr/include", "-fdefault-real-8 -fdefault-double-8 -fcray-pointer -ffree-line-length-none -I/usr/include"]
exclude:
- distcheck-conf-flags: --disable-setting-flags
fcflags: -I/usr/include
- distcheck-conf-flags: --enable-mixed-mode
fcflags: "-fdefault-real-8 -fdefault-double-8 -fcray-pointer -ffree-line-length-none -I/usr/include"
distcheck-conf-flags: [--enable-openmp, --disable-openmp, --enable-mixed-mode, --disable-setting-flags ]
yaml-flag: [ --with-yaml, "" ]
container:
image: underwoo/ubuntu_libfms_gnu
image: noaagfdl/ubuntu_libfms_gnu
env:
FCFLAGS: "${{ matrix.fcflags }}"
FCFLAGS: "-I/usr/include"
VERBOSE: 1
DISTCHECK_CONFIGURE_FLAGS: "${{ matrix.distcheck-conf-flags }} ${{ matrix.yaml-flag }}"
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Prepare GNU autoconf for build
run: autoreconf -if
- name: Configure the build
run: ./configure ${{ matrix.distcheck-conf-flags }}
if: ${{ matrix.distcheck-conf-flags != '--disable-setting-flags' }}
run: ./configure ${DISTCHECK_CONFIGURE_FLAGS}
- name: Configure the build with compiler flags
if: ${{ matrix.distcheck-conf-flags == '--disable-setting-flags' }}
run: ./configure ${DISTCHECK_CONFIGURE_FLAGS}
env:
DISTCHECK_CONFIGURE_FLAGS: "${{ matrix.distcheck-conf-flags }}"
FCFLAGS: "-fdefault-real-8 -fdefault-double-8 -fcray-pointer -ffree-line-length-none -I/usr/include"
- name: Build the library
run: make -j distcheck
env:
DISTCHECK_CONFIGURE_FLAGS: "${{ matrix.distcheck-conf-flags }}"
2 changes: 1 addition & 1 deletion test_fms/parser/test_yaml_parser.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ program test_read_and_parse_file

!! Try get_value_from_key using a r8 buffer
call get_value_from_key(yaml_file_id1, variable_ids(1), "fill_value", r8_buffer)
if (r8_buffer .ne. real(-999.9, kind=r8_kind)) call mpp_error(FATAL, "fill_value was not read correctly as an r8!")
if (abs(r8_buffer - real(-999.9, kind=r8_kind)) .gt. 5e-5) call mpp_error(FATAL, "fill_value was not read correctly as an r8!")

!! Try the is_optional argument on an key that does not exist
string_buffer = ""
Expand Down