Skip to content

Commit 5a4d84d

Browse files
montythindmontythind
authored
Merge pull request #117 from NCAR/main
Merge to Release
2 parents c36fff6 + 2b03db7 commit 5a4d84d

File tree

14 files changed

+213
-90
lines changed

14 files changed

+213
-90
lines changed

‎.github/workflows/mac.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Mac
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
gnu:
16+
runs-on: macos-latest
17+
continue-on-error: true
18+
strategy:
19+
matrix:
20+
gcc_version: [12, 13, 14]
21+
build_type: [Debug, Release]
22+
env:
23+
FC: gfortran-${{ matrix.gcc_version }}
24+
25+
steps:
26+
- uses: actions/checkout@v4
27+
28+
- name: Install dependencies
29+
run: brew install netcdf netcdf-fortran
30+
31+
- name: Run Cmake
32+
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
33+
34+
- name: Build
35+
run: cmake --build build --verbose
36+
37+
- name: Test
38+
run: ctest -C ${{ matrix.build_type }} --output-on-failure

‎.github/workflows/windows.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Windows
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
gnu:
16+
runs-on: windows-latest
17+
continue-on-error: true
18+
strategy:
19+
matrix:
20+
build_type: [Debug, Release]
21+
22+
steps:
23+
- name: Checkout code
24+
uses: actions/checkout@v4
25+
26+
- name: Setup MSYS2
27+
uses: msys2/setup-msys2@v2
28+
with:
29+
update: true
30+
install: >-
31+
base-devel
32+
mingw-w64-x86_64-toolchain
33+
mingw-w64-x86_64-gcc
34+
mingw-w64-x86_64-gcc-fortran
35+
mingw-w64-x86_64-cmake
36+
mingw-w64-x86_64-netcdf
37+
mingw-w64-x86_64-netcdf-fortran
38+
msystem: MINGW64
39+
40+
- name: Check package versions
41+
shell: msys2 {0}
42+
run: |
43+
cmake --version
44+
gcc --version
45+
g++ --version
46+
gfortran --version
47+
make --version
48+
pkg-config --version
49+
50+
- name: Configure with CMake
51+
shell: msys2 {0}
52+
run: |
53+
cmake -G "MinGW Makefiles" -S . -B build -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
54+
55+
- name: Build the project
56+
shell: msys2 {0}
57+
run: cmake --build build
58+
59+
- name: Run the tests
60+
working-directory: build
61+
shell: msys2 {0}
62+
run: ctest -C ${{ matrix.build_type }} --output-on-failure

‎CITATION.cff‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ authors:
1313
given-names: Jian
1414
- family-names: Walters
1515
given-names: Stacy
16-
title: "NCAR/tuv-x: Version 0.10.0"
17-
version: 0.10.0
16+
- family-names: Thind
17+
given-names: Montek
18+
title: "NCAR/tuv-x"
19+
version: 0.10.1
1820
doi: 10.5281/zenodo.7126039
1921
url: "https://github.com/NCAR/tuv-x"
2022
year: 2024

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.17)
55

66
project(
77
tuv-x
8-
VERSION 0.10.0
8+
VERSION 0.10.1
99
LANGUAGES Fortran CXX C
1010
)
1111

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Tropospheric ultraviolet-extended (TUV-x): A photolysis rate calculator
66

77
[![License](https://img.shields.io/github/license/NCAR/tuv-x.svg)](https://github.com/NCAR/tuv-x/blob/main/LICENSE)
88
[![Ubuntu](https://github.com/NCAR/tuv-x/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/NCAR/tuv-x/actions/workflows/ubuntu.yml)
9+
[![Mac](https://github.com/NCAR/tuv-x/actions/workflows/mac.yml/badge.svg)](https://github.com/NCAR/tuv-x/actions/workflows/mac.yml)
10+
[![Windows](https://github.com/NCAR/tuv-x/actions/workflows/windows.yml/badge.svg)](https://github.com/NCAR/tuv-x/actions/workflows/windows.yml)
911
[![Docker](https://github.com/NCAR/tuv-x/actions/workflows/docker.yml/badge.svg)](https://github.com/NCAR/tuv-x/actions/workflows/docker.yml)
1012
[![codecov](https://codecov.io/gh/NCAR/tuv-x/branch/main/graph/badge.svg?token=H46AAEAQF9)](https://codecov.io/gh/NCAR/tuv-x)
1113
[![DOI](https://zenodo.org/badge/396946468.svg)](https://zenodo.org/badge/latestdoi/396946468)

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
suffix = os.getenv("SWITCHER_SUFFIX", "")
2727

2828
# The full version, including alpha/beta/rc tags
29-
release = f'v0.10{suffix}'
29+
release = f'v0.10.1{suffix}'
3030

3131

3232
# -- General configuration ---------------------------------------------------

‎docs/switcher.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"name": "v0.10 (stable)",
3+
"name": "v0.10.1 (stable)",
44
"version": "stable",
55
"url": "https://ncar.github.io/tuv-x/versions/stable/"
66
},
@@ -28,10 +28,15 @@
2828
"name": "v0.9",
2929
"version": "0.9",
3030
"url": "https://ncar.github.io/tuv-x/versions/0.9/"
31-
}
31+
},
3232
{
3333
"name": "v0.10",
3434
"version": "0.10",
3535
"url": "https://ncar.github.io/tuv-x/versions/0.10/"
36+
},
37+
{
38+
"name": "v0.10.1",
39+
"version": "0.10.1",
40+
"url": "https://ncar.github.io/tuv-x/versions/0.10.1/"
3641
}
3742
]

‎examples/tuv_5_4.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
]
175175
},
176176
"photolysis": {
177-
"enable diagnostics" : true,
177+
"enable diagnostics" : false,
178178
"reactions": [
179179
{
180180
"name": "O2+hv->O+O",

‎examples/tuv_5_4.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ grids:
164164
- 12.0
165165
- 14.0
166166
photolysis:
167-
enable diagnostics: true
167+
enable diagnostics: false
168168
reactions:
169169
- cross section:
170170
apply O2 bands: true

‎src/photolysis_rates.F90‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,13 @@ subroutine get( this, la_srb, spherical_geometry, grid_warehouse, &
380380
if( allocated( quantum_yield ) ) deallocate( quantum_yield )
381381
end do rate_loop
382382

383-
call diagout( 'annotatedjlabels.new', this%handles_, &
384-
this%enable_diagnostics_ )
385-
call diagout( 'xsqy.'//file_tag//'.new', xsqyWrk, this%enable_diagnostics_ )
386-
383+
if (this%enable_diagnostics_) then
384+
associate( enable => this%enable_diagnostics_ )
385+
call diagout( 'annotatedjlabels.new', this%handles_, enable )
386+
call diagout( 'xsqy.'//file_tag//'.new', xsqyWrk, enable )
387+
end associate
388+
end if
389+
387390
deallocate( zGrid )
388391
deallocate( lambdaGrid )
389392
deallocate( etfl )

0 commit comments

Comments
 (0)