Skip to content

Commit 60d9d8d

Browse files
authored
Merge pull request #344 from NCAR/dev
Dev
2 parents c421064 + 889fe7e commit 60d9d8d

7 files changed

+790
-424
lines changed

.github/workflows/ci.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
matrix:
2525
os: ['ubuntu-latest']
2626
# python-version: ['3.7', '3.8', '3.9']
27-
python-version: ['3.9']
27+
python-version: ['3.10', '3.11', '3.12']
2828
steps:
2929
- name: Cancel previous runs
3030
uses: styfle/[email protected]
3131
with:
3232
access_token: ${{ github.token }}
3333
- uses: actions/checkout@v3
34-
- uses: conda-incubator/setup-miniconda@v2
34+
- uses: conda-incubator/setup-miniconda@v3
3535
with:
3636
channels: conda-forge
3737
channel-priority: strict
@@ -62,7 +62,7 @@ jobs:
6262
upstream-dev:
6363
if: |
6464
github.repository == 'NCAR/ldcpy'
65-
name: upstream-dev-py39
65+
name: upstream-dev-py311
6666
runs-on: ubuntu-latest
6767
defaults:
6868
run:
@@ -74,14 +74,14 @@ jobs:
7474
with:
7575
access_token: ${{ github.token }}
7676
- uses: actions/checkout@v3
77-
- uses: conda-incubator/setup-miniconda@v2
77+
- uses: conda-incubator/setup-miniconda@v3
7878
with:
7979
channels: conda-forge
8080
channel-priority: strict
8181
mamba-version: '*'
8282
activate-environment: ldcpy # Defined in ci/environment.yml
8383
auto-update-conda: false
84-
python-version: 3.9
84+
python-version: 3.11
8585
environment-file: ci/upstream-dev-environment.yml
8686

8787
- name: Install ldcpy

docs/source/notebooks/WRFCompare.ipynb

+12-12
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
},
6666
{
6767
"cell_type": "code",
68-
"execution_count": 5,
68+
"execution_count": 3,
6969
"id": "532534c1-5acc-47c0-b605-68adf6f0c865",
7070
"metadata": {},
7171
"outputs": [],
@@ -76,7 +76,7 @@
7676
},
7777
{
7878
"cell_type": "code",
79-
"execution_count": 6,
79+
"execution_count": 4,
8080
"id": "5bac8639-aaa0-4532-83b9-84898a2bfb1f",
8181
"metadata": {},
8282
"outputs": [],
@@ -90,8 +90,8 @@
9090
"o_file2d = mydir + \"lossless/\" + file2d\n",
9191
"o_file3d = mydir + \"lossless/\" + file3d\n",
9292
"# look at a granular bit rounded file w/3 sig figs\n",
93-
"gbr_file2d = mydir + \"gbr3/\" + file2d\n",
94-
"gbr_file3d = mydir + \"gbr3/\" + file3d\n",
93+
"gbr_file2d = mydir + \"gbr_3/\" + file2d\n",
94+
"gbr_file3d = mydir + \"gbr_3/\" + file3d\n",
9595
"# look at a sperr file with pwe=1e-3\n",
9696
"sp_file2d = mydir + \"sperr_pwe1e-3/\" + file2d\n",
9797
"sp_file3d = mydir + \"sperr_pwe1e-3/\" + file3d\n",
@@ -102,7 +102,7 @@
102102
},
103103
{
104104
"cell_type": "code",
105-
"execution_count": 7,
105+
"execution_count": 5,
106106
"id": "2b64c4ea-e99f-429a-b867-c0071c360978",
107107
"metadata": {},
108108
"outputs": [],
@@ -120,7 +120,7 @@
120120
},
121121
{
122122
"cell_type": "code",
123-
"execution_count": 8,
123+
"execution_count": 6,
124124
"id": "36cd4aaa-b7c2-4033-9afa-2adeb2838c4e",
125125
"metadata": {},
126126
"outputs": [],
@@ -131,7 +131,7 @@
131131
},
132132
{
133133
"cell_type": "code",
134-
"execution_count": 9,
134+
"execution_count": 7,
135135
"id": "b94d32b0-d414-4e5d-9e10-649c4f5bf08a",
136136
"metadata": {},
137137
"outputs": [
@@ -149,13 +149,13 @@
149149
" * z (z) float32 200B 0.9969 0.9901 0.9821 ... 0.0161 0.009015 0.0028\n",
150150
" * z_stag (z_stag) float32 204B 1.0 0.9938 0.9864 ... 0.01243 0.0056 0.0\n",
151151
" * Time (Time) datetime64[ns] 8B 1979-10-01\n",
152+
" * y_stag (y_stag) float64 8kB -2.03e+06 -2.026e+06 ... 2.026e+06 2.03e+06\n",
152153
" * x (x) float64 11kB -2.732e+06 -2.728e+06 ... 2.728e+06 2.732e+06\n",
153154
" * y (y) float64 8kB -2.028e+06 -2.024e+06 ... 2.024e+06 2.028e+06\n",
154-
" * x_stag (x_stag) float64 11kB -2.734e+06 -2.73e+06 ... 2.73e+06 2.734e+06\n",
155-
" * y_stag (y_stag) float64 8kB -2.03e+06 -2.026e+06 ... 2.026e+06 2.03e+06"
155+
" * x_stag (x_stag) float64 11kB -2.734e+06 -2.73e+06 ... 2.73e+06 2.734e+06"
156156
]
157157
},
158-
"execution_count": 9,
158+
"execution_count": 7,
159159
"metadata": {},
160160
"output_type": "execute_result"
161161
}
@@ -167,7 +167,7 @@
167167
},
168168
{
169169
"cell_type": "code",
170-
"execution_count": 10,
170+
"execution_count": 8,
171171
"id": "1d24fa65-f62c-4a4f-b4c2-4d921a2c3f51",
172172
"metadata": {},
173173
"outputs": [],
@@ -185,7 +185,7 @@
185185
},
186186
{
187187
"cell_type": "code",
188-
"execution_count": 11,
188+
"execution_count": 9,
189189
"id": "06349874-c61a-4059-9bbb-9985ddee4f2d",
190190
"metadata": {},
191191
"outputs": [

0 commit comments

Comments
 (0)