GUVI #107

landsito · 2022-04-06T18:35:13Z

Description

Addresses # (issue)

Adding support for TIMED-GUVI L1C disk data (v13) into pysatNASA.

Type of change

Please delete options that are not relevant.

New feature (non-breaking change which adds functionality)

How Has This Been Tested?

Simple local script indicated in comments:

import pysat
from datetime import datetime
guvi = pysat.Instrument(platform='timed', name='guvi')
guvi.download(start=datetime(2005, 6, 20), stop=datetime(2005, 6, 21))
guvi.load(yr=2005,doy=171)

Test Configuration

Operating system: [Os Type]
Version number: [Python 3.9]

Checklist:

Make sure you are merging into the develop (not main) branch
My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation

rstoneback

Thanks Luis! I have a round of comments, some on style, and some on the loaded data format in xarray.

pysatNASA/instruments/timed_guvi.py

pysatNASA/instruments/methods/cdaweb.py

pysatNASA/instruments/timed_guvi.py

rstoneback · 2022-04-06T22:18:32Z

Friendly note that the formatting notes point to specific examples but are intended to apply throughout the file.

landsito · 2022-04-07T09:18:39Z

I have included time variables according to pysat standards. timeDayAur is left as a secondary index in case of future need to use it. Geographic coordinates, altitude and solar zenith angle were also added as coordinates into the output dataset. The pytest routines successfully passed from my side. Finally, I checked the pep8 standard on this script.

aburrell

More comment, mostly about style. Looks like you got to at least some of the files between the times I started and ended the review, so some of these may be outdated.

pysatNASA/instruments/__init__.py

pysatNASA/instruments/methods/cdaweb.py

pysatNASA/instruments/timed_guvi.py

aburrell · 2022-04-07T15:56:17Z

Also, an entry in the "supported_instruments" documentation file needs to be added.

landsito · 2022-04-07T17:47:10Z

I just added a few style considerations recommended before. Thanks.

landsito · 2022-04-07T18:24:42Z

Checked style code with flake8 and autopep8.

pysatNASA/instruments/timed_guvi.py

landsito · 2022-04-07T19:11:19Z

Added this instrument into 'supported instruments' section.

aburrell

The doc tags were in the wrong order. Also, some style updates weren't made across the entire file.

docs/supported_instruments.rst

pysatNASA/instruments/timed_guvi.py

aburrell · 2022-04-07T20:07:42Z

Looks like there's some bugs in the download and remote file listing functions. Feel free to poke me if you need help debugging or need the CI tests to run again.

aburrell

Suggestions for your work in progress.

pysatNASA/instruments/timed_guvi.py

jklenzing

Thanks @landsito! The tests are running locally for me. The CI server is hanging on some formatting issues. I've added some comments that should fix those (though they may different in the upstream branch).

You can check these locally by running

flake8 . --count --select=D,E,F,H,W --show-source --statistics

jklenzing · 2022-11-08T19:45:52Z

pysatNASA/instruments/timed_guvi.py

+tags_fmt = {tag: fname.format(res= "-2" if 'low' in tag.split('_')[1] else "",
+                               mode=tag.split("_")[0].upper())
+                               for tag in tags.keys()}


Suggested change

tags_fmt = {tag: fname.format(res= "-2" if 'low' in tag.split('_')[1] else "",

mode=tag.split("_")[0].upper())

for tag in tags.keys()}

tags_fmt = {tag: fname.format(res="-2" if 'low' in tag.split('_')[1] else "",

mode=tag.split("_")[0].upper())

for tag in tags.keys()}

jklenzing · 2022-11-08T19:46:33Z

pysatNASA/instruments/timed_guvi.py

+tags_url = {tag: url.format(mode='imaging') if 'img' in tag else
+             url.format(mode='spectrograph') for tag in tags.keys()}


Suggested change

tags_url = {tag: url.format(mode='imaging') if 'img' in tag else

url.format(mode='spectrograph') for tag in tags.keys()}

tags_url = {tag: url.format(mode='imaging') if 'img' in tag else

url.format(mode='spectrograph') for tag in tags.keys()}

jklenzing · 2022-11-08T19:47:30Z

pysatNASA/instruments/timed_guvi.py

+            inners = {dim : xr.concat([inners[dim], jnners[dim]], dim=dim)
+                      for dim in dims }


Suggested change

inners = {dim : xr.concat([inners[dim], jnners[dim]], dim=dim)

for dim in dims }

inners = {dim: xr.concat([inners[dim], jnners[dim]], dim=dim)

for dim in dims}

jklenzing · 2022-11-08T19:48:14Z

pysatNASA/instruments/timed_guvi.py

+        data = data.drop_vars(["YEAR_GAIM_DAY", "DOY_GAIM_DAY", 
+                               "TIME_GAIM_DAY", "TIME_GAIM_NIGHT",
+                               "YEAR_GAIM_NIGHT", "DOY_GAIM_NIGHT"])


Suggested change

data = data.drop_vars(["YEAR_GAIM_DAY", "DOY_GAIM_DAY",

"TIME_GAIM_DAY", "TIME_GAIM_NIGHT",

"YEAR_GAIM_NIGHT", "DOY_GAIM_NIGHT"])

data = data.drop_vars(["YEAR_GAIM_DAY", "DOY_GAIM_DAY",

"TIME_GAIM_DAY", "TIME_GAIM_NIGHT",

"YEAR_GAIM_NIGHT", "DOY_GAIM_NIGHT"])

jklenzing · 2022-11-08T19:49:26Z

pysatNASA/instruments/timed_guvi.py

+    data = data.assign(time_day=xr.DataArray(day_dts, dims=('nAlongDay')),
+                       time=night_dts)
+    if 'img' in tag:
+        dt_aur=xr.DataArray(aur_dts, dims=('nAlongDayAur'))


Suggested change

dt_aur=xr.DataArray(aur_dts, dims=('nAlongDayAur'))

dt_aur = xr.DataArray(aur_dts, dims=('nAlongDayAur'))

jklenzing · 2022-11-08T19:49:55Z

pysatNASA/instruments/timed_guvi.py

+                  "nCrossDayAur": data.nCrossDayAur.data}
+    elif 'spect' in tag:
+        coords = {"nchan": ["121.6nm", "130.4nm", "135.6nm",
+                            "LBHshort", "LBHlong","?"]}


Suggested change

"LBHshort", "LBHlong","?"]}

"LBHshort", "LBHlong", "?"]}

jklenzing · 2022-11-08T19:50:10Z

pysatNASA/instruments/timed_guvi.py

+
+    # Sort
+    data = data.sortby("time")
+


Suggested change

jklenzing · 2022-11-08T19:51:14Z

pysatNASA/instruments/timed_guvi.py

+# Instrument test attributes
+
+_test_dates = {'': {tag: dt.datetime(2005, 6, 28) for tag in tags.keys()}}
+


Suggested change

jklenzing · 2022-11-08T19:56:08Z

pysatNASA/instruments/timed_guvi.py

+    data = data.swap_dims({"nAlongNight": "time"})
+
+    # Update time variables
+    # 'time_night' will be renamed as 'time' to follow pysat standard 


Suggested change

# 'time_night' will be renamed as 'time' to follow pysat standard

# 'time_night' will be renamed as 'time' to follow pysat standard

rstoneback reviewed Apr 6, 2022

View reviewed changes

aburrell reviewed Apr 7, 2022

View reviewed changes

pysatNASA/instruments/timed_guvi.py Outdated Show resolved Hide resolved

aburrell reviewed Apr 7, 2022

View reviewed changes

docs/supported_instruments.rst Outdated Show resolved Hide resolved

pysatNASA/instruments/timed_guvi.py Outdated Show resolved Hide resolved

aburrell reviewed Apr 18, 2022

View reviewed changes

jklenzing reviewed Nov 9, 2022

View reviewed changes

landsito closed this Nov 12, 2022

landsito force-pushed the guvi branch from 18173ab to f45c3a6 Compare November 12, 2022 07:45

landsito deleted the guvi branch November 12, 2022 07:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GUVI #107

GUVI #107

landsito commented Apr 6, 2022 •

edited by aburrell

rstoneback left a comment

rstoneback commented Apr 6, 2022

landsito commented Apr 7, 2022 •

edited

aburrell left a comment

aburrell commented Apr 7, 2022

landsito commented Apr 7, 2022

landsito commented Apr 7, 2022

landsito commented Apr 7, 2022

aburrell left a comment

aburrell commented Apr 7, 2022

aburrell left a comment

jklenzing left a comment

jklenzing Nov 8, 2022

jklenzing Nov 8, 2022

jklenzing Nov 8, 2022

jklenzing Nov 8, 2022

jklenzing Nov 8, 2022

jklenzing Nov 8, 2022

jklenzing Nov 8, 2022

jklenzing Nov 8, 2022

jklenzing Nov 8, 2022

		tags_url = {tag: url.format(mode='imaging') if 'img' in tag else
		url.format(mode='spectrograph') for tag in tags.keys()}

		inners = {dim : xr.concat([inners[dim], jnners[dim]], dim=dim)
		for dim in dims }

	dt_aur=xr.DataArray(aur_dts, dims=('nAlongDayAur'))
	dt_aur = xr.DataArray(aur_dts, dims=('nAlongDayAur'))

		# Instrument test attributes

		_test_dates = {'': {tag: dt.datetime(2005, 6, 28) for tag in tags.keys()}}

	# 'time_night' will be renamed as 'time' to follow pysat standard
	# 'time_night' will be renamed as 'time' to follow pysat standard

GUVI #107

GUVI #107

Conversation

landsito commented Apr 6, 2022 • edited by aburrell

Description

Type of change

How Has This Been Tested?

Test Configuration

Checklist:

rstoneback left a comment

Choose a reason for hiding this comment

rstoneback commented Apr 6, 2022

landsito commented Apr 7, 2022 • edited

aburrell left a comment

Choose a reason for hiding this comment

aburrell commented Apr 7, 2022

landsito commented Apr 7, 2022

landsito commented Apr 7, 2022

landsito commented Apr 7, 2022

aburrell left a comment

Choose a reason for hiding this comment

aburrell commented Apr 7, 2022

aburrell left a comment

Choose a reason for hiding this comment

jklenzing left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

landsito commented Apr 6, 2022 •

edited by aburrell

landsito commented Apr 7, 2022 •

edited