Skip to content
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.

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

reviewing to update my fork #1

Merged
merged 191 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
10394ae
pre-commit
zmoon Nov 21, 2022
34475e4
Merge branch 'develop' of https://github.com/noaa-oar-arl/monetio int…
amcz Dec 2, 2022
b8b0bb0
hysplit.py removed makegrid method and replaced with call to
amcz Dec 3, 2022
a828785
hysplit.py modified reset_latlon_coords function so it will work with an
amcz Jan 12, 2023
ec1bac2
Always i8
zmoon Feb 14, 2023
2fe3f3c
Be specific
zmoon Feb 14, 2023
010e570
Merge pull request #101 from zmoon/pardump
zmoon Feb 24, 2023
5940aa1
hytraj.py added combine_dataset function to combine multiple tdump
amcz Feb 28, 2023
8b0200d
hysplit.py
amcz Mar 3, 2023
f2de74b
Merge branch 'develop' of https://github.com/noaa-oar-arl/monetio int…
amcz Mar 3, 2023
4c86d56
Merge branch 'develop' into hysplitdev
amcz Mar 6, 2023
704d4a6
fix ish_lite reader
bbakernoaa Apr 6, 2023
7a0e66e
flake8 changes
bbakernoaa Apr 6, 2023
fe528aa
Please the formatters
zmoon Apr 6, 2023
fdb3501
Add some initial tests for ISH-lite
zmoon Apr 6, 2023
4922b89
ISH-lite history file notes/tests
zmoon Apr 6, 2023
f76218e
Check only one subsetter arg is used for ISH-lite
zmoon Apr 6, 2023
c6e45b5
Able to override dates for ISH-lite history read
zmoon Apr 6, 2023
74cd0da
ISH-lite error if no data for selection
zmoon Apr 6, 2023
0f27de6
Update `ISH.add_data` docstring a bit
zmoon Apr 6, 2023
bc6515e
fix ish reader
bbakernoaa Apr 6, 2023
ccb3aa8
More tests of ISH-lite single site load
zmoon Apr 6, 2023
e886659
Ignore warning about stdlib cgi module removal
zmoon Apr 6, 2023
009dee5
notes [skip ci]
zmoon Apr 6, 2023
f98831f
format
zmoon Apr 6, 2023
9001dba
Pretty sure this is unused
zmoon Apr 6, 2023
5e16e31
Pass `window`
zmoon Apr 6, 2023
e3c1740
Possible to get whole history file
zmoon Apr 6, 2023
101cf22
ISH-lite build URLs cleanup
zmoon Apr 6, 2023
a69353c
ISH-lite resample
zmoon Apr 6, 2023
1294b9a
consistency [skip ci]
zmoon Apr 6, 2023
2eafb54
cleanup [skip ci]
zmoon Apr 6, 2023
afbdf6e
ISH-lite resample false by default
zmoon Apr 6, 2023
3bfc52a
Remove `ISH.read_data_frame`
zmoon Apr 6, 2023
c8de356
Merge pull request #105 from noaa-oar-arl/feature/fix_ish_lite
zmoon Apr 6, 2023
9603391
Merge remote-tracking branch 'noaa/develop' into feature/fix_ish
zmoon Apr 6, 2023
d737944
Remove some unused things in ISH-lite `ISH` class
zmoon Apr 6, 2023
5468465
consistency
zmoon Apr 6, 2023
11c4dea
WIP
zmoon Apr 6, 2023
b72a6b4
cleanup [skip ci]
zmoon Apr 6, 2023
a85dcb7
One site test for ISH
zmoon Apr 6, 2023
810012f
doc [skip ci]
zmoon Apr 6, 2023
be1e52c
Other ISH tests working like the ISH-lite ones
zmoon Apr 6, 2023
c70eb74
'country'
zmoon Apr 6, 2023
bd729f2
Don't pass URL to `np.genfromtxt()`
zmoon Apr 6, 2023
a7ecf1e
Consolidate var info in ISH
zmoon Apr 6, 2023
3ecb281
Allow reading single ISD URL directly
zmoon Apr 6, 2023
2de1b69
ISH test read URL direct
zmoon Apr 6, 2023
0ca9e60
Decode all bytes cols
zmoon Apr 6, 2023
faf076f
Decode option for direct URL read (WIP)
zmoon Apr 6, 2023
39f6b17
Always decode bytes
zmoon Apr 7, 2023
bdc1c37
Ignore pandas warning
zmoon Apr 7, 2023
fde4df1
Download option not working currently
zmoon Apr 7, 2023
00f6886
Fix download option
zmoon Apr 7, 2023
b82e614
Silence a pandas warning about future empty dtype
zmoon Apr 7, 2023
245fbed
ISH docstring work
zmoon Apr 7, 2023
8ca06c3
ISH resample notes
zmoon Apr 7, 2023
af3c746
cleanup
zmoon Apr 7, 2023
f08795e
Merge pull request #107 from noaa-oar-arl/feature/fix_ish
zmoon Apr 7, 2023
4f2efa3
Increment version
zmoon Apr 7, 2023
27d5b5b
Merge branch 'develop' of https://github.com/noaa-oar-arl/monetio int…
amcz Apr 12, 2023
a1f865f
Merge branch 'develop' into hysplitdev
amcz Apr 12, 2023
b94e40f
Merge pull request #108 from noaa-oar-arl/hysplitdev
amcz Apr 12, 2023
608828b
Add failing test for empty site
zmoon Apr 20, 2023
349e5a4
Decode bytes cols no fail if df empty
zmoon Apr 20, 2023
b2f1034
Don't try to resample if empty
zmoon Apr 20, 2023
78b37be
Keep all site meta cols and clean up the output df a bit
zmoon Apr 20, 2023
009d50f
pre-commit
zmoon Apr 20, 2023
ecf3926
Please flake8
zmoon Apr 20, 2023
a2c5dab
Fix hytraj test data loading
zmoon Apr 20, 2023
15b967e
ci: ub pandas (temporary)
zmoon Apr 20, 2023
52e9873
Merge pull request #110 from noaa-oar-arl/hysplitdev
zmoon Apr 20, 2023
eaedd1f
Merge remote-tracking branch 'noaa/develop' into fix/ish
zmoon Apr 20, 2023
8cbfaba
Ensure 1-d records array when constructing df
zmoon May 3, 2023
82d5565
Develop satellite (#29)
rrbuchholz May 4, 2023
592c423
ci: older attrs for py36
zmoon May 8, 2023
2738aae
Update ISH history file dupe WBAN/USAF checks
zmoon May 8, 2023
63199de
Merge pull request #115 from noaa-oar-arl/ci36
zmoon May 8, 2023
9707aed
Merge remote-tracking branch 'noaa/develop' into fix/ish
zmoon May 8, 2023
f766a51
test emptiness
zmoon May 8, 2023
8a3c4a1
notes
zmoon May 8, 2023
bde1db6
Test resample on empty ISH doesn't cause error
zmoon May 9, 2023
3927588
Merge pull request #109 from zmoon/fix/ish
zmoon May 9, 2023
c7a70f2
Different local time calc
zmoon May 22, 2023
3b50eaf
Convert units
zmoon May 22, 2023
d92ac1d
Update conversion factors
zmoon May 26, 2023
45e4899
Only find where once
zmoon May 26, 2023
1486417
In case we have some CH4 or NO
zmoon May 26, 2023
f423e27
format
zmoon May 30, 2023
2ca5fc2
please flake8
zmoon May 30, 2023
db5c69a
No top-level h5py import; some formatting
zmoon May 30, 2023
63186b5
build(deps): bump mamba-org/provision-with-micromamba from 15 to 16 (…
dependabot[bot] Jun 1, 2023
2bd4c9d
Apply codespell (with some line ignores)
zmoon Jun 1, 2023
bbb8cf6
Add codespell to CI
zmoon Jun 1, 2023
ac43f65
codespell for monetio dir
zmoon Jun 1, 2023
a50db77
codespell tests dir
zmoon Jun 1, 2023
90b1d33
Explicit codespell skip in CI
zmoon Jun 1, 2023
9ecdd8b
xfail AQS test if newer OpenSSL
zmoon Jun 5, 2023
956825e
Warn if getting OpenSSL version tup fails
zmoon Jun 5, 2023
ebdbe0a
Don't skip AQS in initial CI pytest run
zmoon Jun 5, 2023
b0bad85
More info in warning
zmoon Jun 5, 2023
ae89165
Update `openssl` after AQS test with downgraded
zmoon Jun 5, 2023
dc0a16e
Ensure openssl update runs always
zmoon Jun 5, 2023
d2c5fbb
Use OpenSSL version info tup
zmoon Jun 5, 2023
59251d4
Stricter xfail
zmoon Jun 5, 2023
85b0a00
Initial mop test
zmoon Jun 5, 2023
e0778ac
Test da extractor
zmoon Jun 5, 2023
c3b917c
better msg
zmoon Jun 5, 2023
793e923
Add h5py to dev env
zmoon Jun 5, 2023
4764db0
Fix cond
zmoon Jun 5, 2023
7c70fb1
Merge pull request #119 from zmoon/codespell
zmoon Jun 8, 2023
dad2e13
Merge pull request #121 from zmoon/aqs
zmoon Jun 8, 2023
1fe2125
Add initial test for OpenAQ
zmoon Jun 9, 2023
bb3da36
Skip OpenAQ test on Python 3.6
zmoon Jun 9, 2023
a245adb
Merge remote-tracking branch 'noaa/develop' into fix/openaq
zmoon Jun 9, 2023
77497d4
Merge pull request #116 from zmoon/fix/openaq
zmoon Jul 11, 2023
0529cc1
Add test warning messages about AirNow UTC offsets
zmoon Jul 11, 2023
f797db8
ub pyhdf for geoms reader (temporary)
zmoon Jul 11, 2023
fa4b376
Add failing test
zmoon Jul 11, 2023
307799b
Sort of fix
zmoon Jul 11, 2023
44b6fca
WIP
zmoon Jul 11, 2023
8280e23
Add options for dealing with bad UTC offsets
zmoon Jul 18, 2023
aa552a9
Initial fix options
zmoon Jul 18, 2023
3062f17
Speed up timezonefinder usage
zmoon Jul 18, 2023
33ed732
Daily doesn't have UTC offset
zmoon Jul 18, 2023
992fb79
Update single site lunar test site ID
zmoon Jul 19, 2023
5acbc95
Merge pull request #127 from zmoon/fix/aeronet-lunar-test
zmoon Jul 19, 2023
9ddd3e4
Merge remote-tracking branch 'noaa/develop' into airnow-uo
zmoon Jul 19, 2023
de5526c
To setup-micromamba
zmoon Aug 1, 2023
7508a02
3.10 for docs env
zmoon Aug 1, 2023
d0c9ddc
Separate AQS CI cases
zmoon Aug 1, 2023
868b08f
Clarify step names
zmoon Aug 1, 2023
d8806dc
bool syntax
zmoon Aug 1, 2023
d1bd95e
Better matrix case job names
zmoon Aug 1, 2023
0f3b40c
Shorter job names
zmoon Aug 3, 2023
961625a
Merge pull request #128 from zmoon/setup-micromamba
zmoon Aug 3, 2023
a04f468
Merge branch 'noaa-oar-arl:develop' into develop
rrbuchholz Aug 10, 2023
2df1d76
Update monetio/sat/_tropomi_l2_no2_mm.py
rrbuchholz Aug 10, 2023
0fda080
Update monetio/sat/_omps_l3_mm.py
rrbuchholz Aug 10, 2023
38fc2f1
Update monetio/sat/_omps_l3_mm.py
rrbuchholz Aug 10, 2023
9598318
Update monetio/sat/_mopitt_l3_mm.py
rrbuchholz Aug 10, 2023
eb82711
Update monetio/sat/_mopitt_l3_mm.py
rrbuchholz Aug 10, 2023
fece70d
Update monetio/sat/_mopitt_l3_mm.py
rrbuchholz Aug 10, 2023
07eaf82
Adding units and long_name
rrbuchholz Aug 10, 2023
f189ca7
Increment version
zmoon Aug 25, 2023
01e14d3
sp
zmoon Sep 6, 2023
f90380f
Style; fix file list/str
zmoon Sep 11, 2023
961554f
Test MOPITT `open_dataset` too
zmoon Sep 11, 2023
86f8b15
Let exceptions be raised; check `varname`
zmoon Sep 11, 2023
be7a9a7
File lock for MOPITT test file
zmoon Sep 11, 2023
1e0bfad
Add filelock to dev deps
zmoon Sep 11, 2023
e643eb2
Alternate lock method
zmoon Sep 11, 2023
d74f9f8
Revert somewhat
zmoon Sep 11, 2023
1dad97e
Custom user agent for Sphinx linkcheck
zmoon Sep 11, 2023
69bbfef
Specify openssl ver in env creation
zmoon Sep 11, 2023
820a760
Use same openssl v1 in the AQS CI envs
zmoon Sep 11, 2023
4769bca
Merge pull request #133 from zmoon/aqs-linkcheck
zmoon Sep 11, 2023
0877a44
Merge remote-tracking branch 'noaa/develop' into ncar-develop
zmoon Sep 11, 2023
6d2cb70
cleanup
zmoon Sep 11, 2023
90c5b5d
Multi-day test now passes
zmoon Sep 20, 2023
f7321b3
notes [skip ci]
zmoon Sep 20, 2023
ab44b37
-2 etc. also ok for joblib
zmoon Sep 20, 2023
1a95aa2
AQS xfail non strict
zmoon Sep 20, 2023
1c1a3da
Update monetio/obs/aeronet.py
zmoon Sep 25, 2023
ce5d939
Merge pull request #125 from zmoon/aeronet-parallel-dates
zmoon Sep 25, 2023
51bad18
`bad_utcoffset` in docstrings
zmoon Sep 25, 2023
cdfe7a9
Confirm longitude [-180, 180)
zmoon Sep 25, 2023
3bbbcc9
Add timezonefinder to dev env
zmoon Sep 25, 2023
7a3ef28
build(deps): bump actions/checkout from 3 to 4 (#135)
dependabot[bot] Oct 3, 2023
7b6b0c7
sp
zmoon Oct 3, 2023
1e3b9fe
Merge pull request #136 from zmoon/sp
zmoon Oct 3, 2023
179394b
Eliminate special AQS CI cases
zmoon Oct 3, 2023
cd4530f
Eliminate xfail for AQS test
zmoon Oct 3, 2023
1dcf228
Merge pull request #137 from zmoon/aqs
zmoon Oct 3, 2023
2c11fc7
Update monetio/obs/airnow.py
zmoon Oct 3, 2023
9a1f798
Merge pull request #126 from zmoon/airnow-uo
zmoon Oct 3, 2023
cd34a1b
updated get_traj method in hytraj.py so that parsing the date informa…
Oct 8, 2023
e8ba2e6
some linting on hytraj.py
Oct 9, 2023
c8f668d
Merge branch 'develop' into hysplitdev
Oct 9, 2023
b6bced6
Use yesterday instead of current date
zmoon Oct 26, 2023
0b7c45f
Merge pull request #142 from zmoon/fix
zmoon Oct 26, 2023
b163c7d
Update monetio/models/hytraj.py
zmoon Oct 26, 2023
205909b
Merge pull request #140 from noaa-oar-arl/hysplitdev
zmoon Oct 26, 2023
0468921
Add retries for Sphinx linkcheck
zmoon Oct 26, 2023
93f6dc6
Merge pull request #143 from zmoon/linkcheck-retry
zmoon Oct 26, 2023
0a0e630
Increment version
zmoon Oct 27, 2023
b170ec2
Mark OpenAQ S3 bucket test skipped
zmoon Nov 9, 2023
2f08f61
Merge pull request #148 from zmoon/skip-openaq
zmoon Nov 9, 2023
8ba9084
build(deps): bump actions/setup-python from 4 to 5
dependabot[bot] Jan 1, 2024
55c7902
Merge pull request #155 from noaa-oar-arl/dependabot/github_actions/d…
zmoon Jan 4, 2024
3655f4e
Merge branch 'noaa-oar-arl:develop' into develop
rrbuchholz Feb 22, 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
37 changes: 37 additions & 0 deletions .codespell-exclude
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<th>CAf</th>
<td>CAf</td>
"SIZ", "Size distribution"
"ALL", "All of the above retrievals (SIZ to FLUX) in one file"
hda = hysplit.combine_dataset([file1,file2], drange=[d1,d2])
print(hda)
metdata = ish_mod.ISH()
df = metdata.add_data(dates, country=None, box=area, resample=False)
"CNA",
d["CAf"] = add_multiple_lazy(d, newkeys, weights=neww)
d["CAf"] = d["CAf"].assign_attrs(
{"units": r"$\mu g m^{-3}$", "name": "CAf", "long_name": "Fine Mode particulate CA"}
"CAf": ["CAf"],
# value is tuple (filename, metdata)
Scrip file path for unstructured grid output
if "CAf" in var_list:
"PRES": "pres_pa_mid",
CMAQ model data including new CAf calculation
# allvars = Series(["TEMP", "Q", "PRES"])
# "p": dset["PRES"][:].compute().values
var_list.append("pres")
if var == "pres": # Insert special versions.
"SIZ",
df.loc[con, "variable"] = "Caf"
df.loc[con, "variable"] = "Laf"
["AZ", "CO", "ID", "KS", "MT", "NE", "NV", "NM", "ND", "SD", "UT", "WY"], dtype="|S12"
r = array(["AZ", "CO", "ID", "KS", "MT", "NE", "NV", "NM", "ND", "SD", "UT", "WY"])
ser = array(["Southeast" for i in se])
region = concatenate([ser, ner, ncr, scr, rr, pr])
"North Dakota": "ND",
fo = self.fs.open(f)
out = xr.open_dataset(fo, engine="h5netcdf")
"""Read SNPP OMPS Nadir Mapper Total Column Ozone L2 data from NASA GES DISC
a.prod = "SIZ"
df = aeronet.add_data(dates, inv_type="ALM15", product="SIZ")
df = aeronet.add_data(dates, inv_type="HYB15", product="SIZ")
# https://aeronet.gsfc.nasa.gov/cgi-bin/print_web_data_inv_v3?site=Cart_Site&year=2002&month=6&day=1&year2=2003&month2=6&day2=14&product=SIZ&AVG=20&ALM15=1&if_no_html=1
39 changes: 21 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
test:
name: Test
name: Test (Py ${{ matrix.python-version }})
runs-on: ubuntu-latest
if: github.repository == 'noaa-oar-arl/monetio'
strategy:
Expand All @@ -22,29 +22,35 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python (micromamba)
uses: mamba-org/provision-with-micromamba@v15
- name: Set up Python (micromamba) [>3.6]
if: matrix.python-version != '3.6'
uses: mamba-org/setup-micromamba@v1
with:
environment-file: environment-dev.yml
cache-environment: true
create-args: >-
python=${{ matrix.python-version }}

- name: Set up Python (micromamba) [3.6]
if: matrix.python-version == '3.6'
uses: mamba-org/setup-micromamba@v1
with:
environment-file: environment-dev.yml
cache-env: true
extra-specs: |
cache-environment: true
create-args: >-
python=${{ matrix.python-version }}
attrs=22.2.0

- name: Test with pytest
run: pytest -n auto -v -k 'not aqs'
run: pytest -n auto -v

- name: Test with pytspack installed
run: |
pip install https://github.com/noaa-oar-arl/pytspack/archive/master.zip
pytest -n auto -v -k with_pytspack

- name: Downgrade OpenSSL and test AQS
run: |
micromamba install 'openssl <3'
pytest -n auto -v -k aqs

docs:
name: Check docs build
runs-on: ubuntu-latest
Expand All @@ -54,16 +60,13 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python (micromamba)
uses: mamba-org/provision-with-micromamba@v15
uses: mamba-org/setup-micromamba@v1
with:
environment-file: docs/environment-docs.yml
cache-env: true

- name: Downgrade OpenSSL (for AQS URL linkcheck)
run: micromamba install 'openssl <3'
cache-environment: true

- name: linkcheck
run: sphinx-build -b linkcheck docs docs/_build/linkcheck
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'noaa-oar-arl/monetio'
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.9"
- uses: pre-commit/action@v3.0.0
Expand All @@ -24,7 +24,18 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'noaa-oar-arl/monetio'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: citation-file-format/cffconvert-github-action@2.0.0
with:
args: "--validate"

spell:
name: codespell
runs-on: ubuntu-latest
if: github.repository == 'noaa-oar-arl/monetio'
steps:
- uses: actions/checkout@v4
- uses: codespell-project/actions-codespell@v2
with:
exclude_file: .codespell-exclude
skip: "./monetio/data/aqs_qualifiers.csv,./monetio/data/cemsinfo.csv,./monetio/data/stations.tsv"
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
._.DS_Store

docs/api/

tests/data/MOP*.he5

# Default GitHub .gitignore for Python below:

Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ repos:
rev: "v4.4.0"
hooks:
- id: trailing-whitespace
exclude: tdump\.[0-9]*
- id: end-of-file-fixer
- id: check-docstring-first
- id: check-yaml
Expand Down
2 changes: 2 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = "sphinx"

linkcheck_retries = 3 # default is 1
linkcheck_ignore = [
"https://doi.org/10.1080/10473289.2005.10464718",
"https://www.camx.com",
]
user_agent = "Mozilla/5.0 (X11; Linux x86_64; rv:25.0) Gecko/20100101 Firefox/25.0"

# -- Extension configuration -------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- nodefaults
dependencies:
- python=3.9
- python=3.10
#
# core
- dask
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ Supported datasets
* `HYSPLIT <https://www.ready.noaa.gov/HYSPLIT.php/>`_
* `CMAQ <https://www.epa.gov/cmaq/>`_
* `CAMx <https://www.camx.com/about/>`_
* FV3-CHEM (comming soon)
* WRF-CHEM (comming soon)
* FV3-CHEM (coming soon)
* WRF-CHEM (coming soon)

**Supported Observations**

Expand Down
4 changes: 2 additions & 2 deletions docs/models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ The source dimension tags which source term the run used.
Attributes:
sample time hours: 1.0

To calcluate mass loading
To calculate mass loading

.. code-block:: python

Expand All @@ -260,7 +260,7 @@ To find top heights
massload = hypslit.hysp_hysp_heights(hxr, threshold=0, height_mult=1/1000.0, mult=1e10, mass_load=False)

returns xarray DataArray which gives top height of each level which contains mass loading higher
than the given threshold value. mult is a mutiplicative factor applied before thresholding.
than the given threshold value. mult is a multiplicative factor applied before thresholding.
height_mult is a multiplicative factor used to convert heights from meters to some other unit.
In this example heights are converted to km.
mass_load is a boolean which indicates whether the height should be determined from the mass loading value (True)
Expand Down
26 changes: 13 additions & 13 deletions docs/observations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ AirNow is the near realtime dataset for air composition and meteorology measurem

"The U.S. EPA AirNow program is the national repository of real time air quality data and forecasts for the United States. AirNow is the vehicle for providing timely Air Quality Index (AQI) information to the public, media outlets, other federal agencies and their applications, and to the research community. The system is managed by the U.S. EPA’s Office of Air Quality Planning and Standards Outreach and Information Division, Information Transfer Group in Research Triangle Park (RTP), North Carolina. AirNow is currently hosted and operated at a contractor facility, known as the AirNow Data Management Center (DMC), which currently resides outside of RTP." - https://www.airnow.gov/index.cfm?action=ani.airnowUS

AirNow_ data can be dowloaded from the Amazon S3 server and aggregated using the
AirNow_ data can be downloaded from the Amazon S3 server and aggregated using the
monet.obs.airnow class. For example,lets say that we want to look at data from
2018-05-01 to 2018-05-05.

Expand All @@ -46,7 +46,7 @@ This provides a structured :py:class:`~pandas.DataFrame`.

df.head()

Some users may want to keep a local copy of the data and not have to retrive the data
Some users may want to keep a local copy of the data and not have to retrieve the data
each time they want to access the data. There is a simple kwarg that can be used to
download the data, *download=True*. By default, *download* is set to False.

Expand Down Expand Up @@ -93,8 +93,8 @@ MONET is able to use the EPA AQS data that is collected and reported on an hourl
prepare reports for Congress as mandated by the Clean Air Act." - https://www.epa.gov/aqs

We will begin by loading hourly ozone concentrations from 2018. The EPA AQS data
is seperated into yearly files and seperate files for hourly and daily data. The
files are also seperated by which variable is measured. For instance, hourly ozone files
is separated into yearly files and separate files for hourly and daily data. The
files are also separated by which variable is measured. For instance, hourly ozone files
for the entire year of 2018 are found in https://aqs.epa.gov/aqsweb/airdata/hourly_44201_2018.zip.
We will first load a single variable and then add multiple later on.

Expand Down Expand Up @@ -146,13 +146,13 @@ Let's load variables PM10 and OZONE using hourly data to get an idea of how to g

df = aqs.add_data(dates, param=['OZONE','PM10'])

Loading Specfic Network
^^^^^^^^^^^^^^^^^^^^^^^
Loading Specific Network
^^^^^^^^^^^^^^^^^^^^^^^^

Sometimes you may want to load a specific network that is available in the AQS data
files. For instance, lets load data from the Chemical Speciation Network (CSN;
https://www.epa.gov/amtic/chemical-speciation-network-csn).
As of writting this tutorial we will load the 2017 data as it is complete.
As of writing this tutorial we will load the 2017 data as it is complete.

.. code:: python

Expand All @@ -176,7 +176,7 @@ AERONET

"The AERONET (AErosol RObotic NETwork) project is a federation of ground-based
remote sensing aerosol networks established by NASA and PHOTONS (PHOtométrie pour le Traitement Opérationnel de Normalisation Satellitaire; Univ. of Lille 1, CNES, and CNRS-INSU)
and is greatly expanded by networks (e.g., RIMA, AeroSpan, AEROCAN, and CARSNET) and collaborators from national agencies, institutes, universities, individual scientists, and partners. Fo more than 25 years, the project has provided long-term, continuous and readily accessible public domain database of aerosol optical, microphysical and radiative properties for aerosol research and characterization, validation of satellite retrievals, and synergism with other databases. The network imposes standardization of instruments, calibration, processing and distribution.
and is greatly expanded by networks (e.g., RIMA, AeroSpan, AEROCAN, and CARSNET) and collaborators from national agencies, institutes, universities, individual scientists, and partners. For more than 25 years, the project has provided long-term, continuous and readily accessible public domain database of aerosol optical, microphysical and radiative properties for aerosol research and characterization, validation of satellite retrievals, and synergism with other databases. The network imposes standardization of instruments, calibration, processing and distribution.

AERONET collaboration provides globally distributed observations of spectral aerosol optical depth (AOD), inversion products, and precipitable water in diverse aerosol regimes. Version 3 AOD data are computed for three data quality levels: Level 1.0 (unscreened), Level 1.5 (cloud-screened and quality controlled), and Level 2.0 (quality-assured). Inversions, precipitable water, and other AOD-dependent products are derived from these levels and may implement additional quality checks. " -https://aeronet.gsfc.nasa.gov

Expand Down Expand Up @@ -206,7 +206,7 @@ Available Measurements
:widths: 20, 20

"SIZ", "Size distribution"
"RIN", "Refractive indicies (real and imaginary)"
"RIN", "Refractive indices (real and imaginary)"
"CAD", "Coincident AOT data with almucantar retrieval"
"VOL", "Volume concentration, volume mean radius, effective radius and standard deviation"
"TAB", "AOT absorption"
Expand Down Expand Up @@ -277,7 +277,7 @@ NTN
"The NTN is the only network providing a long-term record of precipitation chemistry across the United States.

Sites predominantly are located away from urban areas and point sources of pollution. Each site has a precipitation
chemistry collector and gage. The automated collector ensures that the sample is exposed only during precipitation (wet-only-sampling)."
chemistry collector and gauge. The automated collector ensures that the sample is exposed only during precipitation (wet-only-sampling)."
- https://nadp.slh.wisc.edu/NTN/

Available Measurements
Expand All @@ -296,14 +296,14 @@ Available Measurements
MDN
^^^

"The MDN is the only network providing a longterm record of total mercury (Hg) concentration and deposition in precipitation in the United States and Canada. All MDN sites follow standard procedures and have uniform precipitation chemistry collectors and gages. The automated collector has the same basic design as the NTN collector but is modified to preserve mercury. Modifications include a glass funnel, connecting tube, bottle for collecting samples, and an insulated enclosure to house this sampling train. The funnel and connecting tube reduce sample exposure to the open atmosphere and limit loss of dissolved mercury. As an additional sample preservation measure, the collection bottle is charged with 20 mL of a one percent hydrochloric acid solution."
"The MDN is the only network providing a longterm record of total mercury (Hg) concentration and deposition in precipitation in the United States and Canada. All MDN sites follow standard procedures and have uniform precipitation chemistry collectors and gauges. The automated collector has the same basic design as the NTN collector but is modified to preserve mercury. Modifications include a glass funnel, connecting tube, bottle for collecting samples, and an insulated enclosure to house this sampling train. The funnel and connecting tube reduce sample exposure to the open atmosphere and limit loss of dissolved mercury. As an additional sample preservation measure, the collection bottle is charged with 20 mL of a one percent hydrochloric acid solution."
- https://nadp.slh.wisc.edu/MDN/

Available Measurements
======================

* net concentration of methyl mercury in ng/L (conc)
* precipitation amount (in inches) reported by the raingage for the entire sampling period. (raingage)
* precipitation amount (in inches) reported by the rain gauge for the entire sampling period. (rain gauge)
* Mg2+ (mg)
* Na+ (na)
* K+ (k)
Expand Down Expand Up @@ -364,7 +364,7 @@ To see what data is in the DataFrame simply output the column header values

.. code:: python

print(df.colums.values)
print(df.columns.values)

Available Measurements
^^^^^^^^^^^^^^^^^^^^^^
Expand Down
12 changes: 6 additions & 6 deletions docs/tutorial/CMAQ_hi_volcano.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ eruption. First, import MONET and several helper functions for later.
Now the data can be downloaded from the MONET github page in the
MONET/data directory. We will assume you already have this downloaded
and will proceed. Open the simulation. As of right now we still require
that a seperate grdcro2d (grddot2d) file be loaded for the mass points
that a separate grdcro2d (grddot2d) file be loaded for the mass points
(dot points) using the ``grid`` kwarg.

.. code:: python
Expand Down Expand Up @@ -138,7 +138,7 @@ aggrigate species in the concentration file.


Notice that this looks like the ncdump of the file except that there are
seperate coordinates including the latitude and longitude and the time
separate coordinates including the latitude and longitude and the time
as numpy.datetime64 objects. Also included is the proj4 string, a pyresample area grid
and default mapping tables to several different observational datasets.

Expand Down Expand Up @@ -195,7 +195,7 @@ will add a map using the MONETAccessor and use the ``robust=True`` kwarg.
Better but we can still do much more. There is low concentrations on
most of this map making it hard to notice the extremely high values and
the SO2 data is in ppmv and not ppbv as normally viewed as. Also, a
logscale may be better fo this type of data as it goes from 0-20000 ppbv
logscale may be better for this type of data as it goes from 0-20000 ppbv
rather than a linear scale.

.. code:: python
Expand All @@ -208,7 +208,7 @@ rather than a linear scale.
.. image:: CMAQ_hi_volcano_files/CMAQ_hi_volcano_11_3.png


Now let’s us view serveral time slices at once. We will average in time
Now let’s us view several time slices at once. We will average in time
(every 8 hours) to give us 6 total subplots.

.. code:: python
Expand Down Expand Up @@ -246,7 +246,7 @@ It is often useful to be able to pair model data with observational
data. MONET uses the pyresample library
(http://pyresample.readthedocs.io/en/latest/) to do a nearest neighbor
interpolation. First let us get the airnow data for the dates of the
simulation. We will also rotate it from the raw AirNow long format (stacked variables) to a wide format (each variable is a seperate column)
simulation. We will also rotate it from the raw AirNow long format (stacked variables) to a wide format (each variable is a separate column)


.. code:: python
Expand Down Expand Up @@ -288,7 +288,7 @@ new column (model).


Let’s look at the distributions to see if the two overlap to get a
general scence of performance.
general sense of performance.

.. code:: python

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorial/NESDIS_VIIRS_AOD.rst
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Notice that the dimensions changed from 1800x3600 to 720x1440.
Open Multiple Days
~~~~~~~~~~~~~~~~~~

If you want to open multiple days in a sinlge call you could use the
If you want to open multiple days in a single call you could use the
open\_mfdataset. Lets grab the first nine days of July 2018.

.. code-block:: python
Expand Down
4 changes: 2 additions & 2 deletions docs/tutorial/_models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ distinguish aerosols which these readers do not process well.

fv3grib2nc4.py like nemsio2nc4.py tool is a command line tool created to
convert the grib2 aerosol data to netcdf files. fv3grib2nc4.py will
create seperate files for each of the three layer types; '1 hybrid
create separate files for each of the three layer types; '1 hybrid
layer', 'entire atmosphere', and 'surface'. These are the three layers
that currently hold aerosol data. The tool is available at
https://github.com/bbakernoaa/fv3grib2nc4
Expand Down Expand Up @@ -150,7 +150,7 @@ MONETIO and FV3CHEM
Using MONET with FV3-Chem is much like using MONET with other model
outputs. It tries to recognize where the files came from (nemsio, grib2,
etc....) and then processes the data, renaming coordinates (lat lon to
latitude and longitude) and processing varaibles like geopotential
latitude and longitude) and processing variables like geopotential
height and pressure if available. First lets import ``monet`` and
``fv3chem`` from MONET

Expand Down
Loading