Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
e974e8a
getPoci() returns np.nan incorrectly
wcarthur Apr 16, 2021
5365c17
track.ncReadTrackData returns true datetime objects
wcarthur Apr 22, 2021
f88ce28
GitHub actions (#111)
wcarthur Apr 22, 2021
ebf2473
Change build status badge to github actions
wcarthur Apr 22, 2021
0719a9f
Update DOI badge
wcarthur Apr 22, 2021
77fe6c6
Remove travis CI tests
wcarthur Apr 30, 2021
9ab8a26
Create tcrm-pylint.yml
wcarthur Apr 30, 2021
9edae9e
Update tcrm-pylint.yml
wcarthur Apr 30, 2021
46b38d4
Update tcrm-pylint.yml
wcarthur Apr 30, 2021
bef6838
Update tcrm-pylint.yml
wcarthur Apr 30, 2021
e3331af
Update tcrm-pylint.yml
wcarthur Apr 30, 2021
52e799c
Update tcrm-pylint.yml
wcarthur Apr 30, 2021
ed271db
Update tcrm-pylint.yml
wcarthur Apr 30, 2021
245d834
Update tcrm-pylint.yml
wcarthur Apr 30, 2021
ad20d46
Update tcrm-pylint.yml
wcarthur Apr 30, 2021
cc797b9
Update tcrm-tests.yml to include Python 3.9
wcarthur May 6, 2021
98d1492
Move definition statements to separate file
wcarthur May 7, 2021
96ab398
Merge branch 'develop' of github.com:GeoscienceAustralia/tcrm into de…
wcarthur May 7, 2021
c967de7
Move queries to separate file
wcarthur May 7, 2021
5d33126
Add readthedocs config file, update pylintrc
wcarthur Jul 9, 2021
b95ddc4
Validation (#115)
wcarthur Jul 9, 2021
5e8d138
Added an extra station
wcarthur Aug 20, 2021
d9ccb67
Additional locations
wcarthur Aug 26, 2021
501e4ba
Merge incoming changes
wcarthur Aug 26, 2021
f205f46
Nhirs 148 fix thread (#119)
mahmudulhasanGA Nov 3, 2021
091db2f
assertDictEqual doesn't like complex values (like arrays)
wcarthur Nov 8, 2021
9e82d3a
NHIRS-148: Fixed issue with FlushCache failing. (#121)
mahmudulhasanGA Nov 15, 2021
477c3a5
Enhancement/linear rmax (#125)
kieranricardo Jan 13, 2022
e40034a
adjust lam for storm direction
kieranricardo Jan 25, 2022
3d391a3
adjust lam for storm direction
kieranricardo Jan 25, 2022
3637dcf
adjust lam for storm direction
kieranricardo Jan 25, 2022
e7440d2
debug comment
kieranricardo Jan 26, 2022
90b29c5
update wind field model to get direction correct, and update document…
kieranricardo Jan 26, 2022
8ae25e5
add deleted lines back in
kieranricardo Jan 26, 2022
c5a1fac
add deleted lines back in
kieranricardo Jan 26, 2022
e7b15b3
Enhancement/linear rmax (#125)
kieranricardo Jan 13, 2022
12b7396
Merge branch 'develop' into bugfix/tests
wcarthur Jan 28, 2022
2d4a0c4
Update tcrm-tests.yml
wcarthur Jan 28, 2022
ba0761e
Change NumpyTestCase import statement
wcarthur Jan 28, 2022
82fb2c4
Merge branch 'bugfix/tests' of github.com:GeoscienceAustralia/tcrm in…
wcarthur Jan 28, 2022
6085be7
Tracing bug in cftime
wcarthur Feb 7, 2022
f703156
cftime bugs
wcarthur Feb 7, 2022
e248f4f
Force cartopy version in environment
wcarthur Feb 7, 2022
355d345
fix double calculation of t3 - it was previously L3 / (L2 * L2) inste…
kieranricardo Feb 15, 2022
03ed2da
extra debugging
kieranricardo Feb 16, 2022
b4223f3
extra debugging
kieranricardo Feb 16, 2022
1188c73
extra debugging
kieranricardo Feb 16, 2022
cca1310
extra debugging
kieranricardo Feb 16, 2022
3c4eee6
extra debugging
kieranricardo Feb 16, 2022
b788c37
Merge pull request #127 from GeoscienceAustralia/bugfix/tests
kieranricardo Feb 16, 2022
06e72dc
Merge branch 'develop' into bugfix/gevfit
kieranricardo Feb 16, 2022
84105f4
Merge branch 'develop' into bugfix/kerpert
kieranricardo Feb 16, 2022
f62886a
robust statistical test using scipy
kieranricardo Feb 16, 2022
2e22b2b
increase test precision so old incorrect fitting routine fails and ne…
kieranricardo Feb 16, 2022
cde392a
new test file
kieranricardo Feb 16, 2022
32e7b6b
add an xfail to flaky cftime failling tests
kieranricardo Feb 16, 2022
9ec9b9f
add an xfail to flaky cftime failling tests
kieranricardo Feb 16, 2022
1c1261a
Merge pull request #129 from GeoscienceAustralia/bugfix/gevfit
kieranricardo Feb 16, 2022
9f09324
Merge pull request #126 from GeoscienceAustralia/bugfix/kerpert
kieranricardo Feb 16, 2022
d6272de
Minor matplotlib updates
wcarthur Mar 7, 2022
6902a8c
faster fortran models
kieranricardo Mar 22, 2022
f296645
parallel fortran code
kieranricardo Mar 22, 2022
04a3358
parallel fortran code
kieranricardo Mar 23, 2022
e88c42e
parallel fortran code
kieranricardo Mar 23, 2022
9afd936
parallel fortran code
kieranricardo Mar 23, 2022
d0b46a4
slight optimizations
kieranricardo Mar 23, 2022
4ed9931
put velocity and vorticity equations in same loop
kieranricardo Mar 23, 2022
5be5b5c
mpi parallelism for one trackfile
kieranricardo Mar 23, 2022
df317ca
handle bad wind fields
Mar 23, 2022
3e8c5ca
tweaks
kieranricardo Mar 24, 2022
1d75810
Merge remote-tracking branch 'origin/fortran-kepert' into fortran-kepert
kieranricardo Mar 24, 2022
49f23ac
update kepert wind profile using python code with updated vmax
kieranricardo Mar 24, 2022
fd1e160
update build
kieranricardo Mar 25, 2022
2622e10
formatting
kieranricardo Mar 25, 2022
6bbe239
rename files and functions
kieranricardo Mar 25, 2022
b18e53d
doc strings
kieranricardo Mar 25, 2022
93cc3ca
only call Kepert wind field fortran code when a Holland pressure prof…
kieranricardo Mar 27, 2022
9344da8
Merge pull request #131 from GeoscienceAustralia/fortran-kepert
kieranricardo Mar 27, 2022
9463f6b
Working version of cartopy-based scalebar
wcarthur Mar 28, 2022
0463060
Pycxml compatability (#133)
kieranricardo Apr 4, 2022
c108d2f
gdal multi-threading for reprojection
Apr 7, 2022
d72eb4e
Merge pull request #134 from GeoscienceAustralia/ensemble-wm
kieranricardo Apr 26, 2022
7190030
Use expected DataProcess-InputFile
wcarthur Sep 29, 2022
f4fcf6c
Merge branch 'develop' of github.com:GeoscienceAustralia/tcrm into de…
wcarthur Sep 30, 2022
ecf9e1a
Create daily LTM MSLP file from ERA5
wcarthur Sep 30, 2022
70a575a
Low resolution wind multipliers (#136)
kieranricardo Nov 4, 2022
474b79a
Bugfix for ACF function (#139)
wcarthur Mar 5, 2023
e28b5fb
Update tcrm-pylint.yml
wcarthur Mar 5, 2023
34e4aca
Merge branch 'master' into develop
wcarthur Mar 5, 2023
2c07290
Change `Speed` to `WindSpeed` in track interpolation
wcarthur Jul 21, 2023
f000d38
Merge commit '2c07290b16dbff416e1f58cb86b96c886c9d221b' into develop
wcarthur Feb 12, 2024
8793053
Workflow fix 1 (#144)
wcarthur Feb 12, 2024
4ac1109
Merge branch 'develop' of github.com:GeoscienceAustralia/tcrm into de…
wcarthur Feb 12, 2024
7d1a144
Bump python version for pylint testing
wcarthur Feb 12, 2024
865421b
Basemap deprecation (#142)
wcarthur Feb 12, 2024
fb357e8
#145 replace shapefile with pyshp module (#146)
wcarthur Feb 14, 2024
234d801
Merge branch 'master' into develop
wcarthur Feb 14, 2024
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
17 changes: 9 additions & 8 deletions .github/workflows/tcrm-pylint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Pylint tests for TCRM
name: Pylint tests for TCRM

on:
on:
push:
branches: [ master, develop ]

Expand All @@ -12,17 +12,18 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up environment
uses: conda-incubator/setup-miniconda@v2.0.0
with:
python-version: 3.7
mamba-version: "*"
uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.9
miniforge-variant: Mambaforge
channels: conda-forge,defaults
channel-priority: true
activate-environment: tcrm
environment-file: tcrmenv.yml
auto-activate-base: false
use-only-tar-bz2: true



- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -32,7 +33,7 @@ jobs:
pylint --rcfile pylintrc --fail-under=7 `find -regextype egrep -regex '(.*.py)$'` |
tee pylint.txt
- name: Upload pylint.txt as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: pylint report
path: pylint.txt
11 changes: 6 additions & 5 deletions .github/workflows/tcrm-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,21 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ['3.9', '3.10']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up environment
uses: conda-incubator/setup-miniconda@v2.0.0
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-variant: MambaForge
python-version: ${{ matrix.python-version }}
mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
activate-environment: tcrm
environment-file: tcrmenv.yml
auto-activate-base: false
use-only-tar-bz2: true
use-only-tar-bz2: tru


- name: Test with pytest
env:
Expand Down
65 changes: 29 additions & 36 deletions Evaluate/evaluate.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@

from matplotlib import pyplot, cm
from matplotlib.dates import date2num
from mpl_toolkits.basemap import Basemap
from cartopy import crs as ccrs
from cartopy import feature as cfeature
from scipy.stats import scoreatpercentile as percentile
from datetime import datetime

Expand Down Expand Up @@ -76,7 +77,7 @@
[ProcessMultipliers]
MaxWorkingThreads = 4
ProcessMultiVersion = 2
ProcessingSegmentSize = 256
ProcessingSegmentSize = 256
WarpMemoryLimit = 500

[Logging]
Expand Down Expand Up @@ -169,57 +170,49 @@ def plotDensity(x, y, data, llLon=None, llLat=None, urLon=None, urLat=None,
else:
urcrnrlat = y.max()

meridians = np.arange(dl * np.floor(llcrnrlon / dl),
dl * np.ceil(urcrnrlon / dl), dl)
parallels = np.arange(dl * np.floor(llcrnrlat / dl),
dl * np.ceil(urcrnrlat / dl), dl)

m = Basemap(projection='cyl',
resolution=res,
llcrnrlon=llcrnrlon,
urcrnrlon=urcrnrlon,
llcrnrlat=llcrnrlat,
urcrnrlat=urcrnrlat)

# Set the colour map:
if hasattr(cm, cmap):
cmap = getattr(cm, cmap)
else:
cmap = colours.colourMap(cmap, 'stretched')

if maskocean:
try:
from mpl_toolkits.basemap import maskoceans
except ImportError:
log.debug("Maskoceans module unavailable, skipping this command")
else:
datam = maskoceans(xx, yy, data, inlands=False)
m.pcolormesh(xx, yy, datam, edgecolors='None',
vmin=datarange[0], vmax=datarange[1],
cmap=cmap)
else:
m.pcolormesh(xx, yy, data, edgecolors='None',
vmin=datarange[0], vmax=datarange[1],
cmap=cmap)
ax = pyplot.axes(projection=ccrs.PlateCarree())
pyplot.pcolormesh(xx, yy, data, edgecolors='None',
vmin=datarange[0], vmax=datarange[1],
cmap=cmap, transfom=ccrs.PlateCarree())

m.drawcoastlines(linewidth=0.5)
if maskland:
m.fillcontinents(color='white')
ax.add_feature(cfeature.LAND, zorder=100, edgecolor='k')

if maskocean:
ax.add_feature(cfeature.OCEAN, zorder=100, edgecolor='k')

ax.coastlines(linewidth=0.5)
gl = ax.gridlines(draw_labels=True, crs=ccrs.PlateCarree(), linewidth=0.2)
gl.top_labels = False
gl.right_labels = False

ax.set_extent([llcrnrlon, urcrnrlon,
llcrnrlat, urcrnrlat])

cb = pyplot.colorbar(shrink=0.5, aspect=30,
orientation='horizontal',
extend='max', pad=0.1)

if cb.orientation == 'horizontal':
for t in cb.ax.get_xticklabels():
t.set_fontsize(8)

m.drawparallels(parallels, labels=[1, 0, 0, 0],
fontsize=7.5, linewidth=0.2)
m.drawmeridians(meridians, labels=[0, 0, 0, 1],
fontsize=7.5, linewidth=0.2)
if clabel:
cb.set_label(clabel)
if ylab:
pyplot.ylabel(ylab, fontsize=7.5)
if xlab:
pyplot.xlabel(xlab, fontsize=7.5)
if title:
pyplot.title(title)

pyplot.grid(True)
pyplot.tick_params(direction='out', right='off', top='off')

cb = pyplot.colorbar(shrink=0.5, aspect=30,
orientation='horizontal',
extend='max', pad=0.1)
Expand Down
6 changes: 3 additions & 3 deletions Evaluate/interpolateTracks.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def interpolate(track, delta, interpolation_type=None):
track.Minute)]
else:
day_ = track.Datetime

timestep = timedelta(delta/24.)
try:
time_ = np.array([d.toordinal() + (d.hour + d.minute/60.)/24.0
Expand Down Expand Up @@ -104,7 +104,7 @@ def interpolate(track, delta, interpolation_type=None):
idx[0] = 1
# TODO: Possibly could change `np.mean(dt)` to `dt`?
track.WindSpeed = maxWindSpeed(idx, np.mean(dt), track.Longitude,
track.Latitude, track.CentralPressure,
track.Latitude, track.CentralPressure,
track.EnvPressure)
# Find the indices of valid pressure observations:
validIdx = np.where(track.CentralPressure < sys.maxsize)[0]
Expand Down Expand Up @@ -182,7 +182,7 @@ def interpolate(track, delta, interpolation_type=None):
kind='linear')(newtime[firsttime:lasttime])

_nwSpd = interp1d(timestep[validIdx],
track.Speed[validIdx],
track.WindSpeed[validIdx],
kind='linear')(newtime[firsttime:lasttime])

npCentre[firsttime:lasttime] = _npCentre
Expand Down
Loading